diff options
| author | Phil Hughes <me@iamphill.com> | 2018-01-10 11:00:33 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-01-10 11:00:33 +0000 |
| commit | 817da7cf8c1caef45c37153c7eb776ed1f226625 (patch) | |
| tree | 9b3d3266365be307e160d0a15ebff04af6ede48e | |
| parent | be623ef3c1a867d23e9625fe372c17fcad3c47ce (diff) | |
| download | gitlab-ce-merge-request-lfs-badge.tar.gz | |
Added LFS to merge request files tracked by LFSmerge-request-lfs-badge
Closes #41829
| -rw-r--r-- | app/views/projects/diffs/_file_header.html.haml | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/merge-request-lfs-badge.yml | 5 |
2 files changed, 8 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 diff --git a/changelogs/unreleased/merge-request-lfs-badge.yml b/changelogs/unreleased/merge-request-lfs-badge.yml new file mode 100644 index 00000000000..6c345397111 --- /dev/null +++ b/changelogs/unreleased/merge-request-lfs-badge.yml @@ -0,0 +1,5 @@ +--- +title: Added LFS badge to merge request files tracked by LFS +merge_request: +author: +type: fixed |