Skip to content

repo sync #1746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 2, 2020
Merged

repo sync #1746

merged 5 commits into from
Dec 2, 2020

Conversation

Octomerger
Copy link
Contributor

This is an automated pull request to sync changes between the public and private repos.

🤖 This pull request should be merged (not squashed) to preserve continuity across repos, so please let a bot do the merging!

Octomerger and others added 3 commits December 2, 2020 16:03
* Improve documentation issue no #1034

Done with the minor fixes for open issue number #1034 .

* Increasing the importance

I wanted to delete a branch, but I couldn't in spite of reading this document. The problem was, the branch I wanted to delete was the default branch. 
Even though it is stated in this document, it was not given enough importance that everyone would see it.

* typo

A small type in the comments

* Update setting-up-your-development-environment-to-create-a-github-app.md

Fix two small typos.

* properly capitalize "macOS"

* Clarify GH password requirements

* Change " to `

As done in the description of `master`

* " to ` in DE

* " to ` in PT

* " to ` in RU

* Fix typo metadata-syntax-for-github-actions.md

Fix typo for metadata-syntax-for-github-actions#outputs-for-composite-run-steps-actions

* chore: Remove bolding from headings

* Removed deprecated echo set-env instruction

* fix typo (#1516)

Co-authored-by: hubwriter <[email protected]>

* Remove extraneous grammar period which breaks the compare URL (#1252)

* Remove extraneous grammar period which breaks the compare URL

* Update data/reusables/repositories/two-dot-diff-comparison-example-urls.md

Co-authored-by: Nick Schonning <[email protected]>

Co-authored-by: Nick Schonning <[email protected]>
Co-authored-by: hubwriter <[email protected]>

* Revert "" to ` in RU"

This reverts commit d484fd6.

* Revert "" to ` in PT"

This reverts commit fab62f0.

* Revert "" to ` in DE"

This reverts commit 78abcd6.

* Change md

This squashes all the translation commits and their deletion.

* Update content/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository.md

Co-authored-by: Felicity Chapman <[email protected]>

Co-authored-by: Atharva Shirdhankar <[email protected]>
Co-authored-by: Aakarsh B <[email protected]>
Co-authored-by: Aritra Roy Gosthipaty <[email protected]>
Co-authored-by: Guilherme Macedo <[email protected]>
Co-authored-by: Stephen Wade <[email protected]>
Co-authored-by: Shao Yang Hong <[email protected]>
Co-authored-by: a2br <[email protected]>
Co-authored-by: Cas van Dinter <[email protected]>
Co-authored-by: Nick Schonning <[email protected]>
Co-authored-by: Antoine Rondelet <[email protected]>
Co-authored-by: Shati Patel <[email protected]>
Co-authored-by: Meg Bird <[email protected]>
Co-authored-by: ねず <[email protected]>
Co-authored-by: hubwriter <[email protected]>
Co-authored-by: Ilia <[email protected]>
Co-authored-by: a2br <[email protected]>
Co-authored-by: Felicity Chapman <[email protected]>
Co-authored-by: Jason Etcovitch <[email protected]>
* Remove unsafe eval

* Actually, we're not using this anyways

* Reset package-lock, I have no idea why this keeps changing

* Update csp.js

* Update server.js
* Default authors to ['GitHub']

* Remove now-redundant GitHub authors
@Octomerger Octomerger requested a review from a team as a code owner December 2, 2020 16:41
@chiedo
Copy link
Contributor

chiedo commented Dec 2, 2020

@shati-patel would you mind resolving this merge conflict?

@Octomerger Octomerger merged commit 1edd1eb into main Dec 2, 2020
@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2020

Thanks very much for contributing! Your pull request has been merged 🎉 You should see your changes appear on the site in approximately 24 hours.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants