Merge branch 'master' into revert-6-migarjo-patch-2

.github/CODEOWNERS

@@ -5,14 +5,7 @@
 # Single users #
 ################
 
-# Creator is in control
-*    @CREATOR
-
-# Admiral is always the boss
-*    @admiralawkbar
-
-# Hubot can update itself
-*    @hubot
+*    @deepthought-the-bot
 
 #########
 # Teams #

.github/workflows/ruby.yml

@@ -25,7 +25,7 @@ jobs:
   test:
     name: Run Tests
 
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux]
 
     steps:
     - uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:
   deploy-to-production:
     name: Deploy to Heroku Prod
     if: ${{github.ref == 'ref/head/master'}}
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux]
     steps:
       - name: start deployment
         uses: bobheadxi/deployments@v0.4.3
@@ -71,7 +71,7 @@ jobs:
   deploy-to-review:
     name: Deploy to Heroku Review
     if: ${{github.ref != 'ref/head/master'}}
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux]
     steps:
       - name: start deployment
         uses: bobheadxi/deployments@v0.4.3

merge-demo.md

@@ -0,0 +1 @@
+this will be merged traditionally

rebase-demo.md

@@ -0,0 +1,2 @@
+rebase
+another commit

squash-demo.md

@@ -0,0 +1,2 @@
+squash
+new commit here