Download as
Browse Code »

Commit 43dcc9575aaf406f7979fdc9836fad40ab8c3b72

Authored by Valery Sizov
1 parent 28cb4313
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 2 changed files with 14 additions and 4 deletions   Show diff stats
app/assets/javascripts/merge_requests.js
  Diff comments   View file @43dcc95
... ... @@ -5,12 +5,13 @@ var MergeRequest = {
5 5  
6 6 init:
7 7 function(opts) {
8   - this.opts = opts;
  8 + var self = this;
  9 + self.opts = opts;
9 10  
10   - if($(".automerge_widget").length){
  11 + self.showState(self.opts.current_state);
  12 + if($(".automerge_widget").length && self.opts.check_enable){
11 13 $.get(opts.url_to_automerge_check, function(data){
12   - $(".automerge_widget").hide();
13   - $(".automerge_widget." + data.state).show();
  14 + self.showState(data.state);
14 15 }, "json");
15 16 }
16 17  
... ... @@ -35,6 +36,13 @@ var MergeRequest = {
35 36 });
36 37 },
37 38  
  39 + showState:
  40 + function(state){
  41 + $(".automerge_widget").hide();
  42 + $(".automerge_widget." + state).show();
  43 + },
  44 +
  45 +
38 46 loadDiff:
39 47 function() {
40 48 $(".dashboard-loader").show();
... ...
app/views/merge_requests/show.html.haml
  Diff comments   View file @43dcc95
... ... @@ -101,6 +101,8 @@
101 101 $(function(){
102 102 MergeRequest.init({
103 103 url_to_automerge_check: "#{automerge_check_project_merge_request_path(@project, @merge_request)}",
  104 + check_enable: #{@merge_request.state == MergeRequest::UNCHECKED ? "true" : "false"},
  105 + current_state: "#{@merge_request.human_state}"
104 106 });
105 107  
106 108 $(".accept_merge_request").live("ajax:beforeSend", function() {
... ...