1
0
mirror of synced 2025-12-23 03:44:00 -05:00
Commit Graph

10 Commits

Author SHA1 Message Date
Meg Bird
d512aac9f6 Pull request auto-merge GA (#17612)
* updates versioning

* update with versioning

* test versioning

* update with fix

* last fix

* Update data/reusables/gated-features/auto-merge.md

Co-authored-by: Lucas Costi <lucascosti@users.noreply.github.com>

* Remove beta badge from auto-merge screen shots (#17689)

Co-authored-by: Lucas Costi <lucascosti@users.noreply.github.com>
Co-authored-by: Will Smythe <willsmythe@github.com>
2021-02-04 14:14:30 -07:00
Laura Coursen
77ee3137ef Refactor protected branches content (#17277)
* Add new structure to index.md

* Move all conceptual and troubleshooting content

* Add more redirects

* Update links

* Reorganize "About" article

* Tweak some conceptual content

* Rename procedural article

* Fix article title in index.md

* Fix links

* Add more redirects

* Fix more links

* Add redirects for "Managing..." and fix links

* Consolidate procedural information

* Remove duplicate redirect

* Fix indentation

* Add 💅

* Add header

* Add editing and deleting

* 💅 conceptual content

* 💅 conceptual content

* 💅 troubleshooting article

* Clarify default behavior

* 💅 gated feature clarification

* Add 💅

* Add 💅

* update hardcoded links in tests

* Fix gated feature reusable

Co-Authored-By: Matt Pollard <mattpollard@users.noreply.github.com>

* Step out of the way while Matt improves all of the legacy content

Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>

* Tweak gated feature reusable

Co-authored-by: Sarah Schneider <sarahs@github.com>
Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>
2021-01-15 16:43:14 +00:00
Laura Coursen
d20831c23f Auto-merge (#16761)
* Add new article

* Mention auto-merge in related articles

* Add new article

* Make intro inclusive

* Add content for repo setting

* Add versioning to reusable

* Add procedures

* Add gated features callout

* Add permissions statements

* Add conceptual content

* Fix filename

* Add missing step

* Fix syntax

* Add 💅

* Update permissions

* Add 💅

* Add missing period

* Add 💅

* Add 💅

* Add auto-merge to permissions articles

* Fix permissions

* Add 💅

* Let @mattpollard fix everything and take partial credit

Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>

* Incorporate answers to questions

* Add how to provide feedback

* Update feedback link

Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>
Co-authored-by: Melanie Yarbrough <11952755+myarb@users.noreply.github.com>
2020-12-15 21:41:17 +00:00
Janice
eef1219b0d Merge branch 'main' into email-selection 2020-11-02 14:53:18 -07:00
Laura Coursen
a3e1733aa1 GitHub AE (GHAE) (#16090) 2020-11-02 15:12:44 -06:00
hubwriter
cd36152a7c Update content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md 2020-10-29 10:47:49 +00:00
Grey Baker
ed1b6dcaf1 Add note to merge commit email selector about rebase and squash merges 2020-10-25 09:50:56 +00:00
Sarah Schneider
f272eec944 Remove deprecated GHES versions from content and data (#15830)
* ran script/remove-unused-assets.js (manually removed unused variables printed by the script)

* package-lock

* turn elsif into two ifs to prepare for running Liquid deprecation script

* ran script/remove-deprecated-enterprise-version-markup.js --release 2.14 (ONLY UPDATES LINE BREAKS ETC.)

* ran script/remove-deprecated-enterprise-version-markup.js --release 2.15

* ran script/remove-deprecated-enterprise-version-markup.js --release 2.17

* ran script/remove-deprecated-enterprise-version-markup.js --release 2.18

* update hardcoded test

* Update content/github/collaborating-with-issues-and-pull-requests/filtering-files-in-a-pull-request.md

Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>

* add currentVersion is NOT free-pro-team to conditional, to make sure the deprecation script does the right thing when it is time to deprecate 2.21

Co-authored-by: Matt Pollard <mattpollard@users.noreply.github.com>
2020-10-01 10:55:34 -04:00
Jason Etcovitch
caaee7a124 Update all files to use {% data %} (#15253)
* Add back changes from prior to purge

* Manually fix some invalid Liquid

* Updoot render-content

* Improve test messages to show correct output

* Run el scripto

* Pass the remaining test
2020-09-29 16:01:04 -04:00
Vanessa Yuen
3df90fc9b8 Hello git history spelunker!
Are you looking for something? Here is all of the GitHub Docs history in one single commit. Enjoy! 🎉
2020-09-27 14:10:11 +02:00