github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into rails_3_1

Browse Source 
Conflicts:
	Gemfile
This commit is contained in:
Mario Visic 2011-11-27 21:42:58 +11:00
commit 39ac60fffe
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -2,6 +2,7 @@ script: "bundle exec rake travis"
before_script: ./bin/ci/before_build.sh before_script: ./bin/ci/before_build.sh
rvm: rvm:
- 1.9.2 - 1.9.2
- 1.9.3
notifications: notifications:
email: email:
- didier@nocoffee.fr - didier@nocoffee.fr

2
Gemfile
View File

@ -61,7 +61,7 @@ end
group :test, :development do group :test, :development do
# gem 'linecache', '0.43', :platforms => :mri_18 # gem 'linecache', '0.43', :platforms => :mri_18
# gem 'ruby-debug', :platforms => :mri_18 # gem 'ruby-debug', :platforms => :mri_18
# gem 'ruby-debug19', :platforms => :mri_19, :require => 'ruby-debug' # gem 'ruby-debug19', :platforms => :mri_19
gem 'cucumber-rails' gem 'cucumber-rails'
end end