mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-27 17:44:08 +01:00
Merge branch 'master' into new-gui
Conflicts: Gemfile.lock
This commit is contained in:
Reinier Balt
commit
463f5e922d
37 changed files with 1083 additions and 501 deletions
94
Gemfile.lock
94
Gemfile.lock
|
|
@ -1,3 +1,12 @@
|
|||
GIT
|
||||
remote: https://github.com/cucumber/aruba
|
||||
revision: adbfc240d69254d7b525876b4c5bff6b721b7d65
|
||||
specs:
|
||||
aruba (0.5.3)
|
||||
childprocess (>= 0.3.6)
|
||||
cucumber (>= 1.1.1)
|
||||
rspec-expectations (>= 2.7.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/rails/actionpack-xml_parser
|
||||
revision: 246653ab3670f329176c1e77e6cd1a632466f06e
|
||||
|
|
@ -9,7 +18,11 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
RedCloth (4.2.9)
|
||||
<<<<<<< HEAD
|
||||
aasm (3.0.20)
|
||||
=======
|
||||
aasm (3.0.22)
|
||||
>>>>>>> master
|
||||
actionmailer (4.0.0)
|
||||
actionpack (= 4.0.0)
|
||||
mail (~> 2.5.3)
|
||||
|
|
@ -37,11 +50,15 @@ GEM
|
|||
acts_as_list (0.3.0)
|
||||
activerecord (>= 3.0)
|
||||
arel (4.0.0)
|
||||
<<<<<<< HEAD
|
||||
aruba (0.5.3)
|
||||
childprocess (>= 0.3.6)
|
||||
cucumber (>= 1.1.1)
|
||||
rspec-expectations (>= 2.7.0)
|
||||
atomic (1.1.12)
|
||||
=======
|
||||
atomic (1.1.14)
|
||||
>>>>>>> master
|
||||
bcrypt-ruby (3.0.1)
|
||||
builder (3.1.4)
|
||||
bullet (4.6.0)
|
||||
|
|
@ -57,6 +74,8 @@ GEM
|
|||
xpath (~> 2.0)
|
||||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
codeclimate-test-reporter (0.0.11)
|
||||
simplecov (>= 0.7.1, < 1.0.0)
|
||||
coffee-rails (4.0.0)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0.beta, < 5.0)
|
||||
|
|
@ -64,61 +83,80 @@ GEM
|
|||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.6.3)
|
||||
<<<<<<< HEAD
|
||||
commonjs (0.2.6)
|
||||
cucumber (1.3.6)
|
||||
=======
|
||||
cucumber (1.3.8)
|
||||
>>>>>>> master
|
||||
builder (>= 2.1.2)
|
||||
diff-lcs (>= 1.1.3)
|
||||
gherkin (~> 2.12.0)
|
||||
multi_json (~> 1.7.5)
|
||||
gherkin (~> 2.12.1)
|
||||
multi_json (>= 1.7.5, < 2.0)
|
||||
multi_test (>= 0.0.2)
|
||||
cucumber-rails (1.3.0)
|
||||
cucumber-rails (1.4.0)
|
||||
capybara (>= 1.1.2)
|
||||
cucumber (>= 1.1.8)
|
||||
cucumber (>= 1.2.0)
|
||||
nokogiri (>= 1.5.0)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
rails (>= 3.0.0)
|
||||
>>>>>>> master
|
||||
database_cleaner (1.1.1)
|
||||
diff-lcs (1.2.4)
|
||||
erubis (2.7.0)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
execjs (2.0.1)
|
||||
factory_girl (4.2.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.2.1)
|
||||
factory_girl (~> 4.2.0)
|
||||
railties (>= 3.0.0)
|
||||
ffi (1.9.0)
|
||||
gherkin (2.12.0)
|
||||
gherkin (2.12.1)
|
||||
multi_json (~> 1.3)
|
||||
hike (1.2.3)
|
||||
htmlentities (4.3.1)
|
||||
i18n (0.6.4)
|
||||
i18n (0.6.5)
|
||||
jquery-rails (3.0.4)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.0)
|
||||
<<<<<<< HEAD
|
||||
less (2.3.2)
|
||||
commonjs (~> 0.2.6)
|
||||
less-rails (2.3.3)
|
||||
actionpack (>= 3.1)
|
||||
less (~> 2.3.1)
|
||||
libv8 (3.11.8.17)
|
||||
=======
|
||||
libv8 (3.16.14.3)
|
||||
>>>>>>> master
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
metaclass (0.0.1)
|
||||
mime-types (1.23)
|
||||
mime-types (1.25)
|
||||
mini_portile (0.5.1)
|
||||
minitest (4.7.5)
|
||||
mocha (0.14.0)
|
||||
metaclass (~> 0.0.1)
|
||||
<<<<<<< HEAD
|
||||
mousetrap-rails (0.0.11)
|
||||
multi_json (1.7.8)
|
||||
=======
|
||||
multi_json (1.8.0)
|
||||
>>>>>>> master
|
||||
multi_test (0.0.2)
|
||||
mysql2 (0.3.13)
|
||||
nokogiri (1.6.0)
|
||||
mini_portile (~> 0.5.0)
|
||||
polyglot (0.3.3)
|
||||
rack (1.5.2)
|
||||
<<<<<<< HEAD
|
||||
rack-mini-profiler (0.1.28)
|
||||
=======
|
||||
rack-mini-profiler (0.1.31)
|
||||
>>>>>>> master
|
||||
rack (>= 1.1.3)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
|
|
@ -130,7 +168,7 @@ GEM
|
|||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.0)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
rails_autolink (1.1.0)
|
||||
rails_autolink (1.1.3)
|
||||
rails (> 3.1)
|
||||
railties (4.0.0)
|
||||
actionpack (= 4.0.0)
|
||||
|
|
@ -139,10 +177,17 @@ GEM
|
|||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.1.0)
|
||||
ref (1.0.5)
|
||||
<<<<<<< HEAD
|
||||
rspec-expectations (2.14.1)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rubyzip (0.9.9)
|
||||
safe_yaml (0.9.5)
|
||||
=======
|
||||
rspec-expectations (2.14.2)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rubyzip (0.9.9)
|
||||
safe_yaml (0.9.7)
|
||||
>>>>>>> master
|
||||
sanitize (2.0.6)
|
||||
nokogiri (>= 1.4.4)
|
||||
sass (3.2.10)
|
||||
|
|
@ -150,10 +195,14 @@ GEM
|
|||
railties (>= 4.0.0.beta, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
<<<<<<< HEAD
|
||||
selenium-webdriver (2.34.0)
|
||||
=======
|
||||
selenium-webdriver (2.35.1)
|
||||
>>>>>>> master
|
||||
childprocess (>= 0.2.5)
|
||||
multi_json (~> 1.0)
|
||||
rubyzip
|
||||
rubyzip (< 1.0.0)
|
||||
websocket (~> 1.0.4)
|
||||
simplecov (0.7.1)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -168,22 +217,22 @@ GEM
|
|||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sqlite3 (1.3.7)
|
||||
sqlite3 (1.3.8)
|
||||
swf_fu (2.0.4)
|
||||
coffee-script
|
||||
rails (>= 3.1)
|
||||
therubyracer (0.11.4)
|
||||
libv8 (~> 3.11.8.12)
|
||||
therubyracer (0.12.0)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thor (0.18.1)
|
||||
thread_safe (0.1.2)
|
||||
thread_safe (0.1.3)
|
||||
atomic
|
||||
tilt (1.4.1)
|
||||
timecop (0.6.3)
|
||||
tolk (1.3.11)
|
||||
safe_yaml (~> 0.8)
|
||||
will_paginate
|
||||
treetop (1.4.14)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
turbolinks (1.3.0)
|
||||
|
|
@ -194,17 +243,21 @@ GEM
|
|||
rails (>= 3.1)
|
||||
railties (>= 3.1)
|
||||
tzinfo (0.3.37)
|
||||
uglifier (2.1.2)
|
||||
uglifier (2.2.1)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
uniform_notifier (1.2.0)
|
||||
uniform_notifier (1.3.0)
|
||||
websocket (1.0.7)
|
||||
<<<<<<< HEAD
|
||||
will_paginate (3.0.4)
|
||||
will_paginate-bootstrap (0.2.3)
|
||||
will_paginate (>= 3.0.3)
|
||||
=======
|
||||
will_paginate (3.0.5)
|
||||
>>>>>>> master
|
||||
xpath (2.0.0)
|
||||
nokogiri (~> 1.3)
|
||||
yard (0.8.7)
|
||||
yard (0.8.7.2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -214,11 +267,12 @@ DEPENDENCIES
|
|||
aasm
|
||||
actionpack-xml_parser!
|
||||
acts_as_list
|
||||
aruba
|
||||
aruba!
|
||||
bcrypt-ruby (~> 3.0.0)
|
||||
bullet
|
||||
cache_digests
|
||||
capybara
|
||||
codeclimate-test-reporter
|
||||
coffee-rails (~> 4.0.0)
|
||||
cucumber-rails
|
||||
database_cleaner
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue