Merge branch 'haru:develop' into develop

Author: FloWalchs

.devcontainer/devcontainer.json

@@ -4,22 +4,19 @@
 	"name": "Redmine plugin",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "app",
-	
 	"mounts": [
 		"source=${localWorkspaceFolder},target=/workspaces/${localWorkspaceFolderBasename},type=bind"
 	],
 	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
-    
 	// Set *default* container specific settings.json values on container create.
-	"settings": { 
+	"settings": {
 		"sqltools.connections": [
 			{
 				"name": "Rails Development Database",
 				"driver": "PostgreSQL",
 				"previewLimit": 50,
 				"server": "localhost",
 				"port": 5432,
-
 				// update this to match config/database.yml
 				"database": "app_development",
 				"username": "vscode"
@@ -30,14 +27,12 @@
 				"previewLimit": 50,
 				"server": "localhost",
 				"port": 5432,
-
 				// update this to match config/database.yml
 				"database": "app_test",
 				"username": "vscode"
 			}
 		]
 	},
-
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"mtxr.sqltools",
@@ -52,24 +47,26 @@
 		"Serhioromano.vscode-gitflow",
 		"github.vscode-github-actions",
 		"Shopify.ruby-extensions-pack",
-		"ritwickdey.LiveServer"
+		"ritwickdey.LiveServer",
+		"aliariff.vscode-erb-beautify",
+		"bysabi.prettier-vscode-standard",
+		"GitHub.copilot",
+		"Shunqian.prettier-plus",
+		"Gruntfuggly.todo-tree"
 	],
-
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [3000, 5432],
-
 	// Use 'postCreateCommand' to run commands after the container is created.
 	"postCreateCommand": "sh -x /post-create.sh",
-
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode",
 	"features": {
 		// "git": "latest"
 	},
-
 	"containerEnv": {
 		"PLUGIN_NAME": "${localWorkspaceFolderBasename}"
 	},
-
-	"forwardPorts": [3000]
+	"forwardPorts": [
+		3000
+	]
 }

.devcontainer/docker-compose.yml

@@ -1,12 +1,12 @@
-version: '3'
+version: "3"
 
 services:
   app:
     build:
       context: ..
       dockerfile: .devcontainer/Dockerfile
       args:
-        # Update 'VARIANT' to pick a version of Ruby: 3, 3.1, 3.2, 3.3, 3.4.
+        # Update 'VARIANT' to pick a version of Ruby: 3, 3.1, 3.2, 3.3, 3.4
         # Append -bullseye or -buster to pin to an OS version.
         # Use -bullseye variants on local arm64/Apple Silicon.
         RUBY_VERSION: "3.4"
@@ -16,7 +16,8 @@ services:
 
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
-
+    volumes:
+      - ..:/usr/local/redmine/plugins/redmine_wiki_extensions
     # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
     # network_mode: service:postgres
     # Uncomment the next line to use a non-root user for all processes.

.devcontainer/post-create.sh

@@ -1,14 +1,6 @@
 #!/bin/sh
 cd $REDMINE_ROOT
 
-if [ -d .git.sv ]
-then
-    mv -s .git.sv .git
-    git pull
-    rm .git
-fi
-
-ln -s /workspaces/${PLUGIN_NAME} plugins/${PLUGIN_NAME}
 if [ -f plugins/${PLUGIN_NAME}/Gemfile_for_test ]
 then
     cp plugins/${PLUGIN_NAME}/Gemfile_for_test plugins/${PLUGIN_NAME}/Gemfile 

.devcontainer/redmine.code-workspace

@@ -4,7 +4,7 @@
 			"path": ".."
 		},
 		{
-			"path": "../../../usr/local/redmine"
+			"path": "/usr/local/redmine"
 		}
 	],
 	"settings": {}

init.rb

@@ -42,7 +42,7 @@
   author_url 'http://twitter.com/haru_iida'
   description 'This is a Wiki Extensions plugin for Redmine'
   url 'http://www.r-labs.org/projects/r-labs/wiki/Wiki_Extensions_en'
-  version '1.0.2'
+  version '1.1.0'
   requires_redmine :version_or_higher => '6.0.0'
 
   project_module :wiki_extensions do

redmine_wiki_extensions

@@ -0,0 +1 @@
+/workspaces/redmine_wiki_extensions