BigW Consortium Gitlab
Support supressing text file diffs on the default branch with .gitattributes This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch. When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed. ![image](/uploads/2e119b725875a301e30d9ad482e283b3/image.png) I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`. Fixes and closes gitlab-org/gitlab-ce#2315. See merge request !3806
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
artifacts | Loading commit data... | |
badges | Loading commit data... | |
blame | Loading commit data... | |
blob | Loading commit data... | |
branches | Loading commit data... | |
builds | Loading commit data... | |
buttons | Loading commit data... | |
ci/builds | Loading commit data... | |
commit | Loading commit data... | |
commits | Loading commit data... | |
compare | Loading commit data... | |
deploy_keys | Loading commit data... | |
diffs | Loading commit data... | |
find_file | Loading commit data... | |
forks | Loading commit data... | |
generic_commit_statuses | Loading commit data... | |
graphs | Loading commit data... | |
group_links | Loading commit data... | |
hooks | Loading commit data... | |
imports | Loading commit data... | |
issues | Loading commit data... | |
labels | Loading commit data... | |
merge_requests | Loading commit data... | |
milestones | Loading commit data... | |
network | Loading commit data... | |
notes | Loading commit data... | |
project_members | Loading commit data... | |
protected_branches | Loading commit data... | |
refs | Loading commit data... | |
releases | Loading commit data... | |
repositories | Loading commit data... | |
runners | Loading commit data... | |
services | Loading commit data... | |
snippets | Loading commit data... | |
tags | Loading commit data... | |
tree | Loading commit data... | |
triggers | Loading commit data... | |
variables | Loading commit data... | |
wikis | Loading commit data... | |
_activity.html.haml | Loading commit data... | |
_bitbucket_import_modal.html.haml | Loading commit data... | |
_builds_settings.html.haml | Loading commit data... | |
_commit_button.html.haml | Loading commit data... | |
_errors.html.haml | Loading commit data... | |
_files.html.haml | Loading commit data... | |
_find_file_link.html.haml | Loading commit data... | |
_github_import_modal.html.haml | Loading commit data... | |
_gitlab_import_modal.html.haml | Loading commit data... | |
_home_panel.html.haml | Loading commit data... | |
_last_commit.html.haml | Loading commit data... | |
_last_push.html.haml | Loading commit data... | |
_md_preview.html.haml | Loading commit data... | |
_readme.html.haml | Loading commit data... | |
_zen.html.haml | Loading commit data... | |
activity.html.haml | Loading commit data... | |
edit.html.haml | Loading commit data... | |
empty.html.haml | Loading commit data... | |
new.html.haml | Loading commit data... | |
no_repo.html.haml | Loading commit data... | |
remove_fork.js.haml | Loading commit data... | |
show.atom.builder | Loading commit data... | |
show.html.haml | Loading commit data... | |
transfer.js.haml | Loading commit data... | |
update.js.haml | Loading commit data... |