Skip to content

Very minor changes to get the plugin working with redmine 6.0.x #845

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

Open
pallinger wants to merge 2 commits into
base: copilot/fix-839
Choose a base branch
from
Open

Very minor changes to get the plugin working with redmine 6.0.x #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e8c5ab
fix repository display error
Jan 12, 2026
fe5cc9c
fix diff view
Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/redmine_git_hosting/cache/abstract_cache.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ def logger
def time_limit
return if max_cache_time.to_i.negative? # No expiration needed

current_time = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.zone.now
current_time = ActiveRecord.default_timezone == :utc ? Time.now.utc : Time.zone.now
current_time - max_cache_time
end

def valid_cache_entry?(cached_entry_date)
return true if max_cache_time.to_i.negative? # No expiration needed

current_time = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.zone.now
current_time = ActiveRecord.default_timezone == :utc ? Time.now.utc : Time.zone.now
expired = current_time.to_i - cached_entry_date.to_i > max_cache_time
!expired
end
Expand Down
2 changes: 1 addition & 1 deletion lib/redmine_git_hosting/patches/repositories_controller_patch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def diff_with_options
@changeset = @repository.find_changeset_by_name @rev
@changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
@diff_format_revisions = @repository.diff_format_revisions @changeset, @changeset_to
render :diff, formats: :html, layout: 'base.html.erb'
render :diff, formats: :html, layout: 'base'
end
end
end
Expand Down
Loading