diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-18 14:22:59 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-18 14:22:59 +0000 |
| commit | 3b0acc9eea5c8e74db9bcb7b46c018ff6ede7e6c (patch) | |
| tree | 95cb4b2e112f83e38cf16028b14a58ce73b14f7e /app | |
| parent | 4efaa51bbe37e05396dc28143e5015a211ecfa64 (diff) | |
| parent | 5cb852589186a661476461ec5dd7bb15dee5bfd9 (diff) | |
| download | gitlab-ce-3b0acc9eea5c8e74db9bcb7b46c018ff6ede7e6c.tar.gz | |
Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index ae5deb0b6de..8703b264f37 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/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 diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index bfcd917d7f4..d2ced59f2c6 100644 --- a/app/views/projects/show.html.haml +++ b/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 |