Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
60af91b4
Commit
60af91b4
authored
Feb 28, 2020
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update scoped label documentation anchor link
parent
eacfd911
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
ee/app/helpers/ee/boards_helper.rb
ee/app/helpers/ee/boards_helper.rb
+1
-1
ee/app/helpers/ee/labels_helper.rb
ee/app/helpers/ee/labels_helper.rb
+2
-2
ee/app/presenters/epic_presenter.rb
ee/app/presenters/epic_presenter.rb
+1
-1
ee/app/views/shared/labels/_create_label_help_text.html.haml
ee/app/views/shared/labels/_create_label_help_text.html.haml
+1
-1
ee/spec/helpers/ee/labels_helper_spec.rb
ee/spec/helpers/ee/labels_helper_spec.rb
+1
-1
No files found.
ee/app/helpers/ee/boards_helper.rb
View file @
60af91b4
...
...
@@ -27,7 +27,7 @@ module EE
weight_feature_available:
current_board_parent
.
feature_available?
(
:issue_weights
).
to_s
,
show_promotion:
show_feature_promotion
,
scoped_labels:
current_board_parent
.
feature_available?
(
:scoped_labels
)
&
.
to_s
,
scoped_labels_documentation_link:
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels'
)
scoped_labels_documentation_link:
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels
-premium
'
)
}
super
.
merge
(
data
)
...
...
ee/app/helpers/ee/labels_helper.rb
View file @
60af91b4
...
...
@@ -45,7 +45,7 @@ module EE
def
label_dropdown_data
(
edit_context
,
opts
=
{})
scoped_labels_fields
=
{
scoped_labels:
edit_context
&
.
feature_available?
(
:scoped_labels
)
&
.
to_s
,
scoped_labels_documentation_link:
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels'
)
scoped_labels_documentation_link:
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels
-premium
'
)
}
return
super
.
merge
(
scoped_labels_fields
)
unless
edit_context
.
is_a?
(
Group
)
...
...
@@ -74,7 +74,7 @@ module EE
private
def
scoped_labels_doc_link
help_url
=
::
Gitlab
::
Routing
.
url_helpers
.
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels'
)
help_url
=
::
Gitlab
::
Routing
.
url_helpers
.
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels
-premium
'
)
%(<a href="#{help_url}" class="gl-link gl-label-icon" target="_blank" rel="noopener"><i class="fa fa-question-circle"></i></a>)
.
html_safe
end
...
...
ee/app/presenters/epic_presenter.rb
View file @
60af91b4
...
...
@@ -79,7 +79,7 @@ class EpicPresenter < Gitlab::View::Presenter::Delegated
toggle_subscription_path:
toggle_subscription_group_epic_path
(
group
,
epic
),
labels_web_url:
group_labels_path
(
group
),
epics_web_url:
group_epics_path
(
group
),
scoped_labels_documentation_link:
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels'
)
scoped_labels_documentation_link:
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels
-premium
'
)
}
paths
[
:todo_delete_path
]
=
dashboard_todo_path
(
epic_pending_todo
)
if
epic_pending_todo
.
present?
...
...
ee/app/views/shared/labels/_create_label_help_text.html.haml
View file @
60af91b4
-
if
@label
.
subject
.
feature_available?
(
:scoped_labels
)
-
docs_url
=
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels'
)
-
docs_url
=
help_page_path
(
'user/project/labels.md'
,
anchor:
'scoped-labels
-premium
'
)
-
docs_link_start
=
"<a href='
#{
docs_url
}
' target='_blank' rel='noreferrer noopener'>"
.
html_safe
-
docs_link_end
=
'</a>'
.
html_safe
-
docs_link_placeholders
=
{
link_start:
docs_link_start
,
...
...
ee/spec/helpers/ee/labels_helper_spec.rb
View file @
60af91b4
...
...
@@ -57,7 +57,7 @@ describe LabelsHelper do
show_any:
"true"
,
default_label:
"Labels"
,
scoped_labels:
"false"
,
scoped_labels_documentation_link:
"/help/user/project/labels.md#scoped-labels"
scoped_labels_documentation_link:
"/help/user/project/labels.md#scoped-labels
-premium
"
}
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment