diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-10 15:51:52 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-01-15 13:26:50 -0600 |
| commit | 1606a6b834fbfa18e55a97a099fa0199961c7ffd (patch) | |
| tree | 862a1495b92db458f0c7e581d3c5ae9c597739ce /app | |
| parent | 39924b113734f178986e7c63c94d741a712a2174 (diff) | |
| download | gitlab-ce-1606a6b834fbfa18e55a97a099fa0199961c7ffd.tar.gz | |
Merge branch 'merge-request-lfs-badge' into 'master'
Added LFS badge to merge request files tracked by LFS
Closes #41829
See merge request gitlab-org/gitlab-ce!16345
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/diffs/_file_header.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/projects/diffs/_file_header.html.haml b/app/views/projects/diffs/_file_header.html.haml index 73c316472e3..dbeddf6689a 100644 --- a/app/views/projects/diffs/_file_header.html.haml +++ b/app/views/projects/diffs/_file_header.html.haml @@ -35,3 +35,6 @@ - if diff_file.mode_changed? %small #{diff_file.a_mode} → #{diff_file.b_mode} + + - if diff_file.stored_externally? && diff_file.external_storage == :lfs + %span.label.label-lfs.append-right-5 LFS |