BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
7da72a0d
Commit
7da72a0d
authored
Sep 25, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sh-remove-additional-grit-settings' into 'master'
Remove Grit settings from default settings See merge request gitlab-org/gitlab-ce!14465
parents
12edee4b
8edc1d07
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
1_settings.rb
config/initializers/1_settings.rb
+1
-3
No files found.
config/initializers/1_settings.rb
View file @
7da72a0d
...
...
@@ -499,9 +499,7 @@ Settings.backup['upload']['storage_class'] ||= nil
# Git
#
Settings
[
'git'
]
||=
Settingslogic
.
new
({})
Settings
.
git
[
'max_size'
]
||=
20971520
# 20.megabytes
Settings
.
git
[
'bin_path'
]
||=
'/usr/bin/git'
Settings
.
git
[
'timeout'
]
||=
10
Settings
.
git
[
'bin_path'
]
||=
'/usr/bin/git'
# Important: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment