Skip to content

Commit 3ea7079

Browse files
authored
Merge branch 'master' into graphql-queries-update
2 parents fed1cf4 + 49b2293 commit 3ea7079

File tree

8 files changed

+112
-308
lines changed

8 files changed

+112
-308
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ Make a pull request and we'll consider it.
1414
* _graphql_: here's a bunch of sample GraphQL queries that can be run against our [GitHub GraphQL API](https://docs.github.com/graphql).
1515
* _hooks_: want to find out how to write a consumer for [our web hooks](https://docs.github.com/webhooks-and-events/webhooks/about-webhooks)? The examples in this subdirectory show you how. We are open for more contributions via pull requests.
1616
* _pre-receive-hooks_: this one contains [pre-receive-hooks](https://docs.github.com/enterprise-server/admin/policies/enforcing-policy-with-pre-receive-hooks) that can block commits on GitHub Enterprise that do not fit your requirements. Do you have more great examples? Create a pull request and we will check it out.
17-
* _scripts_: want to analyze or clean-up your Git repository? The scripts in this subdirectory show you how. We are open for more contributions via pull requests
17+
* _scripts_: want to analyze or clean-up your Git repository? The scripts in this subdirectory show you how. We are open for more contributions via pull requests.
1818
* _sql_: here are sql scripts for custom reporting for GitHub Enterprise Server. We are open for more contributions via pull requests.

api/javascript/gha-cleanup/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/javascript/org-invite/package-lock.json

Lines changed: 81 additions & 281 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/javascript/org-invite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"org-invite": "./cli.js"
88
},
99
"dependencies": {
10-
"@octokit/rest": "^16.39.0",
10+
"@octokit/rest": "^20.0.2",
1111
"chalk": "^3.0.0",
1212
"commander": "^4.1.0",
1313
"dotenv": "^8.2.0",

api/ruby/rendering-data-as-graphs/Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.0.4.3)
4+
activesupport (7.0.7.2)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 1.6, < 2)
77
minitest (>= 5.1)
@@ -32,10 +32,10 @@ GEM
3232
faraday-patron (1.0.0)
3333
faraday-rack (1.0.0)
3434
faraday-retry (1.0.3)
35-
i18n (1.12.0)
35+
i18n (1.14.1)
3636
concurrent-ruby (~> 1.0)
3737
json (2.3.0)
38-
minitest (5.18.0)
38+
minitest (5.19.0)
3939
multipart-post (2.3.0)
4040
octokit (4.7.0)
4141
sawyer (~> 0.8.0, >= 0.5.3)

app/ruby/app-issue-creator/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.1.7.3)
4+
activesupport (6.1.7.5)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 1.6, < 2)
77
minitest (>= 5.1)
@@ -33,11 +33,11 @@ GEM
3333
faraday-patron (1.0.0)
3434
faraday-rack (1.0.0)
3535
faraday-retry (1.0.3)
36-
i18n (1.12.0)
36+
i18n (1.14.1)
3737
concurrent-ruby (~> 1.0)
3838
json (2.3.0)
3939
jwt (1.5.6)
40-
minitest (5.18.0)
40+
minitest (5.19.0)
4141
multipart-post (2.3.0)
4242
mustermann (2.0.2)
4343
ruby2_keywords (~> 0.0.1)
@@ -59,7 +59,7 @@ GEM
5959
tilt (2.1.0)
6060
tzinfo (2.0.6)
6161
concurrent-ruby (~> 1.0)
62-
zeitwerk (2.6.7)
62+
zeitwerk (2.6.11)
6363

6464
PLATFORMS
6565
ruby

graphql/queries/org-audit-log-api-example.graphql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ query {
2121
teamName
2222
}
2323

24+
... on EnterpriseAuditEntryData {
25+
enterpriseUrl
26+
}
27+
2428
... on OauthApplicationAuditEntryData {
2529
oauthApplicationName
2630
}

pre-receive-hooks/reject-commits.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ while read -r oldrev newrev refname; do
2828
# Calculate range for new branch/updated branch
2929
[ "$oldrev" = "$zero_commit" ] && range="$newrev" || range="$oldrev..$newrev"
3030

31-
# Iterate over all new hashes and try to match "rejected hashes"
32-
# Return "success" if there are no matches
33-
match=$(git rev-list "$range" --not --all \
34-
| fgrep --max-count=1 --file=$rejected_commits \
35-
) || continue
31+
# Iterate over all new hashes and try to match "rejected hashes"
32+
# Return "success" if there are no matches
33+
match=$(git rev-list "$range" --not --all \
34+
| fgrep --max-count=1 --file=$rejected_commits \
35+
) || continue
3636

37-
echo "ERROR:"
38-
echo "ERROR: Your push was rejected because it contained the commit"
39-
echo "ERROR: '$match' in '${refname#refs/heads/}'."
40-
echo "ERROR:"
41-
echo "ERROR: Please contact your GitHub Enterprise administrator."
42-
echo "ERROR"
43-
exit 1
37+
echo "ERROR:"
38+
echo "ERROR: Your push was rejected because it contained the commit"
39+
echo "ERROR: '$match' in '${refname#refs/heads/}'."
40+
echo "ERROR:"
41+
echo "ERROR: Please contact your GitHub Enterprise administrator."
42+
echo "ERROR"
43+
exit 1
4444
done

0 commit comments

Comments
 (0)