gitlab-org--gitlab-foss/app/views
Rémy Coutable bfc6a0e371 Merge branch 'gitattributes' into 'master'
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
2016-04-29 12:40:13 +00:00
..
abuse_report_mailer
abuse_reports
admin disable spellcheck and autocorrect for username field in admin page 2016-04-20 19:27:17 -04:00
ci
dashboard
devise Improved confirmation UX 2016-04-21 20:20:09 -04:00
doorkeeper Updated project group sharing UI 2016-04-25 14:42:17 +01:00
email_rejection_mailer
emojis
errors
events link user avatar in activity page to user profile 2016-04-25 13:13:43 +01:00
explore
groups Fixed group milestones placeholder bug 2016-04-14 10:28:05 +01:00
help Update shortcuts dialog 2016-04-18 15:03:36 -05:00
import Fix GitHub project's link on import page when provider has a custom URL 2016-04-19 13:21:30 -03:00
invites
kaminari/gitlab
layouts Make layout navigation gray and fluid 2016-04-28 14:23:25 +02:00
notify format merge request references properly 2016-04-18 23:32:02 -07:00
profiles Updated project group sharing UI 2016-04-25 14:42:17 +01:00
projects Merge branch 'gitattributes' into 'master' 2016-04-29 12:40:13 +00:00
repository_check_mailer Improve 'auto fsck' admin emails 2016-04-18 10:58:40 +02:00
search Updated based on feedback 2016-04-26 09:04:35 +01:00
shared Properly handle bigger files 2016-04-28 21:28:39 +02:00
sherlock
snippets
users Add JS prefix to user tab classes 2016-04-26 21:54:40 +08:00
votes Fixes issue with emoji comments not showing correct emoji image 2016-04-22 17:01:53 +01:00