Merge branch 'release/1.2.1'

Author: haru

.devcontainer/Dockerfile

@@ -1,50 +1,6 @@
-# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
-ARG VARIANT=2-bullseye
-FROM mcr.microsoft.com/vscode/devcontainers/ruby:0-${VARIANT}
-
-# Install Rails
-RUN gem install rails webdrivers 
-
-# Default value to allow debug server to serve content over GitHub Codespace's port forwarding service
-# The value is a comma-separated list of allowed domains 
-ENV RAILS_DEVELOPMENT_HOSTS=".githubpreview.dev"
-
-# [Choice] Node.js version: lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="lts/*"
-RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# [Optional] Uncomment this line to install additional gems.
-# RUN gem install <your-gem-names-here>
-
-# [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
-
-RUN apt-get update
-RUN apt-get install -y imagemagick git-flow
-
-WORKDIR /usr/local
+ARG RUBY_VERSION=3.2
 ARG REDMINE_VERSION=master
-RUN git clone https://github.com/redmine/redmine.git -b ${REDMINE_VERSION}
-WORKDIR /usr/local/redmine
-COPY .devcontainer/database.yml /usr/local/redmine/config/database.yml
-
-RUN rm -rf .git
-# RUN echo "gem 'ruby-debug-ide'" >> Gemfile
-RUN echo "gem 'debug'" >> Gemfile
-RUN echo "gem 'rufo'" >> Gemfile
-ENV DB=sqlite3
-RUN bundle install
-RUN bundle exec rake db:migrate
-RUN bundle exec rake db:migrate RAILS_ENV=test
-RUN bundle exec rake test:scm:setup:all 
-COPY .devcontainer/launch.json /usr/local/redmine/.vscode/launch.json
-RUN chown -R vscode .
-RUN sed -i "s/^end/  config.hosts.clear\nend/" config/environments/development.rb 
-
+FROM haru/redmine_devcontainer:${REDMINE_VERSION}-ruby${RUBY_VERSION}
 COPY .devcontainer/post-create.sh /post-create.sh
 
-WORKDIR /workspaces
+

.devcontainer/database.yml

@@ -9,10 +9,10 @@ services:
         # Update 'VARIANT' to pick a version of Ruby: 3, 3.0, 2, 2.7, 2.6
         # Append -bullseye or -buster to pin to an OS version.
         # Use -bullseye variants on local arm64/Apple Silicon.
-        VARIANT: "3.1"
+        RUBY_VERSION: "3.2"
         # Optional Node.js version to install
         NODE_VERSION: "lts/*"
-        REDMINE_VERSION: "5.0-stable"
+        REDMINE_VERSION: "6.0-stable"
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity

.devcontainer/docker-compose.yml

