Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-21 21:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.3_branch'

Browse source
This commit is contained in:
Dan Rice 2015-06-17 10:27:10 -04:00
commit 0dae5ccde0
2 changed files with 34 additions and 34 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'
gem 'rails', '~>4.1.10'
gem 'rails', '~>4.1.11'
gem 'sass-rails', '~>4.0'
gem 'coffee-rails', '~>4.0'

66
Gemfile.lock
View file

@ -3,30 +3,30 @@ GEM
specs:
RedCloth (4.2.9)
aasm (3.4.0)
actionmailer (4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
actionmailer (4.1.11)
actionpack (= 4.1.11)
actionview (= 4.1.11)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.10)
actionview (= 4.1.10)
activesupport (= 4.1.10)
actionpack (4.1.11)
actionview (= 4.1.11)
activesupport (= 4.1.11)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionpack-xml_parser (1.0.1)
actionpack (>= 4.0.0.rc1)
actionview (4.1.10)
activesupport (= 4.1.10)
actionview (4.1.11)
activesupport (= 4.1.11)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.10)
activesupport (= 4.1.10)
activemodel (4.1.11)
activesupport (= 4.1.11)
builder (~> 3.1)
activerecord (4.1.10)
activemodel (= 4.1.10)
activesupport (= 4.1.10)
activerecord (4.1.11)
activemodel (= 4.1.11)
activesupport (= 4.1.11)
arel (~> 5.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.1.10)
activesupport (4.1.11)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -95,45 +95,45 @@ GEM
jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.2)
json (1.8.3)
libv8 (3.16.14.7)
mail (2.6.3)
mime-types (>= 1.16, < 3)
metaclass (0.0.4)
mime-types (2.4.3)
mime-types (2.6.1)
mini_portile (0.6.1)
minitest (5.5.1)
minitest (5.7.0)
mocha (1.1.0)
metaclass (~> 0.0.1)
multi_json (1.11.0)
multi_json (1.11.1)
multi_test (0.1.1)
mysql2 (0.3.16)
nokogiri (1.6.4)
mini_portile (~> 0.6.0)
nokogumbo (1.1.12)
nokogiri
rack (1.5.2)
rack (1.5.4)
rack-dev-mark (0.7.3)
rack (>= 1.1)
rack-mini-profiler (0.9.2)
rack (>= 1.1.3)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.10)
actionmailer (= 4.1.10)
actionpack (= 4.1.10)
actionview (= 4.1.10)
activemodel (= 4.1.10)
activerecord (= 4.1.10)
activesupport (= 4.1.10)
rails (4.1.11)
actionmailer (= 4.1.11)
actionpack (= 4.1.11)
actionview (= 4.1.11)
activemodel (= 4.1.11)
activerecord (= 4.1.11)
activesupport (= 4.1.11)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.10)
railties (= 4.1.11)
sprockets-rails (~> 2.0)
rails_autolink (1.1.6)
rails (> 3.1)
railties (4.1.10)
actionpack (= 4.1.10)
activesupport (= 4.1.10)
railties (4.1.11)
actionpack (= 4.1.11)
activesupport (= 4.1.11)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
@ -172,7 +172,7 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4)
sprockets-rails (2.3.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
@ -230,10 +230,10 @@ DEPENDENCIES
mysql2
rack-dev-mark
rack-mini-profiler
rails (~> 4.1.10)
rails (~> 4.1.11)
rails_autolink
rspec-expectations
sanitize
sanitize (>= 3.0.0)
sass-rails (~> 4.0)
selenium-webdriver (>= 2.45)
simplecov