kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/projects/merge_requests/_discussion.html.haml

12 lines
1.1 KiB
Text
Raw Normal View History

Set of UI changes mostly for issue and merge request * return edit/close buttons to old position (right of title) * make 'Issue #1' header smaller * move mr commits to separate tab * change inline/side diff switcher to buttons from tabs * make issue sidebar start with dicsussion block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25 07:32:49 -05:00
- content_for :note_actions do
Rename abilities to correspond contoller/model action names write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 09:55:56 -04:00
- if can?(current_user, :update_merge_request, @merge_request)
reverting _disscusion
2016-01-12 13:52:36 -05:00
- if @merge_request.open?
Fixed placement of close button on merge requests
2016-06-18 16:40:59 -04:00
= link_to 'Close merge request', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-comment btn-close close-mr-link js-note-target-close", title: "Close merge request", data: {original_text: "Close merge request", alternative_text: "Comment & close merge request"}
Change method name to #reopenable?
2016-09-13 08:40:00 -04:00
- if @merge_request.reopenable?
Fixed placement of close button on merge requests
2016-06-18 16:40:59 -04:00
= link_to 'Reopen merge request', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request", data: {original_text: "Reopen merge request", alternative_text: "Comment & reopen merge request"}
Correctly cycles the unresolved discussions Switches back to discussion tab when clicking jump to next unresolved button
2016-07-29 08:31:32 -04:00
%comment-and-resolve-btn{ "inline-template" => true, ":discussion-id" => "" }
Fixed comment & resolve button
2016-08-31 11:45:41 -04:00
%button.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button{ "v-if" => "showButton", type: "submit", data: { project_path: "#{project_path(@merge_request.project)}" } }
Comment & resolve button text is done through VueJS
2016-07-26 12:45:48 -04:00
{{ buttonText }}
Set of UI changes mostly for issue and merge request * return edit/close buttons to old position (right of title) * make 'Issue #1' header smaller * move mr commits to separate tab * change inline/side diff switcher to buttons from tabs * make issue sidebar start with dicsussion block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25 07:32:49 -05:00
reverting _disscusion
2016-01-12 13:52:36 -05:00
#notes= render "projects/notes/notes_with_form"
Copy permalink