Skip to content

Commit 7441241

Browse files
Merge branch '11.2' into 11.3
2 parents 758f876 + ad5652a commit 7441241

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
* TBC
1111

12-
[11.3.0]: https://github.com/GitLabPHP/Client/compare/11.2.0...11.3.0
12+
[11.3.0]: https://github.com/GitLabPHP/Client/compare/11.2.1...11.3.0
13+
14+
## [11.2.1] - 2021-03-14
15+
16+
* Fixed commit order validation
17+
18+
[11.2.1]: https://github.com/GitLabPHP/Client/compare/11.2.0...11.2.1
1319

1420
## [11.2.0] - 2021-02-20
1521

1622
* Added support for user memberships
17-
* Add support for the following projects parameters: id_after, id_before, last_activity_after, last_activity_before, repository_checksum_failed, repository_storage, wiki_checksum_failed, with_custom_attributes, with_programming_language
23+
* Added support for the following projects parameters: id_after, id_before, last_activity_after, last_activity_before, repository_checksum_failed, repository_storage, wiki_checksum_failed, with_custom_attributes, with_programming_language
1824

1925
[11.2.0]: https://github.com/GitLabPHP/Client/compare/11.1.0...11.2.0
2026

src/Api/Repositories.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public function commits($project_id, array $parameters = [])
233233
->setNormalizer('first_parent', $booleanNormalizer)
234234
;
235235
$resolver->setDefined('order')
236-
->setAllowedTypes('order', ['default', 'topo'])
236+
->setAllowedValues('order', ['default', 'topo'])
237237
;
238238

239239
return $this->get($this->getProjectPath($project_id, 'repository/commits'), $resolver->resolve($parameters));

vendor-bin/phpstan/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.2.5 || ^8.0",
4-
"phpstan/phpstan": "0.12.78",
4+
"phpstan/phpstan": "0.12.81",
55
"phpstan/phpstan-deprecation-rules": "0.12.6",
66
"phpstan/phpstan-strict-rules": "0.12.9",
77
"thecodingmachine/phpstan-strict-rules": "0.12.1",

vendor-bin/psalm/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.2.5 || ^8.0",
4-
"psalm/phar": "4.6.1"
4+
"psalm/phar": "4.6.2"
55
},
66
"config": {
77
"preferred-install": "dist"

0 commit comments

Comments
 (0)