Just updated gitlab-org/gitlab#19591 to track:
one of the features of Gollum is support for CriticMarkup. It seems that we support some variation of it here, e.g.
> {+ this is an addition +} and {- this is a removal -}
does:
this is an addition and this is a removal
This is different from the CriticMarkup format, which is supposed to be:
> {++ this is an addition ++} and {-- this is a removal --}
It also supports things like substitutions, highlights, and comments.
We don't actually use Gollum to render the wikis at GitLab. We removed it several years ago. Nevertheless, we will build a redirection system as mentioned in gitlab-org&3192 (comment 1776529943).
Tracking issue: gitlab-org/gitlab#257892
It seems that this gollum implementation does not support the redirection features of Gollum, which are quite useful when renaming pages. Is that deliberate or an oversight?
Is there a way to understand better which features of gollum are actually supported by GitLab?
Thanks!
Stan Hu (d9f7674b) at 11 Jan 17:05
Merge branch 'sh-release-4.2.7.10' into 'master'
Stan Hu (c343b8e6) at 11 Jan 17:00
Stan Hu (cb26a610) at 11 Jan 17:00
Merge branch 'sh-release-4.2.7.10' into 'master'
... and 1 more commit
@stanhu yeah I think I changed it because I kept getting confused which upstream version we're actually on, and stole this versioning scheme from other forked gems like https://rubygems.org/gems/gitlab-puma
Stan Hu (c343b8e6) at 11 Jan 16:55
Release 4.2.7.10.gitlab.2
@toupeira Ok. We already released v4.2.7.8 and v4.2.7.9 ourselves, which is why this confused me.
@stanhu ah the idea is that we keep the upstream version as prefix, and only increment the .gitlab.1
part. So the next version would be 4.2.7.10.gitlab.2
@toupeira I was about to release a new gem version, but I'm confused by the versioning scheme:
Would this version be 4.2.8, 4.2.8.0, or 4.2.8.0.gitlab.1?
Stan Hu (1fe0cc87) at 10 Jan 13:54
Nokogiri v1.12 now incorporates Nokogumbo and sanitize has been updated to use this.
Note that upstream has removed sanitize in favor of loofah (https://github.com/gollum/gollum-lib/pull/351), so we may want to consider syncing these projects again.
Markus Koller (66b26d75) at 10 Jan 13:54
Merge branch 'sh-update-sanitize-6.0' into 'master'
... and 1 more commit
Nokogiri v1.12 now incorporates Nokogumbo and sanitize has been updated to use this.
Note that upstream has removed sanitize in favor of loofah (https://github.com/gollum/gollum-lib/pull/351), so we may want to consider syncing these projects again.