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

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Reinier Balt 2014-01-07 21:01:55 +01:00
parent fa537fbeb0
commit eb1502d4e0
28 changed files with 385 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

156
Gemfile.lock
View file

@ -1,6 +1,6 @@
GIT
remote: https://github.com/cucumber/aruba
revision: adbfc240d69254d7b525876b4c5bff6b721b7d65
revision: 7afbc5c0cbae9c9a946d70c4c2735ccb86e00f08
specs:
aruba (0.5.3)
childprocess (>= 0.3.6)
@ -9,35 +9,35 @@ GIT
GIT
remote: https://github.com/rails/actionpack-xml_parser
revision: 246653ab3670f329176c1e77e6cd1a632466f06e
revision: e1516064761ea26502cd79b283f6af0fa2b1edf5
specs:
actionpack-xml_parser (1.0.0)
actionpack (>= 4.0.0.rc1, < 4.1)
actionpack-xml_parser (1.0.1)
actionpack (>= 4.0.0, < 5)
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
aasm (3.0.22)
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0)
activesupport (= 4.0.0)
aasm (3.0.25)
actionmailer (4.0.2)
actionpack (= 4.0.2)
mail (~> 2.5.4)
actionpack (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.0)
activesupport (= 4.0.0)
activemodel (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
activesupport (= 4.0.2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0)
activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
@ -45,16 +45,17 @@ GEM
tzinfo (~> 0.3.37)
acts_as_list (0.3.0)
activerecord (>= 3.0)
arel (4.0.0)
arel (4.0.1)
atomic (1.1.14)
bcrypt-ruby (3.0.1)
builder (3.1.4)
bullet (4.6.0)
uniform_notifier
bullet (4.7.1)
activesupport
uniform_notifier (>= 1.4.0)
cache_digests (0.3.1)
actionpack (>= 3.2)
thread_safe
capybara (2.1.0)
capybara (2.2.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@ -62,20 +63,20 @@ GEM
xpath (~> 2.0)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
codeclimate-test-reporter (0.1.1)
codeclimate-test-reporter (0.2.0)
simplecov (>= 0.7.1, < 1.0.0)
coffee-rails (4.0.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0.beta, < 5.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.3)
commonjs (0.2.7)
cucumber (1.3.8)
cucumber (1.3.10)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12.1)
gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.0.2)
cucumber-rails (1.4.0)
@ -83,25 +84,26 @@ GEM
cucumber (>= 1.2.0)
nokogiri (>= 1.5.0)
rails (>= 3.0.0)
database_cleaner (1.1.1)
diff-lcs (1.2.4)
database_cleaner (1.2.0)
diff-lcs (1.2.5)
docile (1.1.1)
erubis (2.7.0)
execjs (2.0.1)
factory_girl (4.2.0)
execjs (2.0.2)
factory_girl (4.3.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
factory_girl_rails (4.3.0)
factory_girl (~> 4.3.0)
railties (>= 3.0.0)
ffi (1.9.0)
gherkin (2.12.1)
ffi (1.9.3)
gherkin (2.12.2)
multi_json (~> 1.3)
hike (1.2.3)
htmlentities (4.3.1)
i18n (0.6.5)
i18n (0.6.9)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
json (1.8.1)
less (2.4.0)
commonjs (~> 0.2.7)
less-rails (2.4.2)
@ -112,66 +114,69 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.25)
mini_portile (0.5.1)
mime-types (1.25.1)
mini_portile (0.5.2)
minitest (4.7.5)
mocha (0.14.0)
metaclass (~> 0.0.1)
mousetrap-rails (0.0.12)
multi_json (1.8.0)
multi_test (0.0.2)
mysql2 (0.3.13)
nokogiri (1.6.0)
mousetrap-rails (1.4.6)
multi_json (1.8.2)
multi_test (0.0.3)
mysql2 (0.3.14)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
polyglot (0.3.3)
protected_attributes (1.0.5)
activemodel (>= 4.0.1, < 5.0)
rack (1.5.2)
rack-mini-profiler (0.1.31)
rack-mini-profiler (0.9.0)
rack (>= 1.1.3)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
rails (4.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
railties (= 4.0.2)
sprockets-rails (~> 2.0.0)
rails_autolink (1.1.4)
rails_autolink (1.1.5)
rails (> 3.1)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
rake (10.1.1)
ref (1.0.5)
rspec-expectations (2.14.3)
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
rubyzip (0.9.9)
rubyzip (1.1.0)
safe_yaml (0.9.7)
sanitize (2.0.6)
nokogiri (>= 1.4.4)
sass (3.2.10)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (3.2.13)
sass-rails (4.0.1)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
selenium-webdriver (2.35.1)
selenium-webdriver (2.39.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip (< 1.0.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
sprockets (2.10.0)
simplecov (0.8.2)
docile (~> 1.1.0)
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.0)
sprockets-rails (2.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
@ -187,31 +192,32 @@ GEM
atomic
tilt (1.4.1)
timecop (0.6.3)
tolk (1.3.11)
tolk (1.4.00)
protected_attributes
safe_yaml (~> 0.8)
will_paginate
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (1.3.0)
turbolinks (2.1.0)
coffee-rails
twitter-bootstrap-rails (2.2.8)
actionpack (>= 3.1)
execjs
rails (>= 3.1)
railties (>= 3.1)
tzinfo (0.3.37)
uglifier (2.2.1)
tzinfo (0.3.38)
uglifier (2.4.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
uniform_notifier (1.3.0)
json (>= 1.8.0)
uniform_notifier (1.4.0)
websocket (1.0.7)
will_paginate (3.0.5)
will_paginate-bootstrap (0.2.5)
will_paginate-bootstrap (1.0.0)
will_paginate (>= 3.0.3)
xpath (2.0.0)
nokogiri (~> 1.3)
yard (0.8.7.2)
yard (0.8.7.3)
PLATFORMS
ruby