From 418899d4256dfdde46dea1d375fd327db3c31845 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Wed, 27 Feb 2019 17:52:30 +1000
Subject: [PATCH 1/4] Version bump

---
 README.md        | 2 +-
 doc/DOCKERHUB.md | 2 +-
 package.json     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 38d3c664..d417ff2a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Nginx Proxy Manager
 
-![Version](https://img.shields.io/badge/version-2.0.9-green.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-2.0.10-green.svg?style=for-the-badge)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 
diff --git a/doc/DOCKERHUB.md b/doc/DOCKERHUB.md
index b7f017ca..911a0837 100644
--- a/doc/DOCKERHUB.md
+++ b/doc/DOCKERHUB.md
@@ -2,7 +2,7 @@
 
 # Nginx Proxy Manager
 
-![Version](https://img.shields.io/badge/version-2.0.9-green.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-2.0.10-green.svg?style=for-the-badge)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 
diff --git a/package.json b/package.json
index 3db398eb..5b0533a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nginx-proxy-manager",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "A beautiful interface for creating Nginx endpoints",
   "main": "src/backend/index.js",
   "devDependencies": {

From 5a9a716ca6f99aed02bbd4ba4da8528758d08428 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Fri, 1 Mar 2019 20:12:49 +1000
Subject: [PATCH 2/4] CI: Prevent having to spin up resources when not Master
 branch

---
 Jenkinsfile | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c31f7e01..d4e0da0c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -81,11 +81,11 @@ pipeline {
       }
     }
     stage('Build Master') {
+      when {
+        branch 'master'
+      }
       parallel {
         stage('x86_64') {
-          when {
-            branch 'master'
-          }
           steps {
             ansiColor('xterm') {
               // Codebase
@@ -127,9 +127,6 @@ pipeline {
           }
         }
         stage('armhf') {
-          when {
-            branch 'master'
-          }
           agent {
             label 'armhf'
           }
@@ -173,9 +170,6 @@ pipeline {
           }
         }
         stage('arm64') {
-          when {
-            branch 'master'
-          }
           agent {
             label 'arm64'
           }

From 0acec1105bb2c29e1e03a81cfb05a6426b3e2a20 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Fri, 1 Mar 2019 20:12:49 +1000
Subject: [PATCH 3/4] CI: Prevent having to spin up resources when not Master
 branch

---
 Jenkinsfile | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c31f7e01..d76d275e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -81,11 +81,11 @@ pipeline {
       }
     }
     stage('Build Master') {
+      when {
+        branch: 'master'
+      }
       parallel {
         stage('x86_64') {
-          when {
-            branch 'master'
-          }
           steps {
             ansiColor('xterm') {
               // Codebase
@@ -127,9 +127,6 @@ pipeline {
           }
         }
         stage('armhf') {
-          when {
-            branch 'master'
-          }
           agent {
             label 'armhf'
           }
@@ -173,9 +170,6 @@ pipeline {
           }
         }
         stage('arm64') {
-          when {
-            branch 'master'
-          }
           agent {
             label 'arm64'
           }

From aad9ecde6bf7be183fe598b10d7cb50569ca914e Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Fri, 1 Mar 2019 20:12:49 +1000
Subject: [PATCH 4/4] CI: Prevent having to spin up resources when not Master
 branch

---
 Jenkinsfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index abd3db30..d4e0da0c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -82,11 +82,7 @@ pipeline {
     }
     stage('Build Master') {
       when {
-<<<<<<< HEAD
         branch 'master'
-=======
-        branch: 'master'
->>>>>>> 0acec1105bb2c29e1e03a81cfb05a6426b3e2a20
       }
       parallel {
         stage('x86_64') {