diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-14 02:33:42 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-14 02:33:42 -0500 |
| commit | 427dc98d980fa9b16a565bf23514ed392ece1be2 (patch) | |
| tree | 466fa8e82ceb311d5c1c726c3c6afd0c1eae33f4 | |
| parent | d9958a54611249a42877bed5ad3ce98fe5f7e541 (diff) | |
| download | gitlab-ce-427dc98d980fa9b16a565bf23514ed392ece1be2.tar.gz | |
initial open state
3 files changed, 27 insertions, 6 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index c513e5448d4..b1ea454dcbc 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -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 @@ -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 diff --git a/app/views/projects/merge_requests/widget/_closed.html.haml b/app/views/projects/merge_requests/widget/_closed.html.haml index 56744b5046a..a48d6c96806 100644 --- a/app/views/projects/merge_requests/widget/_closed.html.haml +++ b/app/views/projects/merge_requests/widget/_closed.html.haml @@ -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 diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml index 55dbae598d3..ec85c034ce2 100644 --- a/app/views/projects/merge_requests/widget/_open.html.haml +++ b/app/views/projects/merge_requests/widget/_open.html.haml @@ -1,4 +1,4 @@ -.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? |