diff options
| author | Robin Gloster <mail@glob.in> | 2018-01-07 04:59:27 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-01-07 05:02:53 +0100 |
| commit | 1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b (patch) | |
| tree | aa0f54fb22746cd536be779dbb07f99817248fa0 /pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch | |
| parent | 042c12e512c2e76732909cab4f7b0655444d2825 (diff) | |
| download | nixpkgs-1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b.tar nixpkgs-1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b.tar.gz nixpkgs-1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b.tar.bz2 nixpkgs-1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b.tar.lz nixpkgs-1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b.tar.xz nixpkgs-1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b.tar.zst nixpkgs-1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b.zip | |
gitlab: 10.1.1 -> 10.3.3
Diffstat (limited to 'pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 39c7c28847c..acc615c63ca 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -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 |