diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-06-07 23:56:59 +0900 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-06-20 23:27:17 +0800 |
| commit | 5b994b8199a3679b6f5ef0d00edce22ea9662664 (patch) | |
| tree | 6574c99eb3b963d0518e079f041552bb10367756 /app/presenters | |
| parent | 222284a6bf9348b30b5ce2b1b04370163e2120e5 (diff) | |
| download | gitlab-ce-5b994b8199a3679b6f5ef0d00edce22ea9662664.tar.gz | |
Notify only when unmergeable due to conflict
There is still the edge case when 'no commits' changes to 'conflict'
would not trigger notification, which we ignore for now.
Calling can_be_merged? can cause exception (e.g. non-UTF8)
Ignore those by rescueing.
Remove unmergeable_reason as now only conflict is notified
Update spec
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/merge_request_presenter.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index 8d466c33510..eb54ab2cda6 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -20,17 +20,6 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated end end - def unmergeable_reasons - strong_memoize(:unmergeable_reasons) do - reasons = [] - reasons << "no commits" if merge_request.has_no_commits? - reasons << "source branch is missing" unless merge_request.source_branch_exists? - reasons << "target branch is missing" unless merge_request.target_branch_exists? - reasons << "has merge conflicts" unless merge_request.project.repository.can_be_merged?(merge_request.diff_head_sha, merge_request.target_branch) - reasons - end - end - def cancel_merge_when_pipeline_succeeds_path if can_cancel_merge_when_pipeline_succeeds?(current_user) cancel_merge_when_pipeline_succeeds_project_merge_request_path(project, merge_request) |