diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-07 13:47:27 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-12-07 13:47:27 +0000 |
| commit | 61d91f640b94d6e273dee502b77e723b599ab86c (patch) | |
| tree | 5d38199ade46feb3410ba2be99e518529674a12a /app/views | |
| parent | 25cd8fb5471ed32c6ce565e2a1027f591091f19f (diff) | |
| parent | f8fdf93ec94b1ad43141a1463a6793082750d86e (diff) | |
| download | gitlab-ce-61d91f640b94d6e273dee502b77e723b599ab86c.tar.gz | |
Merge branch 'gt-show-primary-button-when-all-labels-are-prioritized' into 'master'
Show primary button when all labels are prioritized
Closes #54467
See merge request gitlab-org/gitlab-ce!23648
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/labels/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index 2c6484c2c99..56b06374d6d 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -5,7 +5,7 @@ - subscribed = params[:subscribed] - labels_or_filters = @labels.exists? || @prioritized_labels.exists? || search.present? || subscribed.present? -- if @labels.present? && can_admin_label +- if labels_or_filters && can_admin_label - content_for(:header_content) do .nav-controls = link_to _('New label'), new_project_label_path(@project), class: "btn btn-success qa-label-create-new" |