diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-05-28 20:19:54 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-05-28 20:19:54 +0300 |
| commit | 89043d6b891057d756b2f9f518d0eb043ce07a19 (patch) | |
| tree | 59c0192ad92321f4b7e11a46a280446b7f7570eb | |
| parent | b729004a500edf330fe68dbf6e5e6cdcb937b8d4 (diff) | |
| download | gitlab-ce-89043d6b891057d756b2f9f518d0eb043ce07a19.tar.gz | |
MR: Accept section polished. Show permission info
| -rw-r--r-- | app/assets/stylesheets/common.scss | 20 | ||||
| -rw-r--r-- | app/views/merge_requests/show.html.haml | 29 |
2 files changed, 37 insertions, 12 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 08dc2ec9209..acc5606328f 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -969,3 +969,23 @@ li.note { vertical-align:top; } } + +.automerge_widget { + + &.can_be_merged { + background: #DFF0D8; + } + + .accept_merge_request { + color: #fff; + text-shadow: 0 1px 1px #222; + background: #5bb75b;; + &:hover { + background-color: #51a351; + color: #fff; + } + } + .how_to_merge_link { + @extend .primary; + } +} diff --git a/app/views/merge_requests/show.html.haml b/app/views/merge_requests/show.html.haml index fb6c3ec2666..84741171198 100644 --- a/app/views/merge_requests/show.html.haml +++ b/app/views/merge_requests/show.html.haml @@ -53,30 +53,35 @@ Closed by #{@merge_request.closed_event.author_name} %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. +- unless can?(current_user, :accept_mr, @project) + .alert-message + %strong Only masters can accept MR + - if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project) .automerge_widget.can_be_merged{:style => "display:none"} - .ui-box.padded - %p + .alert.alert-success + %span + = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true + You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions - = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true - .automerge_widget.cannot_be_merged{:style => "display:none"} - .alert-message - %p - %strong This request cant be merged with GitLab. You should do it manually + .alert.alert-info + %span = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge" + + %strong This request cant be merged with GitLab. You should do it manually .automerge_widget.unchecked .alert-message - %p - %strong Checking for ability to automatically merge… + %strong + %i.icon-refresh + Checking for ability to automatically merge… .automerge_widget.already_cannot_be_merged{:style => "display:none"} - .alert-message - %p - %strong This merge request already can not be merged + .alert.alert-info + %strong This merge request already can not be merged. Try to reload page. |