diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-15 14:32:52 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-15 14:32:52 +0000 |
| commit | 5fc12561c15e3939889ad9419403266ed96e1cb3 (patch) | |
| tree | 8ba6c9d9ddafe380771912dc03fe4306661291c6 | |
| parent | 3f1c95c6384ef69aaae9d0b30a50395c31d1196a (diff) | |
| parent | c926922ade4f3f8b84cabe95186860e0f8a6a8f8 (diff) | |
| download | gitlab-ce-5fc12561c15e3939889ad9419403266ed96e1cb3.tar.gz | |
Merge branch 'improve-lock-mr-ui' into 'master'
Improve locked merge request UI
It allows us easily detect when MR get into lock state
Fixes UI part of #1674
See merge request !1183
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_state_widget.html.haml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 947e8f58ae5..7b28dd5e7da 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -21,7 +21,7 @@ - content_for :note_actions do - if can?(current_user, :modify_merge_request, @merge_request) - - unless @merge_request.closed? || @merge_request.merged? + - if @merge_request.open? = link_to 'Close', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-grouped btn-close close-mr-link js-note-target-close", title: "Close merge request" - if @merge_request.closed? = link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request" diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml index 2b58c865b2e..87dad6140be 100644 --- a/app/views/projects/merge_requests/show/_state_widget.html.haml +++ b/app/views/projects/merge_requests/show/_state_widget.html.haml @@ -21,6 +21,12 @@ #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} = render "projects/merge_requests/show/remove_source_branch" + - if @merge_request.locked? + %h4 + Merge in progress... + %p + GitLab tries to merge it right now. During this time merge request is locked and can not be closed. + - unless @commits.any? %h4 Nothing to merge %p |