Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-09 14:12:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Rails to 4.1.11

Browse source 
Resolves #1877
This commit is contained in:
Dan Rice 2015-06-16 20:49:19 -04:00
parent 67ced62096
commit f8b868d12b
2 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,6 +1,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '~> 4.1.6' gem 'rails', '~> 4.1.11'
gem 'sass-rails', '~> 4.0.3' gem 'sass-rails', '~> 4.0.3'
gem 'coffee-rails', '~> 4.0.1' gem 'coffee-rails', '~> 4.0.1'

72
Gemfile.lock
View file

@ -3,30 +3,30 @@ GEM
specs: specs:
RedCloth (4.2.9) RedCloth (4.2.9)
aasm (3.4.0) aasm (3.4.0)
actionmailer (4.1.7) actionmailer (4.1.11)
actionpack (= 4.1.7) actionpack (= 4.1.11)
actionview (= 4.1.7) actionview (= 4.1.11)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
actionpack (4.1.7) actionpack (4.1.11)
actionview (= 4.1.7) actionview (= 4.1.11)
activesupport (= 4.1.7) activesupport (= 4.1.11)
rack (~> 1.5.2) rack (~> 1.5.2)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
actionpack-xml_parser (1.0.1) actionpack-xml_parser (1.0.1)
actionpack (>= 4.0.0.rc1) actionpack (>= 4.0.0.rc1)
actionview (4.1.7) actionview (4.1.11)
activesupport (= 4.1.7) activesupport (= 4.1.11)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
activemodel (4.1.7) activemodel (4.1.11)
activesupport (= 4.1.7) activesupport (= 4.1.11)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.1.7) activerecord (4.1.11)
activemodel (= 4.1.7) activemodel (= 4.1.11)
activesupport (= 4.1.7) activesupport (= 4.1.11)
arel (~> 5.0.0) arel (~> 5.0.0)
activerecord-deprecated_finders (1.0.3) activerecord-deprecated_finders (1.0.3)
activesupport (4.1.7) activesupport (4.1.11)
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)
@ -92,52 +92,52 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
hike (1.2.3) hike (1.2.3)
htmlentities (4.3.2) htmlentities (4.3.2)
i18n (0.6.11) i18n (0.7.0)
jquery-rails (3.1.2) jquery-rails (3.1.2)
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.3)
libv8 (3.16.14.7) libv8 (3.16.14.7)
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
metaclass (0.0.4) metaclass (0.0.4)
mime-types (2.4.3) mime-types (2.6.1)
mini_portile (0.6.1) mini_portile (0.6.1)
minitest (5.4.2) minitest (5.7.0)
mocha (1.1.0) mocha (1.1.0)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.10.1) multi_json (1.11.1)
multi_test (0.1.1) multi_test (0.1.1)
mysql2 (0.3.16) mysql2 (0.3.16)
nokogiri (1.6.4) nokogiri (1.6.4)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
nokogumbo (1.1.12) nokogumbo (1.1.12)
nokogiri nokogiri
rack (1.5.2) rack (1.5.4)
rack-dev-mark (0.7.3) rack-dev-mark (0.7.3)
rack (>= 1.1) rack (>= 1.1)
rack-mini-profiler (0.9.2) rack-mini-profiler (0.9.2)
rack (>= 1.1.3) rack (>= 1.1.3)
rack-test (0.6.2) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.7) rails (4.1.11)
actionmailer (= 4.1.7) actionmailer (= 4.1.11)
actionpack (= 4.1.7) actionpack (= 4.1.11)
actionview (= 4.1.7) actionview (= 4.1.11)
activemodel (= 4.1.7) activemodel (= 4.1.11)
activerecord (= 4.1.7) activerecord (= 4.1.11)
activesupport (= 4.1.7) activesupport (= 4.1.11)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.1.7) railties (= 4.1.11)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
rails_autolink (1.1.6) rails_autolink (1.1.6)
rails (> 3.1) rails (> 3.1)
railties (4.1.7) railties (4.1.11)
actionpack (= 4.1.7) actionpack (= 4.1.11)
activesupport (= 4.1.7) activesupport (= 4.1.11)
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.4.2)
ref (1.0.5) ref (1.0.5)
rspec-expectations (3.1.2) rspec-expectations (3.1.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
@ -173,7 +173,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.0) sprockets-rails (2.3.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
@ -185,7 +185,7 @@ 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.4) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
tolk (1.6.0) tolk (1.6.0)
rails (>= 4.0, < 4.2) rails (>= 4.0, < 4.2)
@ -228,7 +228,7 @@ DEPENDENCIES
mysql2 (~> 0.3.16) mysql2 (~> 0.3.16)
rack-dev-mark (= 0.7.3) rack-dev-mark (= 0.7.3)
rack-mini-profiler (~> 0.9.2) rack-mini-profiler (~> 0.9.2)
rails (~> 4.1.6) rails (~> 4.1.11)
rails_autolink (~> 1.1.6) rails_autolink (~> 1.1.6)
rspec-expectations (~> 3.1.2) rspec-expectations (~> 3.1.2)
sanitize (~> 3.0.2) sanitize (~> 3.0.2)