Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-22 15:14:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into rails4

Browse source 
Conflicts:
	Gemfile.lock
	config/routes.rb
This commit is contained in:
Reinier Balt 2013-06-17 09:25:02 +02:00
commit 4a485558e2
51 changed files with 5475 additions and 5015 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Gemfile.lock
View file

@ -9,9 +9,15 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
<<<<<<< HEAD
aasm (3.0.18)
actionmailer (4.0.0.rc1)
actionpack (= 4.0.0.rc1)
=======
aasm (3.0.19)
actionmailer (3.2.13)
actionpack (= 3.2.13)
>>>>>>> master
mail (~> 2.5.3)
actionpack (4.0.0.rc1)
activesupport (= 4.0.0.rc1)
@ -36,7 +42,11 @@ GEM
tzinfo (~> 0.3.37)
acts_as_list (0.2.0)
activerecord (>= 3.0)
<<<<<<< HEAD
arel (4.0.0)
=======
arel (3.0.2)
>>>>>>> master
aruba (0.5.3)
childprocess (>= 0.3.6)
cucumber (>= 1.1.1)
@ -73,6 +83,10 @@ GEM
capybara (>= 1.1.2)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
<<<<<<< HEAD
=======
rails (~> 3.0)
>>>>>>> master
database_cleaner (1.0.1)
diff-lcs (1.2.4)
erubis (2.7.0)
@ -83,33 +97,49 @@ GEM
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
ffi (1.8.1)
ffi (1.9.0)
gherkin (2.12.0)
multi_json (~> 1.3)
hike (1.2.2)
hike (1.2.3)
htmlentities (4.3.1)
<<<<<<< HEAD
i18n (0.6.4)
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
=======
i18n (0.6.1)
journey (1.0.4)
jquery-rails (3.0.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
>>>>>>> master
libv8 (3.11.8.17)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.23)
<<<<<<< HEAD
minitest (4.7.4)
mocha (0.14.0)
metaclass (~> 0.0.1)
multi_json (1.7.3)
=======
mocha (0.14.0)
metaclass (~> 0.0.1)
multi_json (1.7.6)
>>>>>>> master
mysql2 (0.3.11)
nokogiri (1.5.9)
nokogiri (1.5.10)
polyglot (0.3.3)
rack (1.5.2)
rack-mini-profiler (0.1.26)
rack (>= 1.1.3)
rack-test (0.6.2)
rack (>= 1.0)
<<<<<<< HEAD
rails (4.0.0.rc1)
actionmailer (= 4.0.0.rc1)
actionpack (= 4.0.0.rc1)
@ -123,23 +153,49 @@ GEM
railties (4.0.0.rc1)
actionpack (= 4.0.0.rc1)
activesupport (= 4.0.0.rc1)
=======
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
bundler (~> 1.0)
railties (= 3.2.13)
rails_autolink (1.1.0)
rails (> 3.1)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
>>>>>>> master
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.0.4)
<<<<<<< HEAD
=======
rdoc (3.12.2)
json (~> 1.4)
>>>>>>> master
ref (1.0.5)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rubyzip (0.9.9)
safe_yaml (0.9.1)
safe_yaml (0.9.3)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.2.9)
<<<<<<< HEAD
sass-rails (4.0.0.rc1)
railties (>= 4.0.0.beta, < 5.0)
=======
sass-rails (3.2.6)
railties (~> 3.2.0)
>>>>>>> master
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0.rc0)
tilt (~> 1.3)
selenium-webdriver (2.32.1)
selenium-webdriver (2.33.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
@ -172,7 +228,7 @@ GEM
tolk (1.3.9)
safe_yaml (~> 0.8)
will_paginate
treetop (1.4.12)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)