gitlab: 8.17.6 -> 9.3.4

1 files changed, 61 insertions, 38 deletions

diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index dfd024a762a65..0c56140b9f075 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -1,5 +1,5 @@
 diff --git a/config/environments/production.rb b/config/environments/production.rb
-index a9d8ac4..85f13f5 100644
+index c5cbfcf64c..e40f10e25f 100644
 --- a/config/environments/production.rb
 +++ b/config/environments/production.rb
 @@ -70,14 +70,16 @@ Rails.application.configure do
@@ -24,10 +24,10 @@ index a9d8ac4..85f13f5 100644
 +  config.active_record.dump_schema_after_migration = false
  end
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 1470a6e..1b2660d 100644
+index 0b33783869..cd4e41d9bd 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
-@@ -476,7 +476,7 @@ production: &base
+@@ -521,7 +521,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
@@ -37,10 +37,10 @@ index 1470a6e..1b2660d 100644
      # Given in number of bytes per git object (e.g. a commit)
      # This value can be increased if you have very large commits
 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
-index 195108b..e55b11d 100644
+index 8ddf8e4d2e..559cf9adf7 100644
 --- a/config/initializers/1_settings.rb
 +++ b/config/initializers/1_settings.rb
-@@ -192,7 +192,7 @@ Settings.gitlab['user']       ||= 'git'
+@@ -219,7 +219,7 @@ Settings.gitlab['user']       ||= 'git'
  Settings.gitlab['user_home']  ||= begin
    Etc.getpwnam(Settings.gitlab['user']).dir
  rescue ArgumentError # no user configured
@@ -49,7 +49,7 @@ index 195108b..e55b11d 100644
  end
  Settings.gitlab['time_zone'] ||= nil
  Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -362,7 +362,7 @@ Settings.backup['upload']['encryption'] ||= nil
+@@ -454,7 +454,7 @@ Settings.backup['upload']['storage_class'] ||= nil
  #
  Settings['git'] ||= Settingslogic.new({})
  Settings.git['max_size']  ||= 20971520 # 20.megabytes
@@ -59,7 +59,7 @@ index 195108b..e55b11d 100644
  
  # Important: keep the satellites.path setting until GitLab 9.0 at
 diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
-index 59b2114..4f4a39a 100644
+index 59b21149a9..4f4a39a06c 100644
 --- a/lib/gitlab/logger.rb
 +++ b/lib/gitlab/logger.rb
 @@ -13,20 +13,20 @@ module Gitlab
@@ -87,51 +87,74 @@ index 59b2114..4f4a39a 100644
    end
  end
 diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb
-index be8fcc7..7642d74 100644
+index b5f4124052..f72c556983 100644
 --- a/lib/gitlab/uploads_transfer.rb
 +++ b/lib/gitlab/uploads_transfer.rb
-@@ -29,7 +29,7 @@ module Gitlab
-     end
- 
+@@ -1,7 +1,7 @@
+ module Gitlab
+   class UploadsTransfer < ProjectTransfer
      def root_dir
--      File.join(Rails.root, "public", "uploads")
-+      ENV['GITLAB_UPLOADS_PATH'] || File.join(Rails.root, "public", "uploads")
+-      File.join(CarrierWave.root, FileUploader.base_dir)
++      ENV['GITLAB_UPLOADS_PATH'] || File.join(CarrierWave.root, FileUploader.base_dir)
      end
    end
  end
-diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
-index 5f4a6bb..01b4cfd 100644
---- a/lib/tasks/gitlab/check.rake
-+++ b/lib/tasks/gitlab/check.rake
-@@ -223,7 +223,7 @@ namespace :gitlab do
-     def check_log_writable
-       print "Log directory writable? ... "
+diff --git a/lib/system_check/app/log_writable_check.rb b/lib/system_check/app/log_writable_check.rb
+index 3e0c436d6e..28cefc5514 100644
+--- a/lib/system_check/app/log_writable_check.rb
++++ b/lib/system_check/app/log_writable_check.rb
+@@ -21,7 +21,7 @@ module SystemCheck
+       private
  
--      log_path = Rails.root.join("log")
-+      log_path = ENV["GITLAB_LOG_PATH"]
+       def log_path
+-        Rails.root.join('log')
++        ENV["GITLAB_LOG_PATH"]
+       end
+     end
+   end
+diff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rb
+index 7026d0ba07..6d88b8b9fb 100644
+--- a/lib/system_check/app/uploads_directory_exists_check.rb
++++ b/lib/system_check/app/uploads_directory_exists_check.rb
+@@ -4,12 +4,13 @@ module SystemCheck
+       set_name 'Uploads directory exists?'
  
-       if File.writable?(log_path)
-         puts "yes".color(:green)
-@@ -263,10 +263,11 @@ namespace :gitlab do
-     def check_uploads
-       print "Uploads directory setup correctly? ... "
+       def check?
+-        File.directory?(Rails.root.join('public/uploads'))
++        File.directory?(ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads'))
+       end
  
--      unless File.directory?(Rails.root.join('public/uploads'))
-+      uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
-+      unless File.directory?(uploads_dir)
-         puts "no".color(:red)
+       def show_error
++        uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
          try_fixing_it(
 -          "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
 +          "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
          )
          for_more_information(
-           see_installation_guide_section "GitLab"
-@@ -275,7 +276,7 @@ namespace :gitlab do
-         return
+           see_installation_guide_section 'GitLab'
+diff --git a/lib/system_check/app/uploads_path_permission_check.rb b/lib/system_check/app/uploads_path_permission_check.rb
+index 7df6c06025..bb447c16b2 100644
+--- a/lib/system_check/app/uploads_path_permission_check.rb
++++ b/lib/system_check/app/uploads_path_permission_check.rb
+@@ -25,7 +25,7 @@ module SystemCheck
+       private
+ 
+       def rails_uploads_path
+-        Rails.root.join('public/uploads')
++        ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
        end
  
--      upload_path = File.realpath(Rails.root.join('public/uploads'))
-+      upload_path = File.realpath(Rails.root.join(uploads_dir))
-       upload_path_tmp = File.join(upload_path, 'tmp')
+       def uploads_fullpath
+diff --git a/lib/system_check/app/uploads_path_tmp_permission_check.rb b/lib/system_check/app/uploads_path_tmp_permission_check.rb
+index b276a81eac..070e3ebd81 100644
+--- a/lib/system_check/app/uploads_path_tmp_permission_check.rb
++++ b/lib/system_check/app/uploads_path_tmp_permission_check.rb
+@@ -33,7 +33,7 @@ module SystemCheck
+       end
  
-       if File.stat(upload_path).mode == 040700
+       def uploads_fullpath
+-        File.realpath(Rails.root.join('public/uploads'))
++        File.realpath(ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads'))
+       end
+     end
+   end