diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-24 16:24:18 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-24 16:24:18 +0000 |
| commit | 96f54853e28acff5ca4801c6b420ea96521af35b (patch) | |
| tree | 6c52560a77dc3ac947844f81573cc3b8e5154d8a /app/services | |
| parent | 0279a72752e17d773c81c46c602204c318fd1ecd (diff) | |
| parent | a7225111b16eb5f8f6f00a6ea2a844ea94e50b5e (diff) | |
| download | gitlab-ce-96f54853e28acff5ca4801c6b420ea96521af35b.tar.gz | |
Merge branch 'ce-6127-move-merge-requests-services' into 'master'
CE: Extract EE specific files/lines for some merge requests files
See merge request gitlab-org/gitlab-ce!19107
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/refresh_service.rb | 8 |
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 |