diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-12 01:09:23 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-12 01:09:23 +0400 |
| commit | 9fd6c3d591fb56e50a9cdbbaac557383e3ef86a7 (patch) | |
| tree | 4fd09317c3e515756b9db39f18eee8f8ad4c76c1 /lib/gitlab | |
| parent | 7edbee6c187460f656134199d8145b7f781f2c09 (diff) | |
| parent | 61c2a2d39a3a73761e862818b73940510eb80b80 (diff) | |
Merge branch 'huge-repo-improve' into 'master'
Better support for huge repositories
This MR contains next improvements to GitLab:
* You can see repo commits count even if it is > 100k commits
* Prevent 500 for commit page for large repos
* Add notice about huge push over http to unicorn config
* File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
* Show spinner when loading data for network graph
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/satellite/files/file_action.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/satellite/files/file_action.rb b/lib/gitlab/satellite/files/file_action.rb index 7701a6d5d60..6446b14568a 100644 --- a/lib/gitlab/satellite/files/file_action.rb +++ b/lib/gitlab/satellite/files/file_action.rb @@ -4,7 +4,7 @@ module Gitlab attr_accessor :file_path, :ref def initialize(user, project, ref, file_path) - super user, project, git_timeout: 10.seconds + super user, project @file_path = file_path @ref = ref end |