Skip to content

Commit

Permalink
[pre-commit.ci] pre-commit autoupdate (#7336)
Browse files Browse the repository at this point in the history
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/thibaudcolas/pre-commit-stylelint: v16.10.0 → v16.11.0](thibaudcolas/pre-commit-stylelint@v16.10.0...v16.11.0)
- [github.com/rubocop/rubocop: v1.68.0 → v1.69.0](rubocop/rubocop@v1.68.0...v1.69.0)

* Updated additional dependencies
* Switched to https://github.com/rbubley/mirrors-prettier for the prettier pre-commit hook
---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: David Liu <[email protected]>
  • Loading branch information
pre-commit-ci[bot] and david-yz-liu authored Dec 11, 2024
1 parent 8e4cdcb commit b241c74
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
20 changes: 10 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ repos:
)$
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
- repo: https://github.com/rbubley/mirrors-prettier
rev: v3.4.2
hooks:
- id: prettier
types_or: [javascript, jsx, css, scss, html]
- repo: https://github.com/thibaudcolas/pre-commit-stylelint
rev: v16.10.0
rev: v16.11.0
hooks:
- id: stylelint
additional_dependencies: [
"stylelint@16.3.1",
"stylelint@16.11.0",
"[email protected]",
"stylelint-config-sass-guidelines@11.1.0",
"[email protected].38",
"stylelint-config-sass-guidelines@12.1.0",
"[email protected].49",
]
args: ["--fix"]
types_or: ["css", "scss"]
Expand All @@ -39,7 +39,7 @@ repos:
app/assets/stylesheets/common/_reset.scss
)$
- repo: https://github.com/rubocop/rubocop
rev: v1.68.0
rev: v1.69.1
hooks:
- id: rubocop
args: ["--autocorrect"]
Expand All @@ -52,10 +52,10 @@ repos:
Vagrantfile
)$
additional_dependencies:
- rubocop-rails:2.26.1
- rubocop-performance:1.22.1
- rubocop-rails:2.27.0
- rubocop-performance:1.23.0
- rubocop-factory_bot:2.26.1
- rubocop-rspec:3.0.5
- rubocop-rspec:3.2.0
- rubocop-rspec_rails:2.30.0
- rubocop-capybara:2.21.0

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $breakpoints: (
@content;
}
} @else {
@media ("#{$name}") {
@media ('#{$name}') {
@content;
}
}
Expand Down
1 change: 0 additions & 1 deletion app/helpers/random_assign_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ module RandomAssignHelper
# at the end of the assignment, including pre-existing peer reviews.
def perform_random_assignment(pr_assignment, num_groups,
reviewer_ids, reviewee_ids)

# If the caller passes string ids from get_grouping_info,
# they should be converted.
reviewer_ids = reviewer_ids.map(&:to_i)
Expand Down
2 changes: 1 addition & 1 deletion app/models/annotation_text.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class AnnotationText < ApplicationRecord
validate :courses_should_match

def should_have_deduction?
!self&.annotation_category&.flexible_criterion_id.nil?
!self.annotation_category&.flexible_criterion_id.nil?
end

def escape_content
Expand Down
2 changes: 1 addition & 1 deletion app/models/flexible_criterion.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def weight

def scale_marks
super
return if self&.annotation_categories.nil?
return if self.annotation_categories.nil?
annotation_categories = self.annotation_categories.includes(:annotation_texts)
annotation_categories.each do |category|
category.annotation_texts.each do |text|
Expand Down

0 comments on commit b241c74

Please sign in to comment.