update rails version
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -18,7 +18,7 @@ gem "uglifier"
|
|||||||
gem 'coffee-rails'
|
gem 'coffee-rails'
|
||||||
gem "therubyracer", :platforms => :ruby
|
gem "therubyracer", :platforms => :ruby
|
||||||
gem "pry", :group => [:test, :development]
|
gem "pry", :group => [:test, :development]
|
||||||
gem "rails", "~> 4.1.0"
|
gem "rails", "~> 4.1.5"
|
||||||
gem "pg"
|
gem "pg"
|
||||||
gem "kgio"
|
gem "kgio"
|
||||||
gem "dalli"
|
gem "dalli"
|
||||||
|
|||||||
66
Gemfile.lock
66
Gemfile.lock
@@ -17,27 +17,27 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.1.0)
|
actionmailer (4.1.5)
|
||||||
actionpack (= 4.1.0)
|
actionpack (= 4.1.5)
|
||||||
actionview (= 4.1.0)
|
actionview (= 4.1.5)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (4.1.0)
|
actionpack (4.1.5)
|
||||||
actionview (= 4.1.0)
|
actionview (= 4.1.5)
|
||||||
activesupport (= 4.1.0)
|
activesupport (= 4.1.5)
|
||||||
rack (~> 1.5.2)
|
rack (~> 1.5.2)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
actionview (4.1.0)
|
actionview (4.1.5)
|
||||||
activesupport (= 4.1.0)
|
activesupport (= 4.1.5)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
activemodel (4.1.0)
|
activemodel (4.1.5)
|
||||||
activesupport (= 4.1.0)
|
activesupport (= 4.1.5)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.1.0)
|
activerecord (4.1.5)
|
||||||
activemodel (= 4.1.0)
|
activemodel (= 4.1.5)
|
||||||
activesupport (= 4.1.0)
|
activesupport (= 4.1.5)
|
||||||
arel (~> 5.0.0)
|
arel (~> 5.0.0)
|
||||||
activesupport (4.1.0)
|
activesupport (4.1.5)
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
@@ -91,7 +91,7 @@ GEM
|
|||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
http-cookie (1.0.2)
|
http-cookie (1.0.2)
|
||||||
domain_name (~> 0.5)
|
domain_name (~> 0.5)
|
||||||
i18n (0.6.9)
|
i18n (0.6.11)
|
||||||
json (1.8.1)
|
json (1.8.1)
|
||||||
kgio (2.9.2)
|
kgio (2.9.2)
|
||||||
libv8 (3.16.14.3)
|
libv8 (3.16.14.3)
|
||||||
@@ -111,10 +111,10 @@ GEM
|
|||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_portile (0.5.3)
|
mini_portile (0.5.3)
|
||||||
minitest (5.3.2)
|
minitest (5.4.0)
|
||||||
mocha (1.0.0)
|
mocha (1.0.0)
|
||||||
metaclass (~> 0.0.1)
|
metaclass (~> 0.0.1)
|
||||||
multi_json (1.9.2)
|
multi_json (1.10.1)
|
||||||
net-http-digest_auth (1.4)
|
net-http-digest_auth (1.4)
|
||||||
net-http-persistent (2.9.4)
|
net-http-persistent (2.9.4)
|
||||||
net-scp (1.2.0)
|
net-scp (1.2.0)
|
||||||
@@ -129,7 +129,7 @@ GEM
|
|||||||
mini_portile (~> 0.5.0)
|
mini_portile (~> 0.5.0)
|
||||||
ntlm-http (0.1.1)
|
ntlm-http (0.1.1)
|
||||||
pg (0.17.1)
|
pg (0.17.1)
|
||||||
polyglot (0.3.4)
|
polyglot (0.3.5)
|
||||||
protected_attributes (1.0.7)
|
protected_attributes (1.0.7)
|
||||||
activemodel (>= 4.0.1, < 5.0)
|
activemodel (>= 4.0.1, < 5.0)
|
||||||
pry (0.9.12.6)
|
pry (0.9.12.6)
|
||||||
@@ -140,23 +140,23 @@ GEM
|
|||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
radix62 (1.0.1)
|
radix62 (1.0.1)
|
||||||
rails (4.1.0)
|
rails (4.1.5)
|
||||||
actionmailer (= 4.1.0)
|
actionmailer (= 4.1.5)
|
||||||
actionpack (= 4.1.0)
|
actionpack (= 4.1.5)
|
||||||
actionview (= 4.1.0)
|
actionview (= 4.1.5)
|
||||||
activemodel (= 4.1.0)
|
activemodel (= 4.1.5)
|
||||||
activerecord (= 4.1.0)
|
activerecord (= 4.1.5)
|
||||||
activesupport (= 4.1.0)
|
activesupport (= 4.1.5)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.1.0)
|
railties (= 4.1.5)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
railties (4.1.0)
|
railties (4.1.5)
|
||||||
actionpack (= 4.1.0)
|
actionpack (= 4.1.5)
|
||||||
activesupport (= 4.1.0)
|
activesupport (= 4.1.5)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
raindrops (0.13.0)
|
raindrops (0.13.0)
|
||||||
rake (10.2.2)
|
rake (10.3.2)
|
||||||
ref (1.0.5)
|
ref (1.0.5)
|
||||||
rmagick (2.13.2)
|
rmagick (2.13.2)
|
||||||
ruby-prof (0.14.2)
|
ruby-prof (0.14.2)
|
||||||
@@ -201,14 +201,14 @@ GEM
|
|||||||
libv8 (~> 3.16.14.0)
|
libv8 (~> 3.16.14.0)
|
||||||
ref
|
ref
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.3)
|
thread_safe (0.3.4)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timecop (0.7.1)
|
timecop (0.7.1)
|
||||||
tins (1.1.0)
|
tins (1.1.0)
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (1.1.0)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.5.0)
|
uglifier (2.5.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
@@ -259,7 +259,7 @@ DEPENDENCIES
|
|||||||
protected_attributes
|
protected_attributes
|
||||||
pry
|
pry
|
||||||
radix62 (~> 1.0.1)
|
radix62 (~> 1.0.1)
|
||||||
rails (~> 4.1.0)
|
rails (~> 4.1.5)
|
||||||
rmagick
|
rmagick
|
||||||
ruby-imagespec!
|
ruby-imagespec!
|
||||||
ruby-prof
|
ruby-prof
|
||||||
|
|||||||
Reference in New Issue
Block a user