diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-06 10:11:24 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-06 10:11:24 +0200 |
| commit | f90b5d5d438e77a6e849f1cc2a3b27fd1dac7ec4 (patch) | |
| tree | 42761eaa48b4c80ef6fce0d409eaee803dfc8ad0 | |
| parent | 66a9511b5245d3bd701b7246b4dafe4851159733 (diff) | |
| download | gitlab-ce-f90b5d5d438e77a6e849f1cc2a3b27fd1dac7ec4.tar.gz | |
Fix CHANGELOG and wrong conflict resolution
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 8 | ||||
| -rw-r--r-- | app/assets/javascripts/labels_select.js | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9fe62b87cb8..68962f20d0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -94,14 +94,6 @@ v 8.12.2 - Fix resolve discussion buttons endpoint path - Refactor remnants of CoffeeScript destructured opts and super !6261 -v 8.12.4 (unreleased) - - Set GitLab project exported file permissions to owner only - - Don't send Private-Token (API authentication) headers to Sentry - -v 8.12.2 (unreleased) - - Fix Import/Export not recognising correctly the imported services. - - Respect the fork_project permission when forking projects - v 8.12.1 - Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST - Fix issue with search filter labels not displaying diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 66cc3f99b0f..e356872624a 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -4,7 +4,7 @@ var _this; _this = this; $('.js-label-select').each(function(i, dropdown) { - var $block, $colorPreview, $dropdown, $form, $loading, $selectbox, $sidebarCollapsedValue, $value, abilityName, defaultLabel, enableLabelCreateButton, issueURLSplit, issueUpdateURL, labelHTMLTemplate, labelNoneHTMLTemplate, labelUrl, projectId, saveLabelData, selectedLabel, showAny, showNo, $sidebarLabelTooltip, initialSelected, $toggleText, fieldName, useId, propertyName, showMenuAbove; + var $block, $colorPreview, $dropdown, $form, $loading, $selectbox, $sidebarCollapsedValue, $value, abilityName, defaultLabel, enableLabelCreateButton, issueURLSplit, issueUpdateURL, labelHTMLTemplate, labelNoneHTMLTemplate, labelUrl, namespacePath, projectPath, saveLabelData, selectedLabel, showAny, showNo, $sidebarLabelTooltip, initialSelected, $toggleText, fieldName, useId, propertyName, showMenuAbove; $dropdown = $(dropdown); $toggleText = $dropdown.find('.dropdown-toggle-text'); namespacePath = $dropdown.data('namespace-path'); |