fix: rename master branch to main

standardnotes · Feb 11, 2021 · 29b7203 · 29b7203
1 parent a3067b7
commit 29b7203
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - develop
-      - master
+      - main
 
 jobs:
   tsc:

diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -2,7 +2,7 @@ name: Prod
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
 

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Standard Notes is a simple and private notes app available on most platforms, in
 <div align="center">
 
 [![latest release version](https://img.shields.io/github/v/release/standardnotes/desktop)](https://github.com/standardnotes/desktop/releases)
-[![License](https://img.shields.io/github/license/standardnotes/web?color=blue)](https://github.com/standardnotes/web/blob/master/LICENSE)
+[![License](https://img.shields.io/github/license/standardnotes/web?color=blue)](https://github.com/standardnotes/web/blob/main/LICENSE)
 [![Slack](https://img.shields.io/badge/slack-standardnotes-CC2B5E.svg?style=flat&logo=slack)](https://standardnotes.org/slack)
 [![Twitter Follow](https://img.shields.io/badge/follow-%40standardnotes-blue.svg?style=flat&logo=twitter)](https://twitter.com/standardnotes)
 

diff --git a/config/deploy.rb b/config/deploy.rb
@@ -4,7 +4,7 @@
 set :repo_url, CAP_CONFIG["default"]["repo_url"]
 
 # Default branch is :master
-# ask :branch, `git rev-parse --abbrev-ref HEAD`.chomp
+set :branch, `git rev-parse --abbrev-ref main`.chomp
 
 # Default deploy_to directory is /var/www/my_app_name
 # set :deploy_to, '/var/www/my_app_name'
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: @@
       pull_request:
         branches:
           - develop
-          - master
+          - main
     jobs:
       tsc:
@@ Expand Down @@