Skip to content

Commit 5c2c7df

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch '11.4' into 11.5
2 parents a7ef084 + c3410bb commit 5c2c7df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+119
-98
lines changed

‎.github/CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
5555
## Enforcement
5656

5757
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at [email protected]. All
58+
reported by contacting the project team at [email protected]. All
5959
complaints will be reviewed and investigated and will result in a response that
6060
is deemed necessary and appropriate to the circumstances. The project team is
6161
obligated to maintain confidentiality with regard to the reporter of an incident.

‎.github/SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ are multiple supported versions at any given time.
99
## Reporting a Vulnerability
1010

1111
If you discover a security vulnerability within this package, please send an
12-
email to Graham Campbell at [email protected]. All security vulnerabilities
12+
email to Graham Campbell at [email protected]. All security vulnerabilities
1313
will be promptly addressed. Please do not disclose security-related issues
1414
publicly until a fix has been announced.

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MIT License
22

33
Copyright (c) 2012-2018 Matt Humphrey <[email protected]>
4-
Copyright (c) 2018-2021 Graham Campbell <[email protected]>
4+
Copyright (c) 2018-2021 Graham Campbell <[email protected]>
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ $ make test
110110

111111
## Security
112112

113-
If you discover a security vulnerability within this package, please send an email to Graham Campbell at [email protected]. All security vulnerabilities will be promptly addressed. You may view our full security policy [here](https://github.com/GitLabPHP/Client/security/policy).
113+
If you discover a security vulnerability within this package, please send an email to Graham Campbell at [email protected]. All security vulnerabilities will be promptly addressed. You may view our full security policy [here](https://github.com/GitLabPHP/Client/security/policy).
114114

115115

116116
## License

‎composer.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,23 @@
66
"authors": [
77
{
88
"name": "Fabien Bourigault",
9-
"email": "[email protected]"
9+
"email": "[email protected]",
10+
"homepage": "https://github.com/fbourigault"
1011
},
1112
{
1213
"name": "Graham Campbell",
13-
"email": "[email protected]"
14+
"email": "[email protected]",
15+
"homepage": "https://github.com/GrahamCampbell"
1416
},
1517
{
1618
"name": "Matt Humphrey",
17-
"email": "[email protected]"
19+
"email": "[email protected]",
20+
"homepage": "https://github.com/m4tthumphrey"
1821
},
1922
{
2023
"name": "Miguel Piedrafita",
21-
"email": "[email protected]"
24+
"email": "[email protected]",
25+
"homepage": "https://github.com/m1guelpf"
2226
}
2327
],
2428
"require": {

‎src/Api/AbstractApi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* This file is part of the Gitlab API library.
77
*
88
* (c) Matt Humphrey <[email protected]>
9-
* (c) Graham Campbell <[email protected]>
9+
* (c) Graham Campbell <[email protected]>
1010
*
1111
* For the full copyright and license information, please view the LICENSE
1212
* file that was distributed with this source code.

‎src/Api/DeployKeys.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* This file is part of the Gitlab API library.
77
*
88
* (c) Matt Humphrey <[email protected]>
9-
* (c) Graham Campbell <[email protected]>
9+
* (c) Graham Campbell <[email protected]>
1010
*
1111
* For the full copyright and license information, please view the LICENSE
1212
* file that was distributed with this source code.

‎src/Api/Deployments.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* This file is part of the Gitlab API library.
77
*
88
* (c) Matt Humphrey <[email protected]>
9-
* (c) Graham Campbell <[email protected]>
9+
* (c) Graham Campbell <[email protected]>
1010
*
1111
* For the full copyright and license information, please view the LICENSE
1212
* file that was distributed with this source code.

‎src/Api/Environments.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* This file is part of the Gitlab API library.
77
*
88
* (c) Matt Humphrey <[email protected]>
9-
* (c) Graham Campbell <[email protected]>
9+
* (c) Graham Campbell <[email protected]>
1010
*
1111
* For the full copyright and license information, please view the LICENSE
1212
* file that was distributed with this source code.

‎src/Api/Groups.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* This file is part of the Gitlab API library.
77
*
88
* (c) Matt Humphrey <[email protected]>
9-
* (c) Graham Campbell <[email protected]>
9+
* (c) Graham Campbell <[email protected]>
1010
*
1111
* For the full copyright and license information, please view the LICENSE
1212
* file that was distributed with this source code.

0 commit comments

Comments
 (0)