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
ec6908f1
Commit
ec6908f1
authored
Dec 13, 2021
by
John Hope
Committed by
Olena Horal-Koretska
Dec 13, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Rails helper for archived badges in admin settings
parent
7554937f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
app/views/admin/projects/_archived.html.haml
app/views/admin/projects/_archived.html.haml
+1
-2
ee/app/views/admin/projects/_archived.html.haml
ee/app/views/admin/projects/_archived.html.haml
+2
-4
spec/features/admin/admin_projects_spec.rb
spec/features/admin/admin_projects_spec.rb
+1
-1
No files found.
app/views/admin/projects/_archived.html.haml
View file @
ec6908f1
-
if
project
.
archived
%span
.badge.badge-warning
=
_
(
'archived'
)
=
gl_badge_tag
_
(
'archived'
),
variant: :warning
ee/app/views/admin/projects/_archived.html.haml
View file @
ec6908f1
-
if
project
.
marked_for_deletion?
%span
.badge.badge-warning
=
_
(
'pending deletion'
)
=
gl_badge_tag
_
(
'pending deletion'
),
variant: :warning
-
elsif
project
.
archived
%span
.badge.badge-warning
=
_
(
'archived'
)
=
gl_badge_tag
_
(
'archived'
),
variant: :warning
spec/features/admin/admin_projects_spec.rb
View file @
ec6908f1
...
...
@@ -40,7 +40,7 @@ RSpec.describe "Admin::Projects" do
expect
(
page
).
to
have_content
(
project
.
name
)
expect
(
page
).
to
have_content
(
archived_project
.
name
)
expect
(
page
).
to
have_xpath
(
"//span[@class='
badge badge-warning
']"
,
text:
'archived'
)
expect
(
page
).
to
have_xpath
(
"//span[@class='
gl-badge badge badge-pill badge-warning md
']"
,
text:
'archived'
)
end
it
'renders only archived projects'
,
:js
do
...
...
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