Merge branch 'compose-default-branch' of github.com:CodeNow/runnable-angular into compose-default-branch

* 'compose-default-branch' of github.com:CodeNow/runnable-angular:
  clean up
  update copy
  add feature flag for branch selector
  show branch selector only in compose tab
  add default branch selector

Author: thejsj

client/assets/styles/scss/modals/modals-forms.scss

@@ -157,6 +157,7 @@
     // max-width on buttons
     > .btn,
     .btn-wrapped {
+      @extend %btn-sm;
       display: block;
       font-size: 16px;
       max-width: 360px;

client/assets/styles/scss/views/views-new-service.scss

@@ -44,6 +44,19 @@
     }
   }
 
+  // for branch selector
+  .btn-wrapped {
+    @extend %btn-md;
+    display: flex;
+    flex: 1 1 auto;
+    justify-content: space-between;
+    padding-left: 8px;
+
+    .icons-branch {
+      top: 9px;
+    }
+  }
+
   // for the nested compose test file
   .well > .label {
     margin-bottom: 0;

client/directives/components/fancySelectors/branchSelector/branchSelectorView.jade

@@ -1,4 +1,4 @@
-fancy-select.btn-sm.white.btn-wrapped(
+fancy-select.white.btn-wrapped(
   ng-disabled = "branchFetching || !state.repo.branches.models.length"
   ng-required = "true"
   on-update = "onBranchChange"

client/directives/components/newContainer/forms/configureNewServiceView.jade

@@ -51,10 +51,16 @@ section.grid-block.vertical.modal-body(
     )
 
     //- form for naming the environment
-    form.grid-block.vertical.label(
+    form.grid-block.vertical.label.label-name(
       name = "NCC.nameForm"
       ng-include = "'nameNewServiceView'"
     )
+    
+    //- default branch selector
+    label.grid-block.vertical.label(
+      ng-if = "NCC.state.dockerFileTab === 'compose' && $root.featureFlags.composeDefaultBranch"
+      ng-include = "'defaultBranchView'"
+    )
 
     .grid-block.vertical.views-kubernetes-setup(
       ng-if = "NCC.state.dockerFileTab === 'kubernetes'"

client/directives/components/newContainer/forms/defaultBranchView.jade

@@ -0,0 +1,8 @@
+.padding-xxs.small.label-sm Initial Branch
+.grid-block(
+  auto-update = "true"
+  branch-selector
+  loading-promises-target = "editServerModal"
+  state = "state"
+)
+small.padding-xxs.small Select the first branch you want to add.

client/services/featureFlagService.js

@@ -14,6 +14,7 @@ function featureFlags(
     autoIsolationSetup: false,
     backup: false,
     cardStatus: false,
+    composeDefaultBranch: false,
     composeEditing: false,
     composeInstance: true,
     composeNav: true,