summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-03-11 17:40:59 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2016-03-18 12:30:46 +0100
commit3f0d780c19d821e74a4a89634ada10dedec0dbeb (patch)
tree0a0b57dc7d57ea039d3678fca8aa2b8142c7d592 /Gemfile.lock
parentbdbc9884348515f71530efc2759c05d794f8547e (diff)
downloadgitlab-ce-3f0d780c19d821e74a4a89634ada10dedec0dbeb.tar.gz
Show a notice for diffs that are too largehide-large-diffs
This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b0dd83da52..63ed9441c62 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -359,11 +359,11 @@ GEM
posix-spawn (~> 0.3)
gitlab_emoji (0.3.1)
gemojione (~> 2.2, >= 2.2.1)
- gitlab_git (9.0.3)
+ gitlab_git (10.0.0)
activesupport (~> 4.0)
charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0)
- rugged (~> 0.24.0b13)
+ rugged (~> 0.24.0)
gitlab_meta (7.0)
gitlab_omniauth-ldap (1.2.1)
net-ldap (~> 0.9)
@@ -942,7 +942,7 @@ DEPENDENCIES
github-markup (~> 1.3.1)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab_emoji (~> 0.3.0)
- gitlab_git (~> 9.0)
+ gitlab_git (~> 10.0)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.1.0)