update to rails 4.1.12
This commit is contained in:
parent
ff097813ad
commit
befee851c8
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
|||
source "https://rubygems.org"
|
||||
|
||||
gem "rails", "4.1.8"
|
||||
gem "rails", "4.1.12"
|
||||
|
||||
gem "unicorn"
|
||||
|
||||
|
|
79
Gemfile.lock
79
Gemfile.lock
|
@ -1,27 +1,27 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
actionmailer (4.1.12)
|
||||
actionpack (= 4.1.12)
|
||||
actionview (= 4.1.12)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
actionpack (4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
actionpack (4.1.12)
|
||||
actionview (= 4.1.12)
|
||||
activesupport (= 4.1.12)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
actionview (4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
actionview (4.1.12)
|
||||
activesupport (= 4.1.12)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
activemodel (4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
activemodel (4.1.12)
|
||||
activesupport (= 4.1.12)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.8)
|
||||
activemodel (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
activerecord (4.1.12)
|
||||
activemodel (= 4.1.12)
|
||||
activesupport (= 4.1.12)
|
||||
arel (~> 5.0.0)
|
||||
activesupport (4.1.8)
|
||||
activesupport (4.1.12)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
|
@ -39,45 +39,43 @@ GEM
|
|||
execjs (2.2.1)
|
||||
faker (1.4.2)
|
||||
i18n (~> 0.5)
|
||||
hike (1.2.3)
|
||||
htmlentities (4.3.2)
|
||||
i18n (0.6.11)
|
||||
i18n (0.7.0)
|
||||
innertube (1.1.0)
|
||||
joiner (0.3.4)
|
||||
activerecord (>= 4.1.0)
|
||||
jquery-rails (3.1.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
json (1.8.3)
|
||||
kgio (2.9.2)
|
||||
machinist (2.0)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
middleware (0.1.0)
|
||||
mime-types (2.4.3)
|
||||
mime-types (2.6.1)
|
||||
mini_portile (0.5.3)
|
||||
minitest (5.5.0)
|
||||
multi_json (1.10.1)
|
||||
minitest (5.7.0)
|
||||
mysql2 (0.3.16)
|
||||
nokogiri (1.6.1)
|
||||
mini_portile (~> 0.5.0)
|
||||
oauth (0.4.7)
|
||||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
rack (1.5.5)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.1.8)
|
||||
actionmailer (= 4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
activemodel (= 4.1.8)
|
||||
activerecord (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
rails (4.1.12)
|
||||
actionmailer (= 4.1.12)
|
||||
actionpack (= 4.1.12)
|
||||
actionview (= 4.1.12)
|
||||
activemodel (= 4.1.12)
|
||||
activerecord (= 4.1.12)
|
||||
activesupport (= 4.1.12)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.1.8)
|
||||
railties (= 4.1.12)
|
||||
sprockets-rails (~> 2.0)
|
||||
railties (4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
railties (4.1.12)
|
||||
actionpack (= 4.1.12)
|
||||
activesupport (= 4.1.12)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
raindrops (0.13.0)
|
||||
|
@ -99,12 +97,9 @@ GEM
|
|||
rspec-core (~> 2.99.0)
|
||||
rspec-expectations (~> 2.99.0)
|
||||
rspec-mocks (~> 2.99.0)
|
||||
sprockets (2.12.3)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
sprockets (3.2.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.2.2)
|
||||
sprockets-rails (2.3.2)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
|
@ -117,8 +112,7 @@ GEM
|
|||
middleware (>= 0.1.0)
|
||||
riddle (>= 1.5.11)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.4)
|
||||
tilt (1.4.1)
|
||||
thread_safe (0.3.5)
|
||||
tzinfo (1.2.2)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (2.5.3)
|
||||
|
@ -144,10 +138,13 @@ DEPENDENCIES
|
|||
mysql2 (>= 0.3.14)
|
||||
nokogiri (= 1.6.1)
|
||||
oauth
|
||||
rails (= 4.1.8)
|
||||
rails (= 4.1.12)
|
||||
rdiscount
|
||||
rspec-rails (~> 2.6)
|
||||
sqlite3
|
||||
thinking-sphinx (~> 3.1.2)
|
||||
uglifier (>= 1.3.0)
|
||||
unicorn
|
||||
|
||||
BUNDLED WITH
|
||||
1.10.6
|
||||
|
|
Loading…
Reference in New Issue