Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4
Showing
... | @@ -212,6 +212,9 @@ gem 'select2-rails', '~> 3.5.9' | ... | @@ -212,6 +212,9 @@ gem 'select2-rails', '~> 3.5.9' |
gem 'virtus', '~> 1.0.1' | gem 'virtus', '~> 1.0.1' | ||
gem 'net-ssh', '~> 3.0.1' | gem 'net-ssh', '~> 3.0.1' | ||
# Sentry integration | |||
gem 'sentry-raven' | |||
# Metrics | # Metrics | ||
group :metrics do | group :metrics do | ||
gem 'allocations', '~> 1.0', require: false, platform: :mri | gem 'allocations', '~> 1.0', require: false, platform: :mri | ||
... | @@ -293,9 +296,6 @@ end | ... | @@ -293,9 +296,6 @@ end |
group :production do | group :production do | ||
gem "gitlab_meta", '7.0' | gem "gitlab_meta", '7.0' | ||
# Sentry integration | |||
gem 'sentry-raven' | |||
end | end | ||
gem "newrelic_rpm", '~> 3.9.4.245' | gem "newrelic_rpm", '~> 3.9.4.245' | ||
... | ... |
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
66.3 KB
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.