summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-19 20:11:41 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-19 20:11:41 +0300
commit4250c349152e252ff36bab54c53d7b267a5b1232 (patch)
tree4318aa60fc5b3af34a0fb28f4917d3ff59422a8b
parentfd7c8c71e5ced72b501b015adedd295f14017785 (diff)
downloadgitlab-ce-4250c349152e252ff36bab54c53d7b267a5b1232.tar.gz
Make repo graph work for large repos on slower machines
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--app/views/projects/graphs/show.html.haml2
3 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index c78f5258a41..45a4b35ed32 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'omniauth-github'
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem "gitlab_git", '2.0.1'
+gem "gitlab_git", '2.1.0'
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 1.0.1', require: 'grack'
diff --git a/Gemfile.lock b/Gemfile.lock
index 37a2299d2c6..d8fc5f4578b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,7 +186,7 @@ GEM
gitlab-pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
- gitlab_git (2.0.1)
+ gitlab_git (2.1.0)
activesupport (~> 3.2.13)
github-linguist (~> 2.3.4)
gitlab-grit (~> 2.6.0)
@@ -578,7 +578,7 @@ DEPENDENCIES
gitlab-gollum-lib (~> 1.0.1)
gitlab-grack (~> 1.0.1)
gitlab-pygments.rb (~> 0.3.2)
- gitlab_git (= 2.0.1)
+ gitlab_git (= 2.1.0)
gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.3)
gon
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index cfa10ae407c..a21cb9e7861 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -13,7 +13,7 @@
%option{:value => "deletions"} Deletions
%h3#date_header.page-title
%p.light
- Commits to #{@project.default_branch}, excluding merge commits. Limited by 8,000 commits
+ Commits to #{@project.default_branch}, excluding merge commits. Limited by 6,000 commits
%input#brush_change{:type => "hidden"}
.graphs
#contributors-master