summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-08-17 12:06:59 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-08-17 12:06:59 +0000
commit05fe45457b048ac10049a9a8785a6587816c98e5 (patch)
tree63abfcbba9c895df910734219ef06a33962c8caa
parentc3e0f31dfbd1ab3f17d9acaf9cba47cfbb280c1c (diff)
parent590a2035ef4fbfb02da2a4f05490f33a8abe5bf6 (diff)
downloadgitlab-ce-05fe45457b048ac10049a9a8785a6587816c98e5.tar.gz
Merge branch 'fix-height-of-group-share-dropdown' into 'master'
Fixed height of group share dropdown Closes gitlab-ee#3149 See merge request !13505
-rw-r--r--app/assets/javascripts/groups_select.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/groups_select.js b/app/assets/javascripts/groups_select.js
index b5975295329..4d629bc6326 100644
--- a/app/assets/javascripts/groups_select.js
+++ b/app/assets/javascripts/groups_select.js
@@ -111,8 +111,7 @@ window.GroupsSelect = (function() {
};
GroupsSelect.prototype.forceOverflow = function (e) {
- const itemHeight = this.dropdown.querySelector('.select2-result:first-child').clientHeight;
- this.dropdown.style.height = `${Math.floor(this.dropdown.scrollHeight - (itemHeight * 0.9))}px`;
+ this.dropdown.style.height = `${Math.floor(this.dropdown.scrollHeight)}px`;
};
GroupsSelect.PER_PAGE = 20;