summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request_tabs.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-01-24 14:48:03 +0000
committerPhil Hughes <me@iamphill.com>2019-01-24 14:48:03 +0000
commit2f40aa68d92f3f51167aaccc9fab2801ee185605 (patch)
tree54f8d590511170db8d7f4db6a16dda1830a9ec54 /app/assets/javascripts/merge_request_tabs.js
parentda251c6436d6e17b18911d37c1b18314fb29329d (diff)
downloadgitlab-ce-2f40aa68d92f3f51167aaccc9fab2801ee185605.tar.gz
Added dropdown for diff settings
Dropdown includes buttons for tree view rendering mode and buttons for the compare view (inline or side-by-side) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55491
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
-rw-r--r--app/assets/javascripts/merge_request_tabs.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js
index b0dc5697018..2f15da42271 100644
--- a/app/assets/javascripts/merge_request_tabs.js
+++ b/app/assets/javascripts/merge_request_tabs.js
@@ -428,7 +428,7 @@ export default class MergeRequestTabs {
}
diffViewType() {
- return $('.inline-parallel-buttons button.active').data('viewType');
+ return $('.js-diff-view-buttons button.active').data('viewType');
}
isDiffAction(action) {