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.

Sign up for GitHub

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

Jump to bottom

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

Commits on Aug 1, 2023

  1. Default to local PlantUML server for security (#412)

    @manofstick
    manofstick authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    7f80b61 View commit details
    Browse the repository at this point in the history

  2. Update octicons

    @dometto
    dometto authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    86d0020 View commit details
    Browse the repository at this point in the history

  3. Implement default branch detection, move away from master as default. (… 

    …#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
    @dometto
    dometto authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    af3793e View commit details
    Browse the repository at this point in the history

  4. Move sanitize filter forwards in the filter chain (#429)

    @dometto
    dometto authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    b74c62b View commit details
    Browse the repository at this point in the history

  5. Allow defining custom rendering Procs for a format (#433)

    @dometto
    dometto authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    dbb391d View commit details
    Browse the repository at this point in the history

  6. Receive :note in Committer options hash (#431)

    @dometto
    dometto authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    e575241 View commit details
    Browse the repository at this point in the history

  7. Preserve relative links for absent pages (#434) 

    * Preserve relative links for absent pages

Co-authored-by: bartkamphorst <[email protected]>
    @dometto @bartkamphorst
    2 people authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    ea3e121 View commit details
    Browse the repository at this point in the history

  8. Support for git notes (#435) 

    Co-authored-by: Bart Kamphorst <[email protected]>
    @dometto @bartkamphorst
    2 people authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    b300639 View commit details
    Browse the repository at this point in the history

  9. Ensure boolean Macro arguments are parsed as boolean. Resolves #441 (#… 

    …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
    @dometto
    dometto authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    4c7e282 View commit details
    Browse the repository at this point in the history

  10. Improve performance (#437) 

    * 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.
    @dometto
    dometto authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    e144af1 View commit details
    Browse the repository at this point in the history

  11. Remove octicons altogether from gollum-lib. (#441) 

    * 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.
    @bartkamphorst
    bartkamphorst authored and Dawa Ometto committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    63dd863 View commit details
    Browse the repository at this point in the history