public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab: 10.1.1 -> 10.3.3

Browse Source
This commit is contained in:
Robin Gloster
2018-01-07 05:02:53 +01:00
parent 042c12e512
commit 1c5fd46d6c
6 changed files with 244 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+5 -14
View File
@@ -62,24 +62,15 @@ diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
index 59b21149a9..4f4a39a06c 100644
--- a/lib/gitlab/logger.rb
+++ b/lib/gitlab/logger.rb
@@ -13,7 +13,7 @@
@@ -26,7 +26,7 @@
end
def self.read_latest
- path = Rails.root.join("log", file_name)
+ path = File.join(ENV["GITLAB_LOG_PATH"], file_name)
return [] unless File.readable?(path)
@@ -22,7 +22,7 @@
def self.full_log_path
- Rails.root.join("log", file_name)
+ File.join(ENV["GITLAB_LOG_PATH"], file_name)
end
def self.build
- new(Rails.root.join("log", file_name))
+ new(File.join(ENV["GITLAB_LOG_PATH"], file_name))
end
end
end
def self.cache_key
diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb
index b5f4124052..f72c556983 100644
--- a/lib/gitlab/uploads_transfer.rb