diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-17 18:20:04 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-17 18:20:04 +0200 |
| commit | 70240f433cd822a8d6f3a5d904c3447b8f19a34a (patch) | |
| tree | 5bcd156870e243b342c0742e6f3d6b8f72c798de /app/views/projects/show.html.haml | |
| parent | c5280434399ee489eebda254b2d246252df68f2b (diff) | |
| parent | 5ad3a274b3404286bb32b695c8f2b7bdd21e4953 (diff) | |
| download | gitlab-ce-70240f433cd822a8d6f3a5d904c3447b8f19a34a.tar.gz | |
Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-files
Diffstat (limited to 'app/views/projects/show.html.haml')
| -rw-r--r-- | app/views/projects/show.html.haml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 54afb7de15d..fdd3d0b322e 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -2,9 +2,10 @@ - if current_user = auto_discovery_link_tag(:atom, namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "#{@project.name} activity") -- if current_user && can?(current_user, :download_code, @project) - = render 'shared/no_ssh' - = render 'shared/no_password' += content_for :flash_message do + - if current_user && can?(current_user, :download_code, @project) + = render 'shared/no_ssh' + = render 'shared/no_password' - if prefer_readme? = render 'projects/last_push' @@ -63,6 +64,10 @@ = icon("exclamation-triangle fw") Archived project! Repository is read-only +- if @repository.commit + .content-block.second-block.white + = render 'projects/last_commit', commit: @repository.commit, project: @project + %section %div{class: "project-show-#{current_user_default_project_view}"} = render current_user_default_project_view @@ -70,7 +75,7 @@ - if current_user - access = user_max_access_in_project(current_user, @project) - if access - .prepend-top-20 + .prepend-top-20.project-footer .gray-content-block.footer-block.center You have #{access} access to this project. - if @project.project_member_by_id(current_user) |