diff options
author | Servilio Afre Puentes <afrepues@sharcnet.ca> | 2017-11-03 17:27:58 -0400 |
---|---|---|
committer | Servilio Afre Puentes <afrepues@sharcnet.ca> | 2017-11-06 14:50:53 -0500 |
commit | f2ac5e0acf7ecd32d87696c9d8d2aeb8d6896eb5 (patch) | |
tree | 451f348ba725eb54e975e34319d3b61dfcede258 /pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch | |
parent | fa0148abf83873b27667346f95b9f76fa09b7a31 (diff) | |
download | nixpkgs-f2ac5e0acf7ecd32d87696c9d8d2aeb8d6896eb5.tar nixpkgs-f2ac5e0acf7ecd32d87696c9d8d2aeb8d6896eb5.tar.gz nixpkgs-f2ac5e0acf7ecd32d87696c9d8d2aeb8d6896eb5.tar.bz2 nixpkgs-f2ac5e0acf7ecd32d87696c9d8d2aeb8d6896eb5.tar.lz nixpkgs-f2ac5e0acf7ecd32d87696c9d8d2aeb8d6896eb5.tar.xz nixpkgs-f2ac5e0acf7ecd32d87696c9d8d2aeb8d6896eb5.tar.zst nixpkgs-f2ac5e0acf7ecd32d87696c9d8d2aeb8d6896eb5.zip |
gitlab: 10.0.2 -> 10.1.1
Diffstat (limited to 'pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch')
-rw-r--r-- | pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index c88f525715e..39c7c28847c 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -27,20 +27,20 @@ diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 0b33783869..cd4e41d9bd 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example -@@ -521,7 +521,7 @@ production: &base +@@ -574,7 +574,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: - bin_path: /usr/bin/git + bin_path: git - # The next value is the maximum memory size grit can use - # Given in number of bytes per git object (e.g. a commit) - # This value can be increased if you have very large commits + + ## Webpack settings + # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 8ddf8e4d2e..559cf9adf7 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -219,7 +219,7 @@ Settings.gitlab['user'] ||= 'git' +@@ -252,7 +252,7 @@ Settings.gitlab['user'] ||= 'git' Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir rescue ArgumentError # no user configured @@ -49,15 +49,15 @@ index 8ddf8e4d2e..559cf9adf7 100644 end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? -@@ -454,7 +454,7 @@ Settings.backup['upload']['storage_class'] ||= nil +@@ -491,7 +491,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['bin_path'] ||= 'git' - Settings.git['timeout'] ||= 10 +-Settings.git['bin_path'] ||= '/usr/bin/git' ++Settings.git['bin_path'] ||= 'git' # Important: keep the satellites.path setting until GitLab 9.0 at + # least. This setting is fed to 'rm -rf' in diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb index 59b21149a9..4f4a39a06c 100644 --- a/lib/gitlab/logger.rb |