Skip to content
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

Jump to bottom

Upgrade Ruby to version 3.1.4 #5157

Merged
merged 5 commits into from
Sep 12, 2023
Merged

Upgrade Ruby to version 3.1.4 #5157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e74eff2
Upgrade Ruby to version 3.1.4
javierm Jul 20, 2023
fd9169e
Update Style/HashSyntax Rubocop rule
javierm Jul 20, 2023
f87d4b5
Add and apply Naming/BlockForwarding rubocop rule
javierm Jul 20, 2023
584176a
Add and apply Style/ArrayIntersect rubocop rule
javierm Sep 6, 2023
dcb6450
Remove no longer needed --keep-file-descriptors option
javierm Sep 8, 2023
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
Prev Previous commit
Next Next commit
Add and apply Style/ArrayIntersect rubocop rule 
The `intersect?` method has been added in Ruby 3.1, and it's more
readable than `(a & b).any?`.
  • Loading branch information
@javierm
javierm committed Sep 12, 2023
commit 584176adfa2a9fa9f39191a33c3b1a9125a18113
3 changes: 3 additions & 0 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,9 @@ Style/AndOr:
Style/ArrayCoercion:
Enabled: true

Style/ArrayIntersect:
Enabled: true

Style/BlockDelimiters:
Enabled: true

Expand Down
2 changes: 1 addition & 1 deletion app/helpers/translatable_form_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def translations_interface_enabled?
end

def backend_translations_enabled?
(controller.class.module_parents & [Admin, Management, Valuation, SDGManagement]).any?
controller.class.module_parents.intersect?([Admin, Management, Valuation, SDGManagement])
end

def highlight_translation_html_class
Expand Down
2 changes: 1 addition & 1 deletion app/models/sdg/process_enabled.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ def module_name
def relatable?
return true if controller_path_name?

(SDG::Related::RELATABLE_TYPES & [record_or_name.class.name, record_or_name]).any?
SDG::Related::RELATABLE_TYPES.intersect?([record_or_name.class.name, record_or_name])
end
end