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 /Gemfile.lock | |
| 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 '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) |