diff options
| author | Rodolfo Santos <rodolfoasantos@gmail.com> | 2016-09-16 08:02:42 -0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-04 14:58:40 +0100 |
| commit | 1db9f826c16053e32a1d234bf40b2ca399779cdf (patch) | |
| tree | 114a255d1269ed0118fa741f6cbbeb113f0de838 /app/views/projects/merge_requests | |
| parent | a3cc2f1e8dfcfb2f3e181fa570ed2ba245f9a069 (diff) | |
| download | gitlab-ce-1db9f826c16053e32a1d234bf40b2ca399779cdf.tar.gz | |
Add setting to only allow merge requests to be merged when all discussions are resolved
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/widget/_open.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index 842b6df310d..01314eb37d0 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -23,8 +23,10 @@ = render 'projects/merge_requests/widget/open/merge_when_build_succeeds' - elsif !@merge_request.can_be_merged_by?(current_user) = render 'projects/merge_requests/widget/open/not_allowed' - - elsif !@merge_request.mergeable_ci_state? && @pipeline && @pipeline.failed? + - elsif !@merge_request.mergeable_ci_state? = render 'projects/merge_requests/widget/open/build_failed' + - elsif !@merge_request.mergeable_discussions_state? + = render 'projects/merge_requests/widget/open/unresolved_discussions' - elsif @merge_request.can_be_merged? || resolved_conflicts = render 'projects/merge_requests/widget/open/accept' diff --git a/app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml b/app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml new file mode 100644 index 00000000000..35d5677ee37 --- /dev/null +++ b/app/views/projects/merge_requests/widget/open/_unresolved_discussions.html.haml @@ -0,0 +1,6 @@ +%h4 + = icon('exclamation-triangle') + This merge request has unresolved discussions + +%p + Please resolve these discussions to allow this merge request to be merged.
\ No newline at end of file |