Skip to content

Commit 5c3ca4c

Browse files
authored
Merge branch 'ruby-grape:master' into update_rubocop_1_40
2 parents c092a53 + 095c6e8 commit 5c3ca4c

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

.github/workflows/danger.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
bundler-cache: true
1616
- name: Run Danger
1717
run: |
18-
# the token is public, this is ok
19-
TOKEN='b8b19daa0ade737762c'
20-
TOKEN+='f35edcb328642d371ce86'
18+
# the token is public, has public_repo scope and belongs to the grape-bot user owned by @dblock, this is ok
19+
TOKEN=$(echo -n Z2hwX2lYb0dPNXNyejYzOFJyaTV3QUxUdkNiS1dtblFwZTFuRXpmMwo= | base64 --decode)
2120
DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose

CHANGELOG.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
### 1.7.0 (Next)
1+
### 1.7.1 (Next)
2+
3+
#### Features
4+
5+
* Your contribution here.
6+
7+
#### Fixes
8+
9+
* Your contribution here.
10+
11+
### 1.7.0 (2022/12/20)
212

313
#### Features
414

@@ -13,7 +23,6 @@
1323
* [#2274](https://github.com/ruby-grape/grape/pull/2274): Error middleware support using rack util's symbols as status - [@dhruvCW](https://github.com/dhruvCW).
1424
* [#2276](https://github.com/ruby-grape/grape/pull/2276): Fix exception super - [@ericproulx](https://github.com/ericproulx).
1525
* [#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).
16-
* Your contribution here.
1726

1827
#### Fixes
1928

@@ -28,7 +37,6 @@
2837
* [#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).
2938
* [#2266](https://github.com/ruby-grape/grape/pull/2266): Fix code coverage - [@duffn](https://github.com/duffn).
3039
* [#2284](https://github.com/ruby-grape/grape/pull/2284): Fix an unexpected backtick - [@zysend](https://github.com/zysend).
31-
* Your contribution here.
3240

3341
### 1.6.2 (2021/12/30)
3442

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ content negotiation, versioning and much more.
159159

160160
## Stable Release
161161

162-
You're reading the documentation for the next release of Grape, which should be **1.7.0**.
162+
You're reading the documentation for the next release of Grape, which should be **1.7.1**.
163163
Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
164-
The current stable release is [1.6.2](https://github.com/ruby-grape/grape/blob/v1.6.2/README.md).
164+
The current stable release is [1.7.0](https://github.com/ruby-grape/grape/blob/v1.7.0/README.md).
165165

166166
## Project Resources
167167

lib/grape/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
module Grape
44
# The current version of Grape.
5-
VERSION = '1.7.0'
5+
VERSION = '1.7.1'
66
end

0 commit comments

Comments
 (0)