1
0
mirror of synced 2026-01-05 03:06:35 -05:00
Commit Graph

19 Commits

Author SHA1 Message Date
Janice
9e085c13a4 Merge branch 'main' into patch-1 2020-10-23 16:13:16 -07:00
Janice
b8ae9903aa Update content/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.md
Co-authored-by: Alex Mullans <infin8x@github.com>
2020-10-23 16:12:06 -07:00
Laura Coursen
a51872d042 Change != "free-pro-team@latest" to enterpriseServerVersions contains currentVersion, actually (#16114)
* Run script/new-versioning/update-not-fpt-conditionals.js

* Fix a few things

* Remove outdated versioning

* Fix broken link

Co-authored-by: jmarlena <6732600+jmarlena@users.noreply.github.com>
2020-10-21 21:33:43 -07:00
Janice
c80c3ab78a Merge branch 'main' into Ruth-ikegah/issue#431 2020-10-19 15:42:30 -07:00
Felicity Chapman
8b5c0e5299 Merge branch 'main' into Ruth-ikegah/issue#430 2020-10-15 22:00:59 +01:00
Ruth Ikegah
5c31f1ad87 Update content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md
Co-authored-by: Felicity Chapman <felicitymay@github.com>
2020-10-15 18:27:18 +01:00
Ruth Ikegah
e0856f2fb1 Update content/github/collaborating-with-issues-and-pull-requests/about-pull-requests.md
Co-authored-by: Felicity Chapman <felicitymay@github.com>
2020-10-15 18:26:16 +01:00
Ruth Ikegah
27d7da9dcf Update content/github/collaborating-with-issues-and-pull-requests/changing-the-base-branch-of-a-pull-request.md
Co-authored-by: Janice <janiceilene@github.com>
2020-10-14 14:54:15 +01:00
Janice
2443c09788 Merge branch 'main' into patch-1 2020-10-13 10:39:46 -07:00
Ruth Ikegah
41f942d3f4 Update about-pull-requests.md 2020-10-13 13:28:05 +01:00
Ruth Ikegah
d5dd4bb9a1 Update changing-the-base-branch-of-a-pull-request.md 2020-10-13 13:18:26 +01:00
Ruth Ikegah
cac3166bd4 Added a quick tip about PR's base branch 2020-10-13 12:51:06 +01:00
Felicity Chapman
0f100dabe9 Fix broken links in report #2697 (#15921) 2020-10-13 10:02:08 +01:00
Alison Jo
21be2b0e74 remove trailing space from link in quotes 2020-10-13 04:18:52 -04:00
David Dyck
8691e3fc32 update master to main
new work processes use 'main' instead of 'master'
2020-10-07 21:01:40 -07:00
Matt Pollard
aa3a4edb62 Document features and changes for phase 2.5 of master/main transition (#15745) 2020-10-01 16:43:01 -07: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