Skip to content

Commit c4966e1

Browse files
committed
Fix Ruby warning
1 parent 09ff5f2 commit c4966e1

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

lib/redmine_git_hosting/gitolite_wrappers/base.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ module GitoliteWrappers
55
class Base
66
include RedmineGitHosting::GitoliteAccessor::Methods
77

8-
attr_reader :admin, :object_id, :options, :gitolite_config
8+
attr_reader :admin, :rails_object_id, :options, :gitolite_config
99

10-
def initialize(admin, object_id, **options)
10+
def initialize(admin, rails_object_id, **options)
1111
@admin = admin
12-
@object_id = object_id
12+
@rails_object_id = rails_object_id
1313
@options = options
1414
@gitolite_config = admin.config
1515
end
1616

1717
class << self
18-
def call(admin, object_id, **options)
19-
new(admin, object_id, **options).call
18+
def call(admin, rails_object_id, **options)
19+
new(admin, rails_object_id, **options).call
2020
end
2121

2222
def inherited(klass)

lib/redmine_git_hosting/gitolite_wrappers/global/delete_from_recycle_bin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module GitoliteWrappers
55
module Global
66
class DeleteFromRecycleBin < GitoliteWrappers::Base
77
def call
8-
RedmineGitHosting::RecycleBin.delete_content object_id
8+
RedmineGitHosting::RecycleBin.delete_content rails_object_id
99
RedmineGitHosting.logger.info 'delete_from_recycle_bin : done !'
1010
end
1111
end

lib/redmine_git_hosting/gitolite_wrappers/projects/move_repositories.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def git_projects
2222
end
2323

2424
def projects
25-
@projects ||= Project.find_by(id: object_id).self_and_descendants
25+
@projects ||= Project.find_by(id: rails_object_id).self_and_descendants
2626
end
2727
end
2828
end

lib/redmine_git_hosting/gitolite_wrappers/projects/update_projects.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ def git_projects
2323

2424
def projects
2525
@projects ||=
26-
case object_id
26+
case rails_object_id
2727
when 'all'
2828
Project.includes(:repositories).all
2929
when 'active'
3030
Project.active.includes(:repositories).all
3131
when 'active_or_closed'
3232
Project.active_or_closed.includes(:repositories).all
3333
else
34-
object_id.map { |project_id| Project.find_by id: project_id }
34+
rails_object_id.map { |project_id| Project.find_by id: project_id }
3535
end
3636
end
3737

lib/redmine_git_hosting/gitolite_wrappers/repositories/add_repository.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def call
1313
end
1414

1515
def repository
16-
@repository ||= Repository.find_by id: object_id
16+
@repository ||= Repository.find_by id: rails_object_id
1717
end
1818

1919
def create_repository

lib/redmine_git_hosting/gitolite_wrappers/repositories/delete_repository.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def call
1313
end
1414

1515
def repository
16-
@repository ||= object_id.symbolize_keys
16+
@repository ||= rails_object_id.symbolize_keys
1717
end
1818

1919
def delete_repository

lib/redmine_git_hosting/gitolite_wrappers/repositories/move_repository.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def call
1313
end
1414

1515
def repository
16-
@repository ||= Repository.find_by id: object_id
16+
@repository ||= Repository.find_by id: rails_object_id
1717
end
1818

1919
def move_repository

lib/redmine_git_hosting/gitolite_wrappers/repositories/update_repository.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def call
1313
end
1414

1515
def repository
16-
@repository ||= Repository.find_by id: object_id
16+
@repository ||= Repository.find_by id: rails_object_id
1717
end
1818

1919
def update_repository

lib/redmine_git_hosting/gitolite_wrappers/users/add_ssh_key.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def call
1313
end
1414

1515
def ssh_key
16-
@ssh_key ||= GitolitePublicKey.find_by id: object_id
16+
@ssh_key ||= GitolitePublicKey.find_by id: rails_object_id
1717
end
1818
end
1919
end

lib/redmine_git_hosting/gitolite_wrappers/users/delete_ssh_key.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def call
1313
end
1414

1515
def ssh_key
16-
@ssh_key ||= object_id.symbolize_keys
16+
@ssh_key ||= rails_object_id.symbolize_keys
1717
end
1818
end
1919
end

0 commit comments

Comments
 (0)