diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-07 16:34:33 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-07 16:34:33 -0500 |
| commit | a5792a8682ef5262f7d04a92b4d014efdd975311 (patch) | |
| tree | c2501ffa1a7b93488cb8ad2dc3dee1c8fa12634c /app | |
| parent | d37f1f1cd013a8b7a307e1004e020df086cba9d5 (diff) | |
| download | gitlab-ce-a5792a8682ef5262f7d04a92b4d014efdd975311.tar.gz | |
Don't show Copy contents button on Blame page
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/_header.html.haml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index 4ad77b6266d..812801d62cf 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -7,7 +7,7 @@ #blob-content-holder.tree-holder .file-holder - = render "projects/blob/header", blob: @blob + = render "projects/blob/header", blob: @blob, displaying_blame: true .table-responsive.file-content.blame.code.js-syntax-highlight %table diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml index 828f8e073a9..4d08a4cf2a3 100644 --- a/app/views/projects/blob/_header.html.haml +++ b/app/views/projects/blob/_header.html.haml @@ -1,3 +1,4 @@ +- displaying_blame = local_assigns.fetch(:displaying_blame, false) .js-file-title.file-title-flex-parent .file-header-content = blob_icon blob.mode, blob.name @@ -12,14 +13,14 @@ .file-actions.hidden-xs .btn-group{ role: "group" }< - = copy_blob_content_button(blob) if blob_text_viewable?(blob) + = copy_blob_content_button(blob) if !displaying_blame && blob_text_viewable?(blob) = open_raw_file_button(namespace_project_raw_path(@project.namespace, @project, @id)) = view_on_environment_button(@commit.sha, @path, @environment) if @environment .btn-group{ role: "group" }< -# only show normal/blame view links for text files - if blob_text_viewable?(blob) - - if current_page? namespace_project_blame_path(@project.namespace, @project, @id) + - if displaying_blame = link_to 'Normal view', namespace_project_blob_path(@project.namespace, @project, @id), class: 'btn btn-sm' - else |