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
4 changes: 3 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ AllCops:
- bin/**/*

require:
- rubocop-performance
- rubocop-rspec

plugins:
- rubocop-performance

inherit_from: .rubocop_todo.yml

Layout/LineLength:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* [#2557](https://github.com/ruby-grape/grape/pull/2557): Add `lint!` - [@ericproulx](https://github.com/ericproulx).
* [#2561](https://github.com/ruby-grape/grape/pull/2561): Optimize hash alloc for middleware's default options - [@ericproulx](https://github.com/ericproulx).
* [#2563](https://github.com/ruby-grape/grape/pull/2563): Update `Grape::Middleware::Auth::Base` - [@ericproulx](https://github.com/ericproulx).
* [#2571](https://github.com/ruby-grape/grape/pull/2571): Update RuboCop 1.75.8 - [@pieterocp](https://github.com/pieterocp).
* Your contribution here.

#### Fixes
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ group :development, :test do
gem 'builder', require: false
gem 'bundler'
gem 'rake'
gem 'rubocop', '1.71.2', require: false
gem 'rubocop-performance', '1.23.1', require: false
gem 'rubocop', '1.75.8', require: false
gem 'rubocop-performance', '1.25.0', require: false
gem 'rubocop-rspec', '3.4.0', require: false
end

Expand Down
6 changes: 3 additions & 3 deletions spec/grape/api_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1422,7 +1422,7 @@ def to_txt
def initialize(app, *args)
@args = args
@app = app
@block = block_given? ? true : nil
@block = block_given? || nil
end

def call(env)
Expand Down Expand Up @@ -4536,8 +4536,8 @@ def inherited(api)

let(:shared_api_module) do
Module.new do
# rubocop:disable Style/ExplicitBlockArgument because this causes
# the underlying issue in this form
# rubocop:disable Style/ExplicitBlockArgument -- because
# this causes the underlying issue in this form
def uniqe_id_route
params do
use :unique_id
Expand Down
2 changes: 1 addition & 1 deletion spec/support/integer_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Spec
module Support
module Helpers
INTEGER_CLASS_NAME = 0.to_i.class.to_s.freeze
INTEGER_CLASS_NAME = 0.class.to_s.freeze

def integer_class_name
INTEGER_CLASS_NAME
Expand Down