diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/services/git | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/services/git')
-rw-r--r-- | app/services/git/branch_push_service.rb | 7 | ||||
-rw-r--r-- | app/services/git/tag_push_service.rb | 18 | ||||
-rw-r--r-- | app/services/git/wiki_push_service.rb | 2 |
3 files changed, 26 insertions, 1 deletions
diff --git a/app/services/git/branch_push_service.rb b/app/services/git/branch_push_service.rb index 5c1ee981d0c..2ec6ac99ece 100644 --- a/app/services/git/branch_push_service.rb +++ b/app/services/git/branch_push_service.rb @@ -29,6 +29,7 @@ module Git perform_housekeeping stop_environments + unlock_artifacts true end @@ -60,6 +61,12 @@ module Git Ci::StopEnvironmentsService.new(project, current_user).execute(branch_name) end + def unlock_artifacts + return unless removing_branch? + + Ci::RefDeleteUnlockArtifactsWorker.perform_async(project.id, current_user.id, ref) + end + def execute_related_hooks BranchHooksService.new(project, current_user, params).execute end diff --git a/app/services/git/tag_push_service.rb b/app/services/git/tag_push_service.rb index 9a266f7d74c..120c4cde94b 100644 --- a/app/services/git/tag_push_service.rb +++ b/app/services/git/tag_push_service.rb @@ -10,7 +10,25 @@ module Git project.repository.before_push_tag TagHooksService.new(project, current_user, params).execute + unlock_artifacts + true end + + private + + def unlock_artifacts + return unless removing_tag? + + Ci::RefDeleteUnlockArtifactsWorker.perform_async(project.id, current_user.id, ref) + end + + def removing_tag? + Gitlab::Git.blank_ref?(newrev) + end + + def tag_name + Gitlab::Git.ref_name(ref) + end end end diff --git a/app/services/git/wiki_push_service.rb b/app/services/git/wiki_push_service.rb index 8bdbc28f3e8..b3937a10a70 100644 --- a/app/services/git/wiki_push_service.rb +++ b/app/services/git/wiki_push_service.rb @@ -23,7 +23,7 @@ module Git end def can_process_wiki_events? - Feature.enabled?(:wiki_events) && Feature.enabled?(:wiki_events_on_git_push, project) + Feature.enabled?(:wiki_events_on_git_push, project) end def push_changes |