diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-07 21:42:41 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-07 21:42:41 +0100 |
| commit | 59195b98d3dfef31915c901e86f91cec74d5fbfa (patch) | |
| tree | b0eba5f79fdb835c838d75d1d0ff29a261b11387 /app/views/projects/show.html.haml | |
| parent | 436047f6575ffc64f065928d1feb4144ca8f7158 (diff) | |
| parent | 69e17c225e53feaa7449e468e89aca3f084ab9f9 (diff) | |
| download | gitlab-ce-59195b98d3dfef31915c901e86f91cec74d5fbfa.tar.gz | |
Merge branch 'master' into new-nav-fix-contextual-breadcrumbs
Diffstat (limited to 'app/views/projects/show.html.haml')
| -rw-r--r-- | app/views/projects/show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 75bbcf82b98..cdf0d64cea7 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -1,10 +1,11 @@ - @no_container = true - @breadcrumb_title = "Project" +- flash_message_container = show_new_nav? ? :new_global_flash : :flash_message = content_for :meta_tags do = auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity") -= content_for :flash_message do += content_for flash_message_container do - if current_user && can?(current_user, :download_code, @project) = render 'shared/no_ssh' = render 'shared/no_password' |