From ba9fc7c8ee2bef07ad1f7de95b1d4bf27cf6c0d0 Mon Sep 17 00:00:00 2001
From: Taylor Dolan <taylordolan@me.com>
Date: Tue, 23 May 2017 15:23:16 -0700
Subject: [PATCH] add feature flag for branch selector

---
 client/assets/styles/scss/views/views-new-service.scss   | 9 ++++-----
 .../newContainer/forms/configureNewServiceView.jade      | 4 ++--
 client/services/featureFlagService.js                    | 1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/assets/styles/scss/views/views-new-service.scss b/client/assets/styles/scss/views/views-new-service.scss
index b22cbfba4..552910e89 100644
--- a/client/assets/styles/scss/views/views-new-service.scss
+++ b/client/assets/styles/scss/views/views-new-service.scss
@@ -14,11 +14,6 @@
       max-width: 330px;
     }
 
-    // for "name" form
-    + .label {
-      margin-bottom: 0;
-    }
-
     .btn-radio {
       border-radius: $input-border-radius-lg;
       flex: 1 1 50%;
@@ -49,6 +44,10 @@
     }
   }
 
+  .label-branch {
+    margin-top: -$sm;
+  }
+
   // for branch selector
   .btn-wrapped {
     @extend %btn-md;
diff --git a/client/directives/components/newContainer/forms/configureNewServiceView.jade b/client/directives/components/newContainer/forms/configureNewServiceView.jade
index da9d1b66a..638abebec 100644
--- a/client/directives/components/newContainer/forms/configureNewServiceView.jade
+++ b/client/directives/components/newContainer/forms/configureNewServiceView.jade
@@ -57,8 +57,8 @@ section.grid-block.vertical.modal-body(
     )
 
     //- default branch selector
-    form.grid-block.vertical.label(
-      ng-if = "NCC.state.dockerFileTab === 'compose'"
+    form.grid-block.vertical.label.label-branch(
+      ng-if = "NCC.state.dockerFileTab === 'compose' && $root.featureFlags.composeDefaultBranch"
       ng-include = "'defaultBranchView'"
     )
 
diff --git a/client/services/featureFlagService.js b/client/services/featureFlagService.js
index 17d618fc9..e883ec04f 100644
--- a/client/services/featureFlagService.js
+++ b/client/services/featureFlagService.js
@@ -14,6 +14,7 @@ function featureFlags(
     autoIsolationSetup: false,
     backup: false,
     cardStatus: false,
+    composeDefaultBranch: false,
     composeEditing: false,
     composeInstance: true,
     composeNav: true,