diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-26 07:19:09 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-09-26 07:19:09 +0000 |
| commit | 1aca3670b0e749ea3a64849a3033c83f0c23ba31 (patch) | |
| tree | 9b01ea373cfe661377c32c41080dcd28003219d2 | |
| parent | 054f1ec6848ddbc05c53d092126d5c1e54d960bb (diff) | |
| parent | a894721e2830b48c6c4781b6f9192d9d0f54ef40 (diff) | |
| download | gitlab-ce-1aca3670b0e749ea3a64849a3033c83f0c23ba31.tar.gz | |
Merge branch 'rs-remove-gitlab_meta' into 'master'
Remove gitlab_meta gem
See merge request !6510
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 1 insertions, 7 deletions
@@ -322,10 +322,6 @@ group :test do gem 'timecop', '~> 0.8.0' end -group :production do - gem 'gitlab_meta', '7.0' -end - gem 'newrelic_rpm', '~> 3.16' gem 'octokit', '~> 4.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index a5a2e5785ac..1db8c9dd8c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -284,7 +284,6 @@ GEM charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) rugged (~> 0.24.0) - gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) omniauth (~> 1.0) @@ -864,7 +863,6 @@ DEPENDENCIES github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_git (~> 10.6.6) - gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) @@ -991,4 +989,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.13.0 + 1.13.1 |