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

adds mr-state-box initially

parent 51e0b069
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -24,12 +24,13 @@ var MR = function(){
 
var init = function(data){
store.state = data;
var mrHeader = new Vue({
el: '#merge-request-header',
data: {
state: store.state
},
created: function() {},
 
methods: {
closeClicked: function() {
Loading
Loading
@@ -40,6 +41,17 @@ var MR = function(){
mrService.changeState('reopen');
}
}
}),
mrStateBox = new Vue({
el: '#mr-state-box',
data: {
state: store.state
},
methods: {
}
});
}
 
Loading
Loading
Loading
Loading
@@ -144,7 +144,9 @@ class Projects::MergeRequestsController < Projects::ApplicationController
render json: {
label: @merge_request.state_human_name,
open: @merge_request.open?,
closed: @merge_request.closed?
closed: @merge_request.closed?,
locked: @merge_request.locked?,
merged: @merge_request.merged?,
}
end
end
Loading
Loading
Loading
Loading
@@ -36,7 +36,8 @@
= @merge_request.target_branch
 
= render "projects/merge_requests/show/how_to_merge"
= render "projects/merge_requests/widget/show.html.haml"
%div#mr-state-box{'v-cloak'=> true}
= render "projects/merge_requests/widget/show.html.haml"
 
- if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user)
.light.prepend-top-default
Loading
Loading
@@ -100,6 +101,8 @@
label: "#{@merge_request.state_human_name}",
closed: #{@merge_request.closed?},
open: #{@merge_request.open?},
locked: #{@merge_request.locked?},
merged: #{@merge_request.merged?},
closeURL: "#{merge_request_path(@merge_request, merge_request: { state_event: :close }, format: :json)}",
reopenURL: "#{merge_request_path(@merge_request, merge_request: {state_event: :reopen }, format: :json)}"
});
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