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

Merge branch 'master' into new-gui

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
Reinier Balt 2013-09-22 10:30:24 +02:00
commit 463f5e922d
37 changed files with 1083 additions and 501 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -67,7 +67,7 @@ group :test do
gem "database_cleaner"
gem "mocha", :require => false
gem "aruba", :require => false
gem "aruba", git: 'https://github.com/cucumber/aruba', :require => false # need 0.5.4 for piping files; 0.5.3 is latest
gem "simplecov"
gem "timecop", "~> 0.6.2"
@ -81,4 +81,7 @@ group :test do
# uncomment to be able to make screenshots from scenarios
#gem "capybara-screenshot"
#gem "launchy"
# get test coverage info on codeclimate
gem "codeclimate-test-reporter", group: :test, require: nil
end