kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Show labels widget on issuable sidebar if project has only group labels

Browse source
This commit is contained in:
Douglas Barbosa Alexandre 2016-09-26 18:06:46 -03:00
parent 8522ef44bf
commit ae88126d13
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/concerns/issuable_actions.rb
View file

@ -2,7 +2,7 @@ module IssuableActions
extend ActiveSupport::Concern
included do
before_action :labels, only: [:new, :edit]
before_action :labels, only: [:show, :new, :edit]
before_action :authorize_destroy_issuable!, only: :destroy
before_action :authorize_admin_issuable!, only: :bulk_update
end

2
app/views/shared/issuable/_sidebar.html.haml
View file

@ -107,7 +107,7 @@
= dropdown_content do
.js-due-date-calendar
- if issuable.project.labels.any?
- if @labels && @labels.any?
- selected_labels = issuable.labels
.block.labels
.sidebar-collapsed-icon.js-sidebar-labels-tooltip{ title: issuable_labels_tooltip(issuable.labels_array), data: { placement: "left", container: "body" } }