summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-20 19:51:45 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-06-20 19:51:45 +0100
commit83e0653f7c7b25c3413470d859e5fbe50bb4d1a2 (patch)
treef8e26e7fe362e9308e1ba52e0be9dd6447b78fda
parentd866bc5ccde54e24ffd3ba1bc3f83bd08037b731 (diff)
downloadgitlab-ce-33693-protected-branch-dropdowns-cut-off-in-repository-settings-page.tar.gz
-rw-r--r--app/assets/javascripts/settings_panels.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/settings_panels.js b/app/assets/javascripts/settings_panels.js
index 46139d58e6e..59ff2a86293 100644
--- a/app/assets/javascripts/settings_panels.js
+++ b/app/assets/javascripts/settings_panels.js
@@ -9,7 +9,11 @@ function expandSection($section) {
const $content = $section.find('.settings-content');
$content.addClass('expanded').off('scroll.expandSection').scrollTop(0);
- $content.on('animationend.expandSectionParent', () => expandSectionParent($section, $content));
+ if ($content.hasClass('no-animate')) {
+ expandSectionParent($section, $content);
+ } else {
+ $content.on('animationend.expandSectionParent', () => expandSectionParent($section, $content));
+ }
}
function closeSection($section) {