1
0
Fork 0

Update Rails

This commit is contained in:
Andrew Tomaka 2014-10-02 16:15:10 -04:00
parent d7130b70e9
commit d9673383a9
3 changed files with 32 additions and 36 deletions

1
.ruby-version Normal file
View file

@ -0,0 +1 @@
2.1.1

View file

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '4.1.5' gem 'rails', '4.1.6'
gem 'sqlite3' gem 'sqlite3'
gem 'sass-rails', '~> 4.0.3' gem 'sass-rails', '~> 4.0.3'
gem 'uglifier', '>= 1.3.0' gem 'uglifier', '>= 1.3.0'

View file

@ -1,27 +1,27 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (4.1.5) actionmailer (4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
mail (~> 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.5) actionpack (4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionview (4.1.5) actionview (4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.5) activemodel (4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.5) activerecord (4.1.6)
activemodel (= 4.1.5) activemodel (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
arel (~> 5.0.0) arel (~> 5.0.0)
activesupport (4.1.5) activesupport (4.1.6)
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)
@ -47,29 +47,27 @@ GEM
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.1)
mail (2.5.4) mail (2.6.1)
mime-types (~> 1.16) mime-types (>= 1.16, < 3)
treetop (~> 1.4.8) mime-types (2.3)
mime-types (1.25.1)
minitest (5.4.2) minitest (5.4.2)
multi_json (1.10.1) multi_json (1.10.1)
polyglot (0.3.5)
rack (1.5.2) rack (1.5.2)
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.5) rails (4.1.6)
actionmailer (= 4.1.5) actionmailer (= 4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
actionview (= 4.1.5) actionview (= 4.1.6)
activemodel (= 4.1.5) activemodel (= 4.1.6)
activerecord (= 4.1.5) activerecord (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.5) railties (= 4.1.6)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
railties (4.1.5) railties (4.1.6)
actionpack (= 4.1.5) actionpack (= 4.1.6)
activesupport (= 4.1.5) activesupport (= 4.1.6)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.3.2)
@ -98,9 +96,6 @@ GEM
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (2.3.0) turbolinks (2.3.0)
coffee-rails coffee-rails
tzinfo (1.2.2) tzinfo (1.2.2)
@ -116,7 +111,7 @@ DEPENDENCIES
coffee-rails (~> 4.0.0) coffee-rails (~> 4.0.0)
jbuilder (~> 2.0) jbuilder (~> 2.0)
jquery-rails jquery-rails
rails (= 4.1.5) rails (= 4.1.6)
sass-rails (~> 4.0.3) sass-rails (~> 4.0.3)
sdoc (~> 0.4.0) sdoc (~> 0.4.0)
spring spring