Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -207,84 +207,10 @@ gem 'request_store',      '~> 1.1'
 gem 'select2-rails',      '~> 3.5.9'
 gem 'virtus',             '~> 1.0.1'
 
-group :development do
-  gem "foreman"
-  gem 'brakeman', '3.0.1', require: false
-
-  gem "annotate", "~> 2.6.0"
-  gem "letter_opener", '~> 1.1.2'
-  gem 'quiet_assets', '~> 1.0.2'
-  gem 'rack-mini-profiler', '~> 0.9.0', require: false
-  gem 'rerun', '~> 0.10.0'
-  gem 'bullet', require: false
-  gem 'active_record_query_trace', require: false
-  gem 'rack-lineprof', platform: :mri
-
-  # Better errors handler
-  gem 'better_errors', '~> 1.0.1'
-  gem 'binding_of_caller', '~> 0.7.2'
-
-  # Docs generator
-  gem "sdoc", '~> 0.3.20'
-
-  # thin instead webrick
-  gem 'thin', '~> 1.6.1'
-end
-
-group :development, :test do
-  gem 'byebug', platform: :mri
-  gem 'pry-rails'
-
-  gem 'awesome_print', '~> 1.2.0'
-  gem 'fuubar', '~> 2.0.0'
-
-  gem 'database_cleaner', '~> 1.4.0'
-  gem 'factory_girl_rails', '~> 4.3.0'
-  gem 'rspec-rails',      '~> 3.3.0'
-  gem 'spinach-rails', '~> 0.2.1'
-
-  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 5.7.0'
-
-  # Generate Fake data
-  gem 'ffaker', '~> 2.0.0'
-
-  gem 'capybara',            '~> 2.4.0'
-  gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'poltergeist',         '~> 1.6.0'
-
-  gem 'teaspoon', '~> 1.0.0'
-  gem 'teaspoon-jasmine', '~> 2.2.0'
-
-  gem 'spring', '~> 1.3.6'
-  gem 'spring-commands-rspec',    '~> 1.0.4'
-  gem 'spring-commands-spinach',  '~> 1.0.0'
-  gem 'spring-commands-teaspoon', '~> 0.0.2'
-
-  gem 'rubocop',  '~> 0.28.0',  require: false
-  gem 'coveralls',  '~> 0.8.2', require: false
-  gem 'simplecov', '~> 0.10.0', require: false
-
-  gem 'benchmark-ips', require: false
-end
-
-group :test do
-  gem 'shoulda-matchers', '~> 2.8.0', require: false
-  gem 'email_spec', '~> 1.6.0'
-  gem 'webmock', '~> 1.21.0'
-  gem 'test_after_commit', '~> 0.2.2'
-  gem 'sham_rack'
-end
-
 group :production do
   gem "gitlab_meta", '7.0'
 end
 
-
-roup :production do
-  gem "gitlab_meta", '7.0'
-end
-
 gem "newrelic_rpm", '~> 3.9.4.245'
 gem 'newrelic-grape'