Download as
Browse Code »

Commit 3b0acc9eea5c8e74db9bcb7b46c018ff6ede7e6c

Authored by Dmitriy Zaporozhets
2 parents 4efaa51b 5cb85258
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

Showing 2 changed files with 9 additions and 5 deletions   Show diff stats
app/views/projects/_home_panel.html.haml
  Diff comments   View file @3b0acc9
@@ -7,10 +7,6 @@ @@ -7,10 +7,6 @@
7 %span.visibility-level-label 7 %span.visibility-level-label
8 = visibility_level_icon(@project.visibility_level) 8 = visibility_level_icon(@project.visibility_level)
9 = visibility_level_label(@project.visibility_level) 9 = visibility_level_label(@project.visibility_level)
10 - - if @project.archived?  
11 - %span.visibility-level-label  
12 - %i.icon-book  
13 - Archived  
14 10
15 .span7 11 .span7
16 - unless empty_repo 12 - unless empty_repo
@@ -32,4 +28,4 @@ @@ -32,4 +28,4 @@
32 = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref) 28 = link_to pluralize(@repository.round_commit_count, 'commit'), project_commits_path(@project, @ref || @repository.root_ref)
33 = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project) 29 = link_to pluralize(@repository.branch_names.count, 'branch'), project_branches_path(@project)
34 = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project) 30 = link_to pluralize(@repository.tag_names.count, 'tag'), project_tags_path(@project)
35 - %span.light.prepend-left-20= repository_size  
36 \ No newline at end of file 31 \ No newline at end of file
  32 + %span.light.prepend-left-20= repository_size
app/views/projects/show.html.haml
  Diff comments   View file @3b0acc9
@@ -8,6 +8,14 @@ @@ -8,6 +8,14 @@
8 .loading.hide 8 .loading.hide
9 .span3.project-side 9 .span3.project-side
10 .clearfix 10 .clearfix
  11 + - if @project.archived?
  12 + .alert
  13 + %h5
  14 + %i.icon-warning-sign
  15 + Archived project!
  16 + %p Repository is read-only
  17 +
  18 +
11 - if @project.forked_from_project 19 - if @project.forked_from_project
12 .alert.alert-success 20 .alert.alert-success
13 %i.icon-code-fork.project-fork-icon 21 %i.icon-code-fork.project-fork-icon