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

adds closed state to vue. works enough for now. minus time stamp

parent cca6242d
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -136,8 +136,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
if @merge_request.valid?
author = nil
avatar = nil
if @merge_request.merged? && @merge_request.merge_event
author = @merge_request.merge_event.author
if @merge_request.merged? && @merge_request.closed_event
author = @merge_request.closed_event.author
avatar = avatar_icon(author)
end
respond_to do |format|
Loading
Loading
Loading
Loading
@@ -108,6 +108,13 @@
mergeObj.remove_source_branch_url = "#{namespace_project_branch_path(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request.source_branch, format: :json)}";
:javascript
 
- if @merge_request.closed? && @merge_request.closed_event
:javascript
mergeObj.author = "#{sanitize(@merge_request.closed_event.author.name)}";
mergeObj.author_link = "#{user_path(@merge_request.closed_event.author)}";
mergeObj.avatar = "#{@merge_request.closed_event.author.avatar_url(16)}";
mergeObj.target_branch_url = "#{namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch)}";
mergeObj.target_branch = "#{@merge_request.target_branch}";
 
:javascript
$(function(){
Loading
Loading
.mr-state-widget
.mr-state-widget.mr-state-closed{"v-if"=>"state.closed"}
= render 'projects/merge_requests/widget/heading'
.mr-widget-body
%h4
Closed
- if @merge_request.closed_event
by #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
%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}}
%p
= succeed '.' do
The changes were not merged into
%span.label-branch= @merge_request.target_branch
The changes were not merged into
%span.label-branch
{{state.target_branch}}.
Loading
Loading
@@ -7,8 +7,6 @@
%img.avatar.avatar-inline.s16{width: 16, "v-bind:src"=>"state.avatar",alt:""}
%span.author
{{state.author}}
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
%div
%template{"v-if"=>"state.source_branch_unavailable"}
The changes were merged into
Loading
Loading
- if @merge_request.open?
= render 'projects/merge_requests/widget/open'
- elsif @merge_request.merged?
= render 'projects/merge_requests/widget/merged'
- elsif @merge_request.closed?
= render 'projects/merge_requests/widget/closed'
- elsif @merge_request.locked?
= render 'projects/merge_requests/widget/open'
= render 'projects/merge_requests/widget/merged'
= render 'projects/merge_requests/widget/closed'
- if @merge_request.locked?
= render 'projects/merge_requests/widget/locked'
 
:javascript
Loading
Loading
Loading
Loading
@@ -573,7 +573,6 @@ Rails.application.routes.draw do
get :commits
get :diffs
get :builds
get :author
get :merge_check
post :merge
post :cancel_merge_when_build_succeeds
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