Skip to content
Snippets Groups Projects

Add support for querying epics with GraphQL

Merged Brett Walker requested to merge 10795-add-epic-tree-BE-epic-graphql-support into master
All threads resolved!
10 files
+ 101
19
Compare changes
  • Side-by-side
  • Inline
Files
10
  • 4df0e259
    Fix display of promote to group label · 4df0e259
    Jan Provaznik authored
    Since label presenter is used in label index view, label class
    check doesn't work as expected because the class is now LabelPresenter.
    
    Also `label.subject` doesn't work as expected now because Label's model
    `subject` method is shadowed by Gitlab's presenter's method which uses
    `subject` for referencing the original object.
    
    Instead we use a presenter's method for both checks now.
    
    `label_deletion_confirm_text` is not used anywhere so it's removed
@@ -5,7 +5,7 @@ module LabelsHelper
include ActionView::Helpers::TagHelper
def show_label_issuables_link?(label, issuables_type, current_user: nil, project: nil)
return true if label.is_a?(GroupLabel)
return true unless label.project_label?
return true unless project
project.feature_available?(issuables_type, current_user)
@@ -159,13 +159,6 @@ def label_subscription_toggle_button_text(label, project = nil)
label.subscribed?(current_user, project) ? 'Unsubscribe' : 'Subscribe'
end
def label_deletion_confirm_text(label)
case label
when GroupLabel then _('Remove this label? This will affect all projects within the group. Are you sure?')
when ProjectLabel then _('Remove this label? Are you sure?')
end
end
def create_label_title(subject)
case subject
when Group
@@ -200,7 +193,7 @@ def view_labels_title(subject)
end
def label_status_tooltip(label, status)
type = label.is_a?(ProjectLabel) ? 'project' : 'group'
type = label.project_label? ? 'project' : 'group'
level = status.unsubscribed? ? type : status.sub('-level', '')
action = status.unsubscribed? ? 'Subscribe' : 'Unsubscribe'
Loading