deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Task #735 Automerge should not be checked on every load of MR show page

Browse source
This commit is contained in:
Valery Sizov 2012-04-27 00:53:55 +03:00
parent 28cb43135c
commit 43dcc9575a
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/assets/javascripts/merge_requests.js
View file

@ -5,12 +5,13 @@ var MergeRequest = {
init:
function(opts) {
this.opts = opts;
var self = this;
self.opts = opts;
if($(".automerge_widget").length){
self.showState(self.opts.current_state);
if($(".automerge_widget").length && self.opts.check_enable){
$.get(opts.url_to_automerge_check, function(data){
$(".automerge_widget").hide();
$(".automerge_widget." + data.state).show();
self.showState(data.state);
}, "json");
}
@ -35,6 +36,13 @@ var MergeRequest = {
});
},
showState:
function(state){
$(".automerge_widget").hide();
$(".automerge_widget." + state).show();
},
loadDiff:
function() {
$(".dashboard-loader").show();