From 0b2ee562e239211bbadea740d11b0590bd13a14f Mon Sep 17 00:00:00 2001 From: Andrey Subbota Date: Wed, 31 Jan 2024 15:42:35 +0100 Subject: [PATCH 1/2] Because every version of grape-swagger depends on Ruby >= 3.0 0, Ruby >= 3.0 is required. --- .github/workflows/danger.yml | 2 +- lib/grape-swagger/entity/attribute_parser.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 403af53..3e62953 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -11,7 +11,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.0 bundler-cache: true rubygems: latest - name: Run Danger diff --git a/lib/grape-swagger/entity/attribute_parser.rb b/lib/grape-swagger/entity/attribute_parser.rb index f4118bd..96c5a37 100644 --- a/lib/grape-swagger/entity/attribute_parser.rb +++ b/lib/grape-swagger/entity/attribute_parser.rb @@ -74,7 +74,7 @@ def ambiguous_model_type?(type) def data_type_from(documentation) documented_type = documentation[:type] - documented_type ||= (documentation[:documentation] && documentation[:documentation][:type]) + documented_type ||= documentation[:documentation] && documentation[:documentation][:type] data_type = GrapeSwagger::DocMethods::DataType.call(documented_type) From 53af52ff29785da810d50fa3854293ec7e128e77 Mon Sep 17 00:00:00 2001 From: Andrey Subbota Date: Wed, 31 Jan 2024 15:52:19 +0100 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d52097f..6146d5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ #### Fixes * Your contribution here. +* [#65](https://github.com/ruby-grape/grape-swagger-entity/pull/65): Bump ruby version required for danger workflow - [@numbata](https://github.com/numbata). ### 0.5.2 (2023/07/07)