diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/services/git | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/services/git')
-rw-r--r-- | app/services/git/process_ref_changes_service.rb | 2 | ||||
-rw-r--r-- | app/services/git/tag_push_service.rb | 4 | ||||
-rw-r--r-- | app/services/git/wiki_push_service.rb | 7 | ||||
-rw-r--r-- | app/services/git/wiki_push_service/change.rb | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/app/services/git/process_ref_changes_service.rb b/app/services/git/process_ref_changes_service.rb index 6d1ff97016b..c012c61a337 100644 --- a/app/services/git/process_ref_changes_service.rb +++ b/app/services/git/process_ref_changes_service.rb @@ -75,8 +75,6 @@ module Git end def merge_request_branches_for(changes) - return if Feature.disabled?(:refresh_only_existing_merge_requests_on_push, default_enabled: true) - @merge_requests_branches ||= MergeRequests::PushedBranchesService.new(project, current_user, changes: changes).execute end end diff --git a/app/services/git/tag_push_service.rb b/app/services/git/tag_push_service.rb index 120c4cde94b..641fe8e3916 100644 --- a/app/services/git/tag_push_service.rb +++ b/app/services/git/tag_push_service.rb @@ -26,9 +26,5 @@ module Git 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 b3937a10a70..f9de72f2d5f 100644 --- a/app/services/git/wiki_push_service.rb +++ b/app/services/git/wiki_push_service.rb @@ -41,7 +41,12 @@ module Git end def create_event_for(change) - event_service.execute(change.last_known_slug, change.page, change.event_action) + event_service.execute( + change.last_known_slug, + change.page, + change.event_action, + change.sha + ) end def event_service diff --git a/app/services/git/wiki_push_service/change.rb b/app/services/git/wiki_push_service/change.rb index 14e622dd147..562c43487e9 100644 --- a/app/services/git/wiki_push_service/change.rb +++ b/app/services/git/wiki_push_service/change.rb @@ -33,6 +33,10 @@ module Git strip_extension(raw_change.old_path || raw_change.new_path) end + def sha + change[:newrev] + end + private attr_reader :raw_change, :change, :wiki |