@@ -7,6 +7,7 @@ then
     cp plugins/${PLUGIN_NAME}/Gemfile_for_test plugins/${PLUGIN_NAME}/Gemfile 
 fi
 cp plugins/${PLUGIN_NAME}/test/fixtures/*.yml test/fixtures
+ln -s /workspaces/${PLUGIN_NAME}/.devcontainer/launch.json .vscode/launch.json
 
 bundle install 
 bundle exec rake redmine:plugins:migrate
@@ -25,10 +26,20 @@ initdb() {
 
 initdb
 
-export DB=postgres
+export DB=mysql2
+export DB_NAME=redmine
+export DB_USERNAME=root
+export DB_PASSWORD=root
+export DB_HOST=mysql
+export DB_PORT=3306
 
 initdb
 
-export DB=mysql
+export DB=postgresql
+export DB_NAME=redmine
+export DB_USERNAME=postgres
+export DB_PASSWORD=postgres
+export DB_HOST=postgres
+export DB_PORT=5432
 
 initdb

.devcontainer/launch.json

@@ -5,14 +5,27 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    # Supported Matrix:
+    # Redmine 5.0-stable: Ruby 2.7, 3.0, 3.1
+    # Redmine 5.1-stable: Ruby 2.7, 3.0, 3.1, 3.2
+    # Redmine 6.0-stable: Ruby 3.1, 3.2, 3.3
+    # Redmine master: Ruby 3.1, 3.2, 3.3
     strategy:
       matrix:
         db: [sqlite3, mysql, postgres]
-        ruby_version: ["2.7", "3.0", "3.1", "3.2"]
-        redmine_version: [5.0-stable, master]
+        ruby_version: ["3.0", "3.1", "3.2", "3.3"]
+        redmine_version: [5.0-stable, 5.1-stable, 6.0-stable, master]
         exclude:
           - ruby_version: "3.2"
             redmine_version: 5.0-stable
+          - ruby_version: "3.3"
+            redmine_version: 5.0-stable
+          - ruby_version: "3.3"
+            redmine_version: 5.1-stable
+          - ruby_version: "3.0"
+            redmine_version: 6.0-stable
+          - ruby_version: "3.0"
+            redmine_version: master
     services:
       mysql:
         image: mysql:5.7
@@ -38,14 +51,14 @@ jobs:
         DB_HOST: ${{ matrix.db }}
         REDMINE_VER: ${{ matrix.redmine_version }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install
         run: bash -x ./build-scripts/install.sh
       - name: Build
         run: bash -x ./build-scripts/build.sh
       - name: Clean
         run: bash -x ./build-scripts/cleanup.sh
-      - uses: codecov/codecov-action@v2
+      - uses: codecov/codecov-action@v3
       - name: Slack Notification on Failure
         uses: rtCamp/[email protected]
         if: failure()

.devcontainer/post-create.sh

@@ -19,7 +19,7 @@ jobs:
           echo ::set-output name=version::$VERSION
           echo ::set-output name=filename::$REPOSITORY-$VERSION
           echo ::set-output name=plugin::$REPOSITORY
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Archive
         run: |
           cd ..; zip -r ${{ steps.version.outputs.filename }}.zip ${{ steps.version.outputs.plugin }}/ -x "*.git*"; mv ${{ steps.version.outputs.filename }}.zip ${{ steps.version.outputs.plugin }}/

.github/workflows/build.yml

@@ -1,3 +1,4 @@
 coverage
 Gemfile
 Gemfile.lock
+test/tmp/*

.github/workflows/release.yml

@@ -1,5 +1,5 @@
 # Code Review plugin for Redmine
-# Copyright (C) 2009-2022 Haruyuki Iida
+# Copyright (C) 2009-2023 Haruyuki Iida
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CodeReviewController < ApplicationController
-  unloadable
   before_action :find_project, :authorize, :find_user, :find_setting, :find_repository, :find_priorities
 
   helper :sort
@@ -115,7 +114,6 @@ def new
           @review.save!
 
           render partial: 'add_success', status: 200
-          return
         else
           change_id = params[:change_id].to_i unless params[:change_id].blank?
           @review.change = Change.find(change_id) if change_id
@@ -138,8 +136,8 @@ def new
               break
             end
           } unless @default_version_id
+          render partial: 'new_form', status: 200
         end
-        render partial: 'new_form', status: 200
       }
     rescue ActiveRecord::RecordInvalid => e
       logger.error e
@@ -253,7 +251,7 @@ def show
       if action_name == 'attachment'
         attachment = target.attachment
         url = url_for(controller: 'attachments', action: 'show',
-                      id: attachment.id) + '/' + URI.encode(attachment.filename)
+                      id: attachment.id) + '/' + URI.encode_www_form_component(attachment.filename)
         url << '?review_id=' + @review.id.to_s if @review
       else
         path = nil if target.diff_all

.gitignore

@@ -1,5 +1,5 @@
 # Code Review plugin for Redmine
-# Copyright (C) 2010  Haruyuki Iida
+# Copyright (C) 2023  Haruyuki Iida
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CodeReviewSettingsController < ApplicationController
-  unloadable
   layout 'base'
   menu_item :code_review
   include CodeReviewAutoAssignSettings