diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-14 01:12:22 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-14 01:12:22 +0300 |
| commit | 385eff573eb300a267af96df153a489ebdf12886 (patch) | |
| tree | 211b117a5287af3f0d06a2de92394102ce5ca7bc | |
| parent | 046b5735bcef0670efd9dfd9eb4ec6288b83fc01 (diff) | |
| download | gitlab-ce-add_autocomplete_for_labels.tar.gz | |
Updated CHANGELOG and template.add_autocomplete_for_labels
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js.coffee | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index f2e97335092..1b6bfd22294 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -47,6 +47,7 @@ v 8.9.0 (unreleased) - Use downcased path to container repository as this is expected path by Docker - Projects pending deletion will render a 404 page - Measure queue duration between gitlab-workhorse and Rails + - Added Gfm autocomplete for labels - Make Omniauth providers specs to not modify global configuration - Make authentication service for Container Registry to be compatible with < Docker 1.11 - Add Application Setting to configure Container Registry token expire delay (default 5min) @@ -164,7 +165,6 @@ v 8.8.0 - Support multi-line tag messages. !3833 (Calin Seciu) - Force users to reset their password after an admin changes it - Allow "NEWS" and "CHANGES" as alternative names for CHANGELOG. !3768 (Connor Shea) - - Added Gfm autocomplete for labels - Added button to toggle whitespaces changes on diff view - Backport GitHub Enterprise import support from EE - Create tags using Rugged for performance reasons. !3745 diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee index da58be5185b..190bb38504c 100644 --- a/app/assets/javascripts/gfm_auto_complete.js.coffee +++ b/app/assets/javascripts/gfm_auto_complete.js.coffee @@ -16,8 +16,7 @@ GitLab.GfmAutoComplete = template: '<li>${username} <small>${title}</small></li>' Labels: - template: '<li>${title} <div style="background-color:${color};height:15px;width:15px;display:inline-block;float:right"> - </div></li>' + template: '<li><span class="dropdown-label-box" style="background: ${color}"></span> ${title}</li>' # Issues and MergeRequests Issues: |