diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-12 22:56:02 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-12 22:56:02 +0000 |
| commit | 0b6caf45ecea550e979562bf483494642c44b878 (patch) | |
| tree | d26dd30faa5d6e25dc5e800f806960ff98fbd0ea | |
| parent | 11eefba891f214eefc1efa334adbcc9e979c0ce3 (diff) | |
| parent | 60858c3d8e5118b5ef6958cf681ba6ae3e141b5c (diff) | |
| download | gitlab-ce-0b6caf45ecea550e979562bf483494642c44b878.tar.gz | |
Merge branch 'archived_project_badge' into 'master'
Add archived badge to project listing
## What does this MR do?
Add an `archived` badge to the user project list, if the project is archived.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
Customer noted in https://gitlab.zendesk.com/agent/tickets/33787 that there is no distinction for archived projects in the project dashboard/explore projects page. There is an archived badge on the admin projects page, though.
## What are the relevant issue numbers?
## Screenshots (if relevant)
Existing admin projects page:
New project list with archived badge:
See merge request !5798
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 96965a20f69..6e096b480c0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -54,6 +54,7 @@ v 8.11.0 (unreleased) - Optimize checking if a user has read access to a list of issues !5370 - Store all DB secrets in secrets.yml, under descriptive names !5274 - Nokogiri's various parsing methods are now instrumented + - Add archived badge to project list !5798 - Add simple identifier to public SSH keys (muteor) - Admin page now references docs instead of a specific file !5600 (AnAverageHuman) - Add a way to send an email and create an issue based on private personal token. Find the email address from issues page. !3363 diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 92803838d02..281ec728e41 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -12,6 +12,8 @@ %li.project-row{ class: css_class } = cache(cache_key) do .controls + - if project.archived + %span.label.label-warning archived - if project.commit.try(:status) %span = render_commit_status(project.commit) |