update rails version

This commit is contained in:
r888888888 2014-12-10 16:23:49 -08:00
parent 884c721ff7
commit f0c89fea03
2 changed files with 34 additions and 39 deletions

View File

@ -19,7 +19,7 @@ gem 'coffee-rails'
gem "therubyracer", :platforms => :ruby
gem "pry", :group => [:test, :development]
gem "pry-debugger", :group => [:test, :development]
gem "rails", "~> 4.1.5"
gem "rails", "~> 4.1.8"
gem "pg"
gem "kgio"
gem "dalli"

View File

@ -17,27 +17,27 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.5)
actionpack (= 4.1.5)
actionview (= 4.1.5)
mail (~> 2.5.4)
actionpack (4.1.5)
actionview (= 4.1.5)
activesupport (= 4.1.5)
actionmailer (4.1.8)
actionpack (= 4.1.8)
actionview (= 4.1.8)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.8)
actionview (= 4.1.8)
activesupport (= 4.1.8)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.5)
activesupport (= 4.1.5)
actionview (4.1.8)
activesupport (= 4.1.8)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.5)
activesupport (= 4.1.5)
activemodel (4.1.8)
activesupport (= 4.1.8)
builder (~> 3.1)
activerecord (4.1.5)
activemodel (= 4.1.5)
activesupport (= 4.1.5)
activerecord (4.1.8)
activemodel (= 4.1.8)
activesupport (= 4.1.8)
arel (~> 5.0.0)
activesupport (4.1.5)
activesupport (4.1.8)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -116,9 +116,8 @@ GEM
jwt (1.2.0)
kgio (2.9.2)
libv8 (3.16.14.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mechanize (2.7.2)
domain_name (~> 0.5, >= 0.5.1)
http-cookie (~> 1.0.0)
@ -132,7 +131,7 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.3)
minitest (5.4.0)
minitest (5.4.3)
mocha (1.0.0)
metaclass (~> 0.0.1)
monetize (0.3.0)
@ -162,7 +161,6 @@ GEM
multi_xml (~> 0.5)
rack (~> 1.2)
pg (0.17.1)
polyglot (0.3.5)
protected_attributes (1.0.7)
activemodel (>= 4.0.1, < 5.0)
pry (0.9.12.6)
@ -176,23 +174,23 @@ GEM
rack-test (0.6.2)
rack (>= 1.0)
radix62 (1.0.1)
rails (4.1.5)
actionmailer (= 4.1.5)
actionpack (= 4.1.5)
actionview (= 4.1.5)
activemodel (= 4.1.5)
activerecord (= 4.1.5)
activesupport (= 4.1.5)
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)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.5)
railties (= 4.1.8)
sprockets-rails (~> 2.0)
railties (4.1.5)
actionpack (= 4.1.5)
activesupport (= 4.1.5)
railties (4.1.8)
actionpack (= 4.1.8)
activesupport (= 4.1.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
rake (10.3.2)
rake (10.4.2)
ref (1.0.5)
rmagick (2.13.3)
ruby-prof (0.14.2)
@ -226,10 +224,10 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3)
sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sprockets (>= 2.8, < 4.0)
statistics2 (0.54)
streamio-ffmpeg (1.0.0)
term-ansicolor (1.3.0)
@ -242,9 +240,6 @@ GEM
tilt (1.4.1)
timecop (0.7.1)
tins (1.1.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.0)
@ -298,7 +293,7 @@ DEPENDENCIES
pry
pry-debugger
radix62 (~> 1.0.1)
rails (~> 4.1.5)
rails (~> 4.1.8)
rmagick
ruby-imagespec!
ruby-prof