update rails to 4.0.11
This commit is contained in:
parent
d046c5e8fa
commit
f1afd46453
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '4.0.9'
|
||||
gem 'rails', '4.0.11'
|
||||
|
||||
gem 'activeadmin', github: 'gregbell/active_admin'
|
||||
gem 'pg', '~> 0.17.1'
|
||||
|
|
53
Gemfile.lock
53
Gemfile.lock
|
@ -52,25 +52,25 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
RedCloth (4.2.9)
|
||||
actionmailer (4.0.9)
|
||||
actionpack (= 4.0.9)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.9)
|
||||
activesupport (= 4.0.9)
|
||||
actionmailer (4.0.11)
|
||||
actionpack (= 4.0.11)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
actionpack (4.0.11)
|
||||
activesupport (= 4.0.11)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.9)
|
||||
activesupport (= 4.0.9)
|
||||
activemodel (4.0.11)
|
||||
activesupport (= 4.0.11)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.9)
|
||||
activemodel (= 4.0.9)
|
||||
activerecord (4.0.11)
|
||||
activemodel (= 4.0.11)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.9)
|
||||
activesupport (= 4.0.11)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.9)
|
||||
activesupport (4.0.11)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
|
@ -229,9 +229,8 @@ GEM
|
|||
rack
|
||||
rest-client
|
||||
ya2yaml
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
mail (2.6.1)
|
||||
mime-types (>= 1.16, < 3)
|
||||
mailcatcher (0.2.4)
|
||||
eventmachine
|
||||
haml
|
||||
|
@ -309,7 +308,6 @@ GEM
|
|||
pg (0.17.1)
|
||||
polyamorous (1.1.0)
|
||||
activerecord (>= 3.0)
|
||||
polyglot (0.3.5)
|
||||
posix-spawn (0.3.9)
|
||||
protected_attributes (1.0.8)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
|
@ -327,21 +325,21 @@ GEM
|
|||
rack (>= 1.0)
|
||||
rack-throttle (0.3.0)
|
||||
rack (>= 1.0.0)
|
||||
rails (4.0.9)
|
||||
actionmailer (= 4.0.9)
|
||||
actionpack (= 4.0.9)
|
||||
activerecord (= 4.0.9)
|
||||
activesupport (= 4.0.9)
|
||||
rails (4.0.11)
|
||||
actionmailer (= 4.0.11)
|
||||
actionpack (= 4.0.11)
|
||||
activerecord (= 4.0.11)
|
||||
activesupport (= 4.0.11)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.9)
|
||||
railties (= 4.0.11)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails3-generators (1.0.0)
|
||||
railties (>= 3.0.0)
|
||||
rails3-jquery-autocomplete (1.0.14)
|
||||
rails (>= 3.0)
|
||||
railties (4.0.9)
|
||||
actionpack (= 4.0.9)
|
||||
activesupport (= 4.0.9)
|
||||
railties (4.0.11)
|
||||
actionpack (= 4.0.11)
|
||||
activesupport (= 4.0.11)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
|
@ -482,10 +480,7 @@ GEM
|
|||
i18n
|
||||
timecop (0.7.1)
|
||||
tmp_cache (0.1.1)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.41)
|
||||
tzinfo (0.3.42)
|
||||
uglifier (2.5.3)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
|
@ -568,7 +563,7 @@ DEPENDENCIES
|
|||
protected_attributes
|
||||
puma
|
||||
rack-throttle (~> 0.3.0)
|
||||
rails (= 4.0.9)
|
||||
rails (= 4.0.11)
|
||||
rails3-generators
|
||||
rails3-jquery-autocomplete (~> 1.0)
|
||||
rake
|
||||
|
|
Loading…
Reference in New Issue