Skip to content

Commit

Permalink
Merge #24672
Browse files Browse the repository at this point in the history
24672: cherrypick-1.1: give craig an avatar, move bors.toml into .github r=couchand a=couchand

build: give craig an avatar

At present, when GitHub apps create commits, they don't show up
with the app's avatar.  A workaround is to commit with an e-mail
address that has an associated gravatar.

build: move bors.toml into .github folder

Just to keep the root of the project a little cleaner.

---

I hadn't planned on cherry-picking this, but figured it's a reasonable test that the branch protection is set up correctly.

cc: @cockroachdb/release @jordanlewis 

Co-authored-by: Andrew Couch <[email protected]>
  • Loading branch information
craig[bot] and couchand committed Apr 11, 2018
2 parents 9468ad3 + 72fadab commit f472f09
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions bors.toml → .github/bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ pr_status = [
block_labels = [
"do-not-merge"
]

[committer]
name = "craig[bot]"
email = "[email protected]"

0 comments on commit f472f09

Please sign in to comment.