Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq

app/views/projects/_home_panel.html.haml

@@ -7,10 +7,6 @@
         %span.visibility-level-label
           = visibility_level_icon(@project.visibility_level)
           = visibility_level_label(@project.visibility_level)
-        - if @project.archived?
-          %span.visibility-level-label
-            %i.icon-book
-            Archived
 
     .span7
       - unless empty_repo
@@ -32,4 +28,4 @@
         = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
         = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)
         = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project)
-        %span.light.prepend-left-20= repository_size
\ No newline at end of file
+        %span.light.prepend-left-20= repository_size

app/views/projects/show.html.haml

@@ -8,6 +8,14 @@
     .loading.hide
   .span3.project-side
     .clearfix
+      - if @project.archived?
+        .alert
+          %h5
+            %i.icon-warning-sign
+            Archived project!
+          %p Repository is read-only
+
+
       - if @project.forked_from_project
         .alert.alert-success
           %i.icon-code-fork.project-fork-icon