Merge 6.x into master #451
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…#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>
* 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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rebased version of the 6.x branch for merging into master. First step towards 6.0 release.