summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-05-24 22:38:48 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-05-24 22:38:48 +0800
commita7225111b16eb5f8f6f00a6ea2a844ea94e50b5e (patch)
tree499b11a1a4c6fc1eea9cab224a37f67119c80c0b
parentec31fa260b9f438fe7e369c6f61d55c4f10441cc (diff)
downloadgitlab-ce-ce-6127-move-merge-requests-services.tar.gz
Extract a do_execute method to be overriddence-6127-move-merge-requests-services
-rw-r--r--app/services/merge_requests/refresh_service.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index 1fb1796b56c..0127d781686 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -3,6 +3,12 @@ module MergeRequests
def execute(oldrev, newrev, ref)
return true unless Gitlab::Git.branch_ref?(ref)
+ do_execute(oldrev, newrev, ref)
+ end
+
+ private
+
+ def do_execute(oldrev, newrev, ref)
@oldrev, @newrev = oldrev, newrev
@branch_name = Gitlab::Git.ref_name(ref)
@@ -28,8 +34,6 @@ module MergeRequests
true
end
- private
-
def close_upon_missing_source_branch_ref
# MergeRequest#reload_diff ignores not opened MRs. This means it won't
# create an `empty` diff for `closed` MRs without a source branch, keeping