Open
Description
For redmine_git_hosting to work (as of:
commit 7841e933d4389b9619dd96c38b1229e5a973f223 (origin/master, origin/HEAD)
Author: Marius Balteanu <[email protected]>
Date: Tue Sep 3 05:35:14 2024 +0000
I have these changes in the plugin directory:
diff --git a/Gemfile b/Gemfile
index 7d067916..762b8970 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,9 +32,11 @@ gem 'RedCloth'
gem 'rack-parser', require: 'rack/parser'
# temp autoloading fix
-gem 'sidekiq', '<7'
+#gem 'sidekiq', '<7'
gem 'sshkey'
+gem 'acts_as_positioned'
+
group :development, :test do
gem 'rspec'
gem 'rspec-rails'
@@ -66,3 +68,4 @@ group :development do
gem 'slim_lint', require: false
end
end
+
diff --git a/app/models/repository_git_extra.rb b/app/models/repository_git_extra.rb
index fe6e3a37..61146290 100644
--- a/app/models/repository_git_extra.rb
+++ b/app/models/repository_git_extra.rb
@@ -3,10 +3,10 @@
class RepositoryGitExtra < ActiveRecord::Base
include Redmine::SafeAttributes
- SMART_HTTP_OPTIONS = [[l(:label_disabled), '0'],
- [l(:label_http_only), '3'],
- [l(:label_https_only), '1'],
- [l(:label_https_and_http), '2']].freeze
+ SMART_HTTP_OPTIONS = [[I18n.t(:label_disabled), '0'],
+ [I18n.t(:label_http_only), '3'],
+ [I18n.t(:label_https_only), '1'],
+ [I18n.t(:label_https_and_http), '2']].freeze
ALLOWED_URLS = %w[ssh http https go git git_annex].freeze
@@ -33,7 +33,7 @@ class RepositoryGitExtra < ActiveRecord::Base
validate :validate_urls_order
## Serializations
- serialize :urls_order, Array
+ serialize :urls_order
## Callbacks
before_save :check_urls_order_consistency
diff --git a/app/models/repository_post_receive_url.rb b/app/models/repository_post_receive_url.rb
index 8bfb858d..93a9d37d 100644
--- a/app/models/repository_post_receive_url.rb
+++ b/app/models/repository_post_receive_url.rb
@@ -22,7 +22,7 @@ class RepositoryPostReceiveUrl < ActiveRecord::Base
validates :mode, presence: true, inclusion: { in: %i[github get post] }
## Serializations
- serialize :triggers, Array
+ serialize :triggers
## Scopes
scope :active, -> { where active: true }
Metadata
Metadata
Assignees
Labels
No labels