Use main ice_cube gem now feature is merged
This commit is contained in:
parent
b26a0cad12
commit
7f9c99f849
2 changed files with 3 additions and 9 deletions
2
Gemfile
2
Gemfile
|
@ -41,7 +41,7 @@ gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb
|
||||||
gem 'protected_attributes'
|
gem 'protected_attributes'
|
||||||
gem 'ruby-units'
|
gem 'ruby-units'
|
||||||
gem 'attribute_normalizer'
|
gem 'attribute_normalizer'
|
||||||
gem 'ice_cube', github: 'wvengen/ice_cube', branch: 'issues/50-from_ical-rebased' # fork until merged
|
gem 'ice_cube', '~> 0.13.0'
|
||||||
gem 'recurring_select'
|
gem 'recurring_select'
|
||||||
gem 'roo', '~> 1.13.2'
|
gem 'roo', '~> 1.13.2'
|
||||||
gem 'spreadsheet'
|
gem 'spreadsheet'
|
||||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -22,13 +22,6 @@ GIT
|
||||||
acts_as_versioned (0.6.0)
|
acts_as_versioned (0.6.0)
|
||||||
activerecord (>= 3.0.9)
|
activerecord (>= 3.0.9)
|
||||||
|
|
||||||
GIT
|
|
||||||
remote: git://github.com/wvengen/ice_cube.git
|
|
||||||
revision: addacaab715c70c5a9b736767ae98032e8efab92
|
|
||||||
branch: issues/50-from_ical-rebased
|
|
||||||
specs:
|
|
||||||
ice_cube (0.12.1)
|
|
||||||
|
|
||||||
PATH
|
PATH
|
||||||
remote: plugins/messages
|
remote: plugins/messages
|
||||||
specs:
|
specs:
|
||||||
|
@ -197,6 +190,7 @@ GEM
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
i18n-spec (0.6.0)
|
i18n-spec (0.6.0)
|
||||||
iso
|
iso
|
||||||
|
ice_cube (0.13.0)
|
||||||
interception (0.5)
|
interception (0.5)
|
||||||
iso (0.2.1)
|
iso (0.2.1)
|
||||||
i18n
|
i18n
|
||||||
|
@ -500,7 +494,7 @@ DEPENDENCIES
|
||||||
haml-rails
|
haml-rails
|
||||||
i18n-js (~> 3.0.0.rc8)
|
i18n-js (~> 3.0.0.rc8)
|
||||||
i18n-spec
|
i18n-spec
|
||||||
ice_cube!
|
ice_cube (~> 0.13.0)
|
||||||
inherited_resources!
|
inherited_resources!
|
||||||
jquery-rails
|
jquery-rails
|
||||||
kaminari
|
kaminari
|
||||||
|
|
Loading…
Reference in a new issue