diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-05 19:53:40 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-05 19:53:40 +0300 |
| commit | 0fc80c54f0d3e1caae1338665a98db78fa5fd8d7 (patch) | |
| tree | e7f34be9a528ec4e21c8295b43267f806ce36e67 /lib | |
| parent | 7c7057590af9ddb6df57afe2ce3dfd4d83d00351 (diff) | |
| parent | 4051d01c9cbd867b2478743ffe1ad50dfb030f6d (diff) | |
Merge branch 'kp-label-select-vue' into 'master'
Port Labels Select dropdown to Vue
See merge request gitlab-org/gitlab-ce!17411
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index 92f0e0402a8..a7e055ac444 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -20,6 +20,7 @@ module Gitlab gon.sprite_icons = IconsHelper.sprite_icon_path gon.sprite_file_icons = IconsHelper.sprite_file_icons_path gon.test_env = Rails.env.test? + gon.suggested_label_colors = LabelsHelper.suggested_colors if current_user gon.current_user_id = current_user.id |