Merge pull request #5292 from mishaschwartz/v1.12.4

V1.12.4

Changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [v1.12.4]
+- Symlink git repo hooks (#5283)
+
 ## [v1.12.3]
 - Add workaround for content security policy to allow loading blobs in Safari (#5273)
 

app/MARKUS_VERSION

@@ -1 +1 @@
-VERSION=1.12.3,PATCH_LEVEL=DEV
+VERSION=1.12.4,PATCH_LEVEL=DEV

app/lib/git_repository.rb

@@ -83,10 +83,15 @@ def self.create(connect_string)
 
       # Set up server-side hooks
       server_hooks.each do |hook_symbol, hook_script|
-        FileUtils.copy(hook_script, File.join(barepath, 'hooks', hook_symbol.to_s))
+        FileUtils.ln_s(hook_script, File.join(barepath, 'hooks', hook_symbol.to_s))
       end
+      max_file_size_file = ::Rails.root + 'lib' + 'repo' + 'git_hooks' + 'max_file_size'
+      FileUtils.ln_s(max_file_size_file, File.join(barepath, 'hooks', 'max_file_size'))
 
       GitRepository.do_commit_and_push(repo, 'Markus', I18n.t('repo.commits.initial'))
+    rescue StandardError
+      FileUtils.rm_rf(barepath)
+      raise
     end
     true
   end

app/models/group.rb

@@ -67,11 +67,12 @@ def build_repository
 
     begin
       Repository.get_class.create(repo_path)
-    rescue Repository::RepositoryCollision => e
+    rescue StandardError => e
       # log the collision
       errors.add(:base, self.repo_name)
       m_logger = MarkusLogger.instance
-      m_logger.log("Creating group '#{self.group_name}' caused repository collision " +
+      error_type = e.is_a?(Repository::RepositoryCollision) ? 'a repository collision' : 'an error'
+      m_logger.log("Creating group '#{self.group_name}' caused #{error_type} " \
                    "(Repository name was: '#{self.repo_name}'). Error message: '#{e.message}'",
                    MarkusLogger::ERROR)
       raise

config/settings.yml

@@ -7,6 +7,7 @@ rails:
   active_record:
     verbose_query_logs: false
   force_ssl: false
+  cache_store: redis_cache_store
   session_store:
     type: cookie_store
     args:

config/settings/development.yml

@@ -7,7 +7,6 @@ rails:
   log_level: debug
   active_support:
     deprecation: stderr
-  cache_store: redis_cache_store
   active_record:
     verbose_query_logs: true
   action_mailer:

lib/repo/git_hooks/multihook.py

@@ -12,7 +12,6 @@
         max_file_size = f.read().strip()
     hooks_dir = os.path.join(real_dir, '{}.d'.format(hook_type))
     env = {**os.environ, 'MAX_FILE_SIZE': max_file_size}
-    print(env)
     if os.path.exists(hooks_dir):
         scripts = sorted([os.path.join(hooks_dir, f) for f in os.listdir(hooks_dir)])
         for script in scripts:

lib/repo/git_hooks/update.d/04-file_size_too_large.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import os
 import sys
 import subprocess