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
ad9a628a
Commit
ad9a628a
authored
Nov 08, 2021
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert labels page tabs to Pajamas
Changelog: other
parent
09536de1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
app/views/shared/labels/_nav.html.haml
app/views/shared/labels/_nav.html.haml
+3
-7
spec/features/groups/labels/subscription_spec.rb
spec/features/groups/labels/subscription_spec.rb
+2
-2
No files found.
app/views/shared/labels/_nav.html.haml
View file @
ad9a628a
-
subscribed
=
params
[
:subscribed
]
.top-area.adjust
%ul
.nav-links.nav.nav-tabs
%li
{
class:
active_when
(
subscribed
!=
'true'
)
}
>
=
link_to
labels_filter_path
do
=
_
(
'All'
)
=
gl_tabs_nav
({
class:
'gl-flex-grow-1 gl-border-0'
})
do
=
gl_tab_link_to
_
(
'All'
),
labels_filter_path
,
{
item_active:
active_when
(
subscribed
!=
'true'
)
}
-
if
current_user
%li
{
class:
active_when
(
subscribed
==
'true'
)
}
>
=
link_to
labels_filter_path
(
subscribed:
'true'
)
do
=
_
(
'Subscribed'
)
=
gl_tab_link_to
_
(
'Subscribed'
),
labels_filter_path
(
subscribed:
'true'
),
{
item_active:
active_when
(
subscribed
==
'true'
)
}
.nav-controls
=
form_tag
labels_filter_path
,
method: :get
do
=
hidden_field_tag
:subscribed
,
params
[
:subscribed
]
...
...
spec/features/groups/labels/subscription_spec.rb
View file @
ad9a628a
...
...
@@ -71,7 +71,7 @@ RSpec.describe 'Labels subscription' do
end
it
'does not show subscribed tab'
do
page
.
within
(
'.
nav-tabs
'
)
do
page
.
within
(
'.
gl-tabs-nav
'
)
do
expect
(
page
).
not_to
have_link
'Subscribed'
end
end
...
...
@@ -86,7 +86,7 @@ RSpec.describe 'Labels subscription' do
end
def
click_subscribed_tab
page
.
within
(
'.
nav-tabs
'
)
do
page
.
within
(
'.
gl-tabs-nav
'
)
do
click_link
'Subscribed'
end
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