Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 6.x into master #451

Merged
merged 11 commits into from
Aug 1, 2023
Merged

Merge 6.x into master #451

merged 11 commits into from
Aug 1, 2023

Conversation

dometto
Copy link
Member

@dometto dometto commented Aug 1, 2023

Rebased version of the 6.x branch for merging into master. First step towards 6.0 release.

manofstick and others added 11 commits August 1, 2023 16:57
…#424)

* Implement default branch detection, move away from master as default.
* Depend on rugged_adapter v2.0
* Depend rjgit-adapter v1.0
* Depend on older activesupport on JRuby in development for ruby 2.7 support
* Add LATEST_CHANGES.md
* Preserve relative links for absent pages

Co-authored-by: bartkamphorst <bart@kamphorst.com>
Co-authored-by: Bart Kamphorst <bart@kamphorst.com>
…447)

* Ensure Macro boolean arguments are parsed as boolean.
* Drop CI support for Ruby 2.6
* Also drop support for JRuby 9.3, which is compatible with Ruby 2.6
* Don't use treemap for finding pages and file
* Reimplement global find
* Ensure File.canonical_pat prevents path traversal. Add test.
* GitAccess: improve #tree! performance
* Expect file mode to be an Integer
* Refactor Page and File to use Pathname
* file.rb: remove unneeded version.to_s call (see gollum/gollum#1972)
* Provide compatibility with latest minitest.
* Remove octicons altogether from gollum-lib.
* Rename Octicon macro to Icon. Leave finding and rendering the actual icon to frontend (gollum).
* Remove hardcoded octicon names from gollum-lib.
* Add Flash macro that comes without default icon.
* Upgrade minitest-reporters.
@dometto dometto merged commit 65ec958 into master Aug 1, 2023
8 checks passed
@dometto dometto deleted the 6.x_rebased branch August 1, 2023 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants