gollum 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 777fc637bf9f32da50347a0bf604706d39ce97c24ed4be4892efc5ef9c557856
-  data.tar.gz: f4d551f8183da4d8ed4335a882976dbf6c07dea068fca79ecc59fc44ec28461d
+  metadata.gz: 1d92e7f609dd007e366009ec8c451349f988c7e39f2d69b172165f6a3cdf1196
+  data.tar.gz: c527dfaaab7d77bdbd0218e18849734ad5bf994aaaeb1f25964fc054d5d89c4c
 SHA512:
-  metadata.gz: 2f2f435022ea90684574562a14ec4e95db45eb1ea0297aa641326c0a6fa767ec4f1985002ced08575b27d18b6a46119bef92ecea32dac22225bb6a542326b7b7
-  data.tar.gz: 2e9ef9046e7f70cda791e76f251cbab4e60a7f5b6539943b1c1418bdc49a89812c64e5e318511c89e37ad69d66a2064f4d7ebbde64f5364ccfe29aa0722a963d
+  metadata.gz: 5404211ceae4fac51554bf3d2f147f23fe3984b41529d205bdc8f3e69da615b79e1acde3a3ff2fbe471360a8047ad72928c94a7e3fdd002e696a8a4aa7ab083f
+  data.tar.gz: 9378bdf8cdeba9fbcbcf4b93ecdfe34345b93d2fb4a84b45ad95ed5138bbb631e3094328e3c2c3d18080bd892fdacd6600b90d515a23ad9df9d7f84b2c97c4ac

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.1-alpine AS builder
+FROM ruby:3.3-alpine AS builder
 
 RUN apk add --update \
             --no-cache \
@@ -28,10 +28,10 @@ WORKDIR /app
 COPY . /app
 RUN bundle exec rake install
 
-FROM ruby:3.1-alpine
+FROM ruby:3.3-alpine
 
-ARG UID=${UID:-1000}
-ARG GID=${GID:-1000}
+ARG UID=1000
+ARG GID=1000
 
 COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
 

data/Gemfile

@@ -2,6 +2,17 @@ source 'https://rubygems.org'
 
 gem 'warbler', git: 'https://github.com/jruby/warbler' if RUBY_PLATFORM == 'java'
 
+# FIXME: There is an upstream JRuby 9.4.9.0 issue with `psych` and the latest
+# version of `jar-dependencies`. The issue will be resolved with the release of
+# 9.4.10.0. Then, we can remove this `jar-dependencies` dependency lock.
+#
+# Gollum end users using JRuby may need to add this lock to their own project
+# Gemfiles, too, unfortunately. :-(
+#
+# For more information, see: https://github.com/jruby/jruby/issues/8488
+#
+gem 'jar-dependencies', '< 0.5'
+
 group :test do
   gem 'selenium-webdriver', require: false
   gem 'capybara', require: false

data/HISTORY.md

@@ -1,3 +1,18 @@
+# 6.1.0 / 2024-12-23
+
+## Fixes & Improvements
+* Fixed a typo in the deprecation message for `--mathjax` (@DavidForster)
+* Update Mermaid to 11.4
+* Add wiki permission check to docker run script
+
+# 6.0.1 / 2024-07-25
+
+## Fixes & Improvements
+
+* Use static assets when `APP_ENV` is `development` (@dometto)
+* Explicitly require Rack 3 or greater (@dometto)
+* Let the `--base-path` wiki option handle prefixed and suffixed slashes in path values. (i.e. `--base-path /my-wiki`) (@dometto)
+
 # 6.0.0 / 2024-05-03
 
 # Breaking Changes

data/LATEST_CHANGES.md

@@ -1,7 +1,6 @@
-# 6.0.1
+# 6.1.0
 
 ## Fixes & Improvements
-
-* Use static assets when `APP_ENV` is `development` (@dometto)
-* Explicitly require Rack 3 or greater (@dometto)
-* Let the `--base-path` wiki option handle prefixed and suffixed slashes in path values. (i.e. `--base-path /my-wiki`) (@dometto)
+* Fixed a typo in the deprecation message for `--mathjax` (@DavidForster)
+* Update Mermaid to 11.4
+* Add wiki permission check to docker run script

