Merge branch 'redmine5'

Author: PowerKiKi

.github/workflows/brakeman.yml

@@ -1,6 +1,8 @@
 name: Run Brakeman
 
-on: [push]
+on:
+  - push
+  - pull_request
 
 jobs:
   build:
@@ -23,7 +25,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.1
         bundler-cache: true
 
     - name: Setup gems

.github/workflows/rubocop.yml

@@ -1,6 +1,8 @@
 name: Run RuboCop
 
-on: [push]
+on:
+  - push
+  - pull_request
 
 jobs:
   build:
@@ -23,7 +25,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.1
         bundler-cache: true
 
     - name: Setup gems

.github/workflows/stylelint.yml

@@ -1,6 +1,8 @@
 name: Run StyleLint
 
-on: [push]
+on:
+  - push
+  - pull_request
 
 jobs:
   build:
@@ -11,6 +13,6 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v2
       with:
-        node-version: '14'
+        node-version: '16'
     - run: yarn install
     - run: node_modules/.bin/stylelint "assets/stylesheets/*.css"

.github/workflows/test.yml

@@ -1,7 +1,8 @@
 name: Test
+
 on:
-  push:
-  pull_request:
+  - push
+  - pull_request
 
 jobs:
   test:
@@ -10,16 +11,9 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7', '2.6', '3.0']
-        redmine: ['4.1-stable', '4.2-stable', 'master']
+        ruby: ['2.7', '3.0', '3.1']
+        redmine: ['5.0-stable', 'master']
         db: ['postgres', 'mysql']
-        exclude:
-          - ruby: 2.7
-            redmine: 4.1-stable
-          - ruby: '3.0'
-            redmine: 4.1-stable
-          - ruby: '3.0'
-            redmine: 4.2-stable
       fail-fast: false
 
     services:
@@ -77,7 +71,10 @@ jobs:
       - name: Checkout redmine_sidekiq
         uses: actions/checkout@v2
         with:
-          repository: ogom/redmine_sidekiq
+          # TODO Switch back to the original repo, once https://github.com/ogom/redmine_sidekiq/pull/16 is released
+          # repository: ogom/redmine_sidekiq
+          repository: dosyfier/redmine_sidekiq
+          ref: fix-rails-6
           path: redmine/plugins/redmine_sidekiq
 
       - name: Checkout gitolite
@@ -100,6 +97,7 @@ jobs:
           libmysqlclient-dev
           libssh2-1
           libssh2-1-dev
+          pkg-config
           subversion
 
       - name: Setup Ruby
@@ -132,6 +130,7 @@ jobs:
         working-directory: redmine
         run: |
           bundle config set --local without 'development'
+          bundle config build.rugged --with-ssh
           bundle install --jobs=4 --retry=3
 
       - name: Run Redmine rake tasks

.rubocop.yml

@@ -124,3 +124,11 @@ Layout/SpaceBeforeBrackets:
 Rails/EnvironmentVariableAccess:
   Enabled: true
   AllowReads: true
+
+# Hrack::Server requires the `initialize` method
+Style/RedundantInitialize:
+  Enabled: false
+
+# Because our unit tests assert that
+Rails/RedundantPresenceValidationOnBelongsTo:
+  Enabled: false

Gemfile

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+source 'https://rubygems.org'
+
 # Gitolite Admin repository management
-gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', tag: '1.4.0'
+gem 'gitolite-rugged', git: 'https://github.com/jbox-web/gitolite-rugged.git', tag: '1.5.0'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0', git: 'https://github.com/jbox-web/grack.git', require: 'grack', branch: 'fix_gemfile'
@@ -16,9 +18,7 @@ gem 'hiredis'
 gem 'redis'
 
 # Markdown rendering
-gem 'deckar01-task_list'
 gem 'escape_utils'
-gem 'html-pipeline', '~> 2.13.2'
 gem 'rinku'
 
 # Syntaxic coloration

app/controllers/concerns/xitolite_repository_finder.rb

@@ -16,12 +16,12 @@ def find_xitolite_repository_by_path
     repo_path = "#{params[:repo_path]}.git"
     repository = Repository::Xitolite.find_by_path repo_path, loose: true
     if repository.nil?
-      RedmineGitHosting.logger.error "GoRedirector : repository not found at path : '#{repo_path}'," \
-                                     ' exiting!'
+      RedmineGitHosting.logger.error "GoRedirector : repository not found at path : '#{repo_path}', " \
+                                     'exiting!'
       render_404
     elsif !repository.go_access_available?
-      RedmineGitHosting.logger.error "GoRedirector : GoAccess is disabled for this repository '#{repository.gitolite_repository_name}'," \
-                                     ' exiting!'
+      RedmineGitHosting.logger.error "GoRedirector : GoAccess is disabled for this repository '#{repository.gitolite_repository_name}', " \
+                                     'exiting!'
       render_403
     else
       RedmineGitHosting.logger.info "GoRedirector : access granted for repository '#{repository.gitolite_repository_name}'"

app/overrides/repositories/navigation.rb

@@ -5,3 +5,8 @@
                      insert_before: 'erb[loud]:contains("label_statistics")',
                      original: '88f120e99075ba3246901c6e970ca671d7166855',
                      text: '<%= call_hook(:view_repositories_navigation, repository: @repository) %>'
+
+module Repositories
+  module Navigation
+  end
+end

app/overrides/repositories/show.rb

@@ -11,3 +11,8 @@
                      insert_before: 'erb[silent]:contains("html_title")',
                      original: '2a0a09659d76066b896016c72527d479c69463ec',
                      partial: 'hooks/show_repositories_sidebar'
+
+module Repositories
+  module Show
+  end
+end

app/views/settings/redmine_git_hosting/_gitolite_config_test.html.slim

@@ -92,4 +92,4 @@ fieldset.box.tabular
 br
 fieldset.box.tabular
   legend = l :label_path_directories
-  pre == (ENV['PATH']).gsub(/:/, '<br/>')
+  pre == ENV.fetch('PATH', nil).gsub(/:/, '<br/>')