Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -470,18 +470,18 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.3)
rubocop (1.75.8)
rubocop (1.76.1)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.44.0, < 2.0)
rubocop-ast (>= 1.45.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.44.1)
rubocop-ast (1.45.1)
parser (>= 3.3.7.2)
prism (~> 1.4)
rubocop-capybara (2.22.1)
Expand Down Expand Up @@ -923,8 +923,8 @@ CHECKSUMS
rspec-mocks (3.13.4) sha256=6bb158a0719c53d522104ed34c0777b884b2c9dc775ce64eaa10207df02ab993
rspec-rails (8.0.0) sha256=977a508cd94d152db2068c6585470db5d0cd47eef56d5410b9531034fb9d97bf
rspec-support (3.13.3) sha256=2a61e393f6e18b7228726e0c6869c5d5a1419d37206116c4d917d145276b3f43
rubocop (1.75.8) sha256=c80ab4286c5dcfc49d7ad1787cdba5569b63b58c96ee7afde4ec47a9c8a85be9
rubocop-ast (1.44.1) sha256=e3cc04203b2ef04f6d6cf5f85fe6d643f442b18cc3b23e3ada0ce5b6521b8e92
rubocop (1.76.1) sha256=e15a2d750794cf2157d2de8b1b403dfa71b8dc3957a22ae6043b1bdf21e7e0e7
rubocop-ast (1.45.1) sha256=94042e49adc17f187ba037b33f941ba7398fede77cdf4bffafba95190a473a3e
rubocop-capybara (2.22.1) sha256=ced88caef23efea53f46e098ff352f8fc1068c649606ca75cb74650970f51c0c
rubocop-factory_bot (2.27.1) sha256=9d744b5916778c1848e5fe6777cc69855bd96548853554ec239ba9961b8573fe
rubocop-performance (1.25.0) sha256=6f7d03568a770054117a78d0a8e191cefeffb703b382871ca7743831b1a52ec1
Expand Down
2 changes: 1 addition & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def name
"#{first_name} #{last_name}"
end

def handle_destroy
def handle_destroy # rubocop:disable Naming/PredicateMethod
handle_group_memberships
handle_collection_membership
handle_messages
Expand Down
2 changes: 1 addition & 1 deletion app/policies/application_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def everyone
@user.present?
end

def no_one
def no_one # rubocop:disable Naming/PredicateMethod
false
end

Expand Down
2 changes: 1 addition & 1 deletion app/views/groups/show.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@
i.fa-solid.fa-trash-can.text-danger
=< t('.button.delete_group')
- if policy(@group).leave?
= link_to t('.button.leave'), leave_group_path(@group), method: :post, class: "leave-btn btn btn-important #{@group.last_admin?(current_user) ? 'disabled' : ''}", data: {confirm: t('common.sure')}
= link_to t('.button.leave'), leave_group_path(@group), method: :post, class: "leave-btn btn btn-important #{'disabled' if @group.last_admin?(current_user)}", data: {confirm: t('common.sure')}
= link_to t('common.button.back'), :back, class: 'btn btn-important'
4 changes: 2 additions & 2 deletions lib/enmeshed/connector.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def pending_relationships
end

# @return [Boolean] Whether the relationship was accepted successfully.
def accept_relationship(relationship_id)
def accept_relationship(relationship_id) # rubocop:disable Naming/PredicateMethod
response = connection.put("/api/v2/Relationships/#{relationship_id}/Accept")
Rails.logger.debug do
"Enmeshed::ConnectorApi accepted the relationship; connector response status is #{response.status}"
Expand All @@ -80,7 +80,7 @@ def accept_relationship(relationship_id)
end

# @return [Boolean] Whether the relationship was rejected successfully.
def reject_relationship(relationship_id)
def reject_relationship(relationship_id) # rubocop:disable Naming/PredicateMethod
response = connection.put("/api/v2/Relationships/#{relationship_id}/Reject")
Rails.logger.debug do
'Enmeshed::ConnectorApi rejected the relationship; ' \
Expand Down
Loading