Merge branch 'ruby-grape:master' into update_rubocop_1_40

ruby-grape · Dec 20, 2022 · 5c3ca4c · 5c3ca4c
2 parents c092a53 + 095c6e8
commit 5c3ca4c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -15,7 +15,6 @@ jobs:
         bundler-cache: true
     - name: Run Danger
       run: |
-        # the token is public, this is ok
-        TOKEN='b8b19daa0ade737762c'
-        TOKEN+='f35edcb328642d371ce86'
+        # the token is public, has public_repo scope and belongs to the grape-bot user owned by @dblock, this is ok
+        TOKEN=$(echo -n Z2hwX2lYb0dPNXNyejYzOFJyaTV3QUxUdkNiS1dtblFwZTFuRXpmMwo= | base64 --decode)
         DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,14 @@
-### 1.7.0 (Next)
+### 1.7.1 (Next)
+
+#### Features
+
+* Your contribution here.
+
+#### Fixes
+
+* Your contribution here.
+
+### 1.7.0 (2022/12/20)
 
 #### Features
 
@@ -13,7 +23,6 @@
 * [#2274](https://github.com/ruby-grape/grape/pull/2274): Error middleware support using rack util's symbols as status - [@dhruvCW](https://github.com/dhruvCW).
 * [#2276](https://github.com/ruby-grape/grape/pull/2276): Fix exception super - [@ericproulx](https://github.com/ericproulx).
 * [#2285](https://github.com/ruby-grape/grape/pull/2285), [#2287](https://github.com/ruby-grape/grape/pull/2287): Added :evaluate_given to declared(params) - [@zysend](https://github.com/zysend).
-* Your contribution here.
 
 #### Fixes
 
@@ -28,7 +37,6 @@
 * [#2256](https://github.com/ruby-grape/grape/pull/2256): Raise `Grape::Exceptions::MultipartPartLimitError` from Rack when too many files are uploaded - [@bschmeck](https://github.com/bschmeck).
 * [#2266](https://github.com/ruby-grape/grape/pull/2266): Fix code coverage - [@duffn](https://github.com/duffn).
 * [#2284](https://github.com/ruby-grape/grape/pull/2284): Fix an unexpected backtick - [@zysend](https://github.com/zysend).
-* Your contribution here.
 
 ### 1.6.2 (2021/12/30)
 

diff --git a/README.md b/README.md
@@ -159,9 +159,9 @@ content negotiation, versioning and much more.
 
 ## Stable Release
 
-You're reading the documentation for the next release of Grape, which should be **1.7.0**.
+You're reading the documentation for the next release of Grape, which should be **1.7.1**.
 Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
-The current stable release is [1.6.2](https://github.com/ruby-grape/grape/blob/v1.6.2/README.md).
+The current stable release is [1.7.0](https://github.com/ruby-grape/grape/blob/v1.7.0/README.md).
 
 ## Project Resources
 

diff --git a/lib/grape/version.rb b/lib/grape/version.rb
@@ -2,5 +2,5 @@
 
 module Grape
   # The current version of Grape.
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end