From 6b242bf9139ff789aba1f56a3efb1fa98da2f9e8 Mon Sep 17 00:00:00 2001 From: Lia Keston <57373296+lmkeston@users.noreply.github.com> Date: Tue, 1 Dec 2020 11:44:18 -0500 Subject: [PATCH 1/7] change "master" to "main" --- config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.yml b/config.yml index 72119b0..c8885e9 100644 --- a/config.yml +++ b/config.yml @@ -39,7 +39,7 @@ steps: - type: gate left: "%payload.pull_request.base.ref%" operator: === - right: master + right: main - type: closeIssue issue: Welcome action_id: prev @@ -153,7 +153,7 @@ steps: - type: gate left: "%payload.pull_request.base.ref%" operator: === - right: master + right: main - type: gate left: "%payload.action%" operator: "!==" @@ -244,7 +244,7 @@ steps: - type: gate left: "%payload.pull_request.base.ref%" operator: === - right: master + right: main - type: gate left: "%payload.action%" operator: "!==" @@ -323,7 +323,7 @@ steps: - type: gate left: "%payload.pull_request.merged%" - type: mergeBranch - head: master + head: main base: add-style - type: createPullRequest title: Add some style to your page From b18de78c81c8d5e2ceea9dca76df0af3da7b432d Mon Sep 17 00:00:00 2001 From: Lia Keston <57373296+lmkeston@users.noreply.github.com> Date: Tue, 1 Dec 2020 11:46:49 -0500 Subject: [PATCH 2/7] update "master" to "main" --- index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index bd3004b..fdaa20d 100644 --- a/index.js +++ b/index.js @@ -51,7 +51,7 @@ async function mergeHandler (context, yes, no) { module.exports = course => { course.before(async context => { await context.github.repos.updateBranchProtection(context.repo({ - branch: 'master', + branch: 'main', required_status_checks: null, enforce_admins: true, required_pull_request_reviews: {}, @@ -257,7 +257,7 @@ module.exports = course => { course.log(`New blob after replacement: ${newBlob}`) // await context.github.repos.removeBranchProtection(context.repo({ - // branch: 'master' + // branch: 'main' // })) const rootTree = await context.github.gitdata.getTree(context.repo({ @@ -273,11 +273,11 @@ module.exports = course => { const encodedBlob = Buffer.from(newBlob).toString('base64') await context.github.repos.removeBranchProtection(context.repo({ - branch: 'master' + branch: 'main' })) await context.github.repos.merge(context.repo({ - base: 'master', + base: 'main', head: 'add-style' })) From c3a707bb973b68786b544d68ffdad5e97d143371 Mon Sep 17 00:00:00 2001 From: Lia Keston <57373296+lmkeston@users.noreply.github.com> Date: Tue, 1 Dec 2020 11:47:41 -0500 Subject: [PATCH 3/7] update "master" to "main" --- responses/00-openapr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responses/00-openapr.md b/responses/00-openapr.md index 943f370..d00ad1c 100644 --- a/responses/00-openapr.md +++ b/responses/00-openapr.md @@ -8,7 +8,7 @@ It's not very special looking yet, is it? Web hosts (and GitHub Pages) look for To help you get started, I have already created an `index.html` file for you on a branch called: `add-index`. All you need to do is create the pull request. Don't worry, I'll help you! -1. Create a pull request. You can either [use this direct link]({{ repoUrl }}/compare/master...add-index?expand=1), or go to the **Code** tab, click on **New Pull Request**, select **base: master**, and **compare: add-index**. +1. Create a pull request. You can either [use this direct link]({{ repoUrl }}/compare/main...add-index?expand=1), or go to the **Code** tab, click on **New Pull Request**, select **base: main**, and **compare: add-index**. 2. Add a descriptive title to your pull request, something like "Add the index.html file". 3. Add a descriptive body to your pull request. 4. Click **Create pull request**. From 30a4f5e4ca8730df1a8f59aa6d79d7d46955c72d Mon Sep 17 00:00:00 2001 From: Lia Keston <57373296+lmkeston@users.noreply.github.com> Date: Tue, 1 Dec 2020 11:48:17 -0500 Subject: [PATCH 4/7] update "master" to "main" --- responses/01-welcome.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responses/01-welcome.md b/responses/01-welcome.md index 764facd..0365b6a 100644 --- a/responses/01-welcome.md +++ b/responses/01-welcome.md @@ -19,7 +19,7 @@ It isn't enough to simply create a webpage on GitHub. You must deploy your webpa ## :keyboard: Activity: Turn on GitHub Pages 1. Under your repository name, click [**Settings**]({{ repoUrl }}/settings). -1. In the **GitHub Pages** section, use the **Select source** drop-down menu to select `master` as your GitHub Pages publishing source. +1. In the **GitHub Pages** section, use the **Select source** drop-down menu to select `main` as your GitHub Pages publishing source. 1. Return to this issue. > _I may take up to a minute to respond as I wait for GitHub Pages to create a deployment of your repository. If you don't see anything after a minute, refresh this page_. From 284771825bf5b662fba846ee4b257cedbe1fa35e Mon Sep 17 00:00:00 2001 From: Lia Keston <57373296+lmkeston@users.noreply.github.com> Date: Tue, 1 Dec 2020 11:49:51 -0500 Subject: [PATCH 5/7] update "master" to "main" --- responses/05-h1-tag.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responses/05-h1-tag.md b/responses/05-h1-tag.md index 16aac35..b83e37e 100644 --- a/responses/05-h1-tag.md +++ b/responses/05-h1-tag.md @@ -11,7 +11,7 @@ Headers create prominent text in the body of your web page. Headers come in diff ### :keyboard: Create a header for your web page -1. Edit the `index.html` file in your master branch by [using this direct link]({{ repoUrl }}/edit/master/index.html) or going to the **Code** tab, clicking on the `index.html` file, clicking the pencil :pencil: to edit the HTML. +1. Edit the `index.html` file in your main branch by [using this direct link]({{ repoUrl }}/edit/main/index.html) or going to the **Code** tab, clicking on the `index.html` file, clicking the pencil :pencil: to edit the HTML. 2. Between the body tags, add an opening `

` tag, some content for the header, and a closing `

` tag. 3. In the _Commit changes_ section, enter a commit message that describes what you've done. 4. Ensure you've selected _Create a new branch for this commit and start a pull request_. From b6c030f359519b2f52ba90b0673330a8d95704c8 Mon Sep 17 00:00:00 2001 From: Lia Keston <57373296+lmkeston@users.noreply.github.com> Date: Tue, 1 Dec 2020 11:51:05 -0500 Subject: [PATCH 6/7] update "master" to "main" --- responses/08-create-list.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responses/08-create-list.md b/responses/08-create-list.md index c9dfcd7..b064767 100644 --- a/responses/08-create-list.md +++ b/responses/08-create-list.md @@ -42,7 +42,7 @@ For the next exercise, you are going to create a list of your favorite websites. ### :keyboard: Activity: Create a list of your favorite sites -1. Edit the `index.html` file in your master branch by [using this direct link]({{ repoUrl }}/edit/master/index.html) or going to the **Code** tab, clicking on the `index.html` file, clicking the pencil :pencil: to edit the HTML. +1. Edit the `index.html` file in your main branch by [using this direct link]({{ repoUrl }}/edit/main/index.html) or going to the **Code** tab, clicking on the `index.html` file, clicking the pencil :pencil: to edit the HTML. 1. Inside the body tag, create a list, either ordered or unordered, of your favorite sites on the internet. 1. In the _Commit changes_ section, enter a commit message that describes what you've done. 1. Ensure you've selected _Create a new branch for this commit and start a pull request_. From 134d10ae60fcf3c8a86df061fe2a9bed7b05d9b1 Mon Sep 17 00:00:00 2001 From: Lia Keston <57373296+lmkeston@users.noreply.github.com> Date: Tue, 1 Dec 2020 11:52:40 -0500 Subject: [PATCH 7/7] update "master" to "main" --- responses/08e-list.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/responses/08e-list.md b/responses/08e-list.md index 6e93578..1ebeb1f 100644 --- a/responses/08e-list.md +++ b/responses/08e-list.md @@ -8,7 +8,7 @@ Let's try again! ### :keyboard: Create a list of your favorite sites -1. Edit the `index.html` file in your master branch by [using this direct link](https://github.com/{{ user.username }}/{{ repo }}/edit/master/index.html) or going to the **Code** tab, clicking on the `index.html` file, clicking the pencil :pencil: to edit the HTML. +1. Edit the `index.html` file in your main branch by [using this direct link](https://github.com/{{ user.username }}/{{ repo }}/edit/main/index.html) or going to the **Code** tab, clicking on the `index.html` file, clicking the pencil :pencil: to edit the HTML. 1. Inside the body tag, create a list, either ordered or unordered, of your favorite sites on the interwebs. 1. In the _Commit changes_ section, enter a commit message that describes what you've done. 1. Ensure you've selected _Create a new branch for this commit and start a pull request_. @@ -18,4 +18,4 @@ Let's try again! 1. Click on **Create pull request.**
-

I'll respond in your new pull request.

\ No newline at end of file +

I'll respond in your new pull request.

pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy