Skip to content
Snippets Groups Projects
Commit 427dc98d authored by Jacob Schatz's avatar Jacob Schatz
Browse files

initial open state

parent d9958a54
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -136,9 +136,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
if @merge_request.valid?
author = nil
avatar = nil
if @merge_request.merged? && @merge_request.closed_event
if @merge_request.closed? && @merge_request.closed_event
author = @merge_request.closed_event.author
avatar = avatar_icon(author)
# avatar = avatar_icon(author,16)
end
respond_to do |format|
format.js
Loading
Loading
@@ -165,8 +165,29 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
def merge_check
@merge_request.check_if_can_be_merged
render partial: "projects/merge_requests/widget/show.html.haml", layout: false
author = nil
avatar = nil
if @merge_request.closed? && @merge_request.closed_event
author = @merge_request.closed_event.author
# avatar = avatar_icon(author,16)
end
respond_to do |format|
format.js
format.html do
render partial: "projects/merge_requests/widget/show.html.haml", layout: false
end
format.json do
render json: {
label: @merge_request.state_human_name,
open: @merge_request.open?,
closed: @merge_request.closed?,
locked: @merge_request.locked?,
merged: @merge_request.merged?,
author: author,
avatar: avatar
}
end
end
end
 
def cancel_merge_when_build_succeeds
Loading
Loading
Loading
Loading
@@ -6,7 +6,7 @@
%a.author_link{"v-bind:href"=>"state.author_link"}
%img.avatar.avatar-inline.s16{width: 16, "v-bind:src"=>"state.avatar",alt:""}
%span.author
{{state.author}}
{{state.author.name}}
%p
The changes were not merged into
%span.label-branch
Loading
Loading
.mr-state-widget
.mr-state-widget.mr-state-open{"v-if"=>"state.open"}
= render 'projects/merge_requests/widget/heading'
.mr-widget-body
- if @project.archived?
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment