diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 15:08:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 15:08:15 +0000 |
| commit | c2b98d3dbd47ab92c79c702276fe9130d9a28036 (patch) | |
| tree | bf4071f551fdc12c22b23b2bb66483064e7b9ea9 /lib | |
| parent | badb9c1deacbea601b02f88811b7e123589d9251 (diff) | |
| download | gitlab-ce-c2b98d3dbd47ab92c79c702276fe9130d9a28036.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/projects.rb | 14 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | lib/gitlab/metrics/transaction.rb | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index a1fce9e8b20..d1f99ea49ce 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -26,6 +26,14 @@ module API def verify_update_project_attrs!(project, attrs) end + + def delete_project(user_project) + destroy_conditionally!(user_project) do + ::Projects::DestroyService.new(user_project, current_user, {}).async_execute + end + + accepted! + end end helpers do @@ -404,11 +412,7 @@ module API delete ":id" do authorize! :remove_project, user_project - destroy_conditionally!(user_project) do - ::Projects::DestroyService.new(user_project, current_user, {}).async_execute - end - - accepted! + delete_project(user_project) end desc 'Mark this project as forked from another' diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index cb45c12c2b0..d20d04425f6 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -1,5 +1,5 @@ .auto-deploy: - image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.8.0" + image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.8.3" review: extends: .auto-deploy diff --git a/lib/gitlab/metrics/transaction.rb b/lib/gitlab/metrics/transaction.rb index 115368c8bc6..552eae639e6 100644 --- a/lib/gitlab/metrics/transaction.rb +++ b/lib/gitlab/metrics/transaction.rb @@ -164,7 +164,6 @@ module Gitlab docstring 'Transaction allocated memory bytes' base_labels BASE_LABELS buckets [100, 1000, 10000, 100000, 1000000, 10000000] - with_feature :prometheus_metrics_transaction_allocated_memory end def self.transaction_metric(name, type, prefix: nil, tags: {}) |