Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

upgrade rails-settings-cached & bundle update

Browse source
This commit is contained in:
wvengen 2014-06-05 12:24:06 +02:00
parent e7a476e6b6
commit 06bed3698f
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -36,7 +36,7 @@ gem 'simple-navigation'
gem 'simple-navigation-bootstrap' gem 'simple-navigation-bootstrap'
gem 'ransack' gem 'ransack'
gem 'acts_as_tree' gem 'acts_as_tree'
gem "rails-settings-cached", "0.3.1" gem 'rails-settings-cached'
gem 'resque' gem 'resque'
gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb gem 'whenever', require: false # For defining cronjobs, see config/schedule.rb
gem 'protected_attributes' gem 'protected_attributes'

48
Gemfile.lock
View file

@ -53,25 +53,25 @@ PATH
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.0.6.rc1) actionmailer (4.0.5)
actionpack (= 4.0.6.rc1) actionpack (= 4.0.5)
mail (~> 2.5.4) mail (~> 2.5.4)
actionpack (4.0.6.rc1) actionpack (4.0.5)
activesupport (= 4.0.6.rc1) activesupport (= 4.0.5)
builder (~> 3.1.0) builder (~> 3.1.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
activemodel (4.0.6.rc1) activemodel (4.0.5)
activesupport (= 4.0.6.rc1) activesupport (= 4.0.5)
builder (~> 3.1.0) builder (~> 3.1.0)
activerecord (4.0.6.rc1) activerecord (4.0.5)
activemodel (= 4.0.6.rc1) activemodel (= 4.0.5)
activerecord-deprecated_finders (~> 1.0.2) activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.6.rc1) activesupport (= 4.0.5)
arel (~> 4.0.0) arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3) activerecord-deprecated_finders (1.0.3)
activesupport (4.0.6.rc1) activesupport (4.0.5)
i18n (~> 0.6, >= 0.6.9) i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2) minitest (~> 4.2)
multi_json (~> 1.3) multi_json (~> 1.3)
@ -237,24 +237,24 @@ GEM
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.0.6.rc1) rails (4.0.5)
actionmailer (= 4.0.6.rc1) actionmailer (= 4.0.5)
actionpack (= 4.0.6.rc1) actionpack (= 4.0.5)
activerecord (= 4.0.6.rc1) activerecord (= 4.0.5)
activesupport (= 4.0.6.rc1) activesupport (= 4.0.5)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.0.6.rc1) railties (= 4.0.5)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0.0)
rails-assets-listjs (0.2.0.beta.4) rails-assets-listjs (0.2.0.beta.4)
railties (>= 3.1) railties (>= 3.1)
rails-i18n (4.0.2) rails-i18n (4.0.2)
i18n (~> 0.6) i18n (~> 0.6)
rails (>= 4.0) rails (>= 4.0)
rails-settings-cached (0.3.1) rails-settings-cached (0.4.1)
rails (>= 4.0.0.beta1) rails (>= 4.0.0)
railties (4.0.6.rc1) railties (4.0.5)
actionpack (= 4.0.6.rc1) actionpack (= 4.0.5)
activesupport (= 4.0.6.rc1) activesupport (= 4.0.5)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.3.2)
@ -338,7 +338,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3) sprockets-rails (2.0.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (~> 2.8)
@ -437,7 +437,7 @@ DEPENDENCIES
rails (~> 4.0.0) rails (~> 4.0.0)
rails-assets-listjs (= 0.2.0.beta.4) rails-assets-listjs (= 0.2.0.beta.4)
rails-i18n rails-i18n
rails-settings-cached (= 0.3.1) rails-settings-cached
ransack ransack
resque resque
rspec-core (= 2.14.8) rspec-core (= 2.14.8)