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

Bump rubocop from 1.67.0 to 1.68.0 #4644

Merged
merged 4 commits into from
Nov 27, 2024
Merged

Bump rubocop from 1.67.0 to 1.68.0 #4644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
614ec0a
Bump rubocop from 1.67.0 to 1.68.0
dependabot[bot] Nov 1, 2024
fc45020
Enable Style/SafeNavigationChainLength and ignore existing violation
inulty-dfe Nov 6, 2024
e8c753e
Fix rubocop Style/KeywordArgumentsMerging violation
inulty-dfe Nov 27, 2024
32caac2
Ignore SafeNavigationChainLength in erb error_warning
inulty-dfe Nov 27, 2024
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
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ GEM
parallel (1.26.3)
parallel_tests (4.7.2)
parallel
parser (3.3.5.0)
parser (3.3.5.1)
ast (~> 2.4.1)
racc
patience_diff (1.2.0)
Expand Down Expand Up @@ -619,7 +619,7 @@ GEM
rspec-support (3.13.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.67.0)
rubocop (1.68.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -629,7 +629,7 @@ GEM
rubocop-ast (>= 1.32.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.3)
rubocop-ast (1.33.0)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
Expand Down
3 changes: 2 additions & 1 deletion app/controllers/publish/courses/gcse_requirements_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ def edit
end

def update
@gcse_requirements_form = GcseRequirementsForm.new(**gcse_requirements_form_params.merge(level: course.level))
gcse_requirements_form_params[:level] = course.level
@gcse_requirements_form = GcseRequirementsForm.new(**gcse_requirements_form_params)

if @gcse_requirements_form.valid? && goto_preview?
@gcse_requirements_form.save(course)
Expand Down
11 changes: 11 additions & 0 deletions config/rubocop/style.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,14 @@ Style/StringLiterals:
- config/initializers/inflections.rb
- bin/rails
- bin/rake

Style/SafeNavigationChainLength:
Enabled: true
Exclude:
- app/controllers/publish/courses/gcse_requirements_controller.rb
- app/forms/publish/course_study_mode_form.rb
- app/models/course.rb
- app/models/course_enrichment.rb
- app/services/courses/content_status_service.rb
- app/services/courses/creation_service.rb
- app/views/publish/shared/_error_wrapper.html.erb
Loading