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: ![Screen_Shot_2016-08-12_at_3.54.37_PM](/uploads/d6ba44c2d3be1f78372792b5ac406672/Screen_Shot_2016-08-12_at_3.54.37_PM.png) New project list with archived badge: ![Screen_Shot_2016-08-12_at_3.54.21_PM](/uploads/3fa8bb9fe7588575aace0761984929a7/Screen_Shot_2016-08-12_at_3.54.21_PM.png) See merge request !5798

Merge branch 'archived_project_badge' into 'master'
0b6caf45 · Rémy Coutable · 11eefba8 · 60858c3d · 0b6caf45 · 0b6caf45
Commit 0b6caf45 authored Aug 12, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

_project.html.haml app/views/shared/projects/_project.html.haml +2 -0

No files found.
--- 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

--- 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)