diff options
author | Matt Oakes <matt@ribot.co.uk> | 2016-03-14 23:33:00 +0000 |
---|---|---|
committer | Matt Oakes <matt@ribot.co.uk> | 2016-04-29 12:45:15 +0100 |
commit | 28dcdb27795de79337df7aeff1107114cdffc2f9 (patch) | |
tree | f32671e2eda91e99eba67da189c2f52370da14a1 /CHANGELOG | |
parent | 10f84f99cb663faae37139495f547bb68bd8aced (diff) | |
download | gitlab-ce-28dcdb27795de79337df7aeff1107114cdffc2f9.tar.gz |
Support supressing text file diffs on the default branch with .gitattributes
This is a combination of 3 commits.
- Update the bare repositories info/attributes if the default branch is updated
- Check the diff attributes of a file before showing a diff
- Update CHANGELOG
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index d453ae19e77..370b2856b43 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.8.0 (unreleased) - Added button to toggle whitespaces changes on diff view - Backport GitLab Enterprise support from EE - Files over 5MB can only be viewed in their raw form, files over 1MB without highlighting !3718 + - Add support for supressing text diffs using .gitattributes on the default branch (Matt Oakes) v 8.7.1 (unreleased) - Throttle the update of `project.last_activity_at` to 1 minute. !3848 |