diff options
author | Connor Shea <connor.james.shea@gmail.com> | 2016-08-18 18:21:40 +0300 |
---|---|---|
committer | Connor Shea <connor.james.shea@gmail.com> | 2016-08-18 18:21:40 +0300 |
commit | b5d0346a99401ec138ee411660b5c7ee28421f84 (patch) | |
tree | da373c601bc635e5293876b659f587c87d09848f /app/assets/javascripts/merge_request_tabs.js | |
parent | c64e977d2e36caf108a1b8dd7348b2846e06b7f0 (diff) | |
parent | ac73de508e21af95b473bfafc2ca2543b234430d (diff) |
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index ab9d2367fc7..ad08209d61e 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -15,6 +15,7 @@ function MergeRequestTabs(opts) { this.opts = opts != null ? opts : {}; + this.opts.setUrl = this.opts.setUrl !== undefined ? this.opts.setUrl : true; this.setCurrentAction = bind(this.setCurrentAction, this); this.tabShown = bind(this.tabShown, this); this.showTab = bind(this.showTab, this); @@ -58,7 +59,9 @@ } else { this.expandView(); } - return this.setCurrentAction(action); + if (this.opts.setUrl) { + this.setCurrentAction(action); + } }; MergeRequestTabs.prototype.scrollToElement = function(container) { |