Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributions-forked-projects
Showing
... | ... | @@ -77,6 +77,9 @@ gem "haml-rails", '~> 0.9.0' |
# Files attachments | ||
gem "carrierwave", '~> 0.9.0' | ||
# Image editing | ||
gem "mini_magick", '~> 4.4.0' | ||
# Drag and Drop UI | ||
gem 'dropzonejs-rails', '~> 0.7.1' | ||
... | ... | @@ -218,7 +221,7 @@ gem 'virtus', '~> 1.0.1' |
gem 'net-ssh', '~> 3.0.1' | ||
# Sentry integration | ||
gem 'sentry-raven' | ||
gem 'sentry-raven', '~> 0.15' | ||
# Metrics | ||
group :metrics do | ||
... | ... | @@ -303,6 +306,8 @@ group :production do |
gem "gitlab_meta", '7.0' | ||
end | ||
gem "newrelic_rpm", '~> 3.14' | ||
gem 'octokit', '~> 3.8.0' | ||
gem "mail_room", "~> 0.6.1" | ||
... | ... |
app/models/appearance.rb
0 → 100644
config/newrelic.yml
0 → 100644
357 KB
307 KB
doc/development/gotchas.md
0 → 100644
File moved
scripts/notify_slack.sh
0 → 100755