summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_requests.js
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/javascripts/merge_requests.js')
-rw-r--r--app/assets/javascripts/merge_requests.js12
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_requests.js b/app/assets/javascripts/merge_requests.js
index b051928e0de..eba9c9cab43 100644
--- a/app/assets/javascripts/merge_requests.js
+++ b/app/assets/javascripts/merge_requests.js
@@ -1,9 +1,19 @@
var MergeRequest = {
diffs_loaded: false,
commits_loaded: false,
+ opts: false,
init:
- function() {
+ function(opts) {
+ this.opts = opts;
+
+ if($(".automerge_widget").lenght){
+ $.get(opts.url_to_automerge_check, function(data){
+ $(".automerge_widget").hide();
+ $(".automerge_widget." + data.state).show();
+ }, "json");
+ }
+
$(".tabs a").live("click", function() {
$(".tabs a").parent().removeClass("active");
$(this).parent().addClass("active");