diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-29 12:40:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-04-29 12:40:13 +0000 |
| commit | bfc6a0e3718c1b4d5e3d2adcc1ef16cf5274df5c (patch) | |
| tree | c5d1fb7ef245438397d72ea4a9e0a1dd20584d89 /Gemfile.lock | |
| parent | b8f28628f59b38136aba5704d3feb84af3eaa567 (diff) | |
| parent | 28dcdb27795de79337df7aeff1107114cdffc2f9 (diff) | |
| download | gitlab-ce-bfc6a0e3718c1b4d5e3d2adcc1ef16cf5274df5c.tar.gz | |
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.
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
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 91d89b4875a..1dcda0daff6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,7 +184,7 @@ GEM encryptor (1.3.0) equalizer (0.0.11) erubis (2.7.0) - escape_utils (1.1.0) + escape_utils (1.1.1) eventmachine (1.0.8) excon (0.45.4) execjs (2.6.0) @@ -334,7 +334,7 @@ GEM json get_process_mem (0.2.0) gherkin-ruby (0.3.2) - github-linguist (4.7.5) + github-linguist (4.7.6) charlock_holmes (~> 0.7.3) escape_utils (~> 1.1.0) mime-types (>= 1.19) @@ -351,7 +351,7 @@ GEM posix-spawn (~> 0.3) gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) - gitlab_git (10.0.0) + gitlab_git (10.0.1) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) |