diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-20 11:10:00 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-20 11:10:00 +0200 |
| commit | 27cc95ab499c08b634990b4c9266bb5ac6b64734 (patch) | |
| tree | 6a401b3d11fd6f7728253dca2e0c2e31548808ed /app/views/projects/blob/_text.html.haml | |
| parent | 5e2219db48719af5ca971f9222fffa7bd66cb6d8 (diff) | |
| parent | 08b2e7cd8f69603075edcb93a6a66b6407beb700 (diff) | |
| download | gitlab-ce-27cc95ab499c08b634990b4c9266bb5ac6b64734.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 26914-add_deploy_history_data_source
Diffstat (limited to 'app/views/projects/blob/_text.html.haml')
| -rw-r--r-- | app/views/projects/blob/_text.html.haml | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/app/views/projects/blob/_text.html.haml b/app/views/projects/blob/_text.html.haml index 7b16d266982..20638f6961d 100644 --- a/app/views/projects/blob/_text.html.haml +++ b/app/views/projects/blob/_text.html.haml @@ -1,19 +1,2 @@ -- if blob.only_display_raw? - .file-content.code - .nothing-here-block - File too large, you can - = succeed '.' do - = link_to 'view the raw file', namespace_project_raw_path(@project.namespace, @project, @id), target: '_blank', rel: 'noopener noreferrer' - -- else - - blob.load_all_data!(@repository) - - - if blob.empty? - .file-content.code - .nothing-here-block Empty file - - else - - if markup?(blob.name) - .file-content.wiki - = render_markup(blob.name, blob.data) - - else - = render 'shared/file_highlight', blob: blob, repository: @repository +- blob.load_all_data!(@repository) += render 'shared/file_highlight', blob: blob, repository: @repository |