Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218diff --git a/config/environments/production.rb b/config/environments/production.rbindex e1a7db8d860..5823f170410 100644--- a/config/environments/production.rb+++ b/config/environments/production.rb@@ -71,10 +71,10 @@ config.action_mailer.delivery_method = :sendmail # Defaults to:- # # config.action_mailer.sendmail_settings = {- # # location: '/usr/sbin/sendmail',- # # arguments: '-i -t'- # # }+ config.action_mailer.sendmail_settings = {+ location: '/run/wrappers/bin/sendmail',+ arguments: '-i -t'+ } config.action_mailer.perform_deliveries = true config.action_mailer.raise_delivery_errors = true diff --git a/config/gitlab.yml.example b/config/gitlab.yml.exampleindex da1a15302da..c846db93e5c 100644--- a/config/gitlab.yml.example+++ b/config/gitlab.yml.example@@ -1191,7 +1191,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 ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server runningdiff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rbindex d096174fca3a..02d0f689c523 100644--- a/config/initializers/1_settings.rb+++ b/config/initializers/1_settings.rb@@ -206,7 +206,7 @@ Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir rescue ArgumentError # no user configured- '/home/' + Settings.gitlab['user']+ '/homeless-shelter' end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?@@ -959,7 +959,7 @@ # Git # Settings['git'] ||= {}-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' indiff --git a/config/puma.rb.example b/config/puma.rb.exampleindex 07a6f6a25015..14a718a43202 100644--- a/config/puma.rb.example+++ b/config/puma.rb.example@@ -5,12 +5,8 @@ # The default is "config.ru". # rackup 'config.ru'-pidfile '/home/git/gitlab/tmp/pids/puma.pid'-state_path '/home/git/gitlab/tmp/pids/puma.state'--stdout_redirect '/home/git/gitlab/log/puma.stdout.log',- '/home/git/gitlab/log/puma.stderr.log',- true+pidfile ENV['PUMA_PATH'] + '/tmp/pids/puma.pid'+state_path ENV['PUMA_PATH'] + '/tmp/pids/puma.state' # Configure "min" to be the minimum number of threads to use to answer # requests and "max" the maximum.@@ -31,11 +27,11 @@ queue_requests false # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only # accepted protocols.-bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket'+bind "unix://#{ENV['PUMA_PATH']}/tmp/sockets/gitlab.socket" workers 3 -require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"+require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/lifecycle_events" on_restart do # Signal application hooks that we're about to restart@@ -74,7 +70,7 @@ worker_timeout 60 wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f # Use json formatter-require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"+require_relative ENV['GITLAB_PATH'] + "lib/gitlab/puma_logging/json_formatter" json_formatter = Gitlab::PumaLogging::JSONFormatter.new log_formatter do |str|diff --git a/lib/api/api.rb b/lib/api/api.rbindex a287ffbfcd8..1a5ca59183a 100644--- a/lib/api/api.rb+++ b/lib/api/api.rb@@ -4,7 +4,7 @@ module API class API < ::API::Base include APIGuard - LOG_FILENAME = Rails.root.join("log", "api_json.log")+ LOG_FILENAME = File.join(ENV["GITLAB_LOG_PATH"], "api_json.log") NO_SLASH_URL_PART_REGEX = %r{[^/]+}.freeze NAMESPACE_OR_PROJECT_REQUIREMENTS = { id: NO_SLASH_URL_PART_REGEX }.freezediff --git a/lib/gitlab/authorized_keys.rb b/lib/gitlab/authorized_keys.rbindex 50cd15b7a10..3ac89e5b8e9 100644--- a/lib/gitlab/authorized_keys.rb+++ b/lib/gitlab/authorized_keys.rb@@ -157,7 +157,7 @@ def command(id) raise KeyError, "Invalid ID: #{id.inspect}" end - "#{File.join(Gitlab.config.gitlab_shell.path, 'bin', 'gitlab-shell')} #{id}"+ "#{File.join('/run/current-system/sw/bin', 'gitlab-shell')} #{id}" end def strip(key)diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rbindex 89a4e36a232..ae379ffb27a 100644--- a/lib/gitlab/logger.rb+++ b/lib/gitlab/logger.rb@@ -37,7 +37,7 @@ def self.build end def self.full_log_path- Rails.root.join("log", file_name)+ File.join(ENV["GITLAB_LOG_PATH"], file_name) end def self.cache_keydiff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rbindex e0e7084e27e..19fab855b90 100644--- a/lib/gitlab/uploads_transfer.rb+++ b/lib/gitlab/uploads_transfer.rb@@ -3,7 +3,7 @@ module Gitlab class UploadsTransfer < ProjectTransfer def root_dir- FileUploader.root+ ENV['GITLAB_UPLOADS_PATH'] || FileUploader.root end end enddiff --git a/lib/system_check/app/log_writable_check.rb b/lib/system_check/app/log_writable_check.rbindex 2c108f0c18d..3a16ff52d01 100644--- a/lib/system_check/app/log_writable_check.rb+++ b/lib/system_check/app/log_writable_check.rb@@ -23,7 +23,7 @@ def show_error private def log_path- Rails.root.join('log')+ ENV["GITLAB_LOG_PATH"] end end enddiff --git a/lib/system_check/app/uploads_directory_exists_check.rb b/lib/system_check/app/uploads_directory_exists_check.rbindex 54dff63ab61..882da702f29 100644--- a/lib/system_check/app/uploads_directory_exists_check.rb+++ b/lib/system_check/app/uploads_directory_exists_check.rb@@ -6,12 +6,13 @@ class UploadsDirectoryExistsCheck < SystemCheck::BaseCheck set_name 'Uploads directory exists?' def check?- File.directory?(Rails.root.join('public/uploads'))+ File.directory?(ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')) end 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')diff --git a/lib/system_check/app/uploads_path_permission_check.rb b/lib/system_check/app/uploads_path_permission_check.rbindex 2e1cc687c43..ca69d63bcf6 100644--- a/lib/system_check/app/uploads_path_permission_check.rb+++ b/lib/system_check/app/uploads_path_permission_check.rb@@ -27,7 +27,7 @@ def show_error private def rails_uploads_path- Rails.root.join('public/uploads')+ ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads') end def uploads_fullpathdiff --git a/lib/system_check/app/uploads_path_tmp_permission_check.rb b/lib/system_check/app/uploads_path_tmp_permission_check.rbindex 567c7540777..29906b1c132 100644--- a/lib/system_check/app/uploads_path_tmp_permission_check.rb+++ b/lib/system_check/app/uploads_path_tmp_permission_check.rb@@ -35,7 +35,7 @@ def upload_path_tmp end def uploads_fullpath- File.realpath(Rails.root.join('public/uploads'))+ File.realpath(ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')) end end enddiff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-keyindex 35f84c64ce1..c2fecf3404c 100755--- a/scripts/decomposition/generate-loose-foreign-key+++ b/scripts/decomposition/generate-loose-foreign-key@@ -1,4 +1,4 @@-#!/usr/bin/env -S ENABLE_SPRING=0 bin/rails runner -e test+#!/usr/bin/env rails # This is helper script to swap foreign key to loose foreign key # using DB schema