p71924506
/
wblog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade rails to 4.1.1

This commit is contained in:
yafeilee 2014-05-11 18:53:20 +08:00
parent 386f7b7f97
commit 30c227634b
2 changed files with 75 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -6,7 +6,7 @@ end
ruby '2.0.0'
gem 'rails', '4.0.4'
gem 'rails', '4.1.1'
gem 'sass-rails', '~> 4.0.2'
gem 'coffee-rails', '~> 4.0.1'
gem 'uglifier', '>= 1.3.0'

145
Gemfile.lock
View File

@ -1,35 +1,36 @@
GEM
remote: http://ruby.taobao.org/
specs:
actionmailer (4.0.4)
actionpack (= 4.0.4)
actionmailer (4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
mail (~> 2.5.4)
actionpack (4.0.4)
activesupport (= 4.0.4)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionpack (4.1.1)
actionview (= 4.1.1)
activesupport (= 4.1.1)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.4)
activesupport (= 4.0.4)
builder (~> 3.1.0)
activerecord (4.0.4)
activemodel (= 4.0.4)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.4)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.4)
actionview (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.1)
activesupport (= 4.1.1)
builder (~> 3.1)
activerecord (4.1.1)
activemodel (= 4.1.1)
activesupport (= 4.1.1)
arel (~> 5.0.0)
activesupport (4.1.1)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
angularjs-rails (1.2.15)
arel (4.0.2)
atomic (1.1.16)
bson (2.2.1)
builder (3.1.4)
tzinfo (~> 1.1)
angularjs-rails (1.2.16)
arel (5.0.1.20140414130214)
bson (2.2.3)
builder (3.2.2)
capybara (2.2.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@ -41,16 +42,16 @@ GEM
activesupport (>= 3.2.0)
json (>= 1.7)
mime-types (>= 1.16)
carrierwave-mongoid (0.7.0)
carrierwave-mongoid (0.7.1)
carrierwave (>= 0.8.0, < 0.11.0)
mongoid (>= 3.0, < 5.0)
mongoid-grid_fs (~> 1.3)
mongoid-grid_fs (>= 1.3, < 3.0)
celluloid (0.15.2)
timers (~> 1.1.0)
celluloid-io (0.15.0)
celluloid (>= 0.15.0)
nio4r (>= 0.5.0)
chunky_png (1.3.0)
chunky_png (1.3.1)
coderay (1.1.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
@ -59,14 +60,14 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
connection_pool (1.2.0)
connection_pool (2.0.0)
database_cleaner (1.2.0)
diff-lcs (1.2.5)
erubis (2.7.0)
execjs (2.0.2)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.4.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
ffi (1.9.3)
@ -77,10 +78,10 @@ GEM
foundation-icons-sass-rails (3.0.0)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
foundation-rails (5.2.1.0)
foundation-rails (5.2.2.0)
railties (>= 3.1.0)
sass (>= 3.2.0)
guard (2.6.0)
guard (2.6.1)
formatador (>= 0.2.4)
listen (~> 2.7)
lumberjack (~> 1.0)
@ -91,7 +92,7 @@ GEM
guard (~> 2.2)
guard-rails (0.5.0)
guard (>= 2.0.0)
guard-rspec (4.2.8)
guard-rspec (4.2.9)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
hike (1.2.3)
@ -102,7 +103,7 @@ GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
listen (2.7.1)
listen (2.7.4)
celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3)
@ -116,14 +117,14 @@ GEM
mini_magick (3.7.0)
subexec (~> 0.2.1)
mini_portile (0.5.3)
minitest (4.7.5)
minitest (5.3.3)
mongoid (4.0.0.beta1)
activemodel (>= 4.0.0)
moped (~> 2.0.beta6)
origin (~> 2.1)
tzinfo (>= 0.3.37)
mongoid-grid_fs (1.9.2)
mime-types (>= 1.19, < 3.0)
mongoid-grid_fs (2.1.0)
mime-types (>= 1.0, < 3.0)
mongoid (>= 3.0, < 5.0)
mongoid-pagination (0.2.0)
activesupport
@ -132,16 +133,16 @@ GEM
mongoid (>= 3.0.0.rc)
rake
rspec (>= 2.9)
moped (2.0.0.beta6)
moped (2.0.0.rc1)
bson (~> 2.2)
connection_pool (~> 1.2)
connection_pool (~> 2.0)
optionable (~> 0.2.0)
multi_json (1.9.2)
multi_json (1.10.0)
nio4r (1.0.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
optionable (0.2.0)
origin (2.1.0)
origin (2.1.1)
polyglot (0.3.4)
pry (0.9.12.6)
coderay (~> 1.0)
@ -156,22 +157,24 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.4)
actionmailer (= 4.0.4)
actionpack (= 4.0.4)
activerecord (= 4.0.4)
activesupport (= 4.0.4)
rails (4.1.1)
actionmailer (= 4.1.1)
actionpack (= 4.1.1)
actionview (= 4.1.1)
activemodel (= 4.1.1)
activerecord (= 4.1.1)
activesupport (= 4.1.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.4)
sprockets-rails (~> 2.0.0)
railties (4.0.4)
actionpack (= 4.0.4)
activesupport (= 4.0.4)
railties (= 4.1.1)
sprockets-rails (~> 2.0)
railties (4.1.1)
actionpack (= 4.1.1)
activesupport (= 4.1.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.2.2)
rake (10.3.1)
rb-fsevent (0.9.4)
rb-inotify (0.9.3)
rb-inotify (0.9.4)
ffi (>= 0.5.0)
redcarpet (3.1.1)
redis (3.0.7)
@ -179,7 +182,7 @@ GEM
redis (~> 3.0.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rouge (1.3.3)
rouge (1.3.4)
rqrcode-with-patches (0.5.4)
chunky_png
rspec (2.14.1)
@ -201,50 +204,50 @@ GEM
rspec-sidekiq (1.0.0)
rspec (>= 2.0.0)
sidekiq (>= 2.4.0)
sass (3.2.18)
sass-rails (4.0.2)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0.0)
sidekiq (2.17.7)
sprockets-rails (~> 2.0)
sidekiq (3.0.2)
celluloid (>= 0.15.2)
connection_pool (>= 1.0.0)
connection_pool (>= 2.0.0)
json
redis (>= 3.0.6)
redis-namespace (>= 1.3.1)
simple_form (3.0.1)
actionpack (>= 4.0.0, < 4.1)
activemodel (>= 4.0.0, < 4.1)
simple_form (3.0.2)
actionpack (~> 4.0)
activemodel (~> 4.0)
slim (2.0.2)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slim-rails (2.1.0)
actionpack (>= 3.0, < 4.1)
activesupport (>= 3.0, < 4.1)
railties (>= 3.0, < 4.1)
slim-rails (2.1.4)
actionpack (>= 3.0, < 4.2)
activesupport (>= 3.0, < 4.2)
railties (>= 3.0, < 4.2)
slim (~> 2.0)
slop (3.5.0)
sprockets (2.11.0)
sprockets (2.8.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1)
sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
subexec (0.2.3)
temple (0.6.7)
thor (0.19.1)
thread_safe (0.3.1)
atomic (>= 1.1.7, < 2)
thread_safe (0.3.3)
tilt (1.4.1)
timers (1.1.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.39)
tzinfo (1.1.0)
thread_safe (~> 0.1)
uglifier (2.5.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
@ -279,7 +282,7 @@ DEPENDENCIES
pry-nav
pry-rails
quiet_assets
rails (= 4.0.4)
rails (= 4.1.1)
redcarpet
rest-client
rouge