Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents 39a1b7d3 53600fca
Showing 1 changed file with 3 additions and 1 deletions Show diff stats
Gemfile
@@ -40,7 +40,9 @@ group :development, :test do
   gem 'capybara'
   gem 'autotest'
   gem 'autotest-rails'
-  gem 'ruby-debug19', :require => 'ruby-debug'
+  unless ENV["CI"]
+    gem 'ruby-debug19', :require => 'ruby-debug'
+  end
   gem 'awesome_print'
   gem 'database_cleaner'
   gem 'launchy'
...	...	@@ -40,7 +40,9 @@ group :development, :test do
40	40	gem 'capybara'
41	41	gem 'autotest'
42	42	gem 'autotest-rails'
43		- gem 'ruby-debug19', :require => 'ruby-debug'
	43	+ unless ENV["CI"]
	44	+ gem 'ruby-debug19', :require => 'ruby-debug'
	45	+ end
44	46	gem 'awesome_print'
45	47	gem 'database_cleaner'
46	48	gem 'launchy'
...	...