3022786948
Conflicts: app/assets/stylesheets/sections/notes.scss app/contexts/notes/load_context.rb app/models/project.rb app/observers/note_observer.rb app/roles/votes.rb app/views/commit/show.html.haml app/views/merge_requests/_show.html.haml app/views/merge_requests/diffs.js.haml app/views/merge_requests/show.js.haml app/views/notes/_note.html.haml features/steps/project/project_merge_requests.rb spec/models/note_spec.rb
40 lines
1.4 KiB
Plaintext
40 lines
1.4 KiB
Plaintext
.merge-request
|
|
= render "merge_requests/show/mr_title"
|
|
= render "merge_requests/show/how_to_merge"
|
|
= render "merge_requests/show/mr_box"
|
|
= render "merge_requests/show/mr_accept"
|
|
- if @project.gitlab_ci?
|
|
= render "merge_requests/show/mr_ci"
|
|
= render "merge_requests/show/commits"
|
|
|
|
- if @commits.present?
|
|
%ul.nav.nav-tabs
|
|
%li.notes-tab{data: {action: 'notes'}}
|
|
= link_to project_merge_request_path(@project, @merge_request) do
|
|
%i.icon-comment
|
|
Discussion
|
|
%li.diffs-tab{data: {action: 'diffs'}}
|
|
= link_to diffs_project_merge_request_path(@project, @merge_request) do
|
|
%i.icon-list-alt
|
|
Diff
|
|
|
|
.notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
|
|
= render "notes/notes_with_form"
|
|
.diffs.tab-content
|
|
= render "merge_requests/show/diffs" if @diffs
|
|
.status
|
|
|
|
:javascript
|
|
var merge_request;
|
|
$(function(){
|
|
merge_request = new MergeRequest({
|
|
url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
|
|
check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"},
|
|
url_to_ci_check: "#{ci_status_project_merge_request_path(@project, @merge_request)}",
|
|
ci_enable: #{@project.gitlab_ci? ? "true" : "false"},
|
|
current_state: "#{@merge_request.human_state}",
|
|
action: "#{controller.action_name}"
|
|
});
|
|
});
|
|
|