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
9de94ac9
Commit
9de94ac9
authored
Oct 28, 2021
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use labels widget on epic board and mr sidebar
Review feedback
parent
5b721c53
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
4 deletions
+15
-4
app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/labels_select_root.vue
...nents/sidebar/labels_select_widget/labels_select_root.vue
+0
-2
app/assets/stylesheets/page_bundles/boards.scss
app/assets/stylesheets/page_bundles/boards.scss
+1
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-1
ee/spec/helpers/boards_helper_spec.rb
ee/spec/helpers/boards_helper_spec.rb
+13
-0
No files found.
app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/labels_select_root.vue
View file @
9de94ac9
...
...
@@ -341,7 +341,6 @@ export default {
:labels-create-title=
"labelsCreateTitle"
:selected-labels=
"issuableLabels"
:variant=
"variant"
:issuable-type=
"issuableType"
:is-visible=
"edit"
:full-path=
"fullPath"
:workspace-type=
"workspaceType"
...
...
@@ -364,7 +363,6 @@ export default {
:labels-create-title=
"labelsCreateTitle"
:selected-labels=
"issuableLabels"
:variant=
"variant"
:issuable-type=
"issuableType"
:full-path=
"fullPath"
:workspace-type=
"workspaceType"
:attr-workspace-path=
"attrWorkspacePath"
...
...
app/assets/stylesheets/page_bundles/boards.scss
View file @
9de94ac9
...
...
@@ -472,7 +472,7 @@
}
.show.dropdown
.dropdown-menu
{
width
:
100%
;
@include
gl-w-full
;
}
}
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
9de94ac9
...
...
@@ -42,7 +42,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
push_frontend_feature_flag
(
:restructured_mr_widget
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:mr_changes_fluid_layout
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:mr_attention_requests
,
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:labels_widget
,
@
project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:labels_widget
,
project
,
default_enabled: :yaml
)
# Usage data feature flags
push_frontend_feature_flag
(
:users_expanding_widgets_usage_data
,
@project
,
default_enabled: :yaml
)
...
...
ee/spec/helpers/boards_helper_spec.rb
View file @
9de94ac9
...
...
@@ -33,6 +33,19 @@ RSpec.describe BoardsHelper do
end
end
describe
'#build_issue_link_base'
do
context
'when epic board'
do
let_it_be
(
:epic_board
)
{
create
(
:epic_board
,
group:
group
)
}
it
'generates the correct url'
do
assign
(
:board
,
epic_board
)
assign
(
:group
,
group
)
expect
(
helper
.
build_issue_link_base
).
to
eq
"/groups/
#{
group
.
full_path
}
/-/epics"
end
end
end
describe
'#board_base_url'
do
context
'when epic board'
do
let_it_be
(
:epic_board
)
{
create
(
:epic_board
,
group:
group
)
}
...
...
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