Merge pull request #77 from loopmediagroup/dev

[Gally]: master <- dev

.gally.json

@@ -7,11 +7,11 @@
   "branches": {
     "dev": {
       "upstream": "master",
-      "protection": "$full-strict",
+      "protection": "$full-dev",
       "create": true
     },
     "master": {
-      "protection": "$full",
+      "protection": "$full-master",
       "create": true
     },
     "fix/*": {
@@ -20,22 +20,26 @@
     "feat/*": {
       "upstream": "dev"
     },
-    "greenkeeper/*": {
+    "dependabot/*": {
       "upstream": "dev"
     }
   },
   "protection": {
-    "$full-strict": {
+    "$full-dev": {
+      "@": "$full"
+    },
+    "$full-master": {
       "@": "$full",
       "required_status_checks": {
-        "strict": true
+        "strict": false
       }
     },
     "$full": {
       "required_status_checks": {
-        "strict": false,
+        "strict": true,
         "contexts": [
-          "continuous-integration/travis-ci",
+          "continuous-integration/travis-ci/pr",
+          "continuous-integration/travis-ci/push",
           "coverage/coveralls"
         ]
       },

.travis.yml

@@ -5,18 +5,16 @@ cache:
 notifications:
   email: false
 before_install:
-  - npm install -g npm
-  - npm install -g greenkeeper-lockfile@1
+  - npm install -g npm gally
+  - ga promote $TRAVIS_BRANCH
 install:
   - npm install
 node_js:
   - '9'
   - '8'
   - '8.10'
-before_script: greenkeeper-lockfile-update
 script:
   - npm test
-after_script: greenkeeper-lockfile-upload
 after_success:
   - npm run coveralls
   - npm run semantic-release

README.md

@@ -2,7 +2,6 @@
 
 [![Build Status](https://img.shields.io/travis/loopmediagroup/gally/master.svg)](https://travis-ci.org/loopmediagroup/gally)
 [![Test Coverage](https://img.shields.io/coveralls/loopmediagroup/gally/master.svg)](https://coveralls.io/github/loopmediagroup/gally?branch=master)
-[![Greenkeeper Badge](https://badges.greenkeeper.io/loopmediagroup/gally.svg)](https://greenkeeper.io/)
 [![Dependencies](https://david-dm.org/loopmediagroup/gally/status.svg)](https://david-dm.org/loopmediagroup/gally)
 [![NPM](https://img.shields.io/npm/v/gally.svg)](https://www.npmjs.com/package/gally)
 [![Downloads](https://img.shields.io/npm/dt/gally.svg)](https://www.npmjs.com/package/gally)
@@ -78,6 +77,8 @@ where the upstream branch is defined in the configuration file under "upstream".
 
 You can define a custom remote if so desired.
 
+When an unknown branch or a branch without an upstream is defined, a warning is printed. This makes is easier to use to create automatic staging prs using CI.
+
 ### init
 
 Create a new `.gally.json` file by running