data/README.md

@@ -67,6 +67,8 @@ The [latest Release](https://github.com/gollum/gollum/releases/) of Gollum will
 
 `java -jar gollum.war -S gollum <your-gollum-arguments-here>`
 
+When using the `.war`, please be sure to pass [absolute paths](https://github.com/gollum/gollum/wiki/Gollum-via-Java-WAR#absolute-paths-issue) to your Gollum arguments.
+
 ### Misc
 
 See [below](#running-from-source) for information on running Gollum from source, as a Rack app, and more.

data/bin/gollum

@@ -121,7 +121,7 @@ MSG
     puts "To set a custom configuration for #{wiki_options[:math]} please add it to \'#{default_math_config}\' and commit it to the repo."
   end
   opts.on('--mathjax', 'Enable rendering of mathematical equations via mathjax.') do |mode|
-    puts 'DEPRECATION WARNING: --mathjax. This switch will be removed in the future. Please use: "--math matjax".'
+    puts 'DEPRECATION WARNING: --mathjax. This switch will be removed in the future. Please use: "--math mathjax".'
     puts "If you are using a custom mathjax.config.js, please remame it to #{default_math_config}."
     wiki_options[:math] = :mathjax
     wiki_options[:math_config] = default_math_config

data/docker-run.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+# Check if /wiki directory exists and is writable
+if [ ! -d "/wiki" ] || [ ! -w "/wiki" ]; then
+  echo "Warning: /wiki directory does not exist or is not writable. Adjust permissions to mapped host volume."
+else
+  echo "The /wiki directory exists and is writable."
+fi
+
 # Initialize the wiki
 if [ ! -d .git ] && [ "$(git rev-parse  --is-bare-repository 2>/dev/null)" != "true" ]; then
     git init
@@ -14,4 +21,4 @@ if [ ${GOLLUM_AUTHOR_EMAIL:+1} ]; then
 fi
 
 # Start gollum service
-exec gollum $@
+exec gollum $@

data/gollum.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6'
 
   s.name              = 'gollum'
-  s.version           = '6.0.1'
+  s.version           = '6.1.0'
   s.license           = 'MIT'
 
   s.summary     = 'A simple, Git-powered wiki.'
@@ -80,12 +80,12 @@ Gem::Specification.new do |s|
     lib/gollum/public/assets/app-e224b375d824f0171fc926d624dc0887bf453db83f485b1992bc0859c4110e3e.css.gz
     lib/gollum/public/assets/criticmarkup-7b66f7a53b854bc9e4168be5b4725ca38e2bc6e9c41d5c050a9f60d9a94cb405.css
     lib/gollum/public/assets/criticmarkup-7b66f7a53b854bc9e4168be5b4725ca38e2bc6e9c41d5c050a9f60d9a94cb405.css.gz
-    lib/gollum/public/assets/editor-5ac2983673c8540e50683c3ae37f1635882e94a04a1e823776a663740fdb3aa7.js
-    lib/gollum/public/assets/editor-5ac2983673c8540e50683c3ae37f1635882e94a04a1e823776a663740fdb3aa7.js.gz
+    lib/gollum/public/assets/editor-9bef5462bb5dae2db84d6d8d534b55c5bb5a430e11344b3c23f9ea4410312f52.js
+    lib/gollum/public/assets/editor-9bef5462bb5dae2db84d6d8d534b55c5bb5a430e11344b3c23f9ea4410312f52.js.gz
     lib/gollum/public/assets/gollum.katex-e70c1d51a08ebfe759eecbb33fbed54f300ccd7fb8d0e86e251caaf4e50f6b68.js
     lib/gollum/public/assets/gollum.katex-e70c1d51a08ebfe759eecbb33fbed54f300ccd7fb8d0e86e251caaf4e50f6b68.js.gz
-    lib/gollum/public/assets/gollum.mermaid-ccc590b7d9655deec94c9975f25d74fbe38f703c927e26cf81169d63fea7cd50.js
-    lib/gollum/public/assets/gollum.mermaid-ccc590b7d9655deec94c9975f25d74fbe38f703c927e26cf81169d63fea7cd50.js.gz
+    lib/gollum/public/assets/gollum.mermaid-06fd2f5494199db250618043312c27770720504b50c3f6ca99d2d2df529c7da3.js
+    lib/gollum/public/assets/gollum.mermaid-06fd2f5494199db250618043312c27770720504b50c3f6ca99d2d2df529c7da3.js.gz
     lib/gollum/public/assets/katex/dist/fonts/KaTeX_AMS-Regular.woff2
     lib/gollum/public/assets/katex/dist/fonts/KaTeX_Caligraphic-Bold.woff2
     lib/gollum/public/assets/katex/dist/fonts/KaTeX_Caligraphic-Regular.woff2

data/lib/gollum/public/assets/.sprockets-manifest-6c4a0bc907c3e25cb7e69c0faf6e71d2.json

@@ -1 +1 @@
-{"files":{"app-05adca32f8f4f3effe10f8f4cf26dfd6a419ba986bce60d3f51a97e4055d4113.js":{"logical_path":"app.js","mtime":"2024-04-16T09:10:02+02:00","size":192041,"digest":"05adca32f8f4f3effe10f8f4cf26dfd6a419ba986bce60d3f51a97e4055d4113","integrity":"sha256-Ba3KMvj08+/+EPj0zybf1qQZuphrzmDT9RqX5AVdQRM="},"editor-5ac2983673c8540e50683c3ae37f1635882e94a04a1e823776a663740fdb3aa7.js":{"logical_path":"editor.js","mtime":"2024-04-16T09:10:02+02:00","size":859495,"digest":"5ac2983673c8540e50683c3ae37f1635882e94a04a1e823776a663740fdb3aa7","integrity":"sha256-WsKYNnPIVA5QaDw6438WNYgulKBKHoI3dqZjdA/bOqc="},"gollum.mermaid-ccc590b7d9655deec94c9975f25d74fbe38f703c927e26cf81169d63fea7cd50.js":{"logical_path":"gollum.mermaid.js","mtime":"2024-04-16T09:10:02+02:00","size":3322948,"digest":"ccc590b7d9655deec94c9975f25d74fbe38f703c927e26cf81169d63fea7cd50","integrity":"sha256-zMWQt9llXe7JTJl18l10++OPcDySfibPgRadY/6nzVA="},"gollum.katex-e70c1d51a08ebfe759eecbb33fbed54f300ccd7fb8d0e86e251caaf4e50f6b68.js":{"logical_path":"gollum.katex.js","mtime":"2024-04-16T09:10:02+02:00","size":277670,"digest":"e70c1d51a08ebfe759eecbb33fbed54f300ccd7fb8d0e86e251caaf4e50f6b68","integrity":"sha256-5wwdUaCOv+dZ7suzP77VTzAMzX+40OhuJRyq9OUPa2g="},"app-e224b375d824f0171fc926d624dc0887bf453db83f485b1992bc0859c4110e3e.css":{"logical_path":"app.css","mtime":"2024-04-16T09:10:02+02:00","size":830320,"digest":"e224b375d824f0171fc926d624dc0887bf453db83f485b1992bc0859c4110e3e","integrity":"sha256-4iSzddgk8BcfySbWJNwIh79FPbg/SFsZkrwIWcQRDj4="},"criticmarkup-7b66f7a53b854bc9e4168be5b4725ca38e2bc6e9c41d5c050a9f60d9a94cb405.css":{"logical_path":"criticmarkup.css","mtime":"2024-04-16T09:10:02+02:00","size":643,"digest":"7b66f7a53b854bc9e4168be5b4725ca38e2bc6e9c41d5c050a9f60d9a94cb405","integrity":"sha256-e2b3pTuFS8nkFovltHJco44rxunEHVwFCp9g2alMtAU="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2024-04-16T09:10:02+02:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="},"katex/dist/katex-709d4191c4f005516a709377f79e468d343f4e6c91a29a6ff188d13d124ba55f.css":{"logical_path":"katex/dist/katex.css","mtime":"2024-04-16T09:10:02+02:00","size":23381,"digest":"709d4191c4f005516a709377f79e468d343f4e6c91a29a6ff188d13d124ba55f","integrity":"sha256-cJ1BkcTwBVFqcJN3955GjTQ/TmyRoppv8YjRPRJLpV8="}},"assets":{"app.js":"app-05adca32f8f4f3effe10f8f4cf26dfd6a419ba986bce60d3f51a97e4055d4113.js","editor.js":"editor-5ac2983673c8540e50683c3ae37f1635882e94a04a1e823776a663740fdb3aa7.js","gollum.mermaid.js":"gollum.mermaid-ccc590b7d9655deec94c9975f25d74fbe38f703c927e26cf81169d63fea7cd50.js","gollum.katex.js":"gollum.katex-e70c1d51a08ebfe759eecbb33fbed54f300ccd7fb8d0e86e251caaf4e50f6b68.js","app.css":"app-e224b375d824f0171fc926d624dc0887bf453db83f485b1992bc0859c4110e3e.css","criticmarkup.css":"criticmarkup-7b66f7a53b854bc9e4168be5b4725ca38e2bc6e9c41d5c050a9f60d9a94cb405.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css","katex/dist/katex.css":"katex/dist/katex-709d4191c4f005516a709377f79e468d343f4e6c91a29a6ff188d13d124ba55f.css"}}
+{"files":{"app-05adca32f8f4f3effe10f8f4cf26dfd6a419ba986bce60d3f51a97e4055d4113.js":{"logical_path":"app.js","mtime":"2024-11-19T15:21:21-08:00","size":192041,"digest":"05adca32f8f4f3effe10f8f4cf26dfd6a419ba986bce60d3f51a97e4055d4113","integrity":"sha256-Ba3KMvj08+/+EPj0zybf1qQZuphrzmDT9RqX5AVdQRM="},"editor-5ac2983673c8540e50683c3ae37f1635882e94a04a1e823776a663740fdb3aa7.js":{"logical_path":"editor.js","mtime":"2024-04-16T09:10:02+02:00","size":859495,"digest":"5ac2983673c8540e50683c3ae37f1635882e94a04a1e823776a663740fdb3aa7","integrity":"sha256-WsKYNnPIVA5QaDw6438WNYgulKBKHoI3dqZjdA/bOqc="},"gollum.mermaid-ccc590b7d9655deec94c9975f25d74fbe38f703c927e26cf81169d63fea7cd50.js":{"logical_path":"gollum.mermaid.js","mtime":"2024-04-16T09:10:02+02:00","size":3322948,"digest":"ccc590b7d9655deec94c9975f25d74fbe38f703c927e26cf81169d63fea7cd50","integrity":"sha256-zMWQt9llXe7JTJl18l10++OPcDySfibPgRadY/6nzVA="},"gollum.katex-e70c1d51a08ebfe759eecbb33fbed54f300ccd7fb8d0e86e251caaf4e50f6b68.js":{"logical_path":"gollum.katex.js","mtime":"2024-11-19T15:21:21-08:00","size":277670,"digest":"e70c1d51a08ebfe759eecbb33fbed54f300ccd7fb8d0e86e251caaf4e50f6b68","integrity":"sha256-5wwdUaCOv+dZ7suzP77VTzAMzX+40OhuJRyq9OUPa2g="},"app-e224b375d824f0171fc926d624dc0887bf453db83f485b1992bc0859c4110e3e.css":{"logical_path":"app.css","mtime":"2024-11-19T15:21:21-08:00","size":830320,"digest":"e224b375d824f0171fc926d624dc0887bf453db83f485b1992bc0859c4110e3e","integrity":"sha256-4iSzddgk8BcfySbWJNwIh79FPbg/SFsZkrwIWcQRDj4="},"criticmarkup-7b66f7a53b854bc9e4168be5b4725ca38e2bc6e9c41d5c050a9f60d9a94cb405.css":{"logical_path":"criticmarkup.css","mtime":"2024-11-19T15:21:21-08:00","size":643,"digest":"7b66f7a53b854bc9e4168be5b4725ca38e2bc6e9c41d5c050a9f60d9a94cb405","integrity":"sha256-e2b3pTuFS8nkFovltHJco44rxunEHVwFCp9g2alMtAU="},"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css":{"logical_path":"print.css","mtime":"2024-11-19T15:21:21-08:00","size":75,"digest":"512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb","integrity":"sha256-USSYw2i+DT+xuhBd+oQomuSDgOyfy++Ui9TiOwsJW/s="},"katex/dist/katex-709d4191c4f005516a709377f79e468d343f4e6c91a29a6ff188d13d124ba55f.css":{"logical_path":"katex/dist/katex.css","mtime":"2024-11-19T15:21:21-08:00","size":23381,"digest":"709d4191c4f005516a709377f79e468d343f4e6c91a29a6ff188d13d124ba55f","integrity":"sha256-cJ1BkcTwBVFqcJN3955GjTQ/TmyRoppv8YjRPRJLpV8="},"editor-52c4e18ed80e69236a112b7a226635e8179d790f2c458341af2ed295b260c25c.js":{"logical_path":"editor.js","mtime":"2024-11-09T16:06:31-05:00","size":859489,"digest":"52c4e18ed80e69236a112b7a226635e8179d790f2c458341af2ed295b260c25c","integrity":"sha256-UsThjtgOaSNqESt6ImY16BedeQ8sRYNBry7SlbJgwlw="},"gollum.mermaid-845d23a58401ae1e6573d87a9a050b1f5cea01a0d5b1adc9803194d35cb3e5d5.js":{"logical_path":"gollum.mermaid.js","mtime":"2024-11-09T16:06:31-05:00","size":2547926,"digest":"845d23a58401ae1e6573d87a9a050b1f5cea01a0d5b1adc9803194d35cb3e5d5","integrity":"sha256-hF0jpYQBrh5lc9h6mgULH1zqAaDVsa3JgDGU01yz5dU="},"editor-9bef5462bb5dae2db84d6d8d534b55c5bb5a430e11344b3c23f9ea4410312f52.js":{"logical_path":"editor.js","mtime":"2024-11-19T15:21:21-08:00","size":859503,"digest":"9bef5462bb5dae2db84d6d8d534b55c5bb5a430e11344b3c23f9ea4410312f52","integrity":"sha256-m+9UYrtdri24TW2NU0tVxbtaQw4RNEs8I/nqRBAxL1I="},"gollum.mermaid-06fd2f5494199db250618043312c27770720504b50c3f6ca99d2d2df529c7da3.js":{"logical_path":"gollum.mermaid.js","mtime":"2024-11-19T15:21:21-08:00","size":2547934,"digest":"06fd2f5494199db250618043312c27770720504b50c3f6ca99d2d2df529c7da3","integrity":"sha256-Bv0vVJQZnbJQYYBDMSwndwcgUEtQw/bKmdLS31KcfaM="}},"assets":{"app.js":"app-05adca32f8f4f3effe10f8f4cf26dfd6a419ba986bce60d3f51a97e4055d4113.js","editor.js":"editor-9bef5462bb5dae2db84d6d8d534b55c5bb5a430e11344b3c23f9ea4410312f52.js","gollum.mermaid.js":"gollum.mermaid-06fd2f5494199db250618043312c27770720504b50c3f6ca99d2d2df529c7da3.js","gollum.katex.js":"gollum.katex-e70c1d51a08ebfe759eecbb33fbed54f300ccd7fb8d0e86e251caaf4e50f6b68.js","app.css":"app-e224b375d824f0171fc926d624dc0887bf453db83f485b1992bc0859c4110e3e.css","criticmarkup.css":"criticmarkup-7b66f7a53b854bc9e4168be5b4725ca38e2bc6e9c41d5c050a9f60d9a94cb405.css","print.css":"print-512498c368be0d3fb1ba105dfa84289ae48380ec9fcbef948bd4e23b0b095bfb.css","katex/dist/katex.css":"katex/dist/katex-709d4191c4f005516a709377f79e468d343f4e6c91a29a6ff188d13d124ba55f.css"}}