From 6d3eea7b46d4b363b39a59e1fa17264de33d14d1 Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Wed, 11 Oct 2017 14:15:28 +0200
Subject: if the branch/tag count is over a certain limit, don't execute the
 long running git query

---
 app/controllers/projects/commit_controller.rb | 4 ++--
 app/models/repository.rb                      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index a62f05db7db..893763862ba 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -56,8 +56,8 @@ class Projects::CommitController < Projects::ApplicationController
   end
 
   def branches
-    @branches = @project.repository.branch_names_contains(commit.id)
-    @tags = @project.repository.tag_names_contains(commit.id)
+    @branches = @project.repository.branch_names_contains(commit.id, 1000)
+    @tags = @project.repository.tag_names_contains(commit.id, 1000)
     render layout: false
   end
 
diff --git a/app/models/repository.rb b/app/models/repository.rb
index d725c65081d..3a083b76202 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -715,12 +715,12 @@ class Repository
     end
   end
 
-  def branch_names_contains(sha)
-    refs_contains_sha('branch', sha)
+  def branch_names_contains(sha, limit = nil)
+    limit && branch_count > limit ? [] : refs_contains_sha('branch', sha)
   end
 
-  def tag_names_contains(sha)
-    refs_contains_sha('tag', sha)
+  def tag_names_contains(sha, limit = nil)
+    limit && tag_count > limit ? [] : refs_contains_sha('tag', sha)
   end
 
   def local_branches
-- 
cgit v1.2.1


From 528f9cde0588b0a6e70b1fa971a99eca439d0aa6 Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Thu, 12 Oct 2017 15:31:43 +0200
Subject: moved throttling into the controller.  if we hit the throttling
 threshhold, a message is shown indicating we didn't perform the search

---
 app/controllers/projects/commit_controller.rb |  7 +++++--
 app/helpers/commits_helper.rb                 | 26 +++++++++++++++++--------
 app/models/repository.rb                      |  8 ++++----
 app/views/projects/commit/branches.html.haml  | 28 +++++++++++++++------------
 4 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 893763862ba..5b8a8159123 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -56,8 +56,11 @@ class Projects::CommitController < Projects::ApplicationController
   end
 
   def branches
-    @branches = @project.repository.branch_names_contains(commit.id, 1000)
-    @tags = @project.repository.tag_names_contains(commit.id, 1000)
+    # branch_names_contains/tag_names_contains can take a long time when there are thousands of
+    # branches/tags - each `git branch --contains xxx` request can consume a cpu core.
+    # so only do the query when there are a manageable number of branches/tags
+    @branches = @project.repository.branch_count > 1000 ? [:limit_exceeded] : @project.repository.branch_names_contains(commit.id)
+    @tags = @project.repository.tag_count > 1000 ? [:limit_exceeded] : @project.repository.tag_names_contains(commit.id)
     render layout: false
   end
 
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index ef22cafc2e2..8aaf3318f90 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -60,23 +60,33 @@ module CommitsHelper
     branches.include?(project.default_branch) ? branches.delete(project.default_branch) : branches.pop
   end
 
+  # returns a link formatted as a commit branch link
+  def commit_branch_link(url, text)
+    link_to(url, class: 'label label-gray ref-name') do
+      icon('code-fork') + " #{text}"
+    end
+  end
+
   # Returns the sorted alphabetically links to branches, separated by a comma
   def commit_branches_links(project, branches)
     branches.sort.map do |branch|
-      link_to(project_ref_path(project, branch), class: "label label-gray ref-name") do
-        icon('code-fork') + " #{branch}"
-      end
-    end.join(" ").html_safe
+      commit_branch_link(project_ref_path(project, branch), branch)
+    end.join(' ').html_safe
+  end
+
+  # returns a link formatted as a commit tag link
+  def commit_tag_link(url, text)
+    link_to(url, class: 'label label-gray ref-name') do
+      icon('tag') + " #{text}"
+    end
   end
 
   # Returns the sorted links to tags, separated by a comma
   def commit_tags_links(project, tags)
     sorted = VersionSorter.rsort(tags)
     sorted.map do |tag|
-      link_to(project_ref_path(project, tag), class: "label label-gray ref-name") do
-        icon('tag') + " #{tag}"
-      end
-    end.join(" ").html_safe
+      commit_tag_link(project_ref_path(project, tag), tag)
+    end.join(' ').html_safe
   end
 
   def link_to_browse_code(project, commit)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 3a083b76202..d725c65081d 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -715,12 +715,12 @@ class Repository
     end
   end
 
-  def branch_names_contains(sha, limit = nil)
-    limit && branch_count > limit ? [] : refs_contains_sha('branch', sha)
+  def branch_names_contains(sha)
+    refs_contains_sha('branch', sha)
   end
 
-  def tag_names_contains(sha, limit = nil)
-    limit && tag_count > limit ? [] : refs_contains_sha('tag', sha)
+  def tag_names_contains(sha)
+    refs_contains_sha('tag', sha)
   end
 
   def local_branches
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 911c9ddce06..398927fb50d 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,15 +1,19 @@
-- if @branches.any? || @tags.any?
+- if @branches.any?
   - branch = commit_default_branch(@project, @branches)
-  = link_to(project_ref_path(@project, branch), class: "label label-gray ref-name") do
-    = icon('code-fork')
-    = branch
+  - if branch == :limit_exceeded
+    = commit_branch_link('#', _('Too many branches to search'))
+  - else
+    = commit_branch_link(project_ref_path(@project, branch), branch)
 
-  -# `commit_default_branch` deletes the default branch from `@branches`,
-  -# so only render this if we have more branches left
-  - if @branches.any? || @tags.any?
-    %span
-      = link_to "…", "#", class: "js-details-expand label label-gray"
+-# `commit_default_branch` deletes the default branch from `@branches`,
+-# so only render this if we have more branches or tags left
+- if @branches.any? || @tags.any?
+  %span
+    = link_to "…", "#", class: "js-details-expand label label-gray"
 
-      %span.js-details-content.hide
-        = commit_branches_links(@project, @branches) if @branches.any?
-        = commit_tags_links(@project, @tags) if @tags.any?
+    %span.js-details-content.hide
+      = commit_branches_links(@project, @branches) if @branches.any?
+      - if @tags.first == :limit_exceeded
+        = commit_tag_link('#', _('Too many tags to search'))
+      - elsif @tags.any?
+        = commit_tags_links(@project, @tags)
-- 
cgit v1.2.1


From cbdf372eb8e6d38c4f47a1c2f6bff76b4b2c659f Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Fri, 13 Oct 2017 19:11:11 +0200
Subject: implemented using an ivar, and added specs

---
 app/controllers/projects/commit_controller.rb      |  9 ++++-
 app/views/projects/commit/branches.html.haml       | 10 ++---
 .../controllers/projects/commit_controller_spec.rb | 26 +++++++++++--
 .../projects/commit/branches.html.haml_spec.rb     | 44 ++++++++++++++++++++++
 4 files changed, 78 insertions(+), 11 deletions(-)
 create mode 100644 spec/views/projects/commit/branches.html.haml_spec.rb

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 5b8a8159123..494d412b532 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -16,6 +16,8 @@ class Projects::CommitController < Projects::ApplicationController
   before_action :define_note_vars, only: [:show, :diff_for_path]
   before_action :authorize_edit_tree!, only: [:revert, :cherry_pick]
 
+  BRANCH_SEARCH_LIMIT = 1000
+
   def show
     apply_diff_view_cookie!
 
@@ -59,8 +61,11 @@ class Projects::CommitController < Projects::ApplicationController
     # branch_names_contains/tag_names_contains can take a long time when there are thousands of
     # branches/tags - each `git branch --contains xxx` request can consume a cpu core.
     # so only do the query when there are a manageable number of branches/tags
-    @branches = @project.repository.branch_count > 1000 ? [:limit_exceeded] : @project.repository.branch_names_contains(commit.id)
-    @tags = @project.repository.tag_count > 1000 ? [:limit_exceeded] : @project.repository.tag_names_contains(commit.id)
+    @branches_limit_exceeded = @project.repository.branch_count > BRANCH_SEARCH_LIMIT
+    @branches = @branches_limit_exceeded ? [] : @project.repository.branch_names_contains(commit.id)
+
+    @tags_limit_exceeded = @project.repository.tag_count > BRANCH_SEARCH_LIMIT
+    @tags = @tags_limit_exceeded ? [] : @project.repository.tag_names_contains(commit.id)
     render layout: false
   end
 
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 398927fb50d..933cb2f73ce 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,19 +1,19 @@
-- if @branches.any?
-  - branch = commit_default_branch(@project, @branches)
-  - if branch == :limit_exceeded
+- if @branches.any? || @branches_limit_exceeded
+  - if @branches_limit_exceeded
     = commit_branch_link('#', _('Too many branches to search'))
   - else
+    - branch = commit_default_branch(@project, @branches)
     = commit_branch_link(project_ref_path(@project, branch), branch)
 
 -# `commit_default_branch` deletes the default branch from `@branches`,
 -# so only render this if we have more branches or tags left
-- if @branches.any? || @tags.any?
+- if @branches.any? || @tags.any? || @tags_limit_exceeded
   %span
     = link_to "…", "#", class: "js-details-expand label label-gray"
 
     %span.js-details-content.hide
       = commit_branches_links(@project, @branches) if @branches.any?
-      - if @tags.first == :limit_exceeded
+      - if @tags_limit_exceeded
         = commit_tag_link('#', _('Too many tags to search'))
       - elsif @tags.any?
         = commit_tags_links(@project, @tags)
diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index df53863482d..f6ecde88b85 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -134,8 +134,8 @@ describe Projects::CommitController do
     end
   end
 
-  describe "GET branches" do
-    it "contains branch and tags information" do
+  describe 'GET branches' do
+    it 'contains branch and tags information' do
       commit = project.commit('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
 
       get(:branches,
@@ -143,8 +143,26 @@ describe Projects::CommitController do
           project_id: project,
           id: commit.id)
 
-      expect(assigns(:branches)).to include("master", "feature_conflict")
-      expect(assigns(:tags)).to include("v1.1.0")
+      expect(assigns(:branches)).to include('master', 'feature_conflict')
+      expect(assigns(:branches_limit_exceeded)).to be_falsey
+      expect(assigns(:tags)).to include('v1.1.0')
+      expect(assigns(:tags_limit_exceeded)).to be_falsey
+    end
+
+    it 'returns :limit_exceeded when number of branches/tags reach a threshhold' do
+      commit = project.commit('5937ac0a7beb003549fc5fd26fc247adbce4a52e')
+      allow_any_instance_of(Repository).to receive(:branch_count).and_return(1001)
+      allow_any_instance_of(Repository).to receive(:tag_count).and_return(1001)
+
+      get(:branches,
+          namespace_id: project.namespace,
+          project_id: project,
+          id: commit.id)
+
+      expect(assigns(:branches)).to eq([])
+      expect(assigns(:branches_limit_exceeded)).to be_truthy
+      expect(assigns(:tags)).to eq([])
+      expect(assigns(:tags_limit_exceeded)).to be_truthy
     end
   end
 
diff --git a/spec/views/projects/commit/branches.html.haml_spec.rb b/spec/views/projects/commit/branches.html.haml_spec.rb
new file mode 100644
index 00000000000..4199d2fd962
--- /dev/null
+++ b/spec/views/projects/commit/branches.html.haml_spec.rb
@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'projects/commit/branches.html.haml' do
+  let(:project) { create(:project, :repository) }
+
+  before do
+    assign(:project, project)
+  end
+
+  context 'branches and tags' do
+    before do
+      assign(:branches, ['master', 'test-branch'])
+      assign(:branches_limit_exceeded, false)
+      assign(:tags, ['tag1'])
+      assign(:tags_limit_exceeded, false)
+
+      render
+    end
+
+    it 'shows branch and tag links' do
+      expect(rendered).to have_selector('.js-details-expand')
+      expect(rendered).to have_link('master')
+      expect(rendered).to have_link('test-branch')
+      expect(rendered).to have_link('tag1')
+    end
+  end
+
+  context 'throttled branches and tags' do
+    before do
+      assign(:branches, [])
+      assign(:branches_limit_exceeded, true)
+      assign(:tags, [])
+      assign(:tags_limit_exceeded, true)
+
+      render
+    end
+
+    it 'shows too many to search' do
+      expect(rendered).to have_selector('.js-details-expand')
+      expect(rendered).to have_link('Too many branches to search', href: '#')
+      expect(rendered).to have_link('Too many tags to search', href: '#')
+    end
+  end
+end
-- 
cgit v1.2.1


From a632440fa91c750bb4a75ee430c3a34c6d98f51c Mon Sep 17 00:00:00 2001
From: Hazel <hazel@gitlab.com>
Date: Mon, 16 Oct 2017 15:13:21 +0800
Subject: Draft a guide of modals in UX guide

---
 doc/development/ux_guide/components.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/doc/development/ux_guide/components.md b/doc/development/ux_guide/components.md
index fa31c496b30..20230a9bb2c 100644
--- a/doc/development/ux_guide/components.md
+++ b/doc/development/ux_guide/components.md
@@ -252,6 +252,35 @@ Skeleton loading is a way to convey to the user what kind of content is currentl
 
 Skeleton loading can replace any existing UI elements for the period in which they are loaded and should aim for maintaining a similar structure visually.
 
+---
+
+## Dialog modals
+Dialog modals are only used for having a conversation and confirmation with the user. The user is not able to access the features on the main page until making an action. Using dialog modals sparingly as it is interruptive.
+
+### Usage
+
+* When the action is irreversible, we should provide the details and confirm with the user before they take an advanced action.
+* When the action will affect privacy or authorization, we should provide the advanced information and confirm with the user.
+
+### Style
+* Dialog modals contain the header title, content, and action bar.
+* Having an affirmative action, a dismissive action, and an extra action in action bar.
+* The order of actions in the action bar: Affirmative action → Extra action → Dismissive action (Right to left)
+* Confirmations regarding labels should keep labeling styling.
+* References to commits, branches, and tags should be **monospaced**.
+
+### Writing
+* The header title is a question instead of a descriptive phrase.
+* The content should not be ambiguous and unclear. It should provide specific information as a reference for the user to take an advanced action.
+
+### Placement
+* Dialog modals should always be the center of the screen horizontally and have **72px** from the top of the screen.
+
+| Dialog with 2 actions | Dialog with 3 actions | Special confirmation |
+| --------------------- | --------------------- | -------------------- |
+| ![two-actions]() | ![three-actions]() | ![spcial-confirmation]() |
+
+
 ---
 
 ## Panels
-- 
cgit v1.2.1


From aeeefe28fbc6f27b200c5c1b15c5f6b5d946f3e8 Mon Sep 17 00:00:00 2001
From: Hazel <hazel@gitlab.com>
Date: Mon, 16 Oct 2017 15:54:48 +0800
Subject: Modified the copy

---
 doc/development/ux_guide/components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/development/ux_guide/components.md b/doc/development/ux_guide/components.md
index 20230a9bb2c..2bcee69201b 100644
--- a/doc/development/ux_guide/components.md
+++ b/doc/development/ux_guide/components.md
@@ -265,7 +265,7 @@ Dialog modals are only used for having a conversation and confirmation with the
 ### Style
 * Dialog modals contain the header title, content, and action bar.
 * Having an affirmative action, a dismissive action, and an extra action in action bar.
-* The order of actions in the action bar: Affirmative action → Extra action → Dismissive action (Right to left)
+* The order of actions in the action bar: (Right to left) Affirmative action → Extra action → Dismissive action 
 * Confirmations regarding labels should keep labeling styling.
 * References to commits, branches, and tags should be **monospaced**.
 
-- 
cgit v1.2.1


From 4a289e1168c239b03fd386b5c6ca1aa9963849ae Mon Sep 17 00:00:00 2001
From: Hazel <hazel@gitlab.com>
Date: Tue, 17 Oct 2017 14:30:50 +0800
Subject: Updated the content and added the images

---
 doc/development/ux_guide/components.md             |  23 +++++++++++----------
 .../img/modals-general-confimation-dialog.png      | Bin 0 -> 55006 bytes
 .../ux_guide/img/modals-layout-for-modals.png      | Bin 0 -> 71731 bytes
 .../img/modals-special-confimation-dialog.png      | Bin 0 -> 94366 bytes
 .../ux_guide/img/modals-three-buttons-special.png  | Bin 0 -> 59942 bytes
 .../ux_guide/img/modals-three-buttons.png          | Bin 0 -> 55863 bytes
 6 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 doc/development/ux_guide/img/modals-general-confimation-dialog.png
 create mode 100644 doc/development/ux_guide/img/modals-layout-for-modals.png
 create mode 100644 doc/development/ux_guide/img/modals-special-confimation-dialog.png
 create mode 100644 doc/development/ux_guide/img/modals-three-buttons-special.png
 create mode 100644 doc/development/ux_guide/img/modals-three-buttons.png

diff --git a/doc/development/ux_guide/components.md b/doc/development/ux_guide/components.md
index 2bcee69201b..a31d8cfb443 100644
--- a/doc/development/ux_guide/components.md
+++ b/doc/development/ux_guide/components.md
@@ -10,6 +10,7 @@
 * [Tables](#tables)
 * [Blocks](#blocks)
 * [Panels](#panels)
+* [Dialog modals](#dialog-modals)
 * [Alerts](#alerts)
 * [Forms](#forms)
 * [Search box](#search-box)
@@ -255,31 +256,31 @@ Skeleton loading can replace any existing UI elements for the period in which th
 ---
 
 ## Dialog modals
-Dialog modals are only used for having a conversation and confirmation with the user. The user is not able to access the features on the main page until making an action. Using dialog modals sparingly as it is interruptive.
+Dialog modals are only used for having a conversation and confirmation with the user. The user is not able to access the features on the main page until closing the modal.
 
 ### Usage
 
-* When the action is irreversible, we should provide the details and confirm with the user before they take an advanced action.
-* When the action will affect privacy or authorization, we should provide the advanced information and confirm with the user.
+* When the action is irreversible, dialog modals provide the details and confirm with the user before they take an advanced action.
+* When the action will affect privacy or authorization, dialog modals provide the advanced information and confirm with the user.
 
 ### Style
-* Dialog modals contain the header title, content, and action bar.
-* Having an affirmative action, a dismissive action, and an extra action in action bar.
-* The order of actions in the action bar: (Right to left) Affirmative action → Extra action → Dismissive action 
+
+* Dialog modals contain the header, body, and actions.
+  * **Actions:** Contains a affirmative action, a dismissive action, and an extra action. The order of actions from right to left: Affirmative action → Extra action → Dismissive action
+  * **Header:** The header title is a question instead of a descriptive phrase.
+  * **Body:** The content in body should never be ambiguous and unclear. It provides specific information.
 * Confirmations regarding labels should keep labeling styling.
 * References to commits, branches, and tags should be **monospaced**.
 
-### Writing
-* The header title is a question instead of a descriptive phrase.
-* The content should not be ambiguous and unclear. It should provide specific information as a reference for the user to take an advanced action.
+![layout-modal](img/modals-layout-for-modals.png)
 
 ### Placement
+
 * Dialog modals should always be the center of the screen horizontally and have **72px** from the top of the screen.
 
 | Dialog with 2 actions | Dialog with 3 actions | Special confirmation |
 | --------------------- | --------------------- | -------------------- |
-| ![two-actions]() | ![three-actions]() | ![spcial-confirmation]() |
-
+| ![two-actions](img/modals-general-confimation-dialog.png) | ![three-actions](img/modals-three-buttons-special.png) | ![spcial-confirmation](img/modals-special-confimation-dialog.png) |
 
 ---
 
diff --git a/doc/development/ux_guide/img/modals-general-confimation-dialog.png b/doc/development/ux_guide/img/modals-general-confimation-dialog.png
new file mode 100644
index 00000000000..8e51cb70c48
Binary files /dev/null and b/doc/development/ux_guide/img/modals-general-confimation-dialog.png differ
diff --git a/doc/development/ux_guide/img/modals-layout-for-modals.png b/doc/development/ux_guide/img/modals-layout-for-modals.png
new file mode 100644
index 00000000000..71ea52be124
Binary files /dev/null and b/doc/development/ux_guide/img/modals-layout-for-modals.png differ
diff --git a/doc/development/ux_guide/img/modals-special-confimation-dialog.png b/doc/development/ux_guide/img/modals-special-confimation-dialog.png
new file mode 100644
index 00000000000..ebdcae25e76
Binary files /dev/null and b/doc/development/ux_guide/img/modals-special-confimation-dialog.png differ
diff --git a/doc/development/ux_guide/img/modals-three-buttons-special.png b/doc/development/ux_guide/img/modals-three-buttons-special.png
new file mode 100644
index 00000000000..d2d40167e4d
Binary files /dev/null and b/doc/development/ux_guide/img/modals-three-buttons-special.png differ
diff --git a/doc/development/ux_guide/img/modals-three-buttons.png b/doc/development/ux_guide/img/modals-three-buttons.png
new file mode 100644
index 00000000000..3947902c021
Binary files /dev/null and b/doc/development/ux_guide/img/modals-three-buttons.png differ
-- 
cgit v1.2.1


From 26abacf829187aaf566e759085c310f2dc4fa95f Mon Sep 17 00:00:00 2001
From: Hazel <hazel@gitlab.com>
Date: Tue, 17 Oct 2017 14:35:06 +0800
Subject: Updated the sytle part - changed the order of  header, body, and
 actions

---
 doc/development/ux_guide/components.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/development/ux_guide/components.md b/doc/development/ux_guide/components.md
index a31d8cfb443..20205d6b398 100644
--- a/doc/development/ux_guide/components.md
+++ b/doc/development/ux_guide/components.md
@@ -266,9 +266,9 @@ Dialog modals are only used for having a conversation and confirmation with the
 ### Style
 
 * Dialog modals contain the header, body, and actions.
-  * **Actions:** Contains a affirmative action, a dismissive action, and an extra action. The order of actions from right to left: Affirmative action → Extra action → Dismissive action
-  * **Header:** The header title is a question instead of a descriptive phrase.
-  * **Body:** The content in body should never be ambiguous and unclear. It provides specific information.
+  * **Header(1):** The header title is a question instead of a descriptive phrase.
+  * **Body(2):** The content in body should never be ambiguous and unclear. It provides specific information.
+  * **Actions(3):** Contains a affirmative action, a dismissive action, and an extra action. The order of actions from right to left: Affirmative action → Extra action → Dismissive action
 * Confirmations regarding labels should keep labeling styling.
 * References to commits, branches, and tags should be **monospaced**.
 
-- 
cgit v1.2.1


From 6d462cea77508e407995c58b0ae581edefa74d22 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Mon, 16 Oct 2017 17:51:58 +0200
Subject: Add helm CLI wrapper

---
 lib/gitlab/helm.rb           | 57 ++++++++++++++++++++++++++++++++++++
 spec/lib/gitlab/helm_spec.rb | 70 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)
 create mode 100644 lib/gitlab/helm.rb
 create mode 100644 spec/lib/gitlab/helm_spec.rb

diff --git a/lib/gitlab/helm.rb b/lib/gitlab/helm.rb
new file mode 100644
index 00000000000..24f8846f69b
--- /dev/null
+++ b/lib/gitlab/helm.rb
@@ -0,0 +1,57 @@
+module Gitlab
+  class Helm
+    Error = Class.new(StandardError)
+
+    attr_accessor :namespace
+    attr_accessor :logger
+
+    delegate :debug, :debug?, to: :logger, allow_nil: true
+
+    def initialize(namespace, kubeconfig, logger: nil)
+      self.namespace = namespace
+      self.logger = logger
+      @kubeconfig = kubeconfig
+    end
+
+    def init!
+      prepare_env do |env|
+        helm('init', '--upgrade', env: env)
+      end
+    end
+
+    def install_or_upgrade!(app_name, chart)
+      prepare_env do |env|
+        helm('init', '--client-only', env: env)
+        helm('upgrade', '--install', '--namespace', namespace, app_name, chart, env: env)
+      end
+    end
+
+    private
+
+    def prepare_env(*args, &blk)
+      Dir.mktmpdir(['helm', namespace]) do |tmpdir|
+        kubeconfig_path = File.join(tmpdir, 'kubeconfig')
+        env = {
+           'HELM_HOME' => File.join(tmpdir, 'helm'),
+           'TILLER_NAMESPACE' => namespace,
+           'KUBECONFIG' => kubeconfig_path
+        }
+
+        File.open(kubeconfig_path, 'w') { |c| c << YAML.dump(@kubeconfig) }
+
+        debug("HELM: Running in tmpdir #{tmpdir}")
+        yield(env) if block_given?
+      end
+    end
+
+    def helm(*args, env: {})
+      Open3.popen3(env, 'helm', *args) do |_, stdout, stderr, wait_thr|
+        exit_status = wait_thr.value
+
+        stdout.readlines.each { |l| debug("HELM: #{l.chomp}") } if debug?
+
+        raise Error, stderr.read.chomp unless exit_status.success?
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/helm_spec.rb b/spec/lib/gitlab/helm_spec.rb
new file mode 100644
index 00000000000..5c8fc935b2c
--- /dev/null
+++ b/spec/lib/gitlab/helm_spec.rb
@@ -0,0 +1,70 @@
+# coding: utf-8
+require 'spec_helper'
+
+describe Gitlab::Helm do
+  let(:namespace) { 'rails-spec' }
+  let(:kubeconfig) {}
+  let(:logger) {}
+  subject { described_class.new(namespace, kubeconfig, logger: logger)}
+
+  def mock_helm_invocation(success:, error: '')
+    stderr = StringIO.new(error)
+    process_status = double('process_status')
+    wait_thr = double('wait_thread')
+
+    expect(Open3).to receive(:popen3).at_least(:once).and_yield(StringIO.new, StringIO.new, stderr, wait_thr)
+    expect(wait_thr).to receive(:value).at_least(:once).and_return(process_status)
+    expect(process_status).to receive(:success?).at_least(:once).and_return(success)
+  end
+
+  shared_examples 'invokes helm binary' do |method, args|
+    context 'when helm binary fails' do
+      let(:error_text) { 'Something went wrong' }
+
+      before do
+        mock_helm_invocation(success: false, error: error_text)
+      end
+
+      it 'throws exception' do
+        expect { subject.send(method, *args) }.to raise_exception(Gitlab::Helm::Error, error_text)
+      end
+    end
+
+    context 'when helm binary exit-code is 0' do
+      before do
+        mock_helm_invocation(success: true)
+      end
+
+      it "doesn't raise exceptions" do
+        expect { subject.send(method, *args) }.not_to raise_exception
+      end
+    end
+  end
+
+  it { is_expected.to delegate_method(:debug).to(:logger) }
+  it { is_expected.to delegate_method(:debug?).to(:logger) }
+
+  describe '#init!' do
+    it 'invokes helm init --upgrade' do
+      expect(subject).to receive(:helm).with('init', '--upgrade', env: instance_of(Hash))
+
+      subject.init!
+    end
+
+    it_should_behave_like 'invokes helm binary', :init!, []
+  end
+
+  describe '#install_or_upgrade!' do
+    let(:app_name) { 'app_name' }
+    let(:chart) { 'stable/a_chart' }
+
+    it 'invokes helm upgrade --install --namespace namespace app_name chart' do
+      expect(subject).to receive(:helm).with('init', '--client-only', env: instance_of(Hash)).ordered.once
+      expect(subject).to receive(:helm).with('upgrade', '--install', '--namespace', namespace, app_name, chart, env: instance_of(Hash)).ordered.once
+
+      subject.install_or_upgrade!(app_name, chart)
+    end
+
+    it_should_behave_like 'invokes helm binary', :install_or_upgrade!, %w[app_name chart]
+  end
+end
-- 
cgit v1.2.1


From 90baab7e21e6d1f327f2675dcc5516feffb3729f Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Tue, 17 Oct 2017 13:16:42 +0200
Subject: optimize branching logic

---
 app/views/projects/commit/branches.html.haml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 933cb2f73ce..31d10ff9040 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,9 +1,8 @@
-- if @branches.any? || @branches_limit_exceeded
-  - if @branches_limit_exceeded
-    = commit_branch_link('#', _('Too many branches to search'))
-  - else
-    - branch = commit_default_branch(@project, @branches)
-    = commit_branch_link(project_ref_path(@project, branch), branch)
+- if @branches_limit_exceeded
+  = commit_branch_link('#', _('Too many branches to search'))
+- elsif @branches.any?
+  - branch = commit_default_branch(@project, @branches)
+  = commit_branch_link(project_ref_path(@project, branch), branch)
 
 -# `commit_default_branch` deletes the default branch from `@branches`,
 -# so only render this if we have more branches or tags left
-- 
cgit v1.2.1


From 35a4370ec873363400ead5e7d4e939f7793b68fa Mon Sep 17 00:00:00 2001
From: Hazel <hazel@gitlab.com>
Date: Wed, 18 Oct 2017 14:56:18 +0800
Subject: Modified the font family in the images

---
 doc/development/ux_guide/components.md              |   2 +-
 .../img/modals-general-confimation-dialog.png       | Bin 55006 -> 51205 bytes
 .../ux_guide/img/modals-layout-for-modals.png       | Bin 71731 -> 68203 bytes
 .../img/modals-special-confimation-dialog.png       | Bin 94366 -> 89978 bytes
 .../ux_guide/img/modals-three-buttons-special.png   | Bin 59942 -> 0 bytes
 .../ux_guide/img/modals-three-buttons.png           | Bin 55863 -> 54927 bytes
 6 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 doc/development/ux_guide/img/modals-three-buttons-special.png

diff --git a/doc/development/ux_guide/components.md b/doc/development/ux_guide/components.md
index 20205d6b398..1d05d40bac0 100644
--- a/doc/development/ux_guide/components.md
+++ b/doc/development/ux_guide/components.md
@@ -280,7 +280,7 @@ Dialog modals are only used for having a conversation and confirmation with the
 
 | Dialog with 2 actions | Dialog with 3 actions | Special confirmation |
 | --------------------- | --------------------- | -------------------- |
-| ![two-actions](img/modals-general-confimation-dialog.png) | ![three-actions](img/modals-three-buttons-special.png) | ![spcial-confirmation](img/modals-special-confimation-dialog.png) |
+| ![two-actions](img/modals-general-confimation-dialog.png) | ![three-actions](img/modals-three-buttons.png) | ![spcial-confirmation](img/modals-special-confimation-dialog.png) |
 
 ---
 
diff --git a/doc/development/ux_guide/img/modals-general-confimation-dialog.png b/doc/development/ux_guide/img/modals-general-confimation-dialog.png
index 8e51cb70c48..00a17374a0b 100644
Binary files a/doc/development/ux_guide/img/modals-general-confimation-dialog.png and b/doc/development/ux_guide/img/modals-general-confimation-dialog.png differ
diff --git a/doc/development/ux_guide/img/modals-layout-for-modals.png b/doc/development/ux_guide/img/modals-layout-for-modals.png
index 71ea52be124..6c7bc09e750 100644
Binary files a/doc/development/ux_guide/img/modals-layout-for-modals.png and b/doc/development/ux_guide/img/modals-layout-for-modals.png differ
diff --git a/doc/development/ux_guide/img/modals-special-confimation-dialog.png b/doc/development/ux_guide/img/modals-special-confimation-dialog.png
index ebdcae25e76..bf1e56326c5 100644
Binary files a/doc/development/ux_guide/img/modals-special-confimation-dialog.png and b/doc/development/ux_guide/img/modals-special-confimation-dialog.png differ
diff --git a/doc/development/ux_guide/img/modals-three-buttons-special.png b/doc/development/ux_guide/img/modals-three-buttons-special.png
deleted file mode 100644
index d2d40167e4d..00000000000
Binary files a/doc/development/ux_guide/img/modals-three-buttons-special.png and /dev/null differ
diff --git a/doc/development/ux_guide/img/modals-three-buttons.png b/doc/development/ux_guide/img/modals-three-buttons.png
index 3947902c021..519439e64e4 100644
Binary files a/doc/development/ux_guide/img/modals-three-buttons.png and b/doc/development/ux_guide/img/modals-three-buttons.png differ
-- 
cgit v1.2.1


From 2bdad7964a2c626118b7f2c762c39f3e1908fc9d Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Thu, 19 Oct 2017 17:18:51 +0300
Subject: added changelog entry

---
 changelogs/unreleased/37824-many-branches-lock-server.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelogs/unreleased/37824-many-branches-lock-server.yml

diff --git a/changelogs/unreleased/37824-many-branches-lock-server.yml b/changelogs/unreleased/37824-many-branches-lock-server.yml
new file mode 100644
index 00000000000..f75f79ec4a0
--- /dev/null
+++ b/changelogs/unreleased/37824-many-branches-lock-server.yml
@@ -0,0 +1,6 @@
+---
+title: While displaying a commit, do not show list of related branches if there are
+  thousands of branches
+merge_request: 14812
+author:
+type: other
-- 
cgit v1.2.1


From 84f5aaa729d6286252602800a1f9e1bf1e5b47d3 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 31 Oct 2017 11:29:56 +0100
Subject: WIP: mock cluster apps status API

---
 app/serializers/cluster_entity.rb             | 12 +++++++++
 app/serializers/cluster_serializer.rb         |  2 +-
 spec/fixtures/api/schemas/cluster_status.json | 35 +++++++++++++++++++++++++--
 spec/serializers/cluster_entity_spec.rb       |  4 +++
 spec/serializers/cluster_serializer_spec.rb   |  2 +-
 5 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/app/serializers/cluster_entity.rb b/app/serializers/cluster_entity.rb
index 08a113c4d8a..84ce34afb32 100644
--- a/app/serializers/cluster_entity.rb
+++ b/app/serializers/cluster_entity.rb
@@ -3,4 +3,16 @@ class ClusterEntity < Grape::Entity
 
   expose :status_name, as: :status
   expose :status_reason
+  expose :applications do |cluster, options|
+    if cluster.created?
+      {
+        helm: { status: 'installed' },
+        ingress: { status: 'error', status_reason: 'Missing namespace' },
+        runner: { status: 'installing' },
+        prometheus: { status: 'installable' }
+      }
+    else
+      {}
+    end
+  end
 end
diff --git a/app/serializers/cluster_serializer.rb b/app/serializers/cluster_serializer.rb
index 2c87202a105..2e13c1501e7 100644
--- a/app/serializers/cluster_serializer.rb
+++ b/app/serializers/cluster_serializer.rb
@@ -2,6 +2,6 @@ class ClusterSerializer < BaseSerializer
   entity ClusterEntity
 
   def represent_status(resource)
-    represent(resource, { only: [:status, :status_reason] })
+    represent(resource, { only: [:status, :status_reason, :applications] })
   end
 end
diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json
index 1f255a17881..451ea50f0f9 100644
--- a/spec/fixtures/api/schemas/cluster_status.json
+++ b/spec/fixtures/api/schemas/cluster_status.json
@@ -5,7 +5,38 @@
   ],
   "properties" : {
     "status": { "type": "string" },
-    "status_reason": { "type": ["string", "null"] }
+    "status_reason": { "type": ["string", "null"] },
+    "applications": { "$ref": "#/definitions/applications" }
   },
-  "additionalProperties": false
+  "additionalProperties": false,
+  "definitions": {
+    "applications": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties" : {
+        "helm": { "$ref": "#/definitions/app_status" },
+        "runner": { "$ref": "#/definitions/app_status" },
+        "ingress": { "$ref": "#/definitions/app_status" },
+        "prometheus": { "$ref": "#/definitions/app_status" }
+      }
+    },
+    "app_status": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties" : {
+        "status": {
+          "type": {
+            "enum": [
+              "installable",
+              "installing",
+              "installed",
+              "error"
+            ]
+          }
+        },
+        "status_reason": { "type": ["string", "null"] }
+      },
+      "required" : [ "status" ]
+    }
+  }
 }
diff --git a/spec/serializers/cluster_entity_spec.rb b/spec/serializers/cluster_entity_spec.rb
index 2c7f49974f1..ec02af4b620 100644
--- a/spec/serializers/cluster_entity_spec.rb
+++ b/spec/serializers/cluster_entity_spec.rb
@@ -18,5 +18,9 @@ describe ClusterEntity do
     it 'contains status reason' do
       expect(subject[:status_reason]).to eq('general error')
     end
+
+    it 'contains applications' do
+      expect(subject[:applications]).to eq({})
+    end
   end
 end
diff --git a/spec/serializers/cluster_serializer_spec.rb b/spec/serializers/cluster_serializer_spec.rb
index 1ac6784d28f..44039327457 100644
--- a/spec/serializers/cluster_serializer_spec.rb
+++ b/spec/serializers/cluster_serializer_spec.rb
@@ -12,7 +12,7 @@ describe ClusterSerializer do
       let(:resource) { create(:gcp_cluster, :errored) }
 
       it 'serializes only status' do
-        expect(subject.keys).to contain_exactly(:status, :status_reason)
+        expect(subject.keys).to contain_exactly(:status, :status_reason, :applications)
       end
     end
   end
-- 
cgit v1.2.1


From 244bec9101ff754291e2c02d9844e0879ff5fa2f Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Wed, 1 Nov 2017 17:09:48 -0600
Subject: Add UI/UX improvements

- Leave 'too many tags to search' always visible
- Add different message to the branch/tags so it states its unavailable
---
 app/helpers/commits_helper.rb                | 16 ++++++++++++++--
 app/views/projects/commit/branches.html.haml | 18 ++++++------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 8aaf3318f90..2ba84e55fe0 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -60,7 +60,7 @@ module CommitsHelper
     branches.include?(project.default_branch) ? branches.delete(project.default_branch) : branches.pop
   end
 
-  # returns a link formatted as a commit branch link
+  # Returns a link formatted as a commit branch link
   def commit_branch_link(url, text)
     link_to(url, class: 'label label-gray ref-name') do
       icon('code-fork') + " #{text}"
@@ -74,13 +74,25 @@ module CommitsHelper
     end.join(' ').html_safe
   end
 
-  # returns a link formatted as a commit tag link
+  # Returns a link formatted as a commit tag link
   def commit_tag_link(url, text)
     link_to(url, class: 'label label-gray ref-name') do
       icon('tag') + " #{text}"
     end
   end
 
+  def branches_unavailable_message
+    link_to('#', class: 'label label-gray ref-name', title: 'Project has too many branches to search') do
+      icon('tag') + ' Branches unavailable'
+    end
+  end
+
+  def tags_unavailable_message
+    link_to('#', class: 'label label-gray ref-name', title: 'Project has too many tags to search') do
+      icon('tag') + ' Tags unavailable'
+    end
+  end
+
   # Returns the sorted links to tags, separated by a comma
   def commit_tags_links(project, tags)
     sorted = VersionSorter.rsort(tags)
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 31d10ff9040..8c7a303adbf 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,18 +1,12 @@
 - if @branches_limit_exceeded
-  = commit_branch_link('#', _('Too many branches to search'))
+  = branches_unavailable_message
 - elsif @branches.any?
   - branch = commit_default_branch(@project, @branches)
   = commit_branch_link(project_ref_path(@project, branch), branch)
 
 -# `commit_default_branch` deletes the default branch from `@branches`,
--# so only render this if we have more branches or tags left
-- if @branches.any? || @tags.any? || @tags_limit_exceeded
-  %span
-    = link_to "…", "#", class: "js-details-expand label label-gray"
-
-    %span.js-details-content.hide
-      = commit_branches_links(@project, @branches) if @branches.any?
-      - if @tags_limit_exceeded
-        = commit_tag_link('#', _('Too many tags to search'))
-      - elsif @tags.any?
-        = commit_tags_links(@project, @tags)
+  -# so only render this if we have more branches or tags left
+- if @tags_limit_exceeded
+  = tags_unavailable_message
+- elsif @tags.any?
+  = commit_tags_links(@project, @tags)
-- 
cgit v1.2.1


From ad3853eba2ef3d6ccce7d75ff8ae543595c51735 Mon Sep 17 00:00:00 2001
From: Hazel <hazel@gitlab.com>
Date: Thu, 2 Nov 2017 13:18:36 +0800
Subject: Modify the sentences and add Todo

---
 doc/development/ux_guide/components.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/development/ux_guide/components.md b/doc/development/ux_guide/components.md
index 1d05d40bac0..82168b18860 100644
--- a/doc/development/ux_guide/components.md
+++ b/doc/development/ux_guide/components.md
@@ -261,7 +261,7 @@ Dialog modals are only used for having a conversation and confirmation with the
 ### Usage
 
 * When the action is irreversible, dialog modals provide the details and confirm with the user before they take an advanced action.
-* When the action will affect privacy or authorization, dialog modals provide the advanced information and confirm with the user.
+* When the action will affect privacy or authorization, dialog modals provide advanced information and confirm with the user.
 
 ### Style
 
@@ -276,12 +276,14 @@ Dialog modals are only used for having a conversation and confirmation with the
 
 ### Placement
 
-* Dialog modals should always be the center of the screen horizontally and have **72px** from the top of the screen.
+* Dialog modals should always be the center of the screen horizontally and be positioned **72px** from the top.
 
 | Dialog with 2 actions | Dialog with 3 actions | Special confirmation |
 | --------------------- | --------------------- | -------------------- |
 | ![two-actions](img/modals-general-confimation-dialog.png) | ![three-actions](img/modals-three-buttons.png) | ![spcial-confirmation](img/modals-special-confimation-dialog.png) |
 
+> TODO: Special case for dialog modal.
+
 ---
 
 ## Panels
-- 
cgit v1.2.1


From 6950f38f830079199c382c974b51ad73048a6939 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Thu, 2 Nov 2017 11:14:10 +0100
Subject: Install k8s application with helm running inside the cluster

---
 app/models/clusters/concerns.rb                    |   4 +
 app/models/clusters/concerns/app_status.rb         |  33 +++++++
 app/models/clusters/kubernetes.rb                  |  16 ++++
 app/models/clusters/kubernetes/helm_app.rb         |  18 ++++
 app/models/project_services/kubernetes_service.rb  |   6 ++
 app/services/clusters/base_helm_service.rb         |  17 ++++
 .../fetch_app_installation_status_service.rb       |  13 +++
 .../clusters/finalize_app_installation_service.rb  |  15 +++
 app/services/clusters/install_app_service.rb       |  23 +++++
 app/services/clusters/install_tiller_service.rb    |  24 +++++
 app/workers/cluster_install_app_worker.rb          |  11 +++
 .../cluster_wait_for_app_installation_worker.rb    |  33 +++++++
 app/workers/concerns/cluster_app.rb                |  10 ++
 ...1100710_create_clusters_kubernetes_helm_apps.rb |  14 +++
 lib/gitlab/clusters/helm.rb                        | 104 +++++++++++++++++++++
 spec/models/clusters/kubernetes/helm_app_spec.rb   |  14 +++
 spec/models/clusters/kubernetes_spec.rb            |   9 ++
 .../project_services/kubernetes_service_spec.rb    |   3 +-
 18 files changed, 366 insertions(+), 1 deletion(-)
 create mode 100644 app/models/clusters/concerns.rb
 create mode 100644 app/models/clusters/concerns/app_status.rb
 create mode 100644 app/models/clusters/kubernetes.rb
 create mode 100644 app/models/clusters/kubernetes/helm_app.rb
 create mode 100644 app/services/clusters/base_helm_service.rb
 create mode 100644 app/services/clusters/fetch_app_installation_status_service.rb
 create mode 100644 app/services/clusters/finalize_app_installation_service.rb
 create mode 100644 app/services/clusters/install_app_service.rb
 create mode 100644 app/services/clusters/install_tiller_service.rb
 create mode 100644 app/workers/cluster_install_app_worker.rb
 create mode 100644 app/workers/cluster_wait_for_app_installation_worker.rb
 create mode 100644 app/workers/concerns/cluster_app.rb
 create mode 100644 db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
 create mode 100644 lib/gitlab/clusters/helm.rb
 create mode 100644 spec/models/clusters/kubernetes/helm_app_spec.rb
 create mode 100644 spec/models/clusters/kubernetes_spec.rb

diff --git a/app/models/clusters/concerns.rb b/app/models/clusters/concerns.rb
new file mode 100644
index 00000000000..cd09863bcfc
--- /dev/null
+++ b/app/models/clusters/concerns.rb
@@ -0,0 +1,4 @@
+module Clusters
+  module Concerns
+  end
+end
diff --git a/app/models/clusters/concerns/app_status.rb b/app/models/clusters/concerns/app_status.rb
new file mode 100644
index 00000000000..f6b817e9ce7
--- /dev/null
+++ b/app/models/clusters/concerns/app_status.rb
@@ -0,0 +1,33 @@
+module Clusters
+  module Concerns
+    module AppStatus
+      extend ActiveSupport::Concern
+
+      included do
+        state_machine :status, initial: :scheduled do
+          state :errored, value: -1
+          state :scheduled, value: 0
+          state :installing, value: 1
+          state :installed, value: 2
+
+          event :make_installing do
+            transition any - [:installing] => :installing
+          end
+
+          event :make_installed do
+            transition any - [:installed] => :installed
+          end
+
+          event :make_errored do
+            transition any - [:errored] => :errored
+          end
+
+          before_transition any => [:errored] do |app_status, transition|
+            status_reason = transition.args.first
+            app_status.status_reason = status_reason if status_reason
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/models/clusters/kubernetes.rb b/app/models/clusters/kubernetes.rb
new file mode 100644
index 00000000000..b68e2ae401e
--- /dev/null
+++ b/app/models/clusters/kubernetes.rb
@@ -0,0 +1,16 @@
+module Clusters
+  module Kubernetes
+    def self.table_name_prefix
+      'clusters_kubernetes_'
+    end
+
+    def self.app(app_name)
+      case app_name
+      when HelmApp::NAME
+        HelmApp
+      else
+        raise ArgumentError, "Unknown app #{app_name}"
+      end
+    end
+  end
+end
diff --git a/app/models/clusters/kubernetes/helm_app.rb b/app/models/clusters/kubernetes/helm_app.rb
new file mode 100644
index 00000000000..32c9e13a469
--- /dev/null
+++ b/app/models/clusters/kubernetes/helm_app.rb
@@ -0,0 +1,18 @@
+module Clusters
+  module Kubernetes
+    class HelmApp < ActiveRecord::Base
+      NAME = 'helm'.freeze
+
+      include ::Clusters::Concerns::AppStatus
+      belongs_to :kubernetes_service, class_name: 'KubernetesService', foreign_key: :service_id
+
+      default_value_for :version, Gitlab::Clusters::Helm::HELM_VERSION
+
+      alias_method :cluster, :kubernetes_service
+
+      def name
+        NAME
+      end
+    end
+  end
+end
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb
index 8ba07173c74..4b754b4d3ce 100644
--- a/app/models/project_services/kubernetes_service.rb
+++ b/app/models/project_services/kubernetes_service.rb
@@ -3,6 +3,8 @@ class KubernetesService < DeploymentService
   include Gitlab::Kubernetes
   include ReactiveCaching
 
+  has_one :helm_app, class_name: 'Clusters::Kubernetes::HelmApp', foreign_key: :service_id
+
   self.reactive_cache_key = ->(service) { [service.class.model_name.singular, service.project_id] }
 
   # Namespace defaults to the project path, but can be overridden in case that
@@ -136,6 +138,10 @@ class KubernetesService < DeploymentService
     { pods: read_pods }
   end
 
+  def helm
+    Gitlab::Clusters::Helm.new(build_kubeclient!)
+  end
+
   TEMPLATE_PLACEHOLDER = 'Kubernetes namespace'.freeze
 
   private
diff --git a/app/services/clusters/base_helm_service.rb b/app/services/clusters/base_helm_service.rb
new file mode 100644
index 00000000000..b8ed52bf376
--- /dev/null
+++ b/app/services/clusters/base_helm_service.rb
@@ -0,0 +1,17 @@
+module Clusters
+  class BaseHelmService
+    attr_accessor :app
+
+    def initialize(app)
+      @app = app
+    end
+
+    protected
+
+    def helm
+      return @helm if defined?(@helm)
+
+      @helm = @app.cluster.helm
+    end
+  end
+end
diff --git a/app/services/clusters/fetch_app_installation_status_service.rb b/app/services/clusters/fetch_app_installation_status_service.rb
new file mode 100644
index 00000000000..e21aa49bb43
--- /dev/null
+++ b/app/services/clusters/fetch_app_installation_status_service.rb
@@ -0,0 +1,13 @@
+module Clusters
+  class FetchAppInstallationStatusService < BaseHelmService
+    def execute
+      return unless app.installing?
+
+      phase = helm.installation_status(app)
+      log = helm.installation_log(app) if phase == 'Failed'
+      yield(phase, log) if block_given?
+    rescue KubeException => ke
+      app.make_errored!("Kubernetes error: #{ke.message}") unless app.errored?
+    end
+  end
+end
diff --git a/app/services/clusters/finalize_app_installation_service.rb b/app/services/clusters/finalize_app_installation_service.rb
new file mode 100644
index 00000000000..c921747febc
--- /dev/null
+++ b/app/services/clusters/finalize_app_installation_service.rb
@@ -0,0 +1,15 @@
+module Clusters
+  class FinalizeAppInstallationService < BaseHelmService
+    def execute
+      helm.delete_installation_pod!(app)
+
+      app.make_errored!('Installation aborted') if aborted?
+    end
+
+    private
+
+    def aborted?
+      app.installing? || app.scheduled?
+    end
+  end
+end
diff --git a/app/services/clusters/install_app_service.rb b/app/services/clusters/install_app_service.rb
new file mode 100644
index 00000000000..dd8556108d4
--- /dev/null
+++ b/app/services/clusters/install_app_service.rb
@@ -0,0 +1,23 @@
+module Clusters
+  class InstallAppService < BaseHelmService
+    def execute
+      return unless app.scheduled?
+
+      begin
+        helm.install(app)
+        if app.make_installing
+          ClusterWaitForAppInstallationWorker.perform_in(
+            ClusterWaitForAppInstallationWorker::INITIAL_INTERVAL, app.name, app.id)
+        else
+          app.make_errored!("Failed to update app record; #{app.errors}")
+        end
+
+      rescue KubeException => ke
+        app.make_errored!("Kubernetes error: #{ke.message}")
+      rescue StandardError => e
+        Rails.logger.warn(e.message)
+        app.make_errored!("Can't start installation process")
+      end
+    end
+  end
+end
diff --git a/app/services/clusters/install_tiller_service.rb b/app/services/clusters/install_tiller_service.rb
new file mode 100644
index 00000000000..ac77a7ea3c2
--- /dev/null
+++ b/app/services/clusters/install_tiller_service.rb
@@ -0,0 +1,24 @@
+module Clusters
+  class InstallTillerService < BaseService
+    def execute
+      ensure_namespace
+      install
+    end
+
+    private
+
+    def kubernetes_service
+      return @kubernetes_service if defined?(@kubernetes_service)
+
+      @kubernetes_service = project&.kubernetes_service
+    end
+
+    def ensure_namespace
+      kubernetes_service&.ensure_namespace!
+    end
+
+    def install
+      kubernetes_service&.helm_client&.init!
+    end
+  end
+end
diff --git a/app/workers/cluster_install_app_worker.rb b/app/workers/cluster_install_app_worker.rb
new file mode 100644
index 00000000000..4993b2b7349
--- /dev/null
+++ b/app/workers/cluster_install_app_worker.rb
@@ -0,0 +1,11 @@
+class ClusterInstallAppWorker
+  include Sidekiq::Worker
+  include ClusterQueue
+  include ClusterApp
+
+  def perform(app_name, app_id)
+    find_app(app_name, app_id) do |app|
+      Clusters::InstallAppService.new(app).execute
+    end
+  end
+end
diff --git a/app/workers/cluster_wait_for_app_installation_worker.rb b/app/workers/cluster_wait_for_app_installation_worker.rb
new file mode 100644
index 00000000000..21149cf2d19
--- /dev/null
+++ b/app/workers/cluster_wait_for_app_installation_worker.rb
@@ -0,0 +1,33 @@
+class ClusterWaitForAppInstallationWorker
+  include Sidekiq::Worker
+  include ClusterQueue
+  include ClusterApp
+
+  INITIAL_INTERVAL = 30.seconds
+  EAGER_INTERVAL = 10.seconds
+  TIMEOUT = 20.minutes
+
+  def perform(app_name, app_id)
+    find_app(app_name, app_id) do |app|
+      Clusters::FetchAppInstallationStatusService.new(app).execute do |phase, log|
+        case phase
+        when 'Succeeded'
+          if app.make_installed
+            Clusters::FinalizeAppInstallationService.new(app).execute
+          else
+            app.make_errored!("Failed to update app record; #{app.errors}")
+          end
+        when 'Failed'
+          app.make_errored!(log || 'Installation silently failed')
+          Clusters::FinalizeAppInstallationService.new(app).execute
+        else
+          if Time.now.utc - app.updated_at.to_time.utc > TIMEOUT
+            app.make_errored!('App installation timeouted')
+          else
+            ClusterWaitForAppInstallationWorker.perform_in(EAGER_INTERVAL, app.name, app.id)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/workers/concerns/cluster_app.rb b/app/workers/concerns/cluster_app.rb
new file mode 100644
index 00000000000..2170f8be6f6
--- /dev/null
+++ b/app/workers/concerns/cluster_app.rb
@@ -0,0 +1,10 @@
+module ClusterApp
+  extend ActiveSupport::Concern
+
+  included do
+    def find_app(app_name, id)
+      app = Clusters::Kubernetes.app(app_name).find(id)
+      yield(app) if block_given?
+    end
+  end
+end
diff --git a/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb b/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
new file mode 100644
index 00000000000..93611bf8a12
--- /dev/null
+++ b/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
@@ -0,0 +1,14 @@
+class CreateClustersKubernetesHelmApps < ActiveRecord::Migration
+  def change
+    create_table :clusters_kubernetes_helm_apps do |t|
+      t.integer :status, null: false
+
+      t.datetime_with_timezone :created_at, null: false
+      t.datetime_with_timezone :updated_at, null: false
+
+      t.references :service, index: true, null: false, foreign_key: { on_delete: :cascade }
+      t.string :version, null: false
+      t.text :status_reason
+    end
+  end
+end
diff --git a/lib/gitlab/clusters/helm.rb b/lib/gitlab/clusters/helm.rb
new file mode 100644
index 00000000000..9c75fe2be96
--- /dev/null
+++ b/lib/gitlab/clusters/helm.rb
@@ -0,0 +1,104 @@
+module Gitlab
+  module Clusters
+    class Helm
+      Error = Class.new(StandardError)
+      HELM_VERSION = '2.7.0'.freeze
+      NAMESPACE = 'gitlab-managed-apps'.freeze
+      COMMAND_SCRIPT = <<-EOS.freeze
+        set -eo pipefail
+        apk add -U ca-certificates openssl >/dev/null
+        wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
+        mv /tmp/linux-amd64/helm /usr/bin/
+        helm init ${HELM_INIT_OPTS} >/dev/null
+        [[ -z "${HELM_COMMAND+x}" ]] || helm ${HELM_COMMAND} >/dev/null
+      EOS
+
+      def initialize(kubeclient)
+        @kubeclient = kubeclient
+      end
+
+      def init!
+        ensure_namespace!
+        @kubeclient.create_pod(pod_resource(OpenStruct.new(name: 'helm')))
+      end
+
+      def install(app)
+        ensure_namespace!
+        @kubeclient.create_pod(pod_resource(app))
+      end
+
+      ##
+      # Returns Pod phase
+      #
+      # https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
+      #
+      # values: "Pending", "Running", "Succeeded", "Failed", "Unknown"
+      #
+      def installation_status(app)
+        @kubeclient.get_pod(pod_name(app), NAMESPACE).status.phase
+      end
+
+      def installation_log(app)
+        @kubeclient.get_pod_log(pod_name(app), NAMESPACE).body
+      end
+
+      def delete_installation_pod!(app)
+        @kubeclient.delete_pod(pod_name(app), NAMESPACE)
+      end
+
+      private
+
+      def pod_name(app)
+        "install-#{app.name}"
+      end
+
+      def pod_resource(app)
+        labels = { 'gitlab.org/action': 'install', 'gitlab.org/application': app.name }
+        metadata = { name: pod_name(app), namespace: NAMESPACE, labels: labels }
+        container = {
+          name: 'helm',
+          image: 'alpine:3.6',
+          env: generate_pod_env(app),
+          command: %w(/bin/sh),
+          args: %w(-c $(COMMAND_SCRIPT))
+        }
+        spec = { containers: [container], restartPolicy: 'Never' }
+
+        ::Kubeclient::Resource.new(metadata: metadata, spec: spec)
+      end
+
+      def generate_pod_env(app)
+        env = {
+          HELM_VERSION: HELM_VERSION,
+          TILLER_NAMESPACE: NAMESPACE,
+          COMMAND_SCRIPT: COMMAND_SCRIPT
+        }
+
+        if app.name != 'helm'
+          env[:HELM_INIT_OPTS] = '--client-only'
+          env[:HELM_COMMAND] = helm_install_comand(app)
+        end
+
+        env.map { |key, value| { name: key, value: value } }
+      end
+
+      def helm_install_comand(app)
+        "install #{app.chart} --name #{app.name} --namespace #{NAMESPACE}"
+      end
+
+      def ensure_namespace!
+        begin
+          @kubeclient.get_namespace(NAMESPACE)
+        rescue KubeException => ke
+          raise ke unless ke.error_code == 404
+
+          namespace_resource = ::Kubeclient::Resource.new
+          namespace_resource.metadata = {}
+          namespace_resource.metadata.name = NAMESPACE
+
+          @kubeclient.create_namespace(namespace_resource)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/clusters/kubernetes/helm_app_spec.rb b/spec/models/clusters/kubernetes/helm_app_spec.rb
new file mode 100644
index 00000000000..27a1561ce6c
--- /dev/null
+++ b/spec/models/clusters/kubernetes/helm_app_spec.rb
@@ -0,0 +1,14 @@
+require 'rails_helper'
+require_relative '../kubernetes_spec'
+
+RSpec.describe Clusters::Kubernetes::HelmApp, type: :model do
+  it_behaves_like 'a registered kubernetes app'
+
+  it { is_expected.to belong_to(:kubernetes_service) }
+
+  describe '#cluster' do
+    it 'is an alias to #kubernetes_service' do
+      expect(subject.method(:cluster).original_name).to eq(:kubernetes_service)
+    end
+  end
+end
diff --git a/spec/models/clusters/kubernetes_spec.rb b/spec/models/clusters/kubernetes_spec.rb
new file mode 100644
index 00000000000..5876f08250f
--- /dev/null
+++ b/spec/models/clusters/kubernetes_spec.rb
@@ -0,0 +1,9 @@
+require 'rails_helper'
+
+RSpec.shared_examples 'a registered kubernetes app' do
+  let(:name) { described_class::NAME }
+
+  it 'can be retrieved with Clusters::Kubernetes.app' do
+    expect(Clusters::Kubernetes.app(name)).to eq(described_class)
+  end
+end
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 2298dcab55f..1084f42ffa7 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -7,8 +7,9 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
   let(:project) { build_stubbed(:kubernetes_project) }
   let(:service) { project.kubernetes_service }
 
-  describe "Associations" do
+  describe 'Associations' do
     it { is_expected.to belong_to :project }
+    it { is_expected.to have_one(:helm_app) }
   end
 
   describe 'Validations' do
-- 
cgit v1.2.1


From d87078520c4c8bf89b9afd77b0fee7075635824e Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Thu, 2 Nov 2017 11:15:39 +0100
Subject: Revert "Add helm CLI wrapper"

This reverts commit 6d462cea77508e407995c58b0ae581edefa74d22.
---
 lib/gitlab/helm.rb           | 57 ------------------------------------
 spec/lib/gitlab/helm_spec.rb | 70 --------------------------------------------
 2 files changed, 127 deletions(-)
 delete mode 100644 lib/gitlab/helm.rb
 delete mode 100644 spec/lib/gitlab/helm_spec.rb

diff --git a/lib/gitlab/helm.rb b/lib/gitlab/helm.rb
deleted file mode 100644
index 24f8846f69b..00000000000
--- a/lib/gitlab/helm.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-module Gitlab
-  class Helm
-    Error = Class.new(StandardError)
-
-    attr_accessor :namespace
-    attr_accessor :logger
-
-    delegate :debug, :debug?, to: :logger, allow_nil: true
-
-    def initialize(namespace, kubeconfig, logger: nil)
-      self.namespace = namespace
-      self.logger = logger
-      @kubeconfig = kubeconfig
-    end
-
-    def init!
-      prepare_env do |env|
-        helm('init', '--upgrade', env: env)
-      end
-    end
-
-    def install_or_upgrade!(app_name, chart)
-      prepare_env do |env|
-        helm('init', '--client-only', env: env)
-        helm('upgrade', '--install', '--namespace', namespace, app_name, chart, env: env)
-      end
-    end
-
-    private
-
-    def prepare_env(*args, &blk)
-      Dir.mktmpdir(['helm', namespace]) do |tmpdir|
-        kubeconfig_path = File.join(tmpdir, 'kubeconfig')
-        env = {
-           'HELM_HOME' => File.join(tmpdir, 'helm'),
-           'TILLER_NAMESPACE' => namespace,
-           'KUBECONFIG' => kubeconfig_path
-        }
-
-        File.open(kubeconfig_path, 'w') { |c| c << YAML.dump(@kubeconfig) }
-
-        debug("HELM: Running in tmpdir #{tmpdir}")
-        yield(env) if block_given?
-      end
-    end
-
-    def helm(*args, env: {})
-      Open3.popen3(env, 'helm', *args) do |_, stdout, stderr, wait_thr|
-        exit_status = wait_thr.value
-
-        stdout.readlines.each { |l| debug("HELM: #{l.chomp}") } if debug?
-
-        raise Error, stderr.read.chomp unless exit_status.success?
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/helm_spec.rb b/spec/lib/gitlab/helm_spec.rb
deleted file mode 100644
index 5c8fc935b2c..00000000000
--- a/spec/lib/gitlab/helm_spec.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# coding: utf-8
-require 'spec_helper'
-
-describe Gitlab::Helm do
-  let(:namespace) { 'rails-spec' }
-  let(:kubeconfig) {}
-  let(:logger) {}
-  subject { described_class.new(namespace, kubeconfig, logger: logger)}
-
-  def mock_helm_invocation(success:, error: '')
-    stderr = StringIO.new(error)
-    process_status = double('process_status')
-    wait_thr = double('wait_thread')
-
-    expect(Open3).to receive(:popen3).at_least(:once).and_yield(StringIO.new, StringIO.new, stderr, wait_thr)
-    expect(wait_thr).to receive(:value).at_least(:once).and_return(process_status)
-    expect(process_status).to receive(:success?).at_least(:once).and_return(success)
-  end
-
-  shared_examples 'invokes helm binary' do |method, args|
-    context 'when helm binary fails' do
-      let(:error_text) { 'Something went wrong' }
-
-      before do
-        mock_helm_invocation(success: false, error: error_text)
-      end
-
-      it 'throws exception' do
-        expect { subject.send(method, *args) }.to raise_exception(Gitlab::Helm::Error, error_text)
-      end
-    end
-
-    context 'when helm binary exit-code is 0' do
-      before do
-        mock_helm_invocation(success: true)
-      end
-
-      it "doesn't raise exceptions" do
-        expect { subject.send(method, *args) }.not_to raise_exception
-      end
-    end
-  end
-
-  it { is_expected.to delegate_method(:debug).to(:logger) }
-  it { is_expected.to delegate_method(:debug?).to(:logger) }
-
-  describe '#init!' do
-    it 'invokes helm init --upgrade' do
-      expect(subject).to receive(:helm).with('init', '--upgrade', env: instance_of(Hash))
-
-      subject.init!
-    end
-
-    it_should_behave_like 'invokes helm binary', :init!, []
-  end
-
-  describe '#install_or_upgrade!' do
-    let(:app_name) { 'app_name' }
-    let(:chart) { 'stable/a_chart' }
-
-    it 'invokes helm upgrade --install --namespace namespace app_name chart' do
-      expect(subject).to receive(:helm).with('init', '--client-only', env: instance_of(Hash)).ordered.once
-      expect(subject).to receive(:helm).with('upgrade', '--install', '--namespace', namespace, app_name, chart, env: instance_of(Hash)).ordered.once
-
-      subject.install_or_upgrade!(app_name, chart)
-    end
-
-    it_should_behave_like 'invokes helm binary', :install_or_upgrade!, %w[app_name chart]
-  end
-end
-- 
cgit v1.2.1


From 64be8d70ae20928df351e495a3442bb6036bc3e7 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 2 Nov 2017 15:10:46 +0100
Subject: Improve backend structure of data

---
 .../projects/clusters/applications_controller.rb   | 39 ++++++++++++++++++++++
 app/models/clusters/applications/helm.rb           | 19 +++++++++++
 app/models/clusters/cluster.rb                     | 19 ++++++++++-
 app/models/clusters/kubernetes.rb                  | 16 ---------
 app/models/clusters/kubernetes/helm_app.rb         | 18 ----------
 app/models/clusters/platforms/kubernetes.rb        |  4 +++
 app/models/project.rb                              |  1 +
 app/models/project_services/kubernetes_service.rb  |  6 ++--
 app/presenters/clusters/cluster_presenter.rb       |  6 ++++
 app/serializers/cluster_app_entity.rb              |  5 +++
 app/serializers/cluster_entity.rb                  | 13 +-------
 app/services/clusters/base_helm_service.rb         | 12 +++++--
 .../fetch_app_installation_status_service.rb       |  4 +--
 .../clusters/finalize_app_installation_service.rb  |  2 +-
 app/services/clusters/install_app_service.rb       |  4 +--
 app/workers/concerns/cluster_app.rb                |  5 +--
 config/routes/project.rb                           |  4 +++
 ...1100710_create_clusters_kubernetes_helm_apps.rb |  8 ++---
 db/schema.rb                                       | 35 +++++++++++--------
 spec/models/clusters/kubernetes/helm_app_spec.rb   |  2 +-
 spec/models/clusters/kubernetes_spec.rb            |  9 -----
 .../project_services/kubernetes_service_spec.rb    |  1 -
 22 files changed, 142 insertions(+), 90 deletions(-)
 create mode 100644 app/controllers/projects/clusters/applications_controller.rb
 create mode 100644 app/models/clusters/applications/helm.rb
 delete mode 100644 app/models/clusters/kubernetes.rb
 delete mode 100644 app/models/clusters/kubernetes/helm_app.rb
 create mode 100644 app/serializers/cluster_app_entity.rb
 delete mode 100644 spec/models/clusters/kubernetes_spec.rb

diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb
new file mode 100644
index 00000000000..438e1853435
--- /dev/null
+++ b/app/controllers/projects/clusters/applications_controller.rb
@@ -0,0 +1,39 @@
+class Projects::Clusters::ApplicationsController < Projects::ApplicationController
+  before_action :cluster
+  before_action :application_class, only: [:create]
+  before_action :authorize_read_cluster!
+  before_action :authorize_create_cluster!, only: [:create]
+
+  def new
+  end
+
+  def create
+    return render_404 if application
+
+    new_application = application_class.create(cluster: cluster)
+
+    respond_to do |format|
+      format.json do
+        if new_application.persisted?
+          head :ok
+        else
+          head :bad_request
+        end
+      end
+    end
+  end
+
+  private
+
+  def cluster
+    @cluster ||= project.clusters.find_by(cluster_id: params[:cluster_id]).present(current_user: current_user)
+  end
+
+  def application_class
+    Clusters::Cluster::Applications.find(params[:application])
+  end
+
+  def application
+    application_class.find_by(cluster: cluster)
+  end
+end
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
new file mode 100644
index 00000000000..59e0076c8df
--- /dev/null
+++ b/app/models/clusters/applications/helm.rb
@@ -0,0 +1,19 @@
+module Clusters
+  module Applications
+    class Helm < ActiveRecord::Base
+      self.table_name = 'clusters_applications_helm'
+
+      NAME = 'helm'.freeze
+
+      include ::Clusters::Concerns::AppStatus
+
+      belongs_to :cluser, class_name: 'Clusters::Cluster', foreign_key: :cluster_id
+
+      default_value_for :version, Gitlab::Clusters::Helm::HELM_VERSION
+
+      def name
+        NAME
+      end
+    end
+  end
+end
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index ca09b939f34..c814f475adf 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -4,6 +4,10 @@ module Clusters
 
     self.table_name = 'clusters'
 
+    APPLICATIONS = {
+      Clusters::Applications::Helm::NAME => Clusters::Applications::Helm
+    }
+
     belongs_to :user
 
     has_many :cluster_projects, class_name: 'Clusters::Project'
@@ -15,13 +19,14 @@ module Clusters
     # We have to ":destroy" it today to ensure that we clean also the Kubernetes Integration
     has_one :platform_kubernetes, class_name: 'Clusters::Platforms::Kubernetes', autosave: true, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
 
+    has_one :application_helm, class_name: 'Clusters::Applications::Helm'
+
     accepts_nested_attributes_for :provider_gcp, update_only: true
     accepts_nested_attributes_for :platform_kubernetes, update_only: true
 
     validates :name, cluster_name: true
     validate :restrict_modification, on: :update
 
-    delegate :status, to: :provider, allow_nil: true
     delegate :status_reason, to: :provider, allow_nil: true
     delegate :status_name, to: :provider, allow_nil: true
     delegate :on_creation?, to: :provider, allow_nil: true
@@ -38,6 +43,14 @@ module Clusters
     scope :enabled, -> { where(enabled: true) }
     scope :disabled, -> { where(enabled: false) }
 
+    def status_name
+      if provider
+        provider.status_name
+      else
+        :created
+      end
+    end
+
     def provider
       return provider_gcp if gcp?
     end
@@ -53,6 +66,10 @@ module Clusters
     end
     alias_method :project, :first_project
 
+    def kubeclient
+      platform_kubernetes.kubeclient if kubernetes?
+    end
+
     private
 
     def restrict_modification
diff --git a/app/models/clusters/kubernetes.rb b/app/models/clusters/kubernetes.rb
deleted file mode 100644
index b68e2ae401e..00000000000
--- a/app/models/clusters/kubernetes.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-module Clusters
-  module Kubernetes
-    def self.table_name_prefix
-      'clusters_kubernetes_'
-    end
-
-    def self.app(app_name)
-      case app_name
-      when HelmApp::NAME
-        HelmApp
-      else
-        raise ArgumentError, "Unknown app #{app_name}"
-      end
-    end
-  end
-end
diff --git a/app/models/clusters/kubernetes/helm_app.rb b/app/models/clusters/kubernetes/helm_app.rb
deleted file mode 100644
index 32c9e13a469..00000000000
--- a/app/models/clusters/kubernetes/helm_app.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module Clusters
-  module Kubernetes
-    class HelmApp < ActiveRecord::Base
-      NAME = 'helm'.freeze
-
-      include ::Clusters::Concerns::AppStatus
-      belongs_to :kubernetes_service, class_name: 'KubernetesService', foreign_key: :service_id
-
-      default_value_for :version, Gitlab::Clusters::Helm::HELM_VERSION
-
-      alias_method :cluster, :kubernetes_service
-
-      def name
-        NAME
-      end
-    end
-  end
-end
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 3ad2ffe531d..1197dfaefcb 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -60,6 +60,10 @@ module Clusters
         self.class.namespace_for_project(project) if project
       end
 
+      def kubeclient
+        @kubeclient ||= kubernetes_service.kubeclient if manages_kubernetes_service?
+      end
+
       private
 
       def enforce_namespace_to_lower_case
diff --git a/app/models/project.rb b/app/models/project.rb
index d9d9e12c947..a42e2553935 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -189,6 +189,7 @@ class Project < ActiveRecord::Base
 
   has_one :cluster_project, class_name: 'Clusters::Project'
   has_one :cluster, through: :cluster_project, class_name: 'Clusters::Cluster'
+  has_many :clusters, through: :cluster_project, class_name: 'Clusters::Cluster'
 
   # Container repositories need to remove data from the container registry,
   # which is not managed by the DB. Hence we're still using dependent: :destroy
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb
index b4654e8d1ea..5080acffb3c 100644
--- a/app/models/project_services/kubernetes_service.rb
+++ b/app/models/project_services/kubernetes_service.rb
@@ -3,8 +3,6 @@ class KubernetesService < DeploymentService
   include Gitlab::Kubernetes
   include ReactiveCaching
 
-  has_one :helm_app, class_name: 'Clusters::Kubernetes::HelmApp', foreign_key: :service_id
-
   self.reactive_cache_key = ->(service) { [service.class.model_name.singular, service.project_id] }
 
   # Namespace defaults to the project path, but can be overridden in case that
@@ -138,8 +136,8 @@ class KubernetesService < DeploymentService
     { pods: read_pods }
   end
 
-  def helm
-    Gitlab::Clusters::Helm.new(build_kubeclient!)
+  def kubeclient
+    @kubeclient ||= build_kubeclient!
   end
 
   TEMPLATE_PLACEHOLDER = 'Kubernetes namespace'.freeze
diff --git a/app/presenters/clusters/cluster_presenter.rb b/app/presenters/clusters/cluster_presenter.rb
index 01cb59d0d44..5e11dac3bd2 100644
--- a/app/presenters/clusters/cluster_presenter.rb
+++ b/app/presenters/clusters/cluster_presenter.rb
@@ -5,5 +5,11 @@ module Clusters
     def gke_cluster_url
       "https://console.cloud.google.com/kubernetes/clusters/details/#{provider.zone}/#{name}" if gcp?
     end
+
+    def applications
+      Clusters::Cluster::APPLICATIONS.map do |key, value|
+        value.find_by(cluster_id: id)
+      end.compact
+    end
   end
 end
diff --git a/app/serializers/cluster_app_entity.rb b/app/serializers/cluster_app_entity.rb
new file mode 100644
index 00000000000..7da2d4921a2
--- /dev/null
+++ b/app/serializers/cluster_app_entity.rb
@@ -0,0 +1,5 @@
+class ClusterAppEntity < Grape::Entity
+  expose :name
+  expose :status_name, as: :status
+  expose :status_reason
+end
diff --git a/app/serializers/cluster_entity.rb b/app/serializers/cluster_entity.rb
index 84ce34afb32..e775c68eb6b 100644
--- a/app/serializers/cluster_entity.rb
+++ b/app/serializers/cluster_entity.rb
@@ -3,16 +3,5 @@ class ClusterEntity < Grape::Entity
 
   expose :status_name, as: :status
   expose :status_reason
-  expose :applications do |cluster, options|
-    if cluster.created?
-      {
-        helm: { status: 'installed' },
-        ingress: { status: 'error', status_reason: 'Missing namespace' },
-        runner: { status: 'installing' },
-        prometheus: { status: 'installable' }
-      }
-    else
-      {}
-    end
-  end
+  expose :applications, using: ClusterAppEntity
 end
diff --git a/app/services/clusters/base_helm_service.rb b/app/services/clusters/base_helm_service.rb
index b8ed52bf376..c7f7e2d0877 100644
--- a/app/services/clusters/base_helm_service.rb
+++ b/app/services/clusters/base_helm_service.rb
@@ -8,10 +8,16 @@ module Clusters
 
     protected
 
-    def helm
-      return @helm if defined?(@helm)
+    def cluster
+      app.cluster
+    end
+
+    def kubeclient
+      cluster.kubeclient
+    end
 
-      @helm = @app.cluster.helm
+    def helm_api
+      @helm ||= Gitlab::Clusters::Helm.new(kubeclient)
     end
   end
 end
diff --git a/app/services/clusters/fetch_app_installation_status_service.rb b/app/services/clusters/fetch_app_installation_status_service.rb
index e21aa49bb43..9b281c77c49 100644
--- a/app/services/clusters/fetch_app_installation_status_service.rb
+++ b/app/services/clusters/fetch_app_installation_status_service.rb
@@ -3,8 +3,8 @@ module Clusters
     def execute
       return unless app.installing?
 
-      phase = helm.installation_status(app)
-      log = helm.installation_log(app) if phase == 'Failed'
+      phase = helm_api.installation_status(app)
+      log = helm_api.installation_log(app) if phase == 'Failed'
       yield(phase, log) if block_given?
     rescue KubeException => ke
       app.make_errored!("Kubernetes error: #{ke.message}") unless app.errored?
diff --git a/app/services/clusters/finalize_app_installation_service.rb b/app/services/clusters/finalize_app_installation_service.rb
index c921747febc..b9d5da063eb 100644
--- a/app/services/clusters/finalize_app_installation_service.rb
+++ b/app/services/clusters/finalize_app_installation_service.rb
@@ -1,7 +1,7 @@
 module Clusters
   class FinalizeAppInstallationService < BaseHelmService
     def execute
-      helm.delete_installation_pod!(app)
+      helm_api.delete_installation_pod!(app)
 
       app.make_errored!('Installation aborted') if aborted?
     end
diff --git a/app/services/clusters/install_app_service.rb b/app/services/clusters/install_app_service.rb
index dd8556108d4..496af2495fd 100644
--- a/app/services/clusters/install_app_service.rb
+++ b/app/services/clusters/install_app_service.rb
@@ -4,14 +4,14 @@ module Clusters
       return unless app.scheduled?
 
       begin
-        helm.install(app)
+        helm_api.install(app)
+
         if app.make_installing
           ClusterWaitForAppInstallationWorker.perform_in(
             ClusterWaitForAppInstallationWorker::INITIAL_INTERVAL, app.name, app.id)
         else
           app.make_errored!("Failed to update app record; #{app.errors}")
         end
-
       rescue KubeException => ke
         app.make_errored!("Kubernetes error: #{ke.message}")
       rescue StandardError => e
diff --git a/app/workers/concerns/cluster_app.rb b/app/workers/concerns/cluster_app.rb
index 2170f8be6f6..a0202901f15 100644
--- a/app/workers/concerns/cluster_app.rb
+++ b/app/workers/concerns/cluster_app.rb
@@ -3,8 +3,9 @@ module ClusterApp
 
   included do
     def find_app(app_name, id)
-      app = Clusters::Kubernetes.app(app_name).find(id)
-      yield(app) if block_given?
+      Clusters::Applications.const_get(app_name.classify).find(id).try do |app|
+        yield(app) if block_given?
+      end
     end
   end
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 746c0c46677..a6a7c5e7482 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -190,6 +190,10 @@ constraints(ProjectUrlConstrainer.new) do
 
         member do
           get :status, format: :json
+
+          scope '*application' do
+            resource :applications, only: [:create]
+          end
         end
       end
 
diff --git a/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb b/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
index 93611bf8a12..1035adfe2b5 100644
--- a/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
+++ b/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
@@ -1,12 +1,12 @@
 class CreateClustersKubernetesHelmApps < ActiveRecord::Migration
   def change
-    create_table :clusters_kubernetes_helm_apps do |t|
-      t.integer :status, null: false
+    create_table :clusters_applications_helm do |t|
+      t.references :cluster, null: false, unique: true, foreign_key: { on_delete: :cascade }
 
       t.datetime_with_timezone :created_at, null: false
       t.datetime_with_timezone :updated_at, null: false
-
-      t.references :service, index: true, null: false, foreign_key: { on_delete: :cascade }
+      
+      t.integer :status, null: false
       t.string :version, null: false
       t.text :status_reason
     end
diff --git a/db/schema.rb b/db/schema.rb
index d76977d45f2..02df408b45e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171017145932) do
+ActiveRecord::Schema.define(version: 20171031100710) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -464,9 +464,7 @@ ActiveRecord::Schema.define(version: 20171017145932) do
 
   create_table "cluster_platforms_kubernetes", force: :cascade do |t|
     t.integer "cluster_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.text "api_url"
+    t.string "api_url"
     t.text "ca_cert"
     t.string "namespace"
     t.string "username"
@@ -474,6 +472,8 @@ ActiveRecord::Schema.define(version: 20171017145932) do
     t.string "encrypted_password_iv"
     t.text "encrypted_token"
     t.string "encrypted_token_iv"
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
   end
 
   add_index "cluster_platforms_kubernetes", ["cluster_id"], name: "index_cluster_platforms_kubernetes_on_cluster_id", unique: true, using: :btree
@@ -491,33 +491,39 @@ ActiveRecord::Schema.define(version: 20171017145932) do
   create_table "cluster_providers_gcp", force: :cascade do |t|
     t.integer "cluster_id", null: false
     t.integer "status"
-    t.integer "num_nodes", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
     t.text "status_reason"
     t.string "gcp_project_id", null: false
     t.string "zone", null: false
+    t.integer "num_nodes", null: false
     t.string "machine_type"
     t.string "operation_id"
     t.string "endpoint"
     t.text "encrypted_access_token"
     t.string "encrypted_access_token_iv"
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
   end
 
   add_index "cluster_providers_gcp", ["cluster_id"], name: "index_cluster_providers_gcp_on_cluster_id", unique: true, using: :btree
 
   create_table "clusters", force: :cascade do |t|
-    t.integer "user_id", null: false
-    t.integer "provider_type"
-    t.integer "platform_type"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.integer "user_id"
     t.boolean "enabled", default: true
     t.string "name", null: false
+    t.integer "provider_type"
+    t.integer "platform_type"
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
   end
 
-  add_index "clusters", ["enabled"], name: "index_clusters_on_enabled", using: :btree
-  add_index "clusters", ["user_id"], name: "index_clusters_on_user_id", using: :btree
+  create_table "clusters_applications_helm", force: :cascade do |t|
+    t.integer "cluster_id", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.integer "status", null: false
+    t.string "version", null: false
+    t.text "status_reason"
+  end
 
   create_table "container_repositories", force: :cascade do |t|
     t.integer "project_id", null: false
@@ -1872,6 +1878,7 @@ ActiveRecord::Schema.define(version: 20171017145932) do
   add_foreign_key "cluster_projects", "projects", on_delete: :cascade
   add_foreign_key "cluster_providers_gcp", "clusters", on_delete: :cascade
   add_foreign_key "clusters", "users", on_delete: :nullify
+  add_foreign_key "clusters_applications_helm", "clusters", on_delete: :cascade
   add_foreign_key "container_repositories", "projects"
   add_foreign_key "deploy_keys_projects", "projects", name: "fk_58a901ca7e", on_delete: :cascade
   add_foreign_key "deployments", "projects", name: "fk_b9a3851b82", on_delete: :cascade
diff --git a/spec/models/clusters/kubernetes/helm_app_spec.rb b/spec/models/clusters/kubernetes/helm_app_spec.rb
index 27a1561ce6c..6e32e2e7037 100644
--- a/spec/models/clusters/kubernetes/helm_app_spec.rb
+++ b/spec/models/clusters/kubernetes/helm_app_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 require_relative '../kubernetes_spec'
 
-RSpec.describe Clusters::Kubernetes::HelmApp, type: :model do
+RSpec.describe Clusters::Applications::Helm, type: :model do
   it_behaves_like 'a registered kubernetes app'
 
   it { is_expected.to belong_to(:kubernetes_service) }
diff --git a/spec/models/clusters/kubernetes_spec.rb b/spec/models/clusters/kubernetes_spec.rb
deleted file mode 100644
index 5876f08250f..00000000000
--- a/spec/models/clusters/kubernetes_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'rails_helper'
-
-RSpec.shared_examples 'a registered kubernetes app' do
-  let(:name) { described_class::NAME }
-
-  it 'can be retrieved with Clusters::Kubernetes.app' do
-    expect(Clusters::Kubernetes.app(name)).to eq(described_class)
-  end
-end
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 6d9fc28bf58..1c629155e1e 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -9,7 +9,6 @@ describe KubernetesService, :use_clean_rails_memory_store_caching do
 
   describe 'Associations' do
     it { is_expected.to belong_to :project }
-    it { is_expected.to have_one(:helm_app) }
   end
 
   describe 'Validations' do
-- 
cgit v1.2.1


From 30938b898c5415d8ec5cdf6c9851c45c1464c1a0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 2 Nov 2017 15:31:25 +0100
Subject: Fix and add applications controller

---
 .../projects/clusters/applications_controller.rb           | 14 +++++---------
 app/models/clusters/applications/helm.rb                   |  2 +-
 app/workers/concerns/cluster_app.rb                        |  2 +-
 config/routes/project.rb                                   |  4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb
index 438e1853435..cdebbdefb3f 100644
--- a/app/controllers/projects/clusters/applications_controller.rb
+++ b/app/controllers/projects/clusters/applications_controller.rb
@@ -4,18 +4,14 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
   before_action :authorize_read_cluster!
   before_action :authorize_create_cluster!, only: [:create]
 
-  def new
-  end
-
   def create
     return render_404 if application
 
-    new_application = application_class.create(cluster: cluster)
-
     respond_to do |format|
       format.json do
-        if new_application.persisted?
-          head :ok
+        # TODO: Do that via Service
+        if application_class.create(cluster: cluster).persisted?
+          head :no_data
         else
           head :bad_request
         end
@@ -26,11 +22,11 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
   private
 
   def cluster
-    @cluster ||= project.clusters.find_by(cluster_id: params[:cluster_id]).present(current_user: current_user)
+    @cluster ||= project.clusters.find(params[:id]) || render_404
   end
 
   def application_class
-    Clusters::Cluster::Applications.find(params[:application])
+    Clusters::Cluster::APPLICATIONS[params[:application]] || render_404
   end
 
   def application
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 59e0076c8df..a18a3f87bc4 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -7,7 +7,7 @@ module Clusters
 
       include ::Clusters::Concerns::AppStatus
 
-      belongs_to :cluser, class_name: 'Clusters::Cluster', foreign_key: :cluster_id
+      belongs_to :cluster, class_name: 'Clusters::Cluster', foreign_key: :cluster_id
 
       default_value_for :version, Gitlab::Clusters::Helm::HELM_VERSION
 
diff --git a/app/workers/concerns/cluster_app.rb b/app/workers/concerns/cluster_app.rb
index a0202901f15..947cdaefcb7 100644
--- a/app/workers/concerns/cluster_app.rb
+++ b/app/workers/concerns/cluster_app.rb
@@ -3,7 +3,7 @@ module ClusterApp
 
   included do
     def find_app(app_name, id)
-      Clusters::Applications.const_get(app_name.classify).find(id).try do |app|
+      Clusters::Cluster::APPLICATIONS[app_name].find(id).try do |app|
         yield(app) if block_given?
       end
     end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index a6a7c5e7482..55dab840dca 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -191,8 +191,8 @@ constraints(ProjectUrlConstrainer.new) do
         member do
           get :status, format: :json
 
-          scope '*application' do
-            resource :applications, only: [:create]
+          scope :applications do
+            get '/*application', to: 'clusters/applications#create'
           end
         end
       end
-- 
cgit v1.2.1


From 31c256c154e7a8727de9e91b1353b9740f380dd8 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Thu, 2 Nov 2017 16:57:18 +0100
Subject: General cleanup

---
 app/models/clusters/applications/helm.rb           |   2 +-
 app/services/clusters/base_helm_service.rb         |   2 +-
 app/services/clusters/install_app_service.rb       |   1 -
 app/services/clusters/install_tiller_service.rb    |  24 -----
 ...1100710_create_clusters_kubernetes_helm_apps.rb |   4 +
 lib/gitlab/clusters/helm.rb                        | 104 --------------------
 lib/gitlab/kubernetes/helm.rb                      | 108 +++++++++++++++++++++
 7 files changed, 114 insertions(+), 131 deletions(-)
 delete mode 100644 app/services/clusters/install_tiller_service.rb
 delete mode 100644 lib/gitlab/clusters/helm.rb
 create mode 100644 lib/gitlab/kubernetes/helm.rb

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index a18a3f87bc4..c35db143205 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -9,7 +9,7 @@ module Clusters
 
       belongs_to :cluster, class_name: 'Clusters::Cluster', foreign_key: :cluster_id
 
-      default_value_for :version, Gitlab::Clusters::Helm::HELM_VERSION
+      default_value_for :version, Gitlab::Kubernetes::Helm::HELM_VERSION
 
       def name
         NAME
diff --git a/app/services/clusters/base_helm_service.rb b/app/services/clusters/base_helm_service.rb
index c7f7e2d0877..dd717a0bb58 100644
--- a/app/services/clusters/base_helm_service.rb
+++ b/app/services/clusters/base_helm_service.rb
@@ -17,7 +17,7 @@ module Clusters
     end
 
     def helm_api
-      @helm ||= Gitlab::Clusters::Helm.new(kubeclient)
+      @helm ||= Gitlab::Kubernetes::Helm.new(kubeclient)
     end
   end
 end
diff --git a/app/services/clusters/install_app_service.rb b/app/services/clusters/install_app_service.rb
index 496af2495fd..a72cfa0a17f 100644
--- a/app/services/clusters/install_app_service.rb
+++ b/app/services/clusters/install_app_service.rb
@@ -15,7 +15,6 @@ module Clusters
       rescue KubeException => ke
         app.make_errored!("Kubernetes error: #{ke.message}")
       rescue StandardError => e
-        Rails.logger.warn(e.message)
         app.make_errored!("Can't start installation process")
       end
     end
diff --git a/app/services/clusters/install_tiller_service.rb b/app/services/clusters/install_tiller_service.rb
deleted file mode 100644
index ac77a7ea3c2..00000000000
--- a/app/services/clusters/install_tiller_service.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module Clusters
-  class InstallTillerService < BaseService
-    def execute
-      ensure_namespace
-      install
-    end
-
-    private
-
-    def kubernetes_service
-      return @kubernetes_service if defined?(@kubernetes_service)
-
-      @kubernetes_service = project&.kubernetes_service
-    end
-
-    def ensure_namespace
-      kubernetes_service&.ensure_namespace!
-    end
-
-    def install
-      kubernetes_service&.helm_client&.init!
-    end
-  end
-end
diff --git a/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb b/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
index 1035adfe2b5..ef2e7e07a41 100644
--- a/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
+++ b/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
@@ -1,4 +1,8 @@
 class CreateClustersKubernetesHelmApps < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
   def change
     create_table :clusters_applications_helm do |t|
       t.references :cluster, null: false, unique: true, foreign_key: { on_delete: :cascade }
diff --git a/lib/gitlab/clusters/helm.rb b/lib/gitlab/clusters/helm.rb
deleted file mode 100644
index 9c75fe2be96..00000000000
--- a/lib/gitlab/clusters/helm.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-module Gitlab
-  module Clusters
-    class Helm
-      Error = Class.new(StandardError)
-      HELM_VERSION = '2.7.0'.freeze
-      NAMESPACE = 'gitlab-managed-apps'.freeze
-      COMMAND_SCRIPT = <<-EOS.freeze
-        set -eo pipefail
-        apk add -U ca-certificates openssl >/dev/null
-        wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
-        mv /tmp/linux-amd64/helm /usr/bin/
-        helm init ${HELM_INIT_OPTS} >/dev/null
-        [[ -z "${HELM_COMMAND+x}" ]] || helm ${HELM_COMMAND} >/dev/null
-      EOS
-
-      def initialize(kubeclient)
-        @kubeclient = kubeclient
-      end
-
-      def init!
-        ensure_namespace!
-        @kubeclient.create_pod(pod_resource(OpenStruct.new(name: 'helm')))
-      end
-
-      def install(app)
-        ensure_namespace!
-        @kubeclient.create_pod(pod_resource(app))
-      end
-
-      ##
-      # Returns Pod phase
-      #
-      # https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
-      #
-      # values: "Pending", "Running", "Succeeded", "Failed", "Unknown"
-      #
-      def installation_status(app)
-        @kubeclient.get_pod(pod_name(app), NAMESPACE).status.phase
-      end
-
-      def installation_log(app)
-        @kubeclient.get_pod_log(pod_name(app), NAMESPACE).body
-      end
-
-      def delete_installation_pod!(app)
-        @kubeclient.delete_pod(pod_name(app), NAMESPACE)
-      end
-
-      private
-
-      def pod_name(app)
-        "install-#{app.name}"
-      end
-
-      def pod_resource(app)
-        labels = { 'gitlab.org/action': 'install', 'gitlab.org/application': app.name }
-        metadata = { name: pod_name(app), namespace: NAMESPACE, labels: labels }
-        container = {
-          name: 'helm',
-          image: 'alpine:3.6',
-          env: generate_pod_env(app),
-          command: %w(/bin/sh),
-          args: %w(-c $(COMMAND_SCRIPT))
-        }
-        spec = { containers: [container], restartPolicy: 'Never' }
-
-        ::Kubeclient::Resource.new(metadata: metadata, spec: spec)
-      end
-
-      def generate_pod_env(app)
-        env = {
-          HELM_VERSION: HELM_VERSION,
-          TILLER_NAMESPACE: NAMESPACE,
-          COMMAND_SCRIPT: COMMAND_SCRIPT
-        }
-
-        if app.name != 'helm'
-          env[:HELM_INIT_OPTS] = '--client-only'
-          env[:HELM_COMMAND] = helm_install_comand(app)
-        end
-
-        env.map { |key, value| { name: key, value: value } }
-      end
-
-      def helm_install_comand(app)
-        "install #{app.chart} --name #{app.name} --namespace #{NAMESPACE}"
-      end
-
-      def ensure_namespace!
-        begin
-          @kubeclient.get_namespace(NAMESPACE)
-        rescue KubeException => ke
-          raise ke unless ke.error_code == 404
-
-          namespace_resource = ::Kubeclient::Resource.new
-          namespace_resource.metadata = {}
-          namespace_resource.metadata.name = NAMESPACE
-
-          @kubeclient.create_namespace(namespace_resource)
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb
new file mode 100644
index 00000000000..76bb14a0609
--- /dev/null
+++ b/lib/gitlab/kubernetes/helm.rb
@@ -0,0 +1,108 @@
+module Gitlab
+  module Kubernetes
+    class Helm
+      HELM_VERSION = '2.7.0'.freeze
+      NAMESPACE = 'gitlab-managed-apps'.freeze
+      COMMAND_SCRIPT = <<-EOS.freeze
+        set -eo pipefail
+        apk add -U ca-certificates openssl >/dev/null
+        wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
+        mv /tmp/linux-amd64/helm /usr/bin/
+        helm init ${HELM_INIT_OPTS} >/dev/null
+        [[ -z "${HELM_COMMAND+x}" ]] || helm ${HELM_COMMAND} >/dev/null
+      EOS
+
+      def initialize(kubeclient)
+        @kubeclient = kubeclient
+      end
+
+      def init!
+        install(OpenStruct.new(name: 'helm'))
+      end
+
+      def install(app)
+        create_namespace! unless has_namespace?
+        @kubeclient.create_pod(pod_resource(app))
+      end
+
+      ##
+      # Returns Pod phase
+      #
+      # https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
+      #
+      # values: "Pending", "Running", "Succeeded", "Failed", "Unknown"
+      #
+      def installation_status(app)
+        @kubeclient.get_pod(pod_name(app), NAMESPACE).status.phase
+      end
+
+      def installation_log(app)
+        @kubeclient.get_pod_log(pod_name(app), NAMESPACE).body
+      end
+
+      def delete_installation_pod!(app)
+        @kubeclient.delete_pod(pod_name(app), NAMESPACE)
+      end
+
+      private
+
+      def pod_name(app)
+        "install-#{app.name}"
+      end
+
+      def pod_resource(app)
+        labels = { 'gitlab.org/action': 'install', 'gitlab.org/application': app.name }
+        metadata = { name: pod_name(app), namespace: NAMESPACE, labels: labels }
+        container = {
+          name: 'helm',
+          image: 'alpine:3.6',
+          env: generate_pod_env(app),
+          command: %w(/bin/sh),
+          args: %w(-c $(COMMAND_SCRIPT))
+        }
+        spec = { containers: [container], restartPolicy: 'Never' }
+
+        ::Kubeclient::Resource.new(metadata: metadata, spec: spec)
+      end
+
+      def generate_pod_env(app)
+        env = {
+          HELM_VERSION: HELM_VERSION,
+          TILLER_NAMESPACE: NAMESPACE,
+          COMMAND_SCRIPT: COMMAND_SCRIPT
+        }
+
+        if app.name != 'helm'
+          env[:HELM_INIT_OPTS] = '--client-only'
+          env[:HELM_COMMAND] = helm_install_comand(app)
+        end
+
+        env.map { |key, value| { name: key, value: value } }
+      end
+
+      def helm_install_comand(app)
+        "install #{app.chart} --name #{app.name} --namespace #{NAMESPACE}"
+      end
+
+      def has_namespace?
+        return @has_namespace if defined?(@has_namespace)
+
+        begin
+          @kubeclient.get_namespace(NAMESPACE)
+          @has_namespace = true
+        rescue KubeException => ke
+          raise ke unless ke.error_code == 404
+          false
+        end
+      end
+
+      def create_namespace!
+        namespace_resource = ::Kubeclient::Resource.new
+        namespace_resource.metadata = {}
+        namespace_resource.metadata.name = NAMESPACE
+
+        @kubeclient.create_namespace(namespace_resource)
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From a8d7e4bcb13e24426a531ef37d573e24d2547b81 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Thu, 2 Nov 2017 17:08:56 +0100
Subject: Fix rubocop offenses

---
 app/models/clusters/cluster.rb                             |  2 +-
 app/models/clusters/platforms/kubernetes.rb                |  2 +-
 .../20171031100710_create_clusters_kubernetes_helm_apps.rb |  2 +-
 spec/models/clusters/applications/helm_spec.rb             | 14 ++++++++++++++
 spec/models/clusters/kubernetes/helm_app_spec.rb           | 14 --------------
 5 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 spec/models/clusters/applications/helm_spec.rb
 delete mode 100644 spec/models/clusters/kubernetes/helm_app_spec.rb

diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index c814f475adf..4513dd426e2 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -6,7 +6,7 @@ module Clusters
 
     APPLICATIONS = {
       Clusters::Applications::Helm::NAME => Clusters::Applications::Helm
-    }
+    }.freeze
 
     belongs_to :user
 
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 1197dfaefcb..0bb2972f7b7 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -91,7 +91,7 @@ module Clusters
           api_url: api_url,
           namespace: namespace,
           token: token,
-          ca_pem: ca_cert,
+          ca_pem: ca_cert
         )
       end
 
diff --git a/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb b/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
index ef2e7e07a41..a2ce37127ea 100644
--- a/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
+++ b/db/migrate/20171031100710_create_clusters_kubernetes_helm_apps.rb
@@ -9,7 +9,7 @@ class CreateClustersKubernetesHelmApps < ActiveRecord::Migration
 
       t.datetime_with_timezone :created_at, null: false
       t.datetime_with_timezone :updated_at, null: false
-      
+
       t.integer :status, null: false
       t.string :version, null: false
       t.text :status_reason
diff --git a/spec/models/clusters/applications/helm_spec.rb b/spec/models/clusters/applications/helm_spec.rb
new file mode 100644
index 00000000000..6e32e2e7037
--- /dev/null
+++ b/spec/models/clusters/applications/helm_spec.rb
@@ -0,0 +1,14 @@
+require 'rails_helper'
+require_relative '../kubernetes_spec'
+
+RSpec.describe Clusters::Applications::Helm, type: :model do
+  it_behaves_like 'a registered kubernetes app'
+
+  it { is_expected.to belong_to(:kubernetes_service) }
+
+  describe '#cluster' do
+    it 'is an alias to #kubernetes_service' do
+      expect(subject.method(:cluster).original_name).to eq(:kubernetes_service)
+    end
+  end
+end
diff --git a/spec/models/clusters/kubernetes/helm_app_spec.rb b/spec/models/clusters/kubernetes/helm_app_spec.rb
deleted file mode 100644
index 6e32e2e7037..00000000000
--- a/spec/models/clusters/kubernetes/helm_app_spec.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'rails_helper'
-require_relative '../kubernetes_spec'
-
-RSpec.describe Clusters::Applications::Helm, type: :model do
-  it_behaves_like 'a registered kubernetes app'
-
-  it { is_expected.to belong_to(:kubernetes_service) }
-
-  describe '#cluster' do
-    it 'is an alias to #kubernetes_service' do
-      expect(subject.method(:cluster).original_name).to eq(:kubernetes_service)
-    end
-  end
-end
-- 
cgit v1.2.1


From 94d5f5680e398ddfe0cc621bde00dfb5c8a39d03 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Thu, 2 Nov 2017 17:52:17 +0100
Subject: Extract ClusterWaitForAppInstallationWorker logic into a service

---
 .../check_app_installation_progress_service.rb     | 28 ++++++++++++++++++++++
 app/services/clusters/install_app_service.rb       |  2 +-
 .../cluster_wait_for_app_installation_worker.rb    | 20 +---------------
 3 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 app/services/clusters/check_app_installation_progress_service.rb

diff --git a/app/services/clusters/check_app_installation_progress_service.rb b/app/services/clusters/check_app_installation_progress_service.rb
new file mode 100644
index 00000000000..ff3398bbd63
--- /dev/null
+++ b/app/services/clusters/check_app_installation_progress_service.rb
@@ -0,0 +1,28 @@
+module Clusters
+  class CheckAppInstallationProgressService < BaseHelmService
+    def execute
+      return unless app.installing?
+
+      FetchAppInstallationStatusService.new(app).execute do |phase, log|
+        case phase
+        when 'Succeeded'
+          if app.make_installed
+            FinalizeAppInstallationService.new(app).execute
+          else
+            app.make_errored!("Failed to update app record; #{app.errors}")
+          end
+        when 'Failed'
+          app.make_errored!(log || 'Installation silently failed')
+          FinalizeAppInstallationService.new(app).execute
+        else
+          if Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
+            app.make_errored!('App installation timeouted')
+          else
+            ClusterWaitForAppInstallationWorker.perform_in(
+              ClusterWaitForAppInstallationWorker::EAGER_INTERVAL, app.name, app.id)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/clusters/install_app_service.rb b/app/services/clusters/install_app_service.rb
index a72cfa0a17f..63f15abaa6d 100644
--- a/app/services/clusters/install_app_service.rb
+++ b/app/services/clusters/install_app_service.rb
@@ -14,7 +14,7 @@ module Clusters
         end
       rescue KubeException => ke
         app.make_errored!("Kubernetes error: #{ke.message}")
-      rescue StandardError => e
+      rescue StandardError
         app.make_errored!("Can't start installation process")
       end
     end
diff --git a/app/workers/cluster_wait_for_app_installation_worker.rb b/app/workers/cluster_wait_for_app_installation_worker.rb
index 21149cf2d19..7e480c42fd4 100644
--- a/app/workers/cluster_wait_for_app_installation_worker.rb
+++ b/app/workers/cluster_wait_for_app_installation_worker.rb
@@ -9,25 +9,7 @@ class ClusterWaitForAppInstallationWorker
 
   def perform(app_name, app_id)
     find_app(app_name, app_id) do |app|
-      Clusters::FetchAppInstallationStatusService.new(app).execute do |phase, log|
-        case phase
-        when 'Succeeded'
-          if app.make_installed
-            Clusters::FinalizeAppInstallationService.new(app).execute
-          else
-            app.make_errored!("Failed to update app record; #{app.errors}")
-          end
-        when 'Failed'
-          app.make_errored!(log || 'Installation silently failed')
-          Clusters::FinalizeAppInstallationService.new(app).execute
-        else
-          if Time.now.utc - app.updated_at.to_time.utc > TIMEOUT
-            app.make_errored!('App installation timeouted')
-          else
-            ClusterWaitForAppInstallationWorker.perform_in(EAGER_INTERVAL, app.name, app.id)
-          end
-        end
-      end
+      Clusters::CheckAppInstallationProgressService.new(app).execute
     end
   end
 end
-- 
cgit v1.2.1


From 4d0a700da09be50291e40a11975b56f74051405b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 2 Nov 2017 17:57:50 +0100
Subject: Expose applications as array via API

---
 app/models/clusters/applications/helm.rb           |  2 +-
 app/models/clusters/cluster.rb                     |  6 ++++
 app/models/clusters/concerns/app_status.rb         | 33 ---------------------
 app/models/clusters/concerns/application_status.rb | 34 ++++++++++++++++++++++
 app/presenters/clusters/cluster_presenter.rb       |  6 ----
 5 files changed, 41 insertions(+), 40 deletions(-)
 delete mode 100644 app/models/clusters/concerns/app_status.rb
 create mode 100644 app/models/clusters/concerns/application_status.rb

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index c35db143205..77c0c61d968 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -5,7 +5,7 @@ module Clusters
 
       NAME = 'helm'.freeze
 
-      include ::Clusters::Concerns::AppStatus
+      include ::Clusters::Concerns::ApplicationStatus
 
       belongs_to :cluster, class_name: 'Clusters::Cluster', foreign_key: :cluster_id
 
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 4513dd426e2..3fd8ffb6e92 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -51,6 +51,12 @@ module Clusters
       end
     end
 
+    def applications
+      [ 
+        application_helm || build_application_helm
+      ]
+    end
+
     def provider
       return provider_gcp if gcp?
     end
diff --git a/app/models/clusters/concerns/app_status.rb b/app/models/clusters/concerns/app_status.rb
deleted file mode 100644
index f6b817e9ce7..00000000000
--- a/app/models/clusters/concerns/app_status.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module Clusters
-  module Concerns
-    module AppStatus
-      extend ActiveSupport::Concern
-
-      included do
-        state_machine :status, initial: :scheduled do
-          state :errored, value: -1
-          state :scheduled, value: 0
-          state :installing, value: 1
-          state :installed, value: 2
-
-          event :make_installing do
-            transition any - [:installing] => :installing
-          end
-
-          event :make_installed do
-            transition any - [:installed] => :installed
-          end
-
-          event :make_errored do
-            transition any - [:errored] => :errored
-          end
-
-          before_transition any => [:errored] do |app_status, transition|
-            status_reason = transition.args.first
-            app_status.status_reason = status_reason if status_reason
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
new file mode 100644
index 00000000000..e1f4c7fdda8
--- /dev/null
+++ b/app/models/clusters/concerns/application_status.rb
@@ -0,0 +1,34 @@
+module Clusters
+  module Concerns
+    module ApplicationStatus
+      extend ActiveSupport::Concern
+
+      included do
+        state_machine :status, initial: :installable do
+          state :errored, value: -1
+          state :installable, value: 0
+          state :scheduled, value: 1
+          state :installing, value: 2
+          state :installed, value: 3
+
+          event :make_installing do
+            transition any - [:installing] => :installing
+          end
+
+          event :make_installed do
+            transition any - [:installed] => :installed
+          end
+
+          event :make_errored do
+            transition any - [:errored] => :errored
+          end
+
+          before_transition any => [:errored] do |app_status, transition|
+            status_reason = transition.args.first
+            app_status.status_reason = status_reason if status_reason
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/presenters/clusters/cluster_presenter.rb b/app/presenters/clusters/cluster_presenter.rb
index 5e11dac3bd2..01cb59d0d44 100644
--- a/app/presenters/clusters/cluster_presenter.rb
+++ b/app/presenters/clusters/cluster_presenter.rb
@@ -5,11 +5,5 @@ module Clusters
     def gke_cluster_url
       "https://console.cloud.google.com/kubernetes/clusters/details/#{provider.zone}/#{name}" if gcp?
     end
-
-    def applications
-      Clusters::Cluster::APPLICATIONS.map do |key, value|
-        value.find_by(cluster_id: id)
-      end.compact
-    end
   end
 end
-- 
cgit v1.2.1


From 4585f358b923bb9b4ab36a0c3e4682b060e088a7 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Thu, 2 Nov 2017 15:08:10 -0600
Subject: Add styles for branch & tags boxes

- Create a partial for limit exceeded message
- Modifies specs to adjust new scenarios
---
 app/assets/stylesheets/framework/wells.scss        | 41 ++++++++++++++++++++++
 app/helpers/commits_helper.rb                      | 12 -------
 app/views/projects/commit/_commit_box.html.haml    |  2 +-
 .../commit/_limit_exceeded_message.html.haml       |  8 +++++
 app/views/projects/commit/branches.html.haml       |  9 ++---
 .../projects/commit/branches.html.haml_spec.rb     |  6 ++--
 6 files changed, 55 insertions(+), 23 deletions(-)
 create mode 100644 app/views/projects/commit/_limit_exceeded_message.html.haml

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 5f9756bf58a..556485c2f3b 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -52,6 +52,47 @@
   .label.label-gray {
     background-color: $well-expand-item;
   }
+
+  .limit-box-branch {
+    width: 160px;
+  }
+
+  .limit-box-tag {
+    width: 125px;
+  }
+
+  .branches {
+    display: inline;
+  }
+
+  .limit-box {
+    background: $blue-100;
+    border-radius: 3px;
+    display: inline-block;
+    margin-left: 5px;
+    padding: 1px 1px 0.5px 0;
+    text-align: center;
+    vertical-align: bottom;
+
+    &:hover {
+      background: $blue-200;
+    }
+
+    .limit-icon {
+      float: left;
+      width: 15%;
+    }
+
+    .limit-message {
+      background: $white-light;
+      border-radius: 0 3px 3px 0;
+      font-family: $regular_font;
+      font-size: 12px;
+      float: right;
+      margin-top: 1px;
+      width: 85%;
+    }
+  }
 }
 
 .light-well {
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 2ba84e55fe0..95fc50a476a 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -81,18 +81,6 @@ module CommitsHelper
     end
   end
 
-  def branches_unavailable_message
-    link_to('#', class: 'label label-gray ref-name', title: 'Project has too many branches to search') do
-      icon('tag') + ' Branches unavailable'
-    end
-  end
-
-  def tags_unavailable_message
-    link_to('#', class: 'label label-gray ref-name', title: 'Project has too many tags to search') do
-      icon('tag') + ' Tags unavailable'
-    end
-  end
-
   # Returns the sorted links to tags, separated by a comma
   def commit_tags_links(project, tags)
     sorted = VersionSorter.rsort(tags)
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 09bcd187e59..cd93886bb24 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -61,7 +61,7 @@
     %span.cgray= n_('parent', 'parents', @commit.parents.count)
     - @commit.parents.each do |parent|
       = link_to parent.short_id, project_commit_path(@project, parent), class: "commit-sha"
-    %span.commit-info.branches
+    %div.commit-info.branches
       %i.fa.fa-spinner.fa-spin
 
   - if @commit.last_pipeline
diff --git a/app/views/projects/commit/_limit_exceeded_message.html.haml b/app/views/projects/commit/_limit_exceeded_message.html.haml
new file mode 100644
index 00000000000..b3372108321
--- /dev/null
+++ b/app/views/projects/commit/_limit_exceeded_message.html.haml
@@ -0,0 +1,8 @@
+.has-tooltip{class: "limit-box limit-box-#{objects.singularize}", data: { title: "Project has too many #{objects} to search"} }
+  .limit-icon
+    - if objects == "branches"
+      = icon('code-fork')
+    - else
+      = icon('tag')
+  .limit-message
+    %span= "#{objects.capitalize} unavailable"
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 8c7a303adbf..d282eb47914 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,12 +1,9 @@
 - if @branches_limit_exceeded
-  = branches_unavailable_message
+  = render 'limit_exceeded_message', objects: 'branches'
 - elsif @branches.any?
-  - branch = commit_default_branch(@project, @branches)
-  = commit_branch_link(project_ref_path(@project, branch), branch)
+  = commit_branches_links(@project, @branches)
 
--# `commit_default_branch` deletes the default branch from `@branches`,
-  -# so only render this if we have more branches or tags left
 - if @tags_limit_exceeded
-  = tags_unavailable_message
+  = render 'limit_exceeded_message', objects: 'tags'
 - elsif @tags.any?
   = commit_tags_links(@project, @tags)
diff --git a/spec/views/projects/commit/branches.html.haml_spec.rb b/spec/views/projects/commit/branches.html.haml_spec.rb
index 4199d2fd962..c9112ede334 100644
--- a/spec/views/projects/commit/branches.html.haml_spec.rb
+++ b/spec/views/projects/commit/branches.html.haml_spec.rb
@@ -18,7 +18,6 @@ describe 'projects/commit/branches.html.haml' do
     end
 
     it 'shows branch and tag links' do
-      expect(rendered).to have_selector('.js-details-expand')
       expect(rendered).to have_link('master')
       expect(rendered).to have_link('test-branch')
       expect(rendered).to have_link('tag1')
@@ -36,9 +35,8 @@ describe 'projects/commit/branches.html.haml' do
     end
 
     it 'shows too many to search' do
-      expect(rendered).to have_selector('.js-details-expand')
-      expect(rendered).to have_link('Too many branches to search', href: '#')
-      expect(rendered).to have_link('Too many tags to search', href: '#')
+      expect(rendered).to have_text('Branches unavailable')
+      expect(rendered).to have_text('Tags unavailable')
     end
   end
 end
-- 
cgit v1.2.1


From 4477f7bb5925d8d720e3e8272bd882fffcc04b28 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 3 Nov 2017 09:22:11 +0100
Subject: Fix nitpicks

---
 app/models/clusters/cluster.rb             | 2 +-
 app/services/clusters/base_helm_service.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 3fd8ffb6e92..7dae2234998 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -27,8 +27,8 @@ module Clusters
     validates :name, cluster_name: true
     validate :restrict_modification, on: :update
 
+    delegate :status, to: :provider, allow_nil: true
     delegate :status_reason, to: :provider, allow_nil: true
-    delegate :status_name, to: :provider, allow_nil: true
     delegate :on_creation?, to: :provider, allow_nil: true
 
     enum platform_type: {
diff --git a/app/services/clusters/base_helm_service.rb b/app/services/clusters/base_helm_service.rb
index dd717a0bb58..0a95955a204 100644
--- a/app/services/clusters/base_helm_service.rb
+++ b/app/services/clusters/base_helm_service.rb
@@ -17,7 +17,7 @@ module Clusters
     end
 
     def helm_api
-      @helm ||= Gitlab::Kubernetes::Helm.new(kubeclient)
+      @helm_api ||= Gitlab::Kubernetes::Helm.new(kubeclient)
     end
   end
 end
-- 
cgit v1.2.1


From c46417c5064867d72debb15c4e280db24c6ab73c Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Thu, 2 Nov 2017 18:55:02 +0100
Subject: Rename App to Applications

---
 app/models/clusters/concerns.rb                    |  4 ---
 .../clusters/applications/base_helm_service.rb     | 25 ++++++++++++++++++
 .../check_installation_progress_service.rb         | 30 ++++++++++++++++++++++
 .../fetch_installation_status_service.rb           | 15 +++++++++++
 .../applications/finalize_installation_service.rb  | 17 ++++++++++++
 .../clusters/applications/install_service.rb       | 24 +++++++++++++++++
 app/services/clusters/base_helm_service.rb         | 23 -----------------
 .../check_app_installation_progress_service.rb     | 28 --------------------
 .../fetch_app_installation_status_service.rb       | 13 ----------
 .../clusters/finalize_app_installation_service.rb  | 15 -----------
 app/services/clusters/install_app_service.rb       | 22 ----------------
 app/workers/cluster_install_app_worker.rb          |  6 ++---
 .../cluster_wait_for_app_installation_worker.rb    |  6 ++---
 app/workers/concerns/cluster_app.rb                | 11 --------
 app/workers/concerns/cluster_applications.rb       |  9 +++++++
 15 files changed, 126 insertions(+), 122 deletions(-)
 delete mode 100644 app/models/clusters/concerns.rb
 create mode 100644 app/services/clusters/applications/base_helm_service.rb
 create mode 100644 app/services/clusters/applications/check_installation_progress_service.rb
 create mode 100644 app/services/clusters/applications/fetch_installation_status_service.rb
 create mode 100644 app/services/clusters/applications/finalize_installation_service.rb
 create mode 100644 app/services/clusters/applications/install_service.rb
 delete mode 100644 app/services/clusters/base_helm_service.rb
 delete mode 100644 app/services/clusters/check_app_installation_progress_service.rb
 delete mode 100644 app/services/clusters/fetch_app_installation_status_service.rb
 delete mode 100644 app/services/clusters/finalize_app_installation_service.rb
 delete mode 100644 app/services/clusters/install_app_service.rb
 delete mode 100644 app/workers/concerns/cluster_app.rb
 create mode 100644 app/workers/concerns/cluster_applications.rb

diff --git a/app/models/clusters/concerns.rb b/app/models/clusters/concerns.rb
deleted file mode 100644
index cd09863bcfc..00000000000
--- a/app/models/clusters/concerns.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-module Clusters
-  module Concerns
-  end
-end
diff --git a/app/services/clusters/applications/base_helm_service.rb b/app/services/clusters/applications/base_helm_service.rb
new file mode 100644
index 00000000000..68320a3b267
--- /dev/null
+++ b/app/services/clusters/applications/base_helm_service.rb
@@ -0,0 +1,25 @@
+module Clusters
+  module Applications
+    class BaseHelmService
+      attr_accessor :app
+
+      def initialize(app)
+        @app = app
+      end
+
+      protected
+
+      def cluster
+        app.cluster
+      end
+
+      def kubeclient
+        cluster.kubeclient
+      end
+
+      def helm_api
+        @helm_api ||= Gitlab::Kubernetes::Helm.new(kubeclient)
+      end
+    end
+  end
+end
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
new file mode 100644
index 00000000000..4e8fd9baaf4
--- /dev/null
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -0,0 +1,30 @@
+module Clusters
+  module Applications
+    class CheckInstallationProgressService < BaseHelmService
+      def execute
+        return unless app.installing?
+
+        FetchInstallationStatusService.new(app).execute do |phase, log|
+          case phase
+          when 'Succeeded'
+            if app.make_installed
+              FinalizeInstallationService.new(app).execute
+            else
+              app.make_errored!("Failed to update app record; #{app.errors}")
+            end
+          when 'Failed'
+            app.make_errored!(log || 'Installation silently failed')
+            FinalizeInstallationService.new(app).execute
+          else
+            if Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
+              app.make_errored!('App installation timeouted')
+            else
+              ClusterWaitForAppInstallationWorker.perform_in(
+                ClusterWaitForAppInstallationWorker::EAGER_INTERVAL, app.name, app.id)
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/clusters/applications/fetch_installation_status_service.rb b/app/services/clusters/applications/fetch_installation_status_service.rb
new file mode 100644
index 00000000000..3d082485532
--- /dev/null
+++ b/app/services/clusters/applications/fetch_installation_status_service.rb
@@ -0,0 +1,15 @@
+module Clusters
+  module Applications
+    class FetchInstallationStatusService < BaseHelmService
+      def execute
+        return unless app.installing?
+
+        phase = helm_api.installation_status(app)
+        log = helm_api.installation_log(app) if phase == 'Failed'
+        yield(phase, log) if block_given?
+      rescue KubeException => ke
+        app.make_errored!("Kubernetes error: #{ke.message}") unless app.errored?
+      end
+    end
+  end
+end
diff --git a/app/services/clusters/applications/finalize_installation_service.rb b/app/services/clusters/applications/finalize_installation_service.rb
new file mode 100644
index 00000000000..339d671c091
--- /dev/null
+++ b/app/services/clusters/applications/finalize_installation_service.rb
@@ -0,0 +1,17 @@
+module Clusters
+  module Applications
+    class FinalizeInstallationService < BaseHelmService
+      def execute
+        helm_api.delete_installation_pod!(app)
+
+        app.make_errored!('Installation aborted') if aborted?
+      end
+
+      private
+
+      def aborted?
+        app.installing? || app.scheduled?
+      end
+    end
+  end
+end
diff --git a/app/services/clusters/applications/install_service.rb b/app/services/clusters/applications/install_service.rb
new file mode 100644
index 00000000000..7fcccb5e78c
--- /dev/null
+++ b/app/services/clusters/applications/install_service.rb
@@ -0,0 +1,24 @@
+module Clusters
+  module Applications
+    class InstallService < BaseHelmService
+      def execute
+        return unless app.scheduled?
+
+        begin
+          helm_api.install(app)
+
+          if app.make_installing
+            ClusterWaitForAppInstallationWorker.perform_in(
+              ClusterWaitForAppInstallationWorker::INITIAL_INTERVAL, app.name, app.id)
+          else
+            app.make_errored!("Failed to update app record; #{app.errors}")
+          end
+        rescue KubeException => ke
+          app.make_errored!("Kubernetes error: #{ke.message}")
+        rescue StandardError
+          app.make_errored!("Can't start installation process")
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/clusters/base_helm_service.rb b/app/services/clusters/base_helm_service.rb
deleted file mode 100644
index 0a95955a204..00000000000
--- a/app/services/clusters/base_helm_service.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module Clusters
-  class BaseHelmService
-    attr_accessor :app
-
-    def initialize(app)
-      @app = app
-    end
-
-    protected
-
-    def cluster
-      app.cluster
-    end
-
-    def kubeclient
-      cluster.kubeclient
-    end
-
-    def helm_api
-      @helm_api ||= Gitlab::Kubernetes::Helm.new(kubeclient)
-    end
-  end
-end
diff --git a/app/services/clusters/check_app_installation_progress_service.rb b/app/services/clusters/check_app_installation_progress_service.rb
deleted file mode 100644
index ff3398bbd63..00000000000
--- a/app/services/clusters/check_app_installation_progress_service.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module Clusters
-  class CheckAppInstallationProgressService < BaseHelmService
-    def execute
-      return unless app.installing?
-
-      FetchAppInstallationStatusService.new(app).execute do |phase, log|
-        case phase
-        when 'Succeeded'
-          if app.make_installed
-            FinalizeAppInstallationService.new(app).execute
-          else
-            app.make_errored!("Failed to update app record; #{app.errors}")
-          end
-        when 'Failed'
-          app.make_errored!(log || 'Installation silently failed')
-          FinalizeAppInstallationService.new(app).execute
-        else
-          if Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
-            app.make_errored!('App installation timeouted')
-          else
-            ClusterWaitForAppInstallationWorker.perform_in(
-              ClusterWaitForAppInstallationWorker::EAGER_INTERVAL, app.name, app.id)
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/app/services/clusters/fetch_app_installation_status_service.rb b/app/services/clusters/fetch_app_installation_status_service.rb
deleted file mode 100644
index 9b281c77c49..00000000000
--- a/app/services/clusters/fetch_app_installation_status_service.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Clusters
-  class FetchAppInstallationStatusService < BaseHelmService
-    def execute
-      return unless app.installing?
-
-      phase = helm_api.installation_status(app)
-      log = helm_api.installation_log(app) if phase == 'Failed'
-      yield(phase, log) if block_given?
-    rescue KubeException => ke
-      app.make_errored!("Kubernetes error: #{ke.message}") unless app.errored?
-    end
-  end
-end
diff --git a/app/services/clusters/finalize_app_installation_service.rb b/app/services/clusters/finalize_app_installation_service.rb
deleted file mode 100644
index b9d5da063eb..00000000000
--- a/app/services/clusters/finalize_app_installation_service.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Clusters
-  class FinalizeAppInstallationService < BaseHelmService
-    def execute
-      helm_api.delete_installation_pod!(app)
-
-      app.make_errored!('Installation aborted') if aborted?
-    end
-
-    private
-
-    def aborted?
-      app.installing? || app.scheduled?
-    end
-  end
-end
diff --git a/app/services/clusters/install_app_service.rb b/app/services/clusters/install_app_service.rb
deleted file mode 100644
index 63f15abaa6d..00000000000
--- a/app/services/clusters/install_app_service.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-module Clusters
-  class InstallAppService < BaseHelmService
-    def execute
-      return unless app.scheduled?
-
-      begin
-        helm_api.install(app)
-
-        if app.make_installing
-          ClusterWaitForAppInstallationWorker.perform_in(
-            ClusterWaitForAppInstallationWorker::INITIAL_INTERVAL, app.name, app.id)
-        else
-          app.make_errored!("Failed to update app record; #{app.errors}")
-        end
-      rescue KubeException => ke
-        app.make_errored!("Kubernetes error: #{ke.message}")
-      rescue StandardError
-        app.make_errored!("Can't start installation process")
-      end
-    end
-  end
-end
diff --git a/app/workers/cluster_install_app_worker.rb b/app/workers/cluster_install_app_worker.rb
index 4993b2b7349..899aed904e4 100644
--- a/app/workers/cluster_install_app_worker.rb
+++ b/app/workers/cluster_install_app_worker.rb
@@ -1,11 +1,11 @@
 class ClusterInstallAppWorker
   include Sidekiq::Worker
   include ClusterQueue
-  include ClusterApp
+  include ClusterApplications
 
   def perform(app_name, app_id)
-    find_app(app_name, app_id) do |app|
-      Clusters::InstallAppService.new(app).execute
+    find_application(app_name, app_id) do |app|
+      Clusters::Applications::InstallService.new(app).execute
     end
   end
 end
diff --git a/app/workers/cluster_wait_for_app_installation_worker.rb b/app/workers/cluster_wait_for_app_installation_worker.rb
index 7e480c42fd4..d5974c467c4 100644
--- a/app/workers/cluster_wait_for_app_installation_worker.rb
+++ b/app/workers/cluster_wait_for_app_installation_worker.rb
@@ -1,15 +1,15 @@
 class ClusterWaitForAppInstallationWorker
   include Sidekiq::Worker
   include ClusterQueue
-  include ClusterApp
+  include ClusterApplications
 
   INITIAL_INTERVAL = 30.seconds
   EAGER_INTERVAL = 10.seconds
   TIMEOUT = 20.minutes
 
   def perform(app_name, app_id)
-    find_app(app_name, app_id) do |app|
-      Clusters::CheckAppInstallationProgressService.new(app).execute
+    find_application(app_name, app_id) do |app|
+      Clusters::Applications::CheckInstallationProgressService.new(app).execute
     end
   end
 end
diff --git a/app/workers/concerns/cluster_app.rb b/app/workers/concerns/cluster_app.rb
deleted file mode 100644
index 947cdaefcb7..00000000000
--- a/app/workers/concerns/cluster_app.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module ClusterApp
-  extend ActiveSupport::Concern
-
-  included do
-    def find_app(app_name, id)
-      Clusters::Cluster::APPLICATIONS[app_name].find(id).try do |app|
-        yield(app) if block_given?
-      end
-    end
-  end
-end
diff --git a/app/workers/concerns/cluster_applications.rb b/app/workers/concerns/cluster_applications.rb
new file mode 100644
index 00000000000..24ecaa0b52f
--- /dev/null
+++ b/app/workers/concerns/cluster_applications.rb
@@ -0,0 +1,9 @@
+module ClusterApplications
+  extend ActiveSupport::Concern
+
+  included do
+    def find_application(app_name, id, &blk)
+      Clusters::Cluster::APPLICATIONS[app_name].find(id).try(&blk)
+    end
+  end
+end
-- 
cgit v1.2.1


From 08752e5d742a144ffb1ec7c8e07e7a558774fbfc Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Fri, 3 Nov 2017 10:02:30 +0100
Subject: Remove `Clusters::Applications::FetchInstallationStatusService`

---
 app/models/clusters/cluster.rb                     |  2 +-
 .../check_installation_progress_service.rb         | 64 +++++++++++++++-------
 .../fetch_installation_status_service.rb           | 15 -----
 .../clusters/applications/install_service.rb       |  2 +-
 .../cluster_wait_for_app_installation_worker.rb    |  3 +-
 lib/gitlab/kubernetes/pod.rb                       | 12 ++++
 6 files changed, 60 insertions(+), 38 deletions(-)
 delete mode 100644 app/services/clusters/applications/fetch_installation_status_service.rb
 create mode 100644 lib/gitlab/kubernetes/pod.rb

diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 7dae2234998..77b299e46a0 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -52,7 +52,7 @@ module Clusters
     end
 
     def applications
-      [ 
+      [
         application_helm || build_application_helm
       ]
     end
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index 4e8fd9baaf4..7f5a633b749 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -4,26 +4,52 @@ module Clusters
       def execute
         return unless app.installing?
 
-        FetchInstallationStatusService.new(app).execute do |phase, log|
-          case phase
-          when 'Succeeded'
-            if app.make_installed
-              FinalizeInstallationService.new(app).execute
-            else
-              app.make_errored!("Failed to update app record; #{app.errors}")
-            end
-          when 'Failed'
-            app.make_errored!(log || 'Installation silently failed')
-            FinalizeInstallationService.new(app).execute
-          else
-            if Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
-              app.make_errored!('App installation timeouted')
-            else
-              ClusterWaitForAppInstallationWorker.perform_in(
-                ClusterWaitForAppInstallationWorker::EAGER_INTERVAL, app.name, app.id)
-            end
-          end
+        case installation_phase
+        when Gitlab::Kubernetes::Pod::SUCCEEDED
+          on_succeeded
+        when Gitlab::Kubernetes::Pod::FAILED
+          on_failed
+        else
+          check_timeout
         end
+      rescue KubeException => ke
+        app.make_errored!("Kubernetes error: #{ke.message}") unless app.errored?
+      end
+
+      private
+
+      def on_succeeded
+        if app.make_installed
+          finalize_installation
+        else
+          app.make_errored!("Failed to update app record; #{app.errors}")
+        end
+      end
+
+      def on_failed
+        app.make_errored!(log || 'Installation silently failed')
+        finalize_installation
+      end
+
+      def check_timeout
+        if Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
+          app.make_errored!('App installation timeouted')
+        else
+          ClusterWaitForAppInstallationWorker.perform_in(
+            ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
+        end
+      end
+
+      def finilize_installation
+        FinalizeInstallationService.new(app).execute
+      end
+
+      def installation_phase
+        helm_api.installation_status(app)
+      end
+
+      def installation_errors
+        helm_api.installation_log(app)
       end
     end
   end
diff --git a/app/services/clusters/applications/fetch_installation_status_service.rb b/app/services/clusters/applications/fetch_installation_status_service.rb
deleted file mode 100644
index 3d082485532..00000000000
--- a/app/services/clusters/applications/fetch_installation_status_service.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module Clusters
-  module Applications
-    class FetchInstallationStatusService < BaseHelmService
-      def execute
-        return unless app.installing?
-
-        phase = helm_api.installation_status(app)
-        log = helm_api.installation_log(app) if phase == 'Failed'
-        yield(phase, log) if block_given?
-      rescue KubeException => ke
-        app.make_errored!("Kubernetes error: #{ke.message}") unless app.errored?
-      end
-    end
-  end
-end
diff --git a/app/services/clusters/applications/install_service.rb b/app/services/clusters/applications/install_service.rb
index 7fcccb5e78c..5ed0968a98a 100644
--- a/app/services/clusters/applications/install_service.rb
+++ b/app/services/clusters/applications/install_service.rb
@@ -9,7 +9,7 @@ module Clusters
 
           if app.make_installing
             ClusterWaitForAppInstallationWorker.perform_in(
-              ClusterWaitForAppInstallationWorker::INITIAL_INTERVAL, app.name, app.id)
+              ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
           else
             app.make_errored!("Failed to update app record; #{app.errors}")
           end
diff --git a/app/workers/cluster_wait_for_app_installation_worker.rb b/app/workers/cluster_wait_for_app_installation_worker.rb
index d5974c467c4..548f34fc6a5 100644
--- a/app/workers/cluster_wait_for_app_installation_worker.rb
+++ b/app/workers/cluster_wait_for_app_installation_worker.rb
@@ -3,8 +3,7 @@ class ClusterWaitForAppInstallationWorker
   include ClusterQueue
   include ClusterApplications
 
-  INITIAL_INTERVAL = 30.seconds
-  EAGER_INTERVAL = 10.seconds
+  INTERVAL = 30.seconds
   TIMEOUT = 20.minutes
 
   def perform(app_name, app_id)
diff --git a/lib/gitlab/kubernetes/pod.rb b/lib/gitlab/kubernetes/pod.rb
new file mode 100644
index 00000000000..12a6bfcf816
--- /dev/null
+++ b/lib/gitlab/kubernetes/pod.rb
@@ -0,0 +1,12 @@
+module Gitlab
+  module Kubernetes
+    module Pod
+      PENDING   = 'Pending'.freeze
+      RUNNING   = 'Running'.freeze
+      SUCCEEDED = 'Succeeded'.freeze
+      FAILED    = 'Failed'.freeze
+      UNKNOWN   = 'Unknown'.freeze
+      PHASES    = [PENDING, RUNNING, SUCCEEDED, FAILED, UNKNONW].freeze
+    end
+  end
+end
-- 
cgit v1.2.1


From 49210dfff12ba0fba5fdbcdc2c485fbbde43f83f Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Fri, 3 Nov 2017 11:10:50 +0100
Subject: Schedule k8s application installation with a service

---
 .../projects/clusters/applications_controller.rb   | 14 ++++-------
 app/models/clusters/applications/helm.rb           |  2 ++
 app/models/clusters/concerns/application_status.rb |  8 +++++++
 .../applications/schedule_installation_service.rb  | 27 ++++++++++++++++++++++
 4 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 app/services/clusters/applications/schedule_installation_service.rb

diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb
index cdebbdefb3f..aa36ccac804 100644
--- a/app/controllers/projects/clusters/applications_controller.rb
+++ b/app/controllers/projects/clusters/applications_controller.rb
@@ -5,12 +5,12 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
   before_action :authorize_create_cluster!, only: [:create]
 
   def create
-    return render_404 if application
-
     respond_to do |format|
       format.json do
-        # TODO: Do that via Service
-        if application_class.create(cluster: cluster).persisted?
+        scheduled = Clusters::Applications::ScheduleInstallationService.new(project, current_user,
+                                                                            application_class: @application_class,
+                                                                            cluster: @cluster).execute
+        if scheduled
           head :no_data
         else
           head :bad_request
@@ -26,10 +26,6 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
   end
 
   def application_class
-    Clusters::Cluster::APPLICATIONS[params[:application]] || render_404
-  end
-
-  def application
-    application_class.find_by(cluster: cluster)
+    @application_class ||= Clusters::Cluster::APPLICATIONS[params[:application]] || render_404
   end
 end
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 77c0c61d968..54eca613ce3 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -11,6 +11,8 @@ module Clusters
 
       default_value_for :version, Gitlab::Kubernetes::Helm::HELM_VERSION
 
+      validates :cluster, presence: true
+
       def name
         NAME
       end
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index e1f4c7fdda8..c5711fd0b58 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -23,6 +23,14 @@ module Clusters
             transition any - [:errored] => :errored
           end
 
+          event :make_scheduled do
+            transition %i(installable errored) => :scheduled
+          end
+
+          before_transition any => [:scheduled] do |app_status, _|
+            app_status.status_reason = nil
+          end
+
           before_transition any => [:errored] do |app_status, transition|
             status_reason = transition.args.first
             app_status.status_reason = status_reason if status_reason
diff --git a/app/services/clusters/applications/schedule_installation_service.rb b/app/services/clusters/applications/schedule_installation_service.rb
new file mode 100644
index 00000000000..17b3a09948d
--- /dev/null
+++ b/app/services/clusters/applications/schedule_installation_service.rb
@@ -0,0 +1,27 @@
+module Clusters
+  module Applications
+    class ScheduleInstallationService < ::BaseService
+      def execute
+        application = application_class.find_or_create_by!(cluster: cluster)
+
+        application.make_scheduled!
+        ClusterInstallAppWorker.perform_async(application.name, application.id)
+        true
+      rescue ActiveRecord::RecordInvalid
+        false
+      rescue StateMachines::InvalidTransition
+        false
+      end
+
+      private
+
+      def application_class
+        params[:application_class]
+      end
+
+      def cluster
+        params[:cluster]
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From 44f885eff62cca07b60f8bb210733c4e0a2ea019 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Fri, 3 Nov 2017 12:23:08 +0100
Subject: Fix typo

---
 lib/gitlab/kubernetes/pod.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/kubernetes/pod.rb b/lib/gitlab/kubernetes/pod.rb
index 12a6bfcf816..f3842cdf762 100644
--- a/lib/gitlab/kubernetes/pod.rb
+++ b/lib/gitlab/kubernetes/pod.rb
@@ -6,7 +6,7 @@ module Gitlab
       SUCCEEDED = 'Succeeded'.freeze
       FAILED    = 'Failed'.freeze
       UNKNOWN   = 'Unknown'.freeze
-      PHASES    = [PENDING, RUNNING, SUCCEEDED, FAILED, UNKNONW].freeze
+      PHASES    = [PENDING, RUNNING, SUCCEEDED, FAILED, UNKNOWN].freeze
     end
   end
 end
-- 
cgit v1.2.1


From e6616e0468deaf1e37ddddc9332cc3e677567410 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Fri, 3 Nov 2017 13:55:44 +0100
Subject:  Fix typos

---
 .../projects/clusters/applications_controller.rb       | 18 +++++++-----------
 .../check_installation_progress_service.rb             |  2 +-
 .../cluster_wait_for_app_installation_worker.rb        |  2 +-
 config/routes/project.rb                               |  2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb
index aa36ccac804..fae1ceb04b0 100644
--- a/app/controllers/projects/clusters/applications_controller.rb
+++ b/app/controllers/projects/clusters/applications_controller.rb
@@ -5,17 +5,13 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
   before_action :authorize_create_cluster!, only: [:create]
 
   def create
-    respond_to do |format|
-      format.json do
-        scheduled = Clusters::Applications::ScheduleInstallationService.new(project, current_user,
-                                                                            application_class: @application_class,
-                                                                            cluster: @cluster).execute
-        if scheduled
-          head :no_data
-        else
-          head :bad_request
-        end
-      end
+    scheduled = Clusters::Applications::ScheduleInstallationService.new(project, current_user,
+                                                                        application_class: @application_class,
+                                                                        cluster: @cluster).execute
+    if scheduled
+      head :no_data
+    else
+      head :bad_request
     end
   end
 
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index 7f5a633b749..cf96c128c2e 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -40,7 +40,7 @@ module Clusters
         end
       end
 
-      def finilize_installation
+      def finalize_installation
         FinalizeInstallationService.new(app).execute
       end
 
diff --git a/app/workers/cluster_wait_for_app_installation_worker.rb b/app/workers/cluster_wait_for_app_installation_worker.rb
index 548f34fc6a5..4bb8c293e5d 100644
--- a/app/workers/cluster_wait_for_app_installation_worker.rb
+++ b/app/workers/cluster_wait_for_app_installation_worker.rb
@@ -3,7 +3,7 @@ class ClusterWaitForAppInstallationWorker
   include ClusterQueue
   include ClusterApplications
 
-  INTERVAL = 30.seconds
+  INTERVAL = 10.seconds
   TIMEOUT = 20.minutes
 
   def perform(app_name, app_id)
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 55dab840dca..ee252ee2466 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -192,7 +192,7 @@ constraints(ProjectUrlConstrainer.new) do
           get :status, format: :json
 
           scope :applications do
-            get '/*application', to: 'clusters/applications#create'
+            post '/*application', to: 'clusters/applications#create'
           end
         end
       end
-- 
cgit v1.2.1


From c0299ce49406302a26e7fd16ec272bca19715afb Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Fri, 3 Nov 2017 16:40:13 +0100
Subject: Add Projects::Clusters::ApplicationsController tests

---
 .../projects/clusters/applications_controller.rb   |  2 +-
 config/routes/project.rb                           |  2 +-
 .../clusters/applications_controller_spec.rb       | 73 ++++++++++++++++++++++
 .../matchers/access_matchers_for_controller.rb     |  2 +-
 4 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 spec/controllers/projects/clusters/applications_controller_spec.rb

diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb
index fae1ceb04b0..4b9d54a8537 100644
--- a/app/controllers/projects/clusters/applications_controller.rb
+++ b/app/controllers/projects/clusters/applications_controller.rb
@@ -9,7 +9,7 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
                                                                         application_class: @application_class,
                                                                         cluster: @cluster).execute
     if scheduled
-      head :no_data
+      head :no_content
     else
       head :bad_request
     end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index ee252ee2466..a1e429e6c20 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -192,7 +192,7 @@ constraints(ProjectUrlConstrainer.new) do
           get :status, format: :json
 
           scope :applications do
-            post '/*application', to: 'clusters/applications#create'
+            post '/*application', to: 'clusters/applications#create', as: :install_applications
           end
         end
       end
diff --git a/spec/controllers/projects/clusters/applications_controller_spec.rb b/spec/controllers/projects/clusters/applications_controller_spec.rb
new file mode 100644
index 00000000000..b8464b713c4
--- /dev/null
+++ b/spec/controllers/projects/clusters/applications_controller_spec.rb
@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe Projects::Clusters::ApplicationsController do
+  include AccessMatchersForController
+
+  def current_application
+    Clusters::Cluster::APPLICATIONS[application]
+  end
+
+  describe 'POST create' do
+    let(:cluster) { create(:cluster, :project, :providing_by_gcp) }
+    let(:project) { cluster.project }
+    let(:application) { 'helm' }
+    let(:params) { { application: application, id: cluster.id } }
+
+    describe 'functionality' do
+      let(:user) { create(:user) }
+
+      before do
+        project.add_master(user)
+        sign_in(user)
+      end
+
+      it 'schedule an application installation' do
+        expect(ClusterInstallAppWorker).to receive(:perform_async).with(application, anything).once
+
+        expect { go }.to change { current_application.count }
+        expect(response).to have_http_status(:no_content)
+        expect(cluster.application_helm).to be_scheduled
+      end
+
+      context 'when cluster do not exists' do
+        before do
+          cluster.destroy!
+        end
+
+        it 'return 404' do
+          expect { go }.not_to change { current_application.count }
+          expect(response).to have_http_status(:not_found)
+        end
+      end
+
+      context 'when application is unknown' do
+        let(:application) { 'unkwnown-app' }
+
+        it 'return 404' do
+          go
+
+          expect(response).to have_http_status(:not_found)
+        end
+      end
+    end
+
+    describe 'security' do
+      before do
+        allow(ClusterInstallAppWorker).to receive(:perform_async)
+      end
+
+      it { expect { go }.to be_allowed_for(:admin) }
+      it { expect { go }.to be_allowed_for(:owner).of(project) }
+      it { expect { go }.to be_allowed_for(:master).of(project) }
+      it { expect { go }.to be_denied_for(:developer).of(project) }
+      it { expect { go }.to be_denied_for(:reporter).of(project) }
+      it { expect { go }.to be_denied_for(:guest).of(project) }
+      it { expect { go }.to be_denied_for(:user) }
+      it { expect { go }.to be_denied_for(:external) }
+    end
+
+    def go
+      post :create, params.merge(namespace_id: project.namespace, project_id: project)
+    end
+  end
+end
diff --git a/spec/support/matchers/access_matchers_for_controller.rb b/spec/support/matchers/access_matchers_for_controller.rb
index bb6b7c63ee9..cdb62a5deee 100644
--- a/spec/support/matchers/access_matchers_for_controller.rb
+++ b/spec/support/matchers/access_matchers_for_controller.rb
@@ -5,7 +5,7 @@ module AccessMatchersForController
   extend RSpec::Matchers::DSL
   include Warden::Test::Helpers
 
-  EXPECTED_STATUS_CODE_ALLOWED = [200, 201, 302].freeze
+  EXPECTED_STATUS_CODE_ALLOWED = [200, 201, 204, 302].freeze
   EXPECTED_STATUS_CODE_DENIED = [401, 404].freeze
 
   def emulate_user(role, membership = nil)
-- 
cgit v1.2.1


From 797e758beb882d67f32b87db6453cad41c0b931f Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Tue, 24 Oct 2017 07:56:39 +0300
Subject: Add applications section to GKE clusters page

---
 app/assets/javascripts/clusters.js                 | 123 -----------
 app/assets/javascripts/clusters/clusters_bundle.js | 216 +++++++++++++++++++
 .../clusters/components/application_row.vue        | 168 +++++++++++++++
 .../clusters/components/applications.vue           | 105 +++++++++
 app/assets/javascripts/clusters/constants.js       |  10 +
 app/assets/javascripts/clusters/event_hub.js       |   3 +
 .../clusters/services/clusters_service.js          |  24 +++
 .../javascripts/clusters/stores/clusters_store.js  |  68 ++++++
 app/assets/javascripts/dispatcher.js               |   9 +-
 .../vue_shared/components/loading_button.vue       |   7 +-
 app/assets/stylesheets/framework/buttons.scss      |   1 +
 app/assets/stylesheets/pages/clusters.scss         |   5 +
 app/views/projects/clusters/show.html.haml         |  19 +-
 ...36629-35958-add-cluster-application-section.yml |   6 +
 .../project/clusters/img/cluster-applications.png  | Bin 0 -> 38153 bytes
 doc/user/project/clusters/index.md                 |   9 +
 spec/javascripts/clusters/clusters_bundle_spec.js  | 235 +++++++++++++++++++++
 .../clusters/components/application_row_spec.js    | 213 +++++++++++++++++++
 .../clusters/components/applications_spec.js       |  42 ++++
 spec/javascripts/clusters/services/mock_data.js    |  50 +++++
 .../clusters/stores/clusters_store_spec.js         |  86 ++++++++
 spec/javascripts/clusters_spec.js                  |  79 -------
 22 files changed, 1268 insertions(+), 210 deletions(-)
 delete mode 100644 app/assets/javascripts/clusters.js
 create mode 100644 app/assets/javascripts/clusters/clusters_bundle.js
 create mode 100644 app/assets/javascripts/clusters/components/application_row.vue
 create mode 100644 app/assets/javascripts/clusters/components/applications.vue
 create mode 100644 app/assets/javascripts/clusters/constants.js
 create mode 100644 app/assets/javascripts/clusters/event_hub.js
 create mode 100644 app/assets/javascripts/clusters/services/clusters_service.js
 create mode 100644 app/assets/javascripts/clusters/stores/clusters_store.js
 create mode 100644 changelogs/unreleased/36629-35958-add-cluster-application-section.yml
 create mode 100644 doc/user/project/clusters/img/cluster-applications.png
 create mode 100644 spec/javascripts/clusters/clusters_bundle_spec.js
 create mode 100644 spec/javascripts/clusters/components/application_row_spec.js
 create mode 100644 spec/javascripts/clusters/components/applications_spec.js
 create mode 100644 spec/javascripts/clusters/services/mock_data.js
 create mode 100644 spec/javascripts/clusters/stores/clusters_store_spec.js
 delete mode 100644 spec/javascripts/clusters_spec.js

diff --git a/app/assets/javascripts/clusters.js b/app/assets/javascripts/clusters.js
deleted file mode 100644
index c9fef94efea..00000000000
--- a/app/assets/javascripts/clusters.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/* globals Flash */
-import Visibility from 'visibilityjs';
-import axios from 'axios';
-import setAxiosCsrfToken from './lib/utils/axios_utils';
-import Poll from './lib/utils/poll';
-import { s__ } from './locale';
-import initSettingsPanels from './settings_panels';
-import Flash from './flash';
-
-/**
- * Cluster page has 2 separate parts:
- *   Toggle button
- *
- * - Polling status while creating or scheduled
- * -- Update status area with the response result
- */
-
-class ClusterService {
-  constructor(options = {}) {
-    this.options = options;
-    setAxiosCsrfToken();
-  }
-  fetchData() {
-    return axios.get(this.options.endpoint);
-  }
-}
-
-export default class Clusters {
-  constructor() {
-    initSettingsPanels();
-
-    const dataset = document.querySelector('.js-edit-cluster-form').dataset;
-
-    this.state = {
-      statusPath: dataset.statusPath,
-      clusterStatus: dataset.clusterStatus,
-      clusterStatusReason: dataset.clusterStatusReason,
-      toggleStatus: dataset.toggleStatus,
-    };
-
-    this.service = new ClusterService({ endpoint: this.state.statusPath });
-    this.toggleButton = document.querySelector('.js-toggle-cluster');
-    this.toggleInput = document.querySelector('.js-toggle-input');
-    this.errorContainer = document.querySelector('.js-cluster-error');
-    this.successContainer = document.querySelector('.js-cluster-success');
-    this.creatingContainer = document.querySelector('.js-cluster-creating');
-    this.errorReasonContainer = this.errorContainer.querySelector('.js-error-reason');
-
-    this.toggleButton.addEventListener('click', this.toggle.bind(this));
-
-    if (this.state.clusterStatus !== 'created') {
-      this.updateContainer(this.state.clusterStatus, this.state.clusterStatusReason);
-    }
-
-    if (this.state.statusPath) {
-      this.initPolling();
-    }
-  }
-
-  toggle() {
-    this.toggleButton.classList.toggle('checked');
-    this.toggleInput.setAttribute('value', this.toggleButton.classList.contains('checked').toString());
-  }
-
-  initPolling() {
-    this.poll = new Poll({
-      resource: this.service,
-      method: 'fetchData',
-      successCallback: data => this.handleSuccess(data),
-      errorCallback: () => Clusters.handleError(),
-    });
-
-    if (!Visibility.hidden()) {
-      this.poll.makeRequest();
-    } else {
-      this.service.fetchData()
-        .then(data => this.handleSuccess(data))
-        .catch(() => Clusters.handleError());
-    }
-
-    Visibility.change(() => {
-      if (!Visibility.hidden()) {
-        this.poll.restart();
-      } else {
-        this.poll.stop();
-      }
-    });
-  }
-
-  static handleError() {
-    Flash(s__('ClusterIntegration|Something went wrong on our end.'));
-  }
-
-  handleSuccess(data) {
-    const { status, status_reason } = data.data;
-    this.updateContainer(status, status_reason);
-  }
-
-  hideAll() {
-    this.errorContainer.classList.add('hidden');
-    this.successContainer.classList.add('hidden');
-    this.creatingContainer.classList.add('hidden');
-  }
-
-  updateContainer(status, error) {
-    this.hideAll();
-    switch (status) {
-      case 'created':
-        this.successContainer.classList.remove('hidden');
-        break;
-      case 'errored':
-        this.errorContainer.classList.remove('hidden');
-        this.errorReasonContainer.textContent = error;
-        break;
-      case 'scheduled':
-      case 'creating':
-        this.creatingContainer.classList.remove('hidden');
-        break;
-      default:
-        this.hideAll();
-    }
-  }
-}
diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
new file mode 100644
index 00000000000..053f11cc3c4
--- /dev/null
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -0,0 +1,216 @@
+import Visibility from 'visibilityjs';
+import Vue from 'vue';
+import { s__, sprintf } from '../locale';
+import Flash from '../flash';
+import Poll from '../lib/utils/poll';
+import initSettingsPanels from '../settings_panels';
+import eventHub from './event_hub';
+import {
+  APPLICATION_INSTALLED,
+  REQUEST_LOADING,
+  REQUEST_SUCCESS,
+  REQUEST_FAILURE,
+} from './constants';
+import ClustersService from './services/clusters_service';
+import ClustersStore from './stores/clusters_store';
+import applications from './components/applications.vue';
+
+/**
+ * Cluster page has 2 separate parts:
+ * Toggle button and applications section
+ *
+ * - Polling status while creating or scheduled
+ * - Update status area with the response result
+ */
+
+export default class Clusters {
+  constructor() {
+    const {
+      statusPath,
+      installHelmPath,
+      installIngressPath,
+      installRunnerPath,
+      clusterStatus,
+      clusterStatusReason,
+      helpPath,
+    } = document.querySelector('.js-edit-cluster-form').dataset;
+
+    this.store = new ClustersStore();
+    this.store.setHelpPath(helpPath);
+    this.store.updateStatus(clusterStatus);
+    this.store.updateStatusReason(clusterStatusReason);
+    this.service = new ClustersService({
+      endpoint: statusPath,
+      installHelmEndpoint: installHelmPath,
+      installIngresEndpoint: installIngressPath,
+      installRunnerEndpoint: installRunnerPath,
+    });
+
+    this.toggle = this.toggle.bind(this);
+    this.installApplication = this.installApplication.bind(this);
+
+    this.toggleButton = document.querySelector('.js-toggle-cluster');
+    this.toggleInput = document.querySelector('.js-toggle-input');
+    this.errorContainer = document.querySelector('.js-cluster-error');
+    this.successContainer = document.querySelector('.js-cluster-success');
+    this.creatingContainer = document.querySelector('.js-cluster-creating');
+    this.errorReasonContainer = this.errorContainer.querySelector('.js-error-reason');
+    this.successApplicationContainer = document.querySelector('.js-cluster-application-notice');
+
+    initSettingsPanels();
+    this.initApplications();
+
+    if (this.store.state.status !== 'created') {
+      this.updateContainer(this.store.state.status, this.store.state.statusReason);
+    }
+
+    this.addListeners();
+    if (statusPath) {
+      this.initPolling();
+    }
+  }
+
+  initApplications() {
+    const store = this.store;
+    const el = document.querySelector('#js-cluster-applications');
+
+    this.applications = new Vue({
+      el,
+      components: {
+        applications,
+      },
+      data() {
+        return {
+          state: store.state,
+        };
+      },
+      render(createElement) {
+        return createElement('applications', {
+          props: {
+            applications: this.state.applications,
+            helpPath: this.state.helpPath,
+          },
+        });
+      },
+    });
+  }
+
+  addListeners() {
+    this.toggleButton.addEventListener('click', this.toggle);
+    eventHub.$on('installApplication', this.installApplication);
+  }
+
+  removeListeners() {
+    this.toggleButton.removeEventListener('click', this.toggle);
+    eventHub.$off('installApplication', this.installApplication);
+  }
+
+  initPolling() {
+    this.poll = new Poll({
+      resource: this.service,
+      method: 'fetchData',
+      successCallback: data => this.handleSuccess(data),
+      errorCallback: () => Clusters.handleError(),
+    });
+
+    if (!Visibility.hidden()) {
+      this.poll.makeRequest();
+    } else {
+      this.service.fetchData()
+        .then(data => this.handleSuccess(data))
+        .catch(() => Clusters.handleError());
+    }
+
+    Visibility.change(() => {
+      if (!Visibility.hidden() && !this.destroyed) {
+        this.poll.restart();
+      } else {
+        this.poll.stop();
+      }
+    });
+  }
+
+  static handleError() {
+    Flash(s__('ClusterIntegration|Something went wrong on our end.'));
+  }
+
+  handleSuccess(data) {
+    const prevApplicationMap = Object.assign({}, this.store.state.applications);
+    this.store.updateStateFromServer(data.data);
+    this.checkForNewInstalls(prevApplicationMap, this.store.state.applications);
+    this.updateContainer(this.store.state.status, this.store.state.statusReason);
+  }
+
+  toggle() {
+    this.toggleButton.classList.toggle('checked');
+    this.toggleInput.setAttribute('value', this.toggleButton.classList.contains('checked').toString());
+  }
+
+  hideAll() {
+    this.errorContainer.classList.add('hidden');
+    this.successContainer.classList.add('hidden');
+    this.creatingContainer.classList.add('hidden');
+  }
+
+  checkForNewInstalls(prevApplicationMap, newApplicationMap) {
+    const appTitles = Object.keys(newApplicationMap)
+      .filter(appId => newApplicationMap[appId].status === APPLICATION_INSTALLED &&
+        prevApplicationMap[appId].status !== APPLICATION_INSTALLED &&
+        prevApplicationMap[appId].status !== null)
+      .map(appId => newApplicationMap[appId].title);
+
+    if (appTitles.length > 0) {
+      this.successApplicationContainer.textContent = sprintf(s__('ClusterIntegration|%{appList} was successfully installed on your cluster'), {
+        appList: appTitles.join(', '),
+      });
+      this.successApplicationContainer.classList.remove('hidden');
+    } else {
+      this.successApplicationContainer.classList.add('hidden');
+    }
+  }
+
+  updateContainer(status, error) {
+    this.hideAll();
+    switch (status) {
+      case 'created':
+        this.successContainer.classList.remove('hidden');
+        break;
+      case 'errored':
+        this.errorContainer.classList.remove('hidden');
+        this.errorReasonContainer.textContent = error;
+        break;
+      case 'scheduled':
+      case 'creating':
+        this.creatingContainer.classList.remove('hidden');
+        break;
+      default:
+        this.hideAll();
+    }
+  }
+
+  installApplication(appId) {
+    this.store.updateAppProperty(appId, 'requestStatus', REQUEST_LOADING);
+    this.store.updateAppProperty(appId, 'requestReason', null);
+
+    this.service.installApplication(appId)
+      .then(() => {
+        this.store.updateAppProperty(appId, 'requestStatus', REQUEST_SUCCESS);
+      })
+      .catch(() => {
+        this.store.updateAppProperty(appId, 'requestStatus', REQUEST_FAILURE);
+        this.store.updateAppProperty(appId, 'requestReason', s__('ClusterIntegration|Request to begin installing failed'));
+      });
+  }
+
+  destroy() {
+    this.destroyed = true;
+
+    this.removeListeners();
+
+    if (this.poll) {
+      this.poll.stop();
+    }
+
+    this.applications.$destroy();
+  }
+}
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
new file mode 100644
index 00000000000..f8d53fcc4b7
--- /dev/null
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -0,0 +1,168 @@
+<script>
+import { s__ } from '../../locale';
+import eventHub from '../event_hub';
+import loadingButton from '../../vue_shared/components/loading_button.vue';
+import {
+  APPLICATION_INSTALLABLE,
+  APPLICATION_INSTALLING,
+  APPLICATION_INSTALLED,
+  APPLICATION_ERROR,
+  REQUEST_LOADING,
+  REQUEST_SUCCESS,
+  REQUEST_FAILURE,
+} from '../constants';
+
+export default {
+  props: {
+    id: {
+      type: String,
+      required: true,
+    },
+    title: {
+      type: String,
+      required: true,
+    },
+    titleLink: {
+      type: String,
+      required: false,
+    },
+    description: {
+      type: String,
+      required: true,
+    },
+    status: {
+      type: String,
+      required: false,
+    },
+    statusReason: {
+      type: String,
+      required: false,
+    },
+    requestStatus: {
+      type: String,
+      required: false,
+    },
+    requestReason: {
+      type: String,
+      required: false,
+    },
+  },
+  components: {
+    loadingButton,
+  },
+  computed: {
+    rowJsClass() {
+      return `js-cluster-application-row-${this.id}`;
+    },
+    titleElementType() {
+      return this.titleLink ? 'a' : 'span';
+    },
+    installButtonLoading() {
+      return !this.status ||
+        this.status === APPLICATION_INSTALLING ||
+        this.requestStatus === REQUEST_LOADING;
+    },
+    installButtonDisabled() {
+      // Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but
+      // we already made a request to install and are just waiting for the real-time
+      // to sync up.
+      return this.status !== APPLICATION_INSTALLABLE ||
+        this.requestStatus === REQUEST_LOADING ||
+        this.requestStatus === REQUEST_SUCCESS;
+    },
+    installButtonLabel() {
+      let label;
+      if (this.status === APPLICATION_INSTALLABLE || this.status === APPLICATION_ERROR) {
+        label = s__('ClusterIntegration|Install');
+      } else if (this.status === APPLICATION_INSTALLING) {
+        label = s__('ClusterIntegration|Installing');
+      } else if (this.status === APPLICATION_INSTALLED) {
+        label = s__('ClusterIntegration|Installed');
+      }
+
+      return label;
+    },
+    hasError() {
+      return this.status === APPLICATION_ERROR || this.requestStatus === REQUEST_FAILURE;
+    },
+  },
+  methods: {
+    installClicked() {
+      eventHub.$emit('installApplication', this.id);
+    },
+  },
+};
+</script>
+
+<template>
+  <div
+    class="gl-responsive-table-row gl-responsive-table-row-col-span"
+    :class="rowJsClass"
+  >
+    <div
+      class="gl-responsive-table-row-layout"
+      role="row"
+    >
+      <component
+        :is="titleElementType"
+        :href="titleLink"
+        target="blank"
+        rel="noopener noreferrer"
+        role="gridcell"
+        class="table-section section-15 section-align-top js-cluster-application-title"
+      >
+        {{ title }}
+      </component>
+      <div
+        class="table-section section-wrap"
+        role="gridcell"
+      >
+        <div v-html="description"></div>
+      </div>
+      <div
+        class="table-section table-button-footer section-15 section-align-top"
+        role="gridcell"
+      >
+        <div class="btn-group table-action-buttons">
+          <loading-button
+            class="js-cluster-application-install-button"
+            :loading="installButtonLoading"
+            :disabled="installButtonDisabled"
+            :label="installButtonLabel"
+            @click="installClicked"
+          />
+        </div>
+      </div>
+    </div>
+    <div
+      v-if="hasError"
+      class="gl-responsive-table-row-layout"
+      role="row"
+    >
+      <div
+        class="alert alert-danger alert-block append-bottom-0 table-section section-100"
+        role="gridcell"
+      >
+        <div>
+          <p class="js-cluster-application-general-error-message">
+            Something went wrong while installing {{ title }}
+          </p>
+          <ul v-if="statusReason || requestReason">
+            <li
+              v-if="statusReason"
+              class="js-cluster-application-status-error-message"
+            >
+              {{ statusReason }}
+            </li>
+            <li
+              v-if="requestReason"
+              class="js-cluster-application-request-error-message"
+            >
+              {{ requestReason }}
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
new file mode 100644
index 00000000000..865fa4f702e
--- /dev/null
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -0,0 +1,105 @@
+<script>
+import _ from 'underscore';
+import { s__, sprintf } from '../../locale';
+import applicationRow from './application_row.vue';
+
+export default {
+  props: {
+    applications: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
+    helpPath: {
+      type: String,
+      required: false,
+    },
+  },
+  components: {
+    applicationRow,
+  },
+  computed: {
+    generalApplicationDescription() {
+      return sprintf(
+        _.escape(s__('ClusterIntegration|Install applications on your cluster. Read more about %{helpLink}')), {
+          helpLink: `<a href="${this.helpPath}">
+            ${_.escape(s__('ClusterIntegration|installing applications'))}
+          </a>`,
+        },
+        false,
+      );
+    },
+    helmTillerDescription() {
+      return _.escape(s__(
+        `ClusterIntegration|Helm streamlines installing and managing Kubernets applications.
+        Tiller runs inside of your Kubernetes Cluster, and manages
+        releases of your charts.`,
+      ));
+    },
+    ingressDescription() {
+      const descriptionParagraph = _.escape(s__(
+        `ClusterIntegration|Ingress gives you a way to route requests to services based on the
+        request host or path, centralizing a number of services into a single entrypoint.`,
+      ));
+
+      const extraCostParagraph = sprintf(
+        _.escape(s__('ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which incur additional costs. See %{pricingLink}')), {
+          boldNotice: `<strong>${_.escape(s__('ClusterIntegration|Note:'))}</strong>`,
+          pricingLink: `<a href="https://cloud.google.com/compute/pricing#lb" target="blank" rel="noopener noreferrer">
+            ${_.escape(s__('ClusterIntegration|GKE pricing'))}
+          </a>`,
+        },
+        false,
+      );
+
+      return `
+        <p>
+          ${descriptionParagraph}
+        </p>
+        <p class="append-bottom-0">
+          ${extraCostParagraph}
+        </p>
+      `;
+    },
+    gitlabRunnerDescription() {
+      return _.escape(s__(
+        `ClusterIntegration|GitLab Runner is the open source project that is used to run your jobs
+        and send the results back to GitLab.`,
+      ));
+    },
+  },
+};
+</script>
+
+<template>
+  <section class="settings no-animate expanded">
+    <div class="settings-header">
+      <h4>
+        {{ s__('ClusterIntegration|Applications') }}
+      </h4>
+      <p
+        class="append-bottom-0"
+        v-html="generalApplicationDescription"
+      >
+      </p>
+    </div>
+
+    <div class="settings-content">
+      <div class="form_group append-bottom-20">
+        <application-row
+          id="helm"
+          :title="applications.helm.title"
+          title-link="https://docs.helm.sh/"
+          :description="helmTillerDescription"
+          :status="applications.helm.status"
+          :status-reason="applications.helm.statusReason"
+          :request-status="applications.helm.requestStatus"
+          :request-reason="applications.helm.requestReason"
+        />
+        <!-- NOTE: Don't forget to update `clusters.scss` min-height for this block and uncomment `application_spec` tests -->
+        <!-- Add Ingress row, all other plumbing is complete -->
+        <!-- Add GitLab Runner row, all other plumbing is complete -->
+      </div>
+    </div>
+  </section>
+</template>
diff --git a/app/assets/javascripts/clusters/constants.js b/app/assets/javascripts/clusters/constants.js
new file mode 100644
index 00000000000..3f202435716
--- /dev/null
+++ b/app/assets/javascripts/clusters/constants.js
@@ -0,0 +1,10 @@
+// These need to match what is returned from the server
+export const APPLICATION_INSTALLABLE = 'installable';
+export const APPLICATION_INSTALLING = 'installing';
+export const APPLICATION_INSTALLED = 'installed';
+export const APPLICATION_ERROR = 'error';
+
+// These are only used client-side
+export const REQUEST_LOADING = 'request-loading';
+export const REQUEST_SUCCESS = 'request-success';
+export const REQUEST_FAILURE = 'request-failure';
diff --git a/app/assets/javascripts/clusters/event_hub.js b/app/assets/javascripts/clusters/event_hub.js
new file mode 100644
index 00000000000..0948c2e5352
--- /dev/null
+++ b/app/assets/javascripts/clusters/event_hub.js
@@ -0,0 +1,3 @@
+import Vue from 'vue';
+
+export default new Vue();
diff --git a/app/assets/javascripts/clusters/services/clusters_service.js b/app/assets/javascripts/clusters/services/clusters_service.js
new file mode 100644
index 00000000000..0ac8e68187d
--- /dev/null
+++ b/app/assets/javascripts/clusters/services/clusters_service.js
@@ -0,0 +1,24 @@
+import axios from 'axios';
+import setAxiosCsrfToken from '../../lib/utils/axios_utils';
+
+export default class ClusterService {
+  constructor(options = {}) {
+    setAxiosCsrfToken();
+
+    this.options = options;
+    this.appInstallEndpointMap = {
+      helm: this.options.installHelmEndpoint,
+      ingress: this.options.installIngressEndpoint,
+      runner: this.options.installRunnerEndpoint,
+    };
+  }
+
+  fetchData() {
+    return axios.get(this.options.endpoint);
+  }
+
+  installApplication(appId) {
+    const endpoint = this.appInstallEndpointMap[appId];
+    return axios.post(endpoint);
+  }
+}
diff --git a/app/assets/javascripts/clusters/stores/clusters_store.js b/app/assets/javascripts/clusters/stores/clusters_store.js
new file mode 100644
index 00000000000..e731cdc3042
--- /dev/null
+++ b/app/assets/javascripts/clusters/stores/clusters_store.js
@@ -0,0 +1,68 @@
+import { s__ } from '../../locale';
+
+export default class ClusterStore {
+  constructor() {
+    this.state = {
+      helpPath: null,
+      status: null,
+      statusReason: null,
+      applications: {
+        helm: {
+          title: s__('ClusterIntegration|Helm Tiller'),
+          status: null,
+          statusReason: null,
+          requestStatus: null,
+          requestReason: null,
+        },
+        ingress: {
+          title: s__('ClusterIntegration|Ingress'),
+          status: null,
+          statusReason: null,
+          requestStatus: null,
+          requestReason: null,
+        },
+        runner: {
+          title: s__('ClusterIntegration|GitLab Runner'),
+          status: null,
+          statusReason: null,
+          requestStatus: null,
+          requestReason: null,
+        },
+      },
+    };
+  }
+
+  setHelpPath(helpPath) {
+    this.state.helpPath = helpPath;
+  }
+
+  updateStatus(status) {
+    this.state.status = status;
+  }
+
+  updateStatusReason(reason) {
+    this.state.statusReason = reason;
+  }
+
+  updateAppProperty(appId, prop, value) {
+    this.state.applications[appId][prop] = value;
+  }
+
+  updateStateFromServer(serverState = {}) {
+    this.state.status = serverState.status;
+    this.state.statusReason = serverState.status_reason;
+    serverState.applications.forEach((serverAppEntry) => {
+      const {
+        name: appId,
+        status,
+        status_reason: statusReason,
+      } = serverAppEntry;
+
+      this.state.applications[appId] = {
+        ...(this.state.applications[appId] || {}),
+        status,
+        statusReason,
+      };
+    });
+  }
+}
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 760fb0cdf67..44606989395 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -1,4 +1,5 @@
 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, wrap-iife, no-shadow, consistent-return, one-var, one-var-declaration-per-line, camelcase, default-case, no-new, quotes, no-duplicate-case, no-case-declarations, no-fallthrough, max-len */
+import { s__ } from './locale';
 /* global ProjectSelect */
 import IssuableIndex from './issuable_index';
 /* global Milestone */
@@ -32,6 +33,7 @@ import Labels from './labels';
 import LabelManager from './label_manager';
 /* global Sidebar */
 
+import Flash from './flash';
 import CommitsList from './commits';
 import Issue from './issue';
 import BindInOut from './behaviors/bind_in_out';
@@ -543,9 +545,12 @@ import Diff from './diff';
           new DueDateSelectors();
           break;
         case 'projects:clusters:show':
-          import(/* webpackChunkName: "clusters" */ './clusters')
+          import(/* webpackChunkName: "clusters" */ './clusters/clusters_bundle')
             .then(cluster => new cluster.default()) // eslint-disable-line new-cap
-            .catch(() => {});
+            .catch((err) => {
+              Flash(s__('ClusterIntegration|Problem setting up the cluster JavaScript'));
+              throw err;
+            });
           break;
       }
       switch (path[0]) {
diff --git a/app/assets/javascripts/vue_shared/components/loading_button.vue b/app/assets/javascripts/vue_shared/components/loading_button.vue
index 6670b554faf..0cc2653761c 100644
--- a/app/assets/javascripts/vue_shared/components/loading_button.vue
+++ b/app/assets/javascripts/vue_shared/components/loading_button.vue
@@ -26,6 +26,11 @@ export default {
       required: false,
       default: false,
     },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     label: {
       type: String,
       required: false,
@@ -47,7 +52,7 @@ export default {
     class="btn btn-align-content"
     @click="onClick"
     type="button"
-    :disabled="loading"
+    :disabled="loading || disabled"
   >
       <transition name="fade">
         <loading-icon
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 00a0e9cef67..16373b14ff7 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -294,6 +294,7 @@
 
 .btn-align-content {
   display: flex;
+  justify-content: center;
   align-items: center;
 }
 
diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss
index 5c91579c69c..b9bfae9356c 100644
--- a/app/assets/stylesheets/pages/clusters.scss
+++ b/app/assets/stylesheets/pages/clusters.scss
@@ -3,3 +3,8 @@
     background-color: $white-light;
   }
 }
+
+.cluster-applications-table {
+  // Wait for the Vue to kick-in and render the applications block
+  min-height: 179px;
+}
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index bd55136562a..de1f9fc5d32 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -4,15 +4,22 @@
 
 - expanded = Rails.env.test?
 
-- status_path = status_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster.id, format: :json) if can?(current_user, :admin_cluster, @cluster) && @cluster.on_creation?
+- status_path = status_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster.id, format: :json) if can?(current_user, :admin_cluster, @cluster)
 .edit-cluster-form.js-edit-cluster-form{ data: { status_path: status_path,
+  install_helm_path: 'TODO',
+  install_ingress_path: 'TODO',
+  install_runner_path: 'TODO',
   toggle_status: @cluster.enabled? ? 'true': 'false',
   cluster_status: @cluster.status_name,
-  cluster_status_reason: @cluster.status_reason } }
+  cluster_status_reason: @cluster.status_reason,
+  help_path: help_page_path('user/project/clusters/index.md', anchor: 'installing-applications') } }
 
-  %section.settings
+
+  .hidden.js-cluster-application-notice.alert.alert-info.alert-block.append-bottom-10{ role: 'alert' }
+
+  %section.settings.no-animate.expanded
     %h4= s_('ClusterIntegration|Enable cluster integration')
-    .settings-content.expanded
+    .settings-content
 
       .hidden.js-cluster-error.alert.alert-danger.alert-block.append-bottom-10{ role: 'alert' }
         = s_('ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine')
@@ -49,6 +56,8 @@
           .form-group
             = field.submit _('Save'), class: 'btn btn-success'
 
+  .cluster-applications-table#js-cluster-applications
+
   %section.settings#js-cluster-details
     .settings-header
       %h4= s_('ClusterIntegration|Cluster details')
@@ -59,7 +68,7 @@
     .settings-content.no-animate{ class: ('expanded' if expanded) }
 
       .form_group.append-bottom-20
-        %label.append-bottom-10{ for: 'cluter-name' }
+        %label.append-bottom-10{ for: 'cluster-name' }
           = s_('ClusterIntegration|Cluster name')
         .input-group
           %input.form-control.cluster-name{ value: @cluster.name, disabled: true }
diff --git a/changelogs/unreleased/36629-35958-add-cluster-application-section.yml b/changelogs/unreleased/36629-35958-add-cluster-application-section.yml
new file mode 100644
index 00000000000..0afa53e8642
--- /dev/null
+++ b/changelogs/unreleased/36629-35958-add-cluster-application-section.yml
@@ -0,0 +1,6 @@
+---
+title: Add applications section to GKE clusters page to easily install Helm Tiller,
+  Ingress
+merge_request:
+author:
+type: added
diff --git a/doc/user/project/clusters/img/cluster-applications.png b/doc/user/project/clusters/img/cluster-applications.png
new file mode 100644
index 00000000000..794f3331296
Binary files /dev/null and b/doc/user/project/clusters/img/cluster-applications.png differ
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 7d9e771f570..27b4b49c207 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -88,3 +88,12 @@ To remove the Cluster integration from your project, simply click on the
 and [add a cluster](#adding-a-cluster) again.
 
 [permissions]: ../../permissions.md
+
+## Installing applications
+
+GitLab provides a one-click install for
+[Helm Tiller](https://docs.helm.sh/) and
+[Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/)
+which will be added directly to your configured cluster.
+
+![Cluster application settings](img/cluster-applications.png)
diff --git a/spec/javascripts/clusters/clusters_bundle_spec.js b/spec/javascripts/clusters/clusters_bundle_spec.js
new file mode 100644
index 00000000000..26d230ce414
--- /dev/null
+++ b/spec/javascripts/clusters/clusters_bundle_spec.js
@@ -0,0 +1,235 @@
+import Clusters from '~/clusters/clusters_bundle';
+import {
+  APPLICATION_INSTALLABLE,
+  APPLICATION_INSTALLING,
+  APPLICATION_INSTALLED,
+  REQUEST_LOADING,
+  REQUEST_SUCCESS,
+  REQUEST_FAILURE,
+} from '~/clusters/constants';
+import getSetTimeoutPromise from '../helpers/set_timeout_promise_helper';
+
+describe('Clusters', () => {
+  let cluster;
+  preloadFixtures('clusters/show_cluster.html.raw');
+
+  beforeEach(() => {
+    loadFixtures('clusters/show_cluster.html.raw');
+    cluster = new Clusters();
+  });
+
+  afterEach(() => {
+    cluster.destroy();
+  });
+
+  describe('toggle', () => {
+    it('should update the button and the input field on click', () => {
+      cluster.toggleButton.click();
+
+      expect(
+        cluster.toggleButton.classList,
+      ).not.toContain('checked');
+
+      expect(
+        cluster.toggleInput.getAttribute('value'),
+      ).toEqual('false');
+    });
+  });
+
+  describe('checkForNewInstalls', () => {
+    const INITIAL_APP_MAP = {
+      helm: { status: null, title: 'Helm Tiller' },
+      ingress: { status: null, title: 'Ingress' },
+      runner: { status: null, title: 'GitLab Runner' },
+    };
+
+    it('does not show alert when things transition from initial null state to something', () => {
+      cluster.checkForNewInstalls(INITIAL_APP_MAP, {
+        ...INITIAL_APP_MAP,
+        helm: { status: APPLICATION_INSTALLABLE, title: 'Helm Tiller' },
+      });
+
+      expect(document.querySelector('.js-cluster-application-notice.hidden')).toBeDefined();
+    });
+
+    it('shows an alert when something gets newly installed', () => {
+      cluster.checkForNewInstalls({
+        ...INITIAL_APP_MAP,
+        helm: { status: APPLICATION_INSTALLING, title: 'Helm Tiller' },
+      }, {
+        ...INITIAL_APP_MAP,
+        helm: { status: APPLICATION_INSTALLED, title: 'Helm Tiller' },
+      });
+
+      expect(document.querySelector('.js-cluster-application-notice:not(.hidden)')).toBeDefined();
+      expect(document.querySelector('.js-cluster-application-notice').textContent.trim()).toEqual('Helm Tiller was successfully installed on your cluster');
+    });
+
+    it('shows an alert when multiple things gets newly installed', () => {
+      cluster.checkForNewInstalls({
+        ...INITIAL_APP_MAP,
+        helm: { status: APPLICATION_INSTALLING, title: 'Helm Tiller' },
+        ingress: { status: APPLICATION_INSTALLABLE, title: 'Ingress' },
+      }, {
+        ...INITIAL_APP_MAP,
+        helm: { status: APPLICATION_INSTALLED, title: 'Helm Tiller' },
+        ingress: { status: APPLICATION_INSTALLED, title: 'Ingress' },
+      });
+
+      expect(document.querySelector('.js-cluster-application-notice:not(.hidden)')).toBeDefined();
+      expect(document.querySelector('.js-cluster-application-notice').textContent.trim()).toEqual('Helm Tiller, Ingress was successfully installed on your cluster');
+    });
+
+    it('hides existing alert when we call again and nothing is newly installed', () => {
+      const installedState = {
+        ...INITIAL_APP_MAP,
+        helm: { status: APPLICATION_INSTALLED, title: 'Helm Tiller' },
+      };
+
+      // Show the banner
+      cluster.checkForNewInstalls({
+        ...INITIAL_APP_MAP,
+        helm: { status: APPLICATION_INSTALLING, title: 'Helm Tiller' },
+      }, installedState);
+
+      expect(document.querySelector('.js-cluster-application-notice:not(.hidden)')).toBeDefined();
+
+      // Banner should go back hidden
+      cluster.checkForNewInstalls(installedState, installedState);
+
+      expect(document.querySelector('.js-cluster-application-notice.hidden')).toBeDefined();
+    });
+  });
+
+  describe('updateContainer', () => {
+    describe('when creating cluster', () => {
+      it('should show the creating container', () => {
+        cluster.updateContainer('creating');
+
+        expect(
+          cluster.creatingContainer.classList.contains('hidden'),
+        ).toBeFalsy();
+        expect(
+          cluster.successContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+        expect(
+          cluster.errorContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+      });
+    });
+
+    describe('when cluster is created', () => {
+      it('should show the success container', () => {
+        cluster.updateContainer('created');
+
+        expect(
+          cluster.creatingContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+        expect(
+          cluster.successContainer.classList.contains('hidden'),
+        ).toBeFalsy();
+        expect(
+          cluster.errorContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+      });
+    });
+
+    describe('when cluster has error', () => {
+      it('should show the error container', () => {
+        cluster.updateContainer('errored', 'this is an error');
+
+        expect(
+          cluster.creatingContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+        expect(
+          cluster.successContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+        expect(
+          cluster.errorContainer.classList.contains('hidden'),
+        ).toBeFalsy();
+
+        expect(
+          cluster.errorReasonContainer.textContent,
+        ).toContain('this is an error');
+      });
+    });
+  });
+
+  describe('installApplication', () => {
+    it('tries to install helm', (done) => {
+      spyOn(cluster.service, 'installApplication').and.returnValue(Promise.resolve());
+      expect(cluster.store.state.applications.helm.requestStatus).toEqual(null);
+
+      cluster.installApplication('helm');
+
+      expect(cluster.store.state.applications.helm.requestStatus).toEqual(REQUEST_LOADING);
+      expect(cluster.store.state.applications.helm.requestReason).toEqual(null);
+      expect(cluster.service.installApplication).toHaveBeenCalledWith('helm');
+
+      getSetTimeoutPromise()
+        .then(() => {
+          expect(cluster.store.state.applications.helm.requestStatus).toEqual(REQUEST_SUCCESS);
+          expect(cluster.store.state.applications.helm.requestReason).toEqual(null);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('tries to install ingress', (done) => {
+      spyOn(cluster.service, 'installApplication').and.returnValue(Promise.resolve());
+      expect(cluster.store.state.applications.ingress.requestStatus).toEqual(null);
+
+      cluster.installApplication('ingress');
+
+      expect(cluster.store.state.applications.ingress.requestStatus).toEqual(REQUEST_LOADING);
+      expect(cluster.store.state.applications.ingress.requestReason).toEqual(null);
+      expect(cluster.service.installApplication).toHaveBeenCalledWith('ingress');
+
+      getSetTimeoutPromise()
+        .then(() => {
+          expect(cluster.store.state.applications.ingress.requestStatus).toEqual(REQUEST_SUCCESS);
+          expect(cluster.store.state.applications.ingress.requestReason).toEqual(null);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('tries to install runner', (done) => {
+      spyOn(cluster.service, 'installApplication').and.returnValue(Promise.resolve());
+      expect(cluster.store.state.applications.runner.requestStatus).toEqual(null);
+
+      cluster.installApplication('runner');
+
+      expect(cluster.store.state.applications.runner.requestStatus).toEqual(REQUEST_LOADING);
+      expect(cluster.store.state.applications.runner.requestReason).toEqual(null);
+      expect(cluster.service.installApplication).toHaveBeenCalledWith('runner');
+
+      getSetTimeoutPromise()
+        .then(() => {
+          expect(cluster.store.state.applications.runner.requestStatus).toEqual(REQUEST_SUCCESS);
+          expect(cluster.store.state.applications.runner.requestReason).toEqual(null);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('sets error request status when the request fails', (done) => {
+      spyOn(cluster.service, 'installApplication').and.returnValue(Promise.reject(new Error('STUBBED ERROR')));
+      expect(cluster.store.state.applications.helm.requestStatus).toEqual(null);
+
+      cluster.installApplication('helm');
+
+      expect(cluster.store.state.applications.helm.requestStatus).toEqual(REQUEST_LOADING);
+      expect(cluster.store.state.applications.helm.requestReason).toEqual(null);
+      expect(cluster.service.installApplication).toHaveBeenCalled();
+
+      getSetTimeoutPromise()
+        .then(() => {
+          expect(cluster.store.state.applications.helm.requestStatus).toEqual(REQUEST_FAILURE);
+          expect(cluster.store.state.applications.helm.requestReason).toBeDefined();
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+  });
+});
diff --git a/spec/javascripts/clusters/components/application_row_spec.js b/spec/javascripts/clusters/components/application_row_spec.js
new file mode 100644
index 00000000000..ba38ed6f180
--- /dev/null
+++ b/spec/javascripts/clusters/components/application_row_spec.js
@@ -0,0 +1,213 @@
+import Vue from 'vue';
+import eventHub from '~/clusters/event_hub';
+import {
+  APPLICATION_INSTALLABLE,
+  APPLICATION_INSTALLING,
+  APPLICATION_INSTALLED,
+  APPLICATION_ERROR,
+  REQUEST_LOADING,
+  REQUEST_SUCCESS,
+  REQUEST_FAILURE,
+} from '~/clusters/constants';
+import applicationRow from '~/clusters/components/application_row.vue';
+import mountComponent from '../../helpers/vue_mount_component_helper';
+import { DEFAULT_APPLICATION_STATE } from '../services/mock_data';
+
+describe('Application Row', () => {
+  let vm;
+  let ApplicationRow;
+
+  beforeEach(() => {
+    ApplicationRow = Vue.extend(applicationRow);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('Title', () => {
+    it('shows title', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        titleLink: null,
+      });
+      const title = vm.$el.querySelector('.js-cluster-application-title');
+
+      expect(title.tagName).toEqual('SPAN');
+      expect(title.textContent.trim()).toEqual(DEFAULT_APPLICATION_STATE.title);
+    });
+
+    it('shows title link', () => {
+      expect(DEFAULT_APPLICATION_STATE.titleLink).toBeDefined();
+
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+      });
+      const title = vm.$el.querySelector('.js-cluster-application-title');
+
+      expect(title.tagName).toEqual('A');
+      expect(title.textContent.trim()).toEqual(DEFAULT_APPLICATION_STATE.title);
+    });
+  });
+
+  describe('Install button', () => {
+    it('has indeterminate state on page load', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: null,
+      });
+
+      expect(vm.installButtonLabel).toBeUndefined();
+    });
+
+    it('has enabled "Install" when `status=installable`', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_INSTALLABLE,
+      });
+
+      expect(vm.installButtonLabel).toEqual('Install');
+      expect(vm.installButtonLoading).toEqual(false);
+      expect(vm.installButtonDisabled).toEqual(false);
+    });
+
+    it('has loading "Installing" when `status=installing`', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_INSTALLING,
+      });
+
+      expect(vm.installButtonLabel).toEqual('Installing');
+      expect(vm.installButtonLoading).toEqual(true);
+      expect(vm.installButtonDisabled).toEqual(true);
+    });
+
+    it('has disabled "Installed" when `status=installed`', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_INSTALLED,
+      });
+
+      expect(vm.installButtonLabel).toEqual('Installed');
+      expect(vm.installButtonLoading).toEqual(false);
+      expect(vm.installButtonDisabled).toEqual(true);
+    });
+
+    it('has disabled "Install" when `status=error`', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_ERROR,
+      });
+
+      expect(vm.installButtonLabel).toEqual('Install');
+      expect(vm.installButtonLoading).toEqual(false);
+      expect(vm.installButtonDisabled).toEqual(true);
+    });
+
+    it('has loading "Install" when `requestStatus=loading`', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_INSTALLABLE,
+        requestStatus: REQUEST_LOADING,
+      });
+
+      expect(vm.installButtonLabel).toEqual('Install');
+      expect(vm.installButtonLoading).toEqual(true);
+      expect(vm.installButtonDisabled).toEqual(true);
+    });
+
+    it('has disabled "Install" when `requestStatus=success`', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_INSTALLABLE,
+        requestStatus: REQUEST_SUCCESS,
+      });
+
+      expect(vm.installButtonLabel).toEqual('Install');
+      expect(vm.installButtonLoading).toEqual(false);
+      expect(vm.installButtonDisabled).toEqual(true);
+    });
+
+    it('has enabled "Install" when `requestStatus=error` (so you can try installing again)', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_INSTALLABLE,
+        requestStatus: REQUEST_FAILURE,
+      });
+
+      expect(vm.installButtonLabel).toEqual('Install');
+      expect(vm.installButtonLoading).toEqual(false);
+      expect(vm.installButtonDisabled).toEqual(false);
+    });
+
+    it('clicking install button emits event', () => {
+      spyOn(eventHub, '$emit');
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_INSTALLABLE,
+      });
+      const installButton = vm.$el.querySelector('.js-cluster-application-install-button');
+
+      installButton.click();
+
+      expect(eventHub.$emit).toHaveBeenCalledWith('installApplication', DEFAULT_APPLICATION_STATE.id);
+    });
+
+    it('clicking disabled install button emits nothing', () => {
+      spyOn(eventHub, '$emit');
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_INSTALLING,
+      });
+      const installButton = vm.$el.querySelector('.js-cluster-application-install-button');
+
+      expect(vm.installButtonDisabled).toEqual(true);
+
+      installButton.click();
+
+      expect(eventHub.$emit).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('Error block', () => {
+    it('does not show error block when there is no error', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: null,
+        requestStatus: null,
+      });
+      const generalErrorMessage = vm.$el.querySelector('.js-cluster-application-general-error-message');
+
+      expect(generalErrorMessage).toBeNull();
+    });
+
+    it('shows status reason when `status=error`', () => {
+      const statusReason = 'We broke it 0.0';
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_ERROR,
+        statusReason,
+      });
+      const generalErrorMessage = vm.$el.querySelector('.js-cluster-application-general-error-message');
+      const statusErrorMessage = vm.$el.querySelector('.js-cluster-application-status-error-message');
+
+      expect(generalErrorMessage.textContent.trim()).toEqual(`Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`);
+      expect(statusErrorMessage.textContent.trim()).toEqual(statusReason);
+    });
+
+    it('shows request reason when `requestStatus=error`', () => {
+      const requestReason = 'We broke thre request 0.0';
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_INSTALLABLE,
+        requestStatus: REQUEST_FAILURE,
+        requestReason,
+      });
+      const generalErrorMessage = vm.$el.querySelector('.js-cluster-application-general-error-message');
+      const requestErrorMessage = vm.$el.querySelector('.js-cluster-application-request-error-message');
+
+      expect(generalErrorMessage.textContent.trim()).toEqual(`Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`);
+      expect(requestErrorMessage.textContent.trim()).toEqual(requestReason);
+    });
+  });
+});
diff --git a/spec/javascripts/clusters/components/applications_spec.js b/spec/javascripts/clusters/components/applications_spec.js
new file mode 100644
index 00000000000..5f59a00dc65
--- /dev/null
+++ b/spec/javascripts/clusters/components/applications_spec.js
@@ -0,0 +1,42 @@
+import Vue from 'vue';
+import applications from '~/clusters/components/applications.vue';
+import mountComponent from '../../helpers/vue_mount_component_helper';
+
+describe('Applications', () => {
+  let vm;
+  let Applications;
+
+  beforeEach(() => {
+    Applications = Vue.extend(applications);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      vm = mountComponent(Applications, {
+        applications: {
+          helm: { title: 'Helm Tiller' },
+          ingress: { title: 'Ingress' },
+          runner: { title: 'GitLab Runner' },
+        },
+      });
+    });
+
+    it('renders a row for Helm Tiller', () => {
+      expect(vm.$el.querySelector('.js-cluster-application-row-helm')).toBeDefined();
+    });
+
+    /* * /
+    it('renders a row for Ingress', () => {
+      expect(vm.$el.querySelector('.js-cluster-application-row-ingress')).toBeDefined();
+    });
+
+    it('renders a row for GitLab Runner', () => {
+      expect(vm.$el.querySelector('.js-cluster-application-row-runner')).toBeDefined();
+    });
+    /* */
+  });
+});
diff --git a/spec/javascripts/clusters/services/mock_data.js b/spec/javascripts/clusters/services/mock_data.js
new file mode 100644
index 00000000000..af6b6a73819
--- /dev/null
+++ b/spec/javascripts/clusters/services/mock_data.js
@@ -0,0 +1,50 @@
+import {
+  APPLICATION_INSTALLABLE,
+  APPLICATION_INSTALLING,
+  APPLICATION_ERROR,
+} from '~/clusters/constants';
+
+const CLUSTERS_MOCK_DATA = {
+  GET: {
+    '/gitlab-org/gitlab-shell/clusters/1/status.json': {
+      data: {
+        status: 'errored',
+        status_reason: 'Failed to request to CloudPlatform.',
+        applications: [{
+          name: 'helm',
+          status: APPLICATION_INSTALLABLE,
+          status_reason: null,
+        }, {
+          name: 'ingress',
+          status: APPLICATION_ERROR,
+          status_reason: 'Cannot connect',
+        }, {
+          name: 'runner',
+          status: APPLICATION_INSTALLING,
+          status_reason: null,
+        }],
+      },
+    },
+  },
+  POST: {
+    '/gitlab-org/gitlab-shell/clusters/1/applications/helm': { },
+    '/gitlab-org/gitlab-shell/clusters/1/applications/ingress': { },
+    '/gitlab-org/gitlab-shell/clusters/1/applications/runner': { },
+  },
+};
+
+const DEFAULT_APPLICATION_STATE = {
+  id: 'some-app',
+  title: 'My App',
+  titleLink: 'https://about.gitlab.com/',
+  description: 'Some description about this interesting application!',
+  status: null,
+  statusReason: null,
+  requestStatus: null,
+  requestReason: null,
+};
+
+export {
+  CLUSTERS_MOCK_DATA,
+  DEFAULT_APPLICATION_STATE,
+};
diff --git a/spec/javascripts/clusters/stores/clusters_store_spec.js b/spec/javascripts/clusters/stores/clusters_store_spec.js
new file mode 100644
index 00000000000..9f9d63434f7
--- /dev/null
+++ b/spec/javascripts/clusters/stores/clusters_store_spec.js
@@ -0,0 +1,86 @@
+import ClustersStore from '~/clusters/stores/clusters_store';
+import { APPLICATION_INSTALLING } from '~/clusters/constants';
+import { CLUSTERS_MOCK_DATA } from '../services/mock_data';
+
+describe('Clusters Store', () => {
+  let store;
+
+  beforeEach(() => {
+    store = new ClustersStore();
+  });
+
+  describe('updateStatus', () => {
+    it('should store new status', () => {
+      expect(store.state.status).toEqual(null);
+
+      const newStatus = 'errored';
+      store.updateStatus(newStatus);
+
+      expect(store.state.status).toEqual(newStatus);
+    });
+  });
+
+  describe('updateStatusReason', () => {
+    it('should store new reason', () => {
+      expect(store.state.statusReason).toEqual(null);
+
+      const newReason = 'Something went wrong!';
+      store.updateStatusReason(newReason);
+
+      expect(store.state.statusReason).toEqual(newReason);
+    });
+  });
+
+  describe('updateAppProperty', () => {
+    it('should store new request status', () => {
+      expect(store.state.applications.helm.requestStatus).toEqual(null);
+
+      const newStatus = APPLICATION_INSTALLING;
+      store.updateAppProperty('helm', 'requestStatus', newStatus);
+
+      expect(store.state.applications.helm.requestStatus).toEqual(newStatus);
+    });
+
+    it('should store new request reason', () => {
+      expect(store.state.applications.helm.requestReason).toEqual(null);
+
+      const newReason = 'We broke it.';
+      store.updateAppProperty('helm', 'requestReason', newReason);
+
+      expect(store.state.applications.helm.requestReason).toEqual(newReason);
+    });
+  });
+
+  describe('updateStateFromServer', () => {
+    it('should store new polling data from server', () => {
+      const mockResponseData = CLUSTERS_MOCK_DATA.GET['/gitlab-org/gitlab-shell/clusters/1/status.json'].data;
+      store.updateStateFromServer(mockResponseData);
+
+      expect(store.state).toEqual({
+        helpPath: null,
+        status: mockResponseData.status,
+        statusReason: mockResponseData.status_reason,
+        applications: {
+          helm: {
+            status: mockResponseData.applications[0].status,
+            statusReason: mockResponseData.applications[0].status_reason,
+            requestStatus: null,
+            requestReason: null,
+          },
+          ingress: {
+            status: mockResponseData.applications[1].status,
+            statusReason: mockResponseData.applications[1].status_reason,
+            requestStatus: null,
+            requestReason: null,
+          },
+          runner: {
+            status: mockResponseData.applications[2].status,
+            statusReason: mockResponseData.applications[2].status_reason,
+            requestStatus: null,
+            requestReason: null,
+          },
+        },
+      });
+    });
+  });
+});
diff --git a/spec/javascripts/clusters_spec.js b/spec/javascripts/clusters_spec.js
deleted file mode 100644
index eb1cd6eb804..00000000000
--- a/spec/javascripts/clusters_spec.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import Clusters from '~/clusters';
-
-describe('Clusters', () => {
-  let cluster;
-  preloadFixtures('clusters/show_cluster.html.raw');
-
-  beforeEach(() => {
-    loadFixtures('clusters/show_cluster.html.raw');
-    cluster = new Clusters();
-  });
-
-  describe('toggle', () => {
-    it('should update the button and the input field on click', () => {
-      cluster.toggleButton.click();
-
-      expect(
-        cluster.toggleButton.classList,
-      ).not.toContain('checked');
-
-      expect(
-        cluster.toggleInput.getAttribute('value'),
-      ).toEqual('false');
-    });
-  });
-
-  describe('updateContainer', () => {
-    describe('when creating cluster', () => {
-      it('should show the creating container', () => {
-        cluster.updateContainer('creating');
-
-        expect(
-          cluster.creatingContainer.classList.contains('hidden'),
-        ).toBeFalsy();
-        expect(
-          cluster.successContainer.classList.contains('hidden'),
-        ).toBeTruthy();
-        expect(
-          cluster.errorContainer.classList.contains('hidden'),
-        ).toBeTruthy();
-      });
-    });
-
-    describe('when cluster is created', () => {
-      it('should show the success container', () => {
-        cluster.updateContainer('created');
-
-        expect(
-          cluster.creatingContainer.classList.contains('hidden'),
-        ).toBeTruthy();
-        expect(
-          cluster.successContainer.classList.contains('hidden'),
-        ).toBeFalsy();
-        expect(
-          cluster.errorContainer.classList.contains('hidden'),
-        ).toBeTruthy();
-      });
-    });
-
-    describe('when cluster has error', () => {
-      it('should show the error container', () => {
-        cluster.updateContainer('errored', 'this is an error');
-
-        expect(
-          cluster.creatingContainer.classList.contains('hidden'),
-        ).toBeTruthy();
-        expect(
-          cluster.successContainer.classList.contains('hidden'),
-        ).toBeTruthy();
-        expect(
-          cluster.errorContainer.classList.contains('hidden'),
-        ).toBeFalsy();
-
-        expect(
-          cluster.errorReasonContainer.textContent,
-        ).toContain('this is an error');
-      });
-    });
-  });
-});
-- 
cgit v1.2.1


From 6947646d00a7a71984d54087452b0d004429b047 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Fri, 3 Nov 2017 11:33:15 -0500
Subject: Add Ingress to cluster applications section

---
 app/assets/javascripts/clusters/components/applications.vue | 11 ++++++++++-
 app/assets/stylesheets/pages/clusters.scss                  |  2 +-
 spec/javascripts/clusters/components/applications_spec.js   |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 865fa4f702e..4b2fc069cee 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -96,8 +96,17 @@ export default {
           :request-status="applications.helm.requestStatus"
           :request-reason="applications.helm.requestReason"
         />
+        <application-row
+         id="ingress"
+         :title="applications.ingress.title"
+         title-link="https://kubernetes.io/docs/concepts/services-networking/ingress/"
+         :description="ingressDescription"
+         :status="applications.ingress.status"
+         :status-reason="applications.ingress.statusReason"
+         :request-status="applications.ingress.requestStatus"
+         :request-reason="applications.ingress.requestReason"
+       />
         <!-- NOTE: Don't forget to update `clusters.scss` min-height for this block and uncomment `application_spec` tests -->
-        <!-- Add Ingress row, all other plumbing is complete -->
         <!-- Add GitLab Runner row, all other plumbing is complete -->
       </div>
     </div>
diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss
index b9bfae9356c..e5b9e1f2de6 100644
--- a/app/assets/stylesheets/pages/clusters.scss
+++ b/app/assets/stylesheets/pages/clusters.scss
@@ -6,5 +6,5 @@
 
 .cluster-applications-table {
   // Wait for the Vue to kick-in and render the applications block
-  min-height: 179px;
+  min-height: 302px;
 }
diff --git a/spec/javascripts/clusters/components/applications_spec.js b/spec/javascripts/clusters/components/applications_spec.js
index 5f59a00dc65..7460da031c4 100644
--- a/spec/javascripts/clusters/components/applications_spec.js
+++ b/spec/javascripts/clusters/components/applications_spec.js
@@ -29,11 +29,11 @@ describe('Applications', () => {
       expect(vm.$el.querySelector('.js-cluster-application-row-helm')).toBeDefined();
     });
 
-    /* * /
     it('renders a row for Ingress', () => {
       expect(vm.$el.querySelector('.js-cluster-application-row-ingress')).toBeDefined();
     });
 
+    /* * /
     it('renders a row for GitLab Runner', () => {
       expect(vm.$el.querySelector('.js-cluster-application-row-runner')).toBeDefined();
     });
-- 
cgit v1.2.1


From c6c9b37b1d1c9304b0eef530adb4d32178adae16 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Fri, 3 Nov 2017 19:20:29 +0100
Subject: Add Clusters::Applications::Helm tests

---
 app/models/clusters/applications/helm.rb           |  8 ++-
 app/models/clusters/cluster.rb                     |  2 +-
 app/models/clusters/concerns/application_status.rb |  2 +-
 spec/factories/clusters/applications/helm.rb       | 35 +++++++++
 spec/models/clusters/applications/helm_spec.rb     | 82 ++++++++++++++++++++--
 5 files changed, 118 insertions(+), 11 deletions(-)
 create mode 100644 spec/factories/clusters/applications/helm.rb

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 54eca613ce3..42626a50175 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -3,8 +3,6 @@ module Clusters
     class Helm < ActiveRecord::Base
       self.table_name = 'clusters_applications_helm'
 
-      NAME = 'helm'.freeze
-
       include ::Clusters::Concerns::ApplicationStatus
 
       belongs_to :cluster, class_name: 'Clusters::Cluster', foreign_key: :cluster_id
@@ -13,8 +11,12 @@ module Clusters
 
       validates :cluster, presence: true
 
+      def self.application_name
+        self.to_s.demodulize.underscore
+      end
+
       def name
-        NAME
+        self.class.application_name
       end
     end
   end
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 242bae4eb3e..7d0be3d3739 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -5,7 +5,7 @@ module Clusters
     self.table_name = 'clusters'
 
     APPLICATIONS = {
-      Clusters::Applications::Helm::NAME => Clusters::Applications::Helm
+      Applications::Helm.application_name => Applications::Helm
     }.freeze
 
     belongs_to :user
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index c5711fd0b58..7bb68d75224 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -24,7 +24,7 @@ module Clusters
           end
 
           event :make_scheduled do
-            transition %i(installable errored) => :scheduled
+            transition any - [:scheduled] => :scheduled
           end
 
           before_transition any => [:scheduled] do |app_status, _|
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
new file mode 100644
index 00000000000..968a6a1a007
--- /dev/null
+++ b/spec/factories/clusters/applications/helm.rb
@@ -0,0 +1,35 @@
+FactoryGirl.define do
+  factory :applications_helm, class: Clusters::Applications::Helm do
+    trait :cluster do
+      before(:create) do |app, _|
+        app.cluster = create(:cluster)
+      end
+    end
+
+    trait :installable do
+      cluster
+      status 0
+    end
+
+    trait :scheduled do
+      cluster
+      status 1
+    end
+
+    trait :installing do
+      cluster
+      status 2
+    end
+
+    trait :installed do
+      cluster
+      status 3
+    end
+
+    trait :errored do
+      cluster
+      status(-1)
+      status_reason 'something went wrong'
+    end
+  end
+end
diff --git a/spec/models/clusters/applications/helm_spec.rb b/spec/models/clusters/applications/helm_spec.rb
index 6e32e2e7037..54fce7d886a 100644
--- a/spec/models/clusters/applications/helm_spec.rb
+++ b/spec/models/clusters/applications/helm_spec.rb
@@ -1,14 +1,84 @@
 require 'rails_helper'
-require_relative '../kubernetes_spec'
 
 RSpec.describe Clusters::Applications::Helm, type: :model do
-  it_behaves_like 'a registered kubernetes app'
+  it { is_expected.to belong_to(:cluster) }
+  it { is_expected.to validate_presence_of(:cluster) }
 
-  it { is_expected.to belong_to(:kubernetes_service) }
+  describe '#name' do
+    it 'is .application_name' do
+      expect(subject.name).to eq(described_class.application_name)
+    end
+
+    it 'is recorded in Clusters::Cluster::APPLICATIONS' do
+      expect(Clusters::Cluster::APPLICATIONS[subject.name]).to eq(described_class)
+    end
+  end
+
+  describe '#version' do
+    it 'defaults to Gitlab::Kubernetes::Helm::HELM_VERSION' do
+      expect(subject.version).to eq(Gitlab::Kubernetes::Helm::HELM_VERSION)
+    end
+  end
+
+  describe '#status' do
+    it 'defaults to :installable' do
+      expect(subject.status_name).to be(:installable)
+    end
+  end
+
+  describe 'status state machine' do
+    describe '#make_installing' do
+      subject { create(:applications_helm, :scheduled) }
+
+      it 'is installing' do
+        subject.make_installing!
+
+        expect(subject).to be_installing
+      end
+    end
+
+    describe '#make_installed' do
+      subject { create(:applications_helm, :installing) }
+
+      it 'is installed' do
+        subject.make_installed
+
+        expect(subject).to be_installed
+      end
+    end
+
+    describe '#make_errored' do
+      subject { create(:applications_helm, :installing) }
+      let(:reason) { 'some errors' }
+
+      it 'is errored' do
+        subject.make_errored(reason)
+
+        expect(subject).to be_errored
+        expect(subject.status_reason).to eq(reason)
+      end
+    end
+
+    describe '#make_scheduled' do
+      subject { create(:applications_helm, :installable) }
+
+      it 'is scheduled' do
+        subject.make_scheduled
+
+        expect(subject).to be_scheduled
+      end
+
+      describe 'when was errored' do
+        subject { create(:applications_helm, :errored) }
+
+        it 'clears #status_reason' do
+          expect(subject.status_reason).not_to be_nil
+
+          subject.make_scheduled!
 
-  describe '#cluster' do
-    it 'is an alias to #kubernetes_service' do
-      expect(subject.method(:cluster).original_name).to eq(:kubernetes_service)
+          expect(subject.status_reason).to be_nil
+        end
+      end
     end
   end
 end
-- 
cgit v1.2.1


From 70b8f421ae6587d2a57db40e7487bf2dd788cbde Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Sat, 4 Nov 2017 14:51:26 -0400
Subject: Modifies commit branches section

- Display the default branch (if the limit is not exceeded)
- Requires '...' to be clicked before showing the rest of the branches and/or tags
- Fixes haml lints
---
 app/views/projects/commit/_commit_box.html.haml    |  2 +-
 .../commit/_limit_exceeded_message.html.haml       |  4 +-
 app/views/projects/commit/branches.html.haml       | 18 ++++--
 .../projects/commit/branches.html.haml_spec.rb     | 73 +++++++++++++++++++++-
 4 files changed, 85 insertions(+), 12 deletions(-)

diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index cd93886bb24..b1beb2ff368 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -61,7 +61,7 @@
     %span.cgray= n_('parent', 'parents', @commit.parents.count)
     - @commit.parents.each do |parent|
       = link_to parent.short_id, project_commit_path(@project, parent), class: "commit-sha"
-    %div.commit-info.branches
+    .commit-info.branches
       %i.fa.fa-spinner.fa-spin
 
   - if @commit.last_pipeline
diff --git a/app/views/projects/commit/_limit_exceeded_message.html.haml b/app/views/projects/commit/_limit_exceeded_message.html.haml
index b3372108321..430ac6df2e4 100644
--- a/app/views/projects/commit/_limit_exceeded_message.html.haml
+++ b/app/views/projects/commit/_limit_exceeded_message.html.haml
@@ -1,8 +1,8 @@
-.has-tooltip{class: "limit-box limit-box-#{objects.singularize}", data: { title: "Project has too many #{objects} to search"} }
+.has-tooltip{ class: "limit-box limit-box-#{objects.singularize}", data: { title: "Project has too many #{objects} to search"} }
   .limit-icon
     - if objects == "branches"
       = icon('code-fork')
     - else
       = icon('tag')
   .limit-message
-    %span= "#{objects.capitalize} unavailable"
+    %span #{objects.capitalize} unavailable
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index d282eb47914..1c4f16b5afa 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,9 +1,15 @@
 - if @branches_limit_exceeded
   = render 'limit_exceeded_message', objects: 'branches'
-- elsif @branches.any?
-  = commit_branches_links(@project, @branches)
+- else
+  - branch = commit_default_branch(@project, @branches)
+  = commit_branch_link(project_ref_path(@project, branch), branch)
 
-- if @tags_limit_exceeded
-  = render 'limit_exceeded_message', objects: 'tags'
-- elsif @tags.any?
-  = commit_tags_links(@project, @tags)
+- if @branches.any? || @tags.any? || @tags_limit_exceeded
+  %span
+    = link_to "…", "#", class: "js-details-expand label label-gray"
+    %span.js-details-content.hide
+      = commit_branches_links(@project, @branches)
+      - if @tags_limit_exceeded
+        = render 'limit_exceeded_message', objects: 'tags'
+      - else
+        = commit_tags_links(@project, @tags)
diff --git a/spec/views/projects/commit/branches.html.haml_spec.rb b/spec/views/projects/commit/branches.html.haml_spec.rb
index c9112ede334..044b73ce419 100644
--- a/spec/views/projects/commit/branches.html.haml_spec.rb
+++ b/spec/views/projects/commit/branches.html.haml_spec.rb
@@ -7,7 +7,7 @@ describe 'projects/commit/branches.html.haml' do
     assign(:project, project)
   end
 
-  context 'branches and tags' do
+  context 'when branches and tags are available' do
     before do
       assign(:branches, ['master', 'test-branch'])
       assign(:branches_limit_exceeded, false)
@@ -17,16 +17,75 @@ describe 'projects/commit/branches.html.haml' do
       render
     end
 
+    it 'shows default branch' do
+      expect(rendered).to have_link('master')
+    end
+
+    it 'shows js expand link' do
+      expect(rendered).to have_selector('.js-details-expand')
+    end
+
     it 'shows branch and tag links' do
+      expect(rendered).to have_link('test-branch')
+      expect(rendered).to have_link('tag1')
+    end
+  end
+
+  context 'when branches are available but no tags' do
+    before do
+      assign(:branches, ['master', 'test-branch'])
+      assign(:branches_limit_exceeded, false)
+      assign(:tags, [])
+      assign(:tags_limit_exceeded, true)
+
+      render
+    end
+
+    it 'shows branches' do
       expect(rendered).to have_link('master')
       expect(rendered).to have_link('test-branch')
+    end
+
+    it 'shows js expand link' do
+      expect(rendered).to have_selector('.js-details-expand')
+    end
+
+    it 'shows limit exceeded message for tags' do
+      expect(rendered).to have_text('Tags unavailable')
+    end
+  end
+
+  context 'when tags are available but no branches (just default)' do
+    before do
+      assign(:branches, ['master'])
+      assign(:branches_limit_exceeded, true)
+      assign(:tags, ['tag1', 'tag2'])
+      assign(:tags_limit_exceeded, false)
+
+      render
+    end
+
+    it 'shows default branch' do
+      expect(rendered).to have_text('master')
+    end
+
+    it 'shows js expand link' do
+      expect(rendered).to have_selector('.js-details-expand')
+    end
+
+    it 'shows tags' do
       expect(rendered).to have_link('tag1')
+      expect(rendered).to have_link('tag2')
+    end
+
+    it 'shows limit exceeded for branches' do
+      expect(rendered).to have_text('Branches unavailable')
     end
   end
 
-  context 'throttled branches and tags' do
+  context 'when branches and tags are not available' do
     before do
-      assign(:branches, [])
+      assign(:branches, ['master'])
       assign(:branches_limit_exceeded, true)
       assign(:tags, [])
       assign(:tags_limit_exceeded, true)
@@ -34,6 +93,14 @@ describe 'projects/commit/branches.html.haml' do
       render
     end
 
+    it 'shows default branch' do
+      expect(rendered).to have_text('master')
+    end
+
+    it 'shows js expand link' do
+      expect(rendered).to have_selector('.js-details-expand')
+    end
+
     it 'shows too many to search' do
       expect(rendered).to have_text('Branches unavailable')
       expect(rendered).to have_text('Tags unavailable')
-- 
cgit v1.2.1


From 8efbba33852d57c08507cbe3a1654dd9de9dae73 Mon Sep 17 00:00:00 2001
From: Hazel <hazel@gitlab.com>
Date: Mon, 6 Nov 2017 15:07:45 +0800
Subject:  Changed the order of buttons from left to right

---
 doc/development/ux_guide/components.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/development/ux_guide/components.md b/doc/development/ux_guide/components.md
index 82168b18860..16a811dbc74 100644
--- a/doc/development/ux_guide/components.md
+++ b/doc/development/ux_guide/components.md
@@ -256,6 +256,7 @@ Skeleton loading can replace any existing UI elements for the period in which th
 ---
 
 ## Dialog modals
+
 Dialog modals are only used for having a conversation and confirmation with the user. The user is not able to access the features on the main page until closing the modal.
 
 ### Usage
@@ -268,7 +269,7 @@ Dialog modals are only used for having a conversation and confirmation with the
 * Dialog modals contain the header, body, and actions.
   * **Header(1):** The header title is a question instead of a descriptive phrase.
   * **Body(2):** The content in body should never be ambiguous and unclear. It provides specific information.
-  * **Actions(3):** Contains a affirmative action, a dismissive action, and an extra action. The order of actions from right to left: Affirmative action → Extra action → Dismissive action
+  * **Actions(3):** Contains a affirmative action, a dismissive action, and an extra action. The order of actions from left to right: Dismissive action → Extra action → Affirmative action
 * Confirmations regarding labels should keep labeling styling.
 * References to commits, branches, and tags should be **monospaced**.
 
-- 
cgit v1.2.1


From 80b0834ae96480202678d8ca1e19c0ee4abf9001 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Mon, 6 Nov 2017 10:23:15 +0100
Subject: Add Clusters::Appplications::CheckInstallationProgressService tests

---
 .../check_installation_progress_service.rb         |  4 +-
 spec/factories/clusters/applications/helm.rb       |  5 ++
 .../check_installation_progress_service_spec.rb    | 75 ++++++++++++++++++++++
 3 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 spec/services/clusters/applications/check_installation_progress_service_spec.rb

diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index cf96c128c2e..81306a2ff5b 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -27,13 +27,13 @@ module Clusters
       end
 
       def on_failed
-        app.make_errored!(log || 'Installation silently failed')
+        app.make_errored!(installation_errors || 'Installation silently failed')
         finalize_installation
       end
 
       def check_timeout
         if Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
-          app.make_errored!('App installation timeouted')
+          app.make_errored!('Installation timeouted')
         else
           ClusterWaitForAppInstallationWorker.perform_in(
             ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index 968a6a1a007..fd956097115 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -31,5 +31,10 @@ FactoryGirl.define do
       status(-1)
       status_reason 'something went wrong'
     end
+
+    trait :timeouted do
+      installing
+      updated_at ClusterWaitForAppInstallationWorker::TIMEOUT.ago
+    end
   end
 end
diff --git a/spec/services/clusters/applications/check_installation_progress_service_spec.rb b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
new file mode 100644
index 00000000000..c64c3a0c94c
--- /dev/null
+++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+describe Clusters::Applications::CheckInstallationProgressService do
+  RESCHEDULE_PHASES = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze
+
+  def mock_helm_api(phase, errors: nil)
+    expect(service).to receive(:installation_phase).once.and_return(phase)
+    expect(service).to receive(:installation_errors).once.and_return(errors) if errors.present?
+  end
+
+  shared_examples 'not yet completed phase' do |phase|
+    context "when the installation POD phase is #{phase}" do
+      before do
+        mock_helm_api(phase)
+      end
+
+      context 'when not timeouted' do
+        it 'reschedule a new check' do
+          expect(ClusterWaitForAppInstallationWorker).to receive(:perform_in).once
+
+          service.execute
+
+          expect(application).to be_installing
+          expect(application.status_reason).to be_nil
+        end
+      end
+
+      context 'when timeouted' do
+        let(:application) { create(:applications_helm, :timeouted) }
+
+        it 'make the application errored' do
+          expect(ClusterWaitForAppInstallationWorker).not_to receive(:perform_in)
+
+          service.execute
+
+          expect(application).to be_errored
+          expect(application.status_reason).to match(/\btimeouted\b/)
+        end
+      end
+    end
+  end
+
+  describe '#execute' do
+    let(:application) { create(:applications_helm, :installing) }
+    let(:service) { described_class.new(application) }
+
+    context 'when installation POD succeeded' do
+      it 'make the application installed' do
+        mock_helm_api(Gitlab::Kubernetes::Pod::SUCCEEDED)
+        expect(service).to receive(:finalize_installation).once
+
+        service.execute
+
+        expect(application).to be_installed
+        expect(application.status_reason).to be_nil
+      end
+    end
+
+    context 'when installation POD failed' do
+      let(:error_message) { 'test installation failed' }
+
+      it 'make the application errored' do
+        mock_helm_api(Gitlab::Kubernetes::Pod::FAILED, errors: error_message)
+        expect(service).to receive(:finalize_installation).once
+
+        service.execute
+
+        expect(application).to be_errored
+        expect(application.status_reason).to eq(error_message)
+      end
+    end
+
+    RESCHEDULE_PHASES.each { |phase| it_behaves_like 'not yet completed phase', phase }
+  end
+end
-- 
cgit v1.2.1


From d8223468ae2ae061020cc26336c51dc93cc75571 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 10:41:27 +0100
Subject: Add ingress application

---
 app/models/clusters/applications/ingress.rb        | 32 ++++++++++++++++++++++
 app/models/clusters/cluster.rb                     |  7 +++--
 ...1200_create_clusters_kubernetes_ingress_apps.rb | 21 ++++++++++++++
 db/schema.rb                                       | 25 +++++++++--------
 4 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 app/models/clusters/applications/ingress.rb
 create mode 100644 db/migrate/20171106101200_create_clusters_kubernetes_ingress_apps.rb

diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
new file mode 100644
index 00000000000..0554cf84ed7
--- /dev/null
+++ b/app/models/clusters/applications/ingress.rb
@@ -0,0 +1,32 @@
+module Clusters
+  module Applications
+    class Ingress < ActiveRecord::Base
+      self.table_name = 'clusters_applications_ingress'
+
+      include ::Clusters::Concerns::ApplicationStatus
+
+      belongs_to :cluster, class_name: 'Clusters::Cluster', foreign_key: :cluster_id
+
+      validates :cluster, presence: true
+
+      default_value_for :ingress_type, :nginx
+      default_value_for :version, :nginx
+
+      enum ingress_type: {
+        nginx: 1
+      }
+
+      def self.application_name
+        self.to_s.demodulize.underscore
+      end
+
+      def name
+        self.class.application_name
+      end
+
+      def chart
+        'stable/nginx-ingress'
+      end
+    end
+  end
+end
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 7d0be3d3739..cfed9c52860 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -5,7 +5,8 @@ module Clusters
     self.table_name = 'clusters'
 
     APPLICATIONS = {
-      Applications::Helm.application_name => Applications::Helm
+      Applications::Helm.application_name => Applications::Helm,
+      Applications::Ingress.application_name => Applications::Ingress
     }.freeze
 
     belongs_to :user
@@ -20,6 +21,7 @@ module Clusters
     has_one :platform_kubernetes, class_name: 'Clusters::Platforms::Kubernetes', autosave: true, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
 
     has_one :application_helm, class_name: 'Clusters::Applications::Helm'
+    has_one :application_ingress, class_name: 'Clusters::Applications::Ingress'
 
     accepts_nested_attributes_for :provider_gcp, update_only: true
     accepts_nested_attributes_for :platform_kubernetes, update_only: true
@@ -59,7 +61,8 @@ module Clusters
 
     def applications
       [
-        application_helm || build_application_helm
+        application_helm || build_application_helm,
+        application_ingress || build_application_ingress
       ]
     end
 
diff --git a/db/migrate/20171106101200_create_clusters_kubernetes_ingress_apps.rb b/db/migrate/20171106101200_create_clusters_kubernetes_ingress_apps.rb
new file mode 100644
index 00000000000..21f48b1d1b4
--- /dev/null
+++ b/db/migrate/20171106101200_create_clusters_kubernetes_ingress_apps.rb
@@ -0,0 +1,21 @@
+class CreateClustersKubernetesIngressApps < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    create_table :clusters_applications_ingress do |t|
+      t.references :cluster, null: false, unique: true, foreign_key: { on_delete: :cascade }
+
+      t.datetime_with_timezone :created_at, null: false
+      t.datetime_with_timezone :updated_at, null: false
+
+      t.integer :status, null: false
+      t.integer :ingress_type, null: false
+
+      t.string :version, null: false
+      t.string :cluster_ip
+      t.text :status_reason
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 548f4711339..2e5c98f2541 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171031100710) do
+ActiveRecord::Schema.define(version: 20171106101200) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -464,9 +464,7 @@ ActiveRecord::Schema.define(version: 20171031100710) do
 
   create_table "cluster_platforms_kubernetes", force: :cascade do |t|
     t.integer "cluster_id", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
-    t.text "api_url"
+    t.string "api_url"
     t.text "ca_cert"
     t.string "namespace"
     t.string "username"
@@ -493,9 +491,6 @@ ActiveRecord::Schema.define(version: 20171031100710) do
   create_table "cluster_providers_gcp", force: :cascade do |t|
     t.integer "cluster_id", null: false
     t.integer "status"
-    t.integer "num_nodes", null: false
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
     t.text "status_reason"
     t.string "gcp_project_id", null: false
     t.string "zone", null: false
@@ -513,10 +508,6 @@ ActiveRecord::Schema.define(version: 20171031100710) do
 
   create_table "clusters", force: :cascade do |t|
     t.integer "user_id"
-    t.integer "provider_type"
-    t.integer "platform_type"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
     t.boolean "enabled", default: true
     t.string "name", null: false
     t.integer "provider_type"
@@ -534,6 +525,17 @@ ActiveRecord::Schema.define(version: 20171031100710) do
     t.text "status_reason"
   end
 
+  create_table "clusters_applications_ingress", force: :cascade do |t|
+    t.integer "cluster_id", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.integer "status", null: false
+    t.integer "ingress_type", null: false
+    t.string "version", null: false
+    t.string "cluster_ip"
+    t.text "status_reason"
+  end
+
   create_table "container_repositories", force: :cascade do |t|
     t.integer "project_id", null: false
     t.string "name", null: false
@@ -1888,6 +1890,7 @@ ActiveRecord::Schema.define(version: 20171031100710) do
   add_foreign_key "cluster_providers_gcp", "clusters", on_delete: :cascade
   add_foreign_key "clusters", "users", on_delete: :nullify
   add_foreign_key "clusters_applications_helm", "clusters", on_delete: :cascade
+  add_foreign_key "clusters_applications_ingress", "clusters", on_delete: :cascade
   add_foreign_key "container_repositories", "projects"
   add_foreign_key "deploy_keys_projects", "projects", name: "fk_58a901ca7e", on_delete: :cascade
   add_foreign_key "deployments", "projects", name: "fk_b9a3851b82", on_delete: :cascade
-- 
cgit v1.2.1


From 8ef73aaaf461ad7fe2b7e351c28c7dfc150bedf0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 10:48:38 +0100
Subject: Set installation paths

---
 app/views/projects/clusters/show.html.haml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index 799b07046e5..75cfeb08b34 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -6,9 +6,8 @@
 
 - status_path = status_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster.id, format: :json) if can?(current_user, :admin_cluster, @cluster)
 .edit-cluster-form.js-edit-cluster-form{ data: { status_path: status_path,
-  install_helm_path: 'TODO',
-  install_ingress_path: 'TODO',
-  install_runner_path: 'TODO',
+  install_helm_path: install_applications_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster, :helm),
+  install_ingress_path: install_applications_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster, :ingress),
   toggle_status: @cluster.enabled? ? 'true': 'false',
   cluster_status: @cluster.status_name,
   cluster_status_reason: @cluster.status_reason,
-- 
cgit v1.2.1


From fe0292cfa7266ad5f936e103cdf005a00da4c233 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 10:50:10 +0100
Subject: Remove not used ingress and runner

---
 app/assets/javascripts/clusters/clusters_bundle.js           | 4 ----
 app/assets/javascripts/clusters/services/clusters_service.js | 2 --
 app/views/projects/clusters/show.html.haml                   | 4 +---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index 053f11cc3c4..9a436b3e22d 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -28,8 +28,6 @@ export default class Clusters {
     const {
       statusPath,
       installHelmPath,
-      installIngressPath,
-      installRunnerPath,
       clusterStatus,
       clusterStatusReason,
       helpPath,
@@ -42,8 +40,6 @@ export default class Clusters {
     this.service = new ClustersService({
       endpoint: statusPath,
       installHelmEndpoint: installHelmPath,
-      installIngresEndpoint: installIngressPath,
-      installRunnerEndpoint: installRunnerPath,
     });
 
     this.toggle = this.toggle.bind(this);
diff --git a/app/assets/javascripts/clusters/services/clusters_service.js b/app/assets/javascripts/clusters/services/clusters_service.js
index 0ac8e68187d..a7bb0961c7e 100644
--- a/app/assets/javascripts/clusters/services/clusters_service.js
+++ b/app/assets/javascripts/clusters/services/clusters_service.js
@@ -8,8 +8,6 @@ export default class ClusterService {
     this.options = options;
     this.appInstallEndpointMap = {
       helm: this.options.installHelmEndpoint,
-      ingress: this.options.installIngressEndpoint,
-      runner: this.options.installRunnerEndpoint,
     };
   }
 
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index 799b07046e5..f116c4f7dba 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -6,9 +6,7 @@
 
 - status_path = status_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster.id, format: :json) if can?(current_user, :admin_cluster, @cluster)
 .edit-cluster-form.js-edit-cluster-form{ data: { status_path: status_path,
-  install_helm_path: 'TODO',
-  install_ingress_path: 'TODO',
-  install_runner_path: 'TODO',
+  install_helm_path: install_applications_namespace_project_cluster_path(@cluster.project.namespace, @cluster.project, @cluster, :helm),
   toggle_status: @cluster.enabled? ? 'true': 'false',
   cluster_status: @cluster.status_name,
   cluster_status_reason: @cluster.status_reason,
-- 
cgit v1.2.1


From a85292922d0721b4912e86396ea5a7ce511d0516 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 11:03:25 +0100
Subject: Fix ingress endpoint

---
 app/assets/javascripts/clusters/clusters_bundle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index ad376efc3c3..9f92d49f576 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -41,7 +41,7 @@ export default class Clusters {
     this.service = new ClustersService({
       endpoint: statusPath,
       installHelmEndpoint: installHelmPath,
-      installIngresEndpoint: installIngressPath,
+      installIngressEndpoint: installIngressPath,
     });
 
     this.toggle = this.toggle.bind(this);
-- 
cgit v1.2.1


From 001de85e7c6f86423aca0d245fdc83c57b374630 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 11:03:58 +0100
Subject: Return empty applications if not Kubernetes [ci skip]

---
 app/models/clusters/cluster.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 7d0be3d3739..5b9bd6e548b 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -58,6 +58,8 @@ module Clusters
     end
 
     def applications
+      return [] unless kubernetes?
+
       [
         application_helm || build_application_helm
       ]
-- 
cgit v1.2.1


From 61501a07cb9c1fff5a30662b3e3815976f2777cb Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Mon, 6 Nov 2017 15:43:02 +0100
Subject: Add Clusters::Applications services tests

---
 app/models/clusters/concerns/application_status.rb |  2 +-
 .../check_installation_progress_service.rb         | 11 +----
 .../applications/finalize_installation_service.rb  |  8 +--
 .../clusters/applications/install_service.rb       |  9 ++--
 .../applications/schedule_installation_service.rb  | 13 ++---
 .../check_installation_progress_service_spec.rb    | 57 ++++++++++++----------
 .../finalize_installation_service_spec.rb          | 32 ++++++++++++
 .../clusters/applications/install_service_spec.rb  | 54 ++++++++++++++++++++
 .../schedule_installation_service_spec.rb          | 55 +++++++++++++++++++++
 9 files changed, 184 insertions(+), 57 deletions(-)
 create mode 100644 spec/services/clusters/applications/finalize_installation_service_spec.rb
 create mode 100644 spec/services/clusters/applications/install_service_spec.rb
 create mode 100644 spec/services/clusters/applications/schedule_installation_service_spec.rb

diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index 7bb68d75224..c5711fd0b58 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -24,7 +24,7 @@ module Clusters
           end
 
           event :make_scheduled do
-            transition any - [:scheduled] => :scheduled
+            transition %i(installable errored) => :scheduled
           end
 
           before_transition any => [:scheduled] do |app_status, _|
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index 81306a2ff5b..1bd5dae0584 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -6,7 +6,7 @@ module Clusters
 
         case installation_phase
         when Gitlab::Kubernetes::Pod::SUCCEEDED
-          on_succeeded
+          finalize_installation
         when Gitlab::Kubernetes::Pod::FAILED
           on_failed
         else
@@ -18,14 +18,6 @@ module Clusters
 
       private
 
-      def on_succeeded
-        if app.make_installed
-          finalize_installation
-        else
-          app.make_errored!("Failed to update app record; #{app.errors}")
-        end
-      end
-
       def on_failed
         app.make_errored!(installation_errors || 'Installation silently failed')
         finalize_installation
@@ -34,6 +26,7 @@ module Clusters
       def check_timeout
         if Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
           app.make_errored!('Installation timeouted')
+          finalize_installation
         else
           ClusterWaitForAppInstallationWorker.perform_in(
             ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
diff --git a/app/services/clusters/applications/finalize_installation_service.rb b/app/services/clusters/applications/finalize_installation_service.rb
index 339d671c091..292c789b67b 100644
--- a/app/services/clusters/applications/finalize_installation_service.rb
+++ b/app/services/clusters/applications/finalize_installation_service.rb
@@ -4,13 +4,7 @@ module Clusters
       def execute
         helm_api.delete_installation_pod!(app)
 
-        app.make_errored!('Installation aborted') if aborted?
-      end
-
-      private
-
-      def aborted?
-        app.installing? || app.scheduled?
+        app.make_installed! if app.installing?
       end
     end
   end
diff --git a/app/services/clusters/applications/install_service.rb b/app/services/clusters/applications/install_service.rb
index 5ed0968a98a..4eba19a474e 100644
--- a/app/services/clusters/applications/install_service.rb
+++ b/app/services/clusters/applications/install_service.rb
@@ -5,14 +5,11 @@ module Clusters
         return unless app.scheduled?
 
         begin
+          app.make_installing!
           helm_api.install(app)
 
-          if app.make_installing
-            ClusterWaitForAppInstallationWorker.perform_in(
-              ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
-          else
-            app.make_errored!("Failed to update app record; #{app.errors}")
-          end
+          ClusterWaitForAppInstallationWorker.perform_in(
+            ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
         rescue KubeException => ke
           app.make_errored!("Kubernetes error: #{ke.message}")
         rescue StandardError
diff --git a/app/services/clusters/applications/schedule_installation_service.rb b/app/services/clusters/applications/schedule_installation_service.rb
index 17b3a09948d..eb8caa68ef7 100644
--- a/app/services/clusters/applications/schedule_installation_service.rb
+++ b/app/services/clusters/applications/schedule_installation_service.rb
@@ -2,15 +2,10 @@ module Clusters
   module Applications
     class ScheduleInstallationService < ::BaseService
       def execute
-        application = application_class.find_or_create_by!(cluster: cluster)
-
-        application.make_scheduled!
-        ClusterInstallAppWorker.perform_async(application.name, application.id)
-        true
-      rescue ActiveRecord::RecordInvalid
-        false
-      rescue StateMachines::InvalidTransition
-        false
+        application_class.find_or_create_by!(cluster: cluster).try do |application|
+          application.make_scheduled!
+          ClusterInstallAppWorker.perform_async(application.name, application.id)
+        end
       end
 
       private
diff --git a/spec/services/clusters/applications/check_installation_progress_service_spec.rb b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
index c64c3a0c94c..fe04fac9613 100644
--- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb
+++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
@@ -3,20 +3,27 @@ require 'spec_helper'
 describe Clusters::Applications::CheckInstallationProgressService do
   RESCHEDULE_PHASES = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze
 
-  def mock_helm_api(phase, errors: nil)
-    expect(service).to receive(:installation_phase).once.and_return(phase)
-    expect(service).to receive(:installation_errors).once.and_return(errors) if errors.present?
+  let(:application) { create(:applications_helm, :installing) }
+  let(:service) { described_class.new(application) }
+  let(:phase) { Gitlab::Kubernetes::Pod::UNKNOWN }
+  let(:errors) { nil }
+
+  shared_examples 'a terminated installation' do
+    it 'finalize the installation' do
+      expect(service).to receive(:finalize_installation).once
+
+      service.execute
+    end
   end
 
-  shared_examples 'not yet completed phase' do |phase|
-    context "when the installation POD phase is #{phase}" do
-      before do
-        mock_helm_api(phase)
-      end
+  shared_examples 'a not yet terminated installation' do |a_phase|
+    let(:phase) { a_phase }
 
+    context "when phase is #{a_phase}" do
       context 'when not timeouted' do
         it 'reschedule a new check' do
           expect(ClusterWaitForAppInstallationWorker).to receive(:perform_in).once
+          expect(service).not_to receive(:finalize_installation)
 
           service.execute
 
@@ -28,6 +35,8 @@ describe Clusters::Applications::CheckInstallationProgressService do
       context 'when timeouted' do
         let(:application) { create(:applications_helm, :timeouted) }
 
+        it_behaves_like 'a terminated installation'
+
         it 'make the application errored' do
           expect(ClusterWaitForAppInstallationWorker).not_to receive(:perform_in)
 
@@ -40,36 +49,34 @@ describe Clusters::Applications::CheckInstallationProgressService do
     end
   end
 
-  describe '#execute' do
-    let(:application) { create(:applications_helm, :installing) }
-    let(:service) { described_class.new(application) }
+  before do
+    expect(service).to receive(:installation_phase).once.and_return(phase)
 
-    context 'when installation POD succeeded' do
-      it 'make the application installed' do
-        mock_helm_api(Gitlab::Kubernetes::Pod::SUCCEEDED)
-        expect(service).to receive(:finalize_installation).once
+    allow(service).to receive(:installation_errors).and_return(errors)
+    allow(service).to receive(:finalize_installation).and_return(nil)
+  end
 
-        service.execute
+  describe '#execute' do
+    context 'when installation POD succeeded' do
+      let(:phase) { Gitlab::Kubernetes::Pod::SUCCEEDED }
 
-        expect(application).to be_installed
-        expect(application.status_reason).to be_nil
-      end
+      it_behaves_like 'a terminated installation'
     end
 
     context 'when installation POD failed' do
-      let(:error_message) { 'test installation failed' }
+      let(:phase) { Gitlab::Kubernetes::Pod::FAILED }
+      let(:errors) { 'test installation failed' }
 
-      it 'make the application errored' do
-        mock_helm_api(Gitlab::Kubernetes::Pod::FAILED, errors: error_message)
-        expect(service).to receive(:finalize_installation).once
+      it_behaves_like 'a terminated installation'
 
+      it 'make the application errored' do
         service.execute
 
         expect(application).to be_errored
-        expect(application.status_reason).to eq(error_message)
+        expect(application.status_reason).to eq(errors)
       end
     end
 
-    RESCHEDULE_PHASES.each { |phase| it_behaves_like 'not yet completed phase', phase }
+    RESCHEDULE_PHASES.each { |phase| it_behaves_like 'a not yet terminated installation', phase }
   end
 end
diff --git a/spec/services/clusters/applications/finalize_installation_service_spec.rb b/spec/services/clusters/applications/finalize_installation_service_spec.rb
new file mode 100644
index 00000000000..08b7a80dfcd
--- /dev/null
+++ b/spec/services/clusters/applications/finalize_installation_service_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Clusters::Applications::FinalizeInstallationService do
+  describe '#execute' do
+    let(:application) { create(:applications_helm, :installing) }
+    let(:service) { described_class.new(application) }
+
+    before do
+      expect_any_instance_of(Gitlab::Kubernetes::Helm).to receive(:delete_installation_pod!).with(application)
+    end
+
+    context 'when installation POD succeeded' do
+      it 'make the application installed' do
+        service.execute
+
+        expect(application).to be_installed
+        expect(application.status_reason).to be_nil
+      end
+    end
+
+    context 'when installation POD failed' do
+      let(:application) { create(:applications_helm, :errored) }
+
+      it 'make the application errored' do
+        service.execute
+
+        expect(application).to be_errored
+        expect(application.status_reason).not_to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/services/clusters/applications/install_service_spec.rb b/spec/services/clusters/applications/install_service_spec.rb
new file mode 100644
index 00000000000..a646dac1cae
--- /dev/null
+++ b/spec/services/clusters/applications/install_service_spec.rb
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Clusters::Applications::InstallService do
+  describe '#execute' do
+    let(:application) { create(:applications_helm, :scheduled) }
+    let(:service) { described_class.new(application) }
+
+    context 'when there are no errors' do
+      before do
+        expect_any_instance_of(Gitlab::Kubernetes::Helm).to receive(:install).with(application)
+        allow(ClusterWaitForAppInstallationWorker).to receive(:perform_in).and_return(nil)
+      end
+
+      it 'make the application installing' do
+        service.execute
+
+        expect(application).to be_installing
+      end
+
+      it 'schedule async installation status check' do
+        expect(ClusterWaitForAppInstallationWorker).to receive(:perform_in).once
+
+        service.execute
+      end
+    end
+
+    context 'when k8s cluster communication fails' do
+      before do
+        error = KubeException.new(500, 'system failure', nil)
+        expect_any_instance_of(Gitlab::Kubernetes::Helm).to receive(:install).with(application).and_raise(error)
+      end
+
+      it 'make the application errored' do
+        service.execute
+
+        expect(application).to be_errored
+        expect(application.status_reason).to match(/kubernetes error:/i)
+      end
+    end
+
+    context 'when application cannot be persisted' do
+      let(:application) { build(:applications_helm, :scheduled) }
+
+      it 'make the application errored' do
+        expect(application).to receive(:make_installing!).once.and_raise(ActiveRecord::RecordInvalid)
+        expect_any_instance_of(Gitlab::Kubernetes::Helm).not_to receive(:install)
+
+        service.execute
+
+        expect(application).to be_errored
+      end
+    end
+  end
+end
diff --git a/spec/services/clusters/applications/schedule_installation_service_spec.rb b/spec/services/clusters/applications/schedule_installation_service_spec.rb
new file mode 100644
index 00000000000..6ba587a41db
--- /dev/null
+++ b/spec/services/clusters/applications/schedule_installation_service_spec.rb
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Clusters::Applications::ScheduleInstallationService do
+  def count_scheduled
+    application_class&.with_status(:scheduled)&.count || 0
+  end
+
+  shared_examples 'a failing service' do
+    it 'raise an exception' do
+      expect(ClusterInstallAppWorker).not_to receive(:perform_async)
+      count_before = count_scheduled
+
+      expect { service.execute }.to raise_error(StandardError)
+      expect(count_scheduled).to eq(count_before)
+    end
+  end
+
+  describe '#execute' do
+    let(:application_class) { Clusters::Applications::Helm }
+    let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+    let(:project) { cluster.project }
+    let(:service) { described_class.new(project, nil, cluster: cluster, application_class: application_class) }
+
+    it 'creates a new application' do
+      expect { service.execute }.to change { application_class.count }.by(1)
+    end
+
+    it 'make the application scheduled' do
+      expect(ClusterInstallAppWorker).to receive(:perform_async).with(application_class.application_name, kind_of(Numeric)).once
+
+      expect { service.execute }.to change { application_class.with_status(:scheduled).count }.by(1)
+    end
+
+    context 'when installation is already in progress' do
+      let(:application) { create(:applications_helm, :installing) }
+      let(:cluster) { application.cluster }
+
+      it_behaves_like 'a failing service'
+    end
+
+    context 'when application_class is nil' do
+      let(:application_class) { nil }
+
+      it_behaves_like 'a failing service'
+    end
+
+    context 'when application cannot be persisted' do
+      before do
+        expect_any_instance_of(application_class).to receive(:make_scheduled!).once.and_raise(ActiveRecord::RecordInvalid)
+      end
+
+      it_behaves_like 'a failing service'
+    end
+  end
+end
-- 
cgit v1.2.1


From ac927462dc1b9578de3a716e9e4ff551f424663b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 15:48:44 +0100
Subject: Add support for not_installable/scheduled and to not show created
 banner

---
 app/assets/javascripts/clusters/clusters_bundle.js             | 5 ++++-
 app/assets/javascripts/clusters/components/application_row.vue | 7 +++++--
 app/assets/javascripts/clusters/constants.js                   | 2 ++
 app/models/clusters/applications/helm.rb                       | 6 ++++++
 app/models/clusters/applications/ingress.rb                    | 6 ++++++
 app/models/clusters/cluster.rb                                 | 5 +++--
 app/models/clusters/concerns/application_status.rb             | 1 +
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index 9f92d49f576..8d0610b23a3 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -134,9 +134,12 @@ export default class Clusters {
 
   handleSuccess(data) {
     const prevApplicationMap = Object.assign({}, this.store.state.applications);
+    const prevStatus = this.store.state.status;
     this.store.updateStateFromServer(data.data);
     this.checkForNewInstalls(prevApplicationMap, this.store.state.applications);
-    this.updateContainer(this.store.state.status, this.store.state.statusReason);
+    if (prevStatus.length == 0 || prevStatus !== this.store.state.status) {
+      this.updateContainer(this.store.state.status, this.store.state.statusReason);
+    }
   }
 
   toggle() {
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index f8d53fcc4b7..9c5ff39534f 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -3,6 +3,8 @@ import { s__ } from '../../locale';
 import eventHub from '../event_hub';
 import loadingButton from '../../vue_shared/components/loading_button.vue';
 import {
+  APPLICATION_NOT_INSTALLABLE,
+  APPLICATION_SCHEDULED,
   APPLICATION_INSTALLABLE,
   APPLICATION_INSTALLING,
   APPLICATION_INSTALLED,
@@ -59,6 +61,7 @@ export default {
     },
     installButtonLoading() {
       return !this.status ||
+        this.status === APPLICATION_SCHEDULED ||
         this.status === APPLICATION_INSTALLING ||
         this.requestStatus === REQUEST_LOADING;
     },
@@ -72,9 +75,9 @@ export default {
     },
     installButtonLabel() {
       let label;
-      if (this.status === APPLICATION_INSTALLABLE || this.status === APPLICATION_ERROR) {
+      if (this.status === APPLICATION_INSTALLABLE || this.status === APPLICATION_ERROR || this.status === APPLICATION_NOT_INSTALLABLE) {
         label = s__('ClusterIntegration|Install');
-      } else if (this.status === APPLICATION_INSTALLING) {
+      } else if (this.status === APPLICATION_SCHEDULED || this.status === APPLICATION_INSTALLING) {
         label = s__('ClusterIntegration|Installing');
       } else if (this.status === APPLICATION_INSTALLED) {
         label = s__('ClusterIntegration|Installed');
diff --git a/app/assets/javascripts/clusters/constants.js b/app/assets/javascripts/clusters/constants.js
index 3f202435716..f1894b173b9 100644
--- a/app/assets/javascripts/clusters/constants.js
+++ b/app/assets/javascripts/clusters/constants.js
@@ -1,5 +1,7 @@
 // These need to match what is returned from the server
+export const APPLICATION_NOT_INSTALLABLE = 'not_installable';
 export const APPLICATION_INSTALLABLE = 'installable';
+export const APPLICATION_SCHEDULED = 'scheduled';
 export const APPLICATION_INSTALLING = 'installing';
 export const APPLICATION_INSTALLED = 'installed';
 export const APPLICATION_ERROR = 'error';
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 42626a50175..9bc5c026645 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -11,10 +11,16 @@ module Clusters
 
       validates :cluster, presence: true
 
+      after_initialize :set_initial_status
+      
       def self.application_name
         self.to_s.demodulize.underscore
       end
 
+      def set_initial_status
+        self.status = 0 unless cluster.platform_kubernetes_active?
+      end
+
       def name
         self.class.application_name
       end
diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index 0554cf84ed7..8cb1ed68de9 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -9,6 +9,8 @@ module Clusters
 
       validates :cluster, presence: true
 
+      after_initialize :set_initial_status
+
       default_value_for :ingress_type, :nginx
       default_value_for :version, :nginx
 
@@ -20,6 +22,10 @@ module Clusters
         self.to_s.demodulize.underscore
       end
 
+      def set_initial_status
+        self.status = 0 unless cluster.application_helm_installed?
+      end
+
       def name
         self.class.application_name
       end
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 90508e31e93..185d9473aab 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -39,6 +39,9 @@ module Clusters
     delegate :on_creation?, to: :provider, allow_nil: true
     delegate :update_kubernetes_integration!, to: :platform, allow_nil: true
 
+    delegate :active?, to: :platform_kubernetes, prefix: true, allow_nil: true
+    delegate :installed?, to: :application_helm, prefix: true, allow_nil: true
+
     enum platform_type: {
       kubernetes: 1
     }
@@ -60,8 +63,6 @@ module Clusters
     end
 
     def applications
-      return [] unless kubernetes?
-
       [
         application_helm || build_application_helm,
         application_ingress || build_application_ingress
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index 7bb68d75224..7592dd55689 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -5,6 +5,7 @@ module Clusters
 
       included do
         state_machine :status, initial: :installable do
+          state :not_installable, value: -2
           state :errored, value: -1
           state :installable, value: 0
           state :scheduled, value: 1
-- 
cgit v1.2.1


From 802e6653de7c67def245d86244f9223431618189 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 15:50:55 +0100
Subject: Add active? to Platforms::Kubernetes

---
 app/models/clusters/platforms/kubernetes.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 74f7c9442db..6dc1ee810d3 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -74,6 +74,10 @@ module Clusters
         )
       end
 
+      def active?
+        manages_kubernetes_service?
+      end
+
       private
 
       def enforce_namespace_to_lower_case
-- 
cgit v1.2.1


From f3a3566edc8fe24337b9df163f4699785061bb38 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 15:48:44 +0100
Subject: Add support for not_installable/scheduled and to not show created
 banner

---
 app/assets/javascripts/clusters/clusters_bundle.js             | 5 ++++-
 app/assets/javascripts/clusters/components/application_row.vue | 7 +++++--
 app/assets/javascripts/clusters/constants.js                   | 2 ++
 app/models/clusters/applications/helm.rb                       | 6 ++++++
 app/models/clusters/cluster.rb                                 | 5 +++--
 app/models/clusters/concerns/application_status.rb             | 1 +
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index 9a436b3e22d..4d4c90460d2 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -132,9 +132,12 @@ export default class Clusters {
 
   handleSuccess(data) {
     const prevApplicationMap = Object.assign({}, this.store.state.applications);
+    const prevStatus = this.store.state.status;
     this.store.updateStateFromServer(data.data);
     this.checkForNewInstalls(prevApplicationMap, this.store.state.applications);
-    this.updateContainer(this.store.state.status, this.store.state.statusReason);
+    if (prevStatus.length == 0 || prevStatus !== this.store.state.status) {
+      this.updateContainer(this.store.state.status, this.store.state.statusReason);
+    }
   }
 
   toggle() {
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index f8d53fcc4b7..9c5ff39534f 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -3,6 +3,8 @@ import { s__ } from '../../locale';
 import eventHub from '../event_hub';
 import loadingButton from '../../vue_shared/components/loading_button.vue';
 import {
+  APPLICATION_NOT_INSTALLABLE,
+  APPLICATION_SCHEDULED,
   APPLICATION_INSTALLABLE,
   APPLICATION_INSTALLING,
   APPLICATION_INSTALLED,
@@ -59,6 +61,7 @@ export default {
     },
     installButtonLoading() {
       return !this.status ||
+        this.status === APPLICATION_SCHEDULED ||
         this.status === APPLICATION_INSTALLING ||
         this.requestStatus === REQUEST_LOADING;
     },
@@ -72,9 +75,9 @@ export default {
     },
     installButtonLabel() {
       let label;
-      if (this.status === APPLICATION_INSTALLABLE || this.status === APPLICATION_ERROR) {
+      if (this.status === APPLICATION_INSTALLABLE || this.status === APPLICATION_ERROR || this.status === APPLICATION_NOT_INSTALLABLE) {
         label = s__('ClusterIntegration|Install');
-      } else if (this.status === APPLICATION_INSTALLING) {
+      } else if (this.status === APPLICATION_SCHEDULED || this.status === APPLICATION_INSTALLING) {
         label = s__('ClusterIntegration|Installing');
       } else if (this.status === APPLICATION_INSTALLED) {
         label = s__('ClusterIntegration|Installed');
diff --git a/app/assets/javascripts/clusters/constants.js b/app/assets/javascripts/clusters/constants.js
index 3f202435716..f1894b173b9 100644
--- a/app/assets/javascripts/clusters/constants.js
+++ b/app/assets/javascripts/clusters/constants.js
@@ -1,5 +1,7 @@
 // These need to match what is returned from the server
+export const APPLICATION_NOT_INSTALLABLE = 'not_installable';
 export const APPLICATION_INSTALLABLE = 'installable';
+export const APPLICATION_SCHEDULED = 'scheduled';
 export const APPLICATION_INSTALLING = 'installing';
 export const APPLICATION_INSTALLED = 'installed';
 export const APPLICATION_ERROR = 'error';
diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 42626a50175..9bc5c026645 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -11,10 +11,16 @@ module Clusters
 
       validates :cluster, presence: true
 
+      after_initialize :set_initial_status
+      
       def self.application_name
         self.to_s.demodulize.underscore
       end
 
+      def set_initial_status
+        self.status = 0 unless cluster.platform_kubernetes_active?
+      end
+
       def name
         self.class.application_name
       end
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 5b9bd6e548b..68759ebb6df 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -37,6 +37,9 @@ module Clusters
     delegate :on_creation?, to: :provider, allow_nil: true
     delegate :update_kubernetes_integration!, to: :platform, allow_nil: true
 
+    delegate :active?, to: :platform_kubernetes, prefix: true, allow_nil: true
+    delegate :installed?, to: :application_helm, prefix: true, allow_nil: true
+
     enum platform_type: {
       kubernetes: 1
     }
@@ -58,8 +61,6 @@ module Clusters
     end
 
     def applications
-      return [] unless kubernetes?
-
       [
         application_helm || build_application_helm
       ]
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index 7bb68d75224..7592dd55689 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -5,6 +5,7 @@ module Clusters
 
       included do
         state_machine :status, initial: :installable do
+          state :not_installable, value: -2
           state :errored, value: -1
           state :installable, value: 0
           state :scheduled, value: 1
-- 
cgit v1.2.1


From 895b6e5d80397fdd6cb5e1727a410a08f8a5b332 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 15:50:55 +0100
Subject: Add active? to Platforms::Kubernetes

---
 app/models/clusters/platforms/kubernetes.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb
index 74f7c9442db..6dc1ee810d3 100644
--- a/app/models/clusters/platforms/kubernetes.rb
+++ b/app/models/clusters/platforms/kubernetes.rb
@@ -74,6 +74,10 @@ module Clusters
         )
       end
 
+      def active?
+        manages_kubernetes_service?
+      end
+
       private
 
       def enforce_namespace_to_lower_case
-- 
cgit v1.2.1


From b893a858808f1e2aefca4e3f665d633d31fa5937 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Mon, 6 Nov 2017 16:04:58 +0100
Subject: db/schema.rb cleanup

---
 db/schema.rb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 548f4711339..507024c20de 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -474,8 +474,6 @@ ActiveRecord::Schema.define(version: 20171031100710) do
     t.string "encrypted_password_iv"
     t.text "encrypted_token"
     t.string "encrypted_token_iv"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
   end
 
   add_index "cluster_platforms_kubernetes", ["cluster_id"], name: "index_cluster_platforms_kubernetes_on_cluster_id", unique: true, using: :btree
@@ -499,14 +497,11 @@ ActiveRecord::Schema.define(version: 20171031100710) do
     t.text "status_reason"
     t.string "gcp_project_id", null: false
     t.string "zone", null: false
-    t.integer "num_nodes", null: false
     t.string "machine_type"
     t.string "operation_id"
     t.string "endpoint"
     t.text "encrypted_access_token"
     t.string "encrypted_access_token_iv"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
   end
 
   add_index "cluster_providers_gcp", ["cluster_id"], name: "index_cluster_providers_gcp_on_cluster_id", unique: true, using: :btree
@@ -519,12 +514,11 @@ ActiveRecord::Schema.define(version: 20171031100710) do
     t.datetime_with_timezone "updated_at", null: false
     t.boolean "enabled", default: true
     t.string "name", null: false
-    t.integer "provider_type"
-    t.integer "platform_type"
-    t.datetime_with_timezone "created_at", null: false
-    t.datetime_with_timezone "updated_at", null: false
   end
 
+  add_index "clusters", ["enabled"], name: "index_clusters_on_enabled", using: :btree
+  add_index "clusters", ["user_id"], name: "index_clusters_on_user_id", using: :btree
+
   create_table "clusters_applications_helm", force: :cascade do |t|
     t.integer "cluster_id", null: false
     t.datetime_with_timezone "created_at", null: false
-- 
cgit v1.2.1


From 2802b5bb52b6ba28e6eeb1813f3fd3a79d2c03c4 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Mon, 6 Nov 2017 17:02:28 +0100
Subject: Add ClusterApplicationEntity tests

---
 app/serializers/cluster_app_entity.rb              |  5 ----
 app/serializers/cluster_application_entity.rb      |  5 ++++
 app/serializers/cluster_entity.rb                  |  2 +-
 spec/fixtures/api/schemas/cluster_status.json      | 26 ++++++++-----------
 .../serializers/cluster_application_entity_spec.rb | 30 ++++++++++++++++++++++
 spec/serializers/cluster_entity_spec.rb            | 13 ++++++++--
 spec/serializers/cluster_serializer_spec.rb        |  2 +-
 7 files changed, 59 insertions(+), 24 deletions(-)
 delete mode 100644 app/serializers/cluster_app_entity.rb
 create mode 100644 app/serializers/cluster_application_entity.rb
 create mode 100644 spec/serializers/cluster_application_entity_spec.rb

diff --git a/app/serializers/cluster_app_entity.rb b/app/serializers/cluster_app_entity.rb
deleted file mode 100644
index 7da2d4921a2..00000000000
--- a/app/serializers/cluster_app_entity.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ClusterAppEntity < Grape::Entity
-  expose :name
-  expose :status_name, as: :status
-  expose :status_reason
-end
diff --git a/app/serializers/cluster_application_entity.rb b/app/serializers/cluster_application_entity.rb
new file mode 100644
index 00000000000..3f9a275ad08
--- /dev/null
+++ b/app/serializers/cluster_application_entity.rb
@@ -0,0 +1,5 @@
+class ClusterApplicationEntity < Grape::Entity
+  expose :name
+  expose :status_name, as: :status
+  expose :status_reason
+end
diff --git a/app/serializers/cluster_entity.rb b/app/serializers/cluster_entity.rb
index e775c68eb6b..7e5b0997878 100644
--- a/app/serializers/cluster_entity.rb
+++ b/app/serializers/cluster_entity.rb
@@ -3,5 +3,5 @@ class ClusterEntity < Grape::Entity
 
   expose :status_name, as: :status
   expose :status_reason
-  expose :applications, using: ClusterAppEntity
+  expose :applications, using: ClusterApplicationEntity
 end
diff --git a/spec/fixtures/api/schemas/cluster_status.json b/spec/fixtures/api/schemas/cluster_status.json
index 451ea50f0f9..489d563be2b 100644
--- a/spec/fixtures/api/schemas/cluster_status.json
+++ b/spec/fixtures/api/schemas/cluster_status.json
@@ -1,42 +1,38 @@
 {
   "type": "object",
   "required" : [
-    "status"
+    "status",
+    "applications"
   ],
   "properties" : {
     "status": { "type": "string" },
     "status_reason": { "type": ["string", "null"] },
-    "applications": { "$ref": "#/definitions/applications" }
+    "applications": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/application_status" }
+    }
   },
   "additionalProperties": false,
   "definitions": {
-    "applications": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties" : {
-        "helm": { "$ref": "#/definitions/app_status" },
-        "runner": { "$ref": "#/definitions/app_status" },
-        "ingress": { "$ref": "#/definitions/app_status" },
-        "prometheus": { "$ref": "#/definitions/app_status" }
-      }
-    },
-    "app_status": {
+    "application_status": {
       "type": "object",
       "additionalProperties": false,
       "properties" : {
+        "name": { "type": "string" },
         "status": {
           "type": {
             "enum": [
               "installable",
+              "scheduled",
               "installing",
               "installed",
-              "error"
+              "errored"
             ]
           }
         },
         "status_reason": { "type": ["string", "null"] }
       },
-      "required" : [ "status" ]
+      "required" : [ "name", "status" ]
     }
   }
 }
diff --git a/spec/serializers/cluster_application_entity_spec.rb b/spec/serializers/cluster_application_entity_spec.rb
new file mode 100644
index 00000000000..61cebcefa28
--- /dev/null
+++ b/spec/serializers/cluster_application_entity_spec.rb
@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe ClusterApplicationEntity do
+  describe '#as_json' do
+    let(:application) { build(:applications_helm) }
+    subject { described_class.new(application).as_json }
+
+    it 'has name' do
+      expect(subject[:name]).to eq(application.name)
+    end
+
+    it 'has status' do
+      expect(subject[:status]).to eq(:installable)
+    end
+
+    it 'has no status_reason' do
+      expect(subject[:status_reason]).to be_nil
+    end
+
+    context 'when application is errored' do
+      let(:application) { build(:applications_helm, :errored) }
+
+      it 'has corresponded data' do
+        expect(subject[:status]).to eq(:errored)
+        expect(subject[:status_reason]).not_to be_nil
+        expect(subject[:status_reason]).to eq(application.status_reason)
+      end
+    end
+  end
+end
diff --git a/spec/serializers/cluster_entity_spec.rb b/spec/serializers/cluster_entity_spec.rb
index abfc3731fb2..c58ee1a1ea6 100644
--- a/spec/serializers/cluster_entity_spec.rb
+++ b/spec/serializers/cluster_entity_spec.rb
@@ -35,8 +35,17 @@ describe ClusterEntity do
       end
     end
 
-    it 'contains applications' do
-      expect(subject[:applications]).to eq({})
+    context 'when no application has been installed' do
+      let(:cluster) { create(:cluster) }
+      subject { described_class.new(cluster).as_json[:applications]}
+
+      it 'contains helm as installable' do
+        expect(subject).not_to be_empty
+
+        helm = subject[0]
+        expect(helm[:name]).to eq('helm')
+        expect(helm[:status]).to eq(:installable)
+      end
     end
   end
 end
diff --git a/spec/serializers/cluster_serializer_spec.rb b/spec/serializers/cluster_serializer_spec.rb
index 04d8728303c..a6dd2309663 100644
--- a/spec/serializers/cluster_serializer_spec.rb
+++ b/spec/serializers/cluster_serializer_spec.rb
@@ -9,7 +9,7 @@ describe ClusterSerializer do
       let(:provider) { create(:provider_gcp, :errored) }
 
       it 'serializes only status' do
-        expect(subject.keys).to contain_exactly(:status, :status_reason)
+        expect(subject.keys).to contain_exactly(:status, :status_reason, :applications)
       end
     end
 
-- 
cgit v1.2.1


From f4fb0340094508106113c0c7c22c865fa7c73f7f Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 6 Nov 2017 10:07:19 -0600
Subject: Add FE tests for not_installable/scheduled and cluster banner rules

---
 app/assets/javascripts/clusters/clusters_bundle.js | 48 +++++++++++++---------
 .../clusters/components/application_row.vue        |  6 ++-
 app/assets/javascripts/clusters/constants.js       |  2 +-
 .../clusters/services/clusters_service.js          |  2 +
 spec/javascripts/clusters/clusters_bundle_spec.js  | 48 ++++++++++++++++++++--
 .../clusters/components/application_row_spec.js    | 42 +++++++++++++++----
 .../clusters/stores/clusters_store_spec.js         |  3 ++
 7 files changed, 117 insertions(+), 34 deletions(-)

diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index 4d4c90460d2..c486208175f 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -28,6 +28,8 @@ export default class Clusters {
     const {
       statusPath,
       installHelmPath,
+      installIngressPath,
+      installRunnerPath,
       clusterStatus,
       clusterStatusReason,
       helpPath,
@@ -40,6 +42,8 @@ export default class Clusters {
     this.service = new ClustersService({
       endpoint: statusPath,
       installHelmEndpoint: installHelmPath,
+      installIngresEndpoint: installIngressPath,
+      installRunnerEndpoint: installRunnerPath,
     });
 
     this.toggle = this.toggle.bind(this);
@@ -57,7 +61,7 @@ export default class Clusters {
     this.initApplications();
 
     if (this.store.state.status !== 'created') {
-      this.updateContainer(this.store.state.status, this.store.state.statusReason);
+      this.updateContainer(null, this.store.state.status, this.store.state.statusReason);
     }
 
     this.addListeners();
@@ -131,13 +135,13 @@ export default class Clusters {
   }
 
   handleSuccess(data) {
-    const prevApplicationMap = Object.assign({}, this.store.state.applications);
     const prevStatus = this.store.state.status;
+    const prevApplicationMap = Object.assign({}, this.store.state.applications);
+
     this.store.updateStateFromServer(data.data);
+
     this.checkForNewInstalls(prevApplicationMap, this.store.state.applications);
-    if (prevStatus.length == 0 || prevStatus !== this.store.state.status) {
-      this.updateContainer(this.store.state.status, this.store.state.statusReason);
-    }
+    this.updateContainer(prevStatus, this.store.state.status, this.store.state.statusReason);
   }
 
   toggle() {
@@ -168,22 +172,26 @@ export default class Clusters {
     }
   }
 
-  updateContainer(status, error) {
+  updateContainer(prevStatus, status, error) {
     this.hideAll();
-    switch (status) {
-      case 'created':
-        this.successContainer.classList.remove('hidden');
-        break;
-      case 'errored':
-        this.errorContainer.classList.remove('hidden');
-        this.errorReasonContainer.textContent = error;
-        break;
-      case 'scheduled':
-      case 'creating':
-        this.creatingContainer.classList.remove('hidden');
-        break;
-      default:
-        this.hideAll();
+
+    // We poll all the time but only want the `created` banner to show when newly created
+    if (this.store.state.status !== 'created' || prevStatus !== this.store.state.status) {
+      switch (status) {
+        case 'created':
+          this.successContainer.classList.remove('hidden');
+          break;
+        case 'errored':
+          this.errorContainer.classList.remove('hidden');
+          this.errorReasonContainer.textContent = error;
+          break;
+        case 'scheduled':
+        case 'creating':
+          this.creatingContainer.classList.remove('hidden');
+          break;
+        default:
+          this.hideAll();
+      }
     }
   }
 
diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index 9c5ff39534f..3dc658d0f1f 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -75,7 +75,11 @@ export default {
     },
     installButtonLabel() {
       let label;
-      if (this.status === APPLICATION_INSTALLABLE || this.status === APPLICATION_ERROR || this.status === APPLICATION_NOT_INSTALLABLE) {
+      if (
+        this.status === APPLICATION_NOT_INSTALLABLE ||
+        this.status === APPLICATION_INSTALLABLE ||
+        this.status === APPLICATION_ERROR
+      ) {
         label = s__('ClusterIntegration|Install');
       } else if (this.status === APPLICATION_SCHEDULED || this.status === APPLICATION_INSTALLING) {
         label = s__('ClusterIntegration|Installing');
diff --git a/app/assets/javascripts/clusters/constants.js b/app/assets/javascripts/clusters/constants.js
index f1894b173b9..93223aefff8 100644
--- a/app/assets/javascripts/clusters/constants.js
+++ b/app/assets/javascripts/clusters/constants.js
@@ -4,7 +4,7 @@ export const APPLICATION_INSTALLABLE = 'installable';
 export const APPLICATION_SCHEDULED = 'scheduled';
 export const APPLICATION_INSTALLING = 'installing';
 export const APPLICATION_INSTALLED = 'installed';
-export const APPLICATION_ERROR = 'error';
+export const APPLICATION_ERROR = 'errored';
 
 // These are only used client-side
 export const REQUEST_LOADING = 'request-loading';
diff --git a/app/assets/javascripts/clusters/services/clusters_service.js b/app/assets/javascripts/clusters/services/clusters_service.js
index a7bb0961c7e..0ac8e68187d 100644
--- a/app/assets/javascripts/clusters/services/clusters_service.js
+++ b/app/assets/javascripts/clusters/services/clusters_service.js
@@ -8,6 +8,8 @@ export default class ClusterService {
     this.options = options;
     this.appInstallEndpointMap = {
       helm: this.options.installHelmEndpoint,
+      ingress: this.options.installIngressEndpoint,
+      runner: this.options.installRunnerEndpoint,
     };
   }
 
diff --git a/spec/javascripts/clusters/clusters_bundle_spec.js b/spec/javascripts/clusters/clusters_bundle_spec.js
index 26d230ce414..86e9cb22be8 100644
--- a/spec/javascripts/clusters/clusters_bundle_spec.js
+++ b/spec/javascripts/clusters/clusters_bundle_spec.js
@@ -104,7 +104,21 @@ describe('Clusters', () => {
   describe('updateContainer', () => {
     describe('when creating cluster', () => {
       it('should show the creating container', () => {
-        cluster.updateContainer('creating');
+        cluster.updateContainer(null, 'creating');
+
+        expect(
+          cluster.creatingContainer.classList.contains('hidden'),
+        ).toBeFalsy();
+        expect(
+          cluster.successContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+        expect(
+          cluster.errorContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+      });
+
+      it('should continue to show `creating` banner with subsequent updates of the same status', () => {
+        cluster.updateContainer('creating', 'creating');
 
         expect(
           cluster.creatingContainer.classList.contains('hidden'),
@@ -120,7 +134,7 @@ describe('Clusters', () => {
 
     describe('when cluster is created', () => {
       it('should show the success container', () => {
-        cluster.updateContainer('created');
+        cluster.updateContainer(null, 'created');
 
         expect(
           cluster.creatingContainer.classList.contains('hidden'),
@@ -132,11 +146,25 @@ describe('Clusters', () => {
           cluster.errorContainer.classList.contains('hidden'),
         ).toBeTruthy();
       });
+
+      it('should not show a banner when status is already `created`', () => {
+        cluster.updateContainer('created', 'created');
+
+        expect(
+          cluster.creatingContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+        expect(
+          cluster.successContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+        expect(
+          cluster.errorContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+      });
     });
 
     describe('when cluster has error', () => {
       it('should show the error container', () => {
-        cluster.updateContainer('errored', 'this is an error');
+        cluster.updateContainer(null, 'errored', 'this is an error');
 
         expect(
           cluster.creatingContainer.classList.contains('hidden'),
@@ -152,6 +180,20 @@ describe('Clusters', () => {
           cluster.errorReasonContainer.textContent,
         ).toContain('this is an error');
       });
+
+      it('should show `error` banner when previously `creating`', () => {
+        cluster.updateContainer('creating', 'errored');
+
+        expect(
+          cluster.creatingContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+        expect(
+          cluster.successContainer.classList.contains('hidden'),
+        ).toBeTruthy();
+        expect(
+          cluster.errorContainer.classList.contains('hidden'),
+        ).toBeFalsy();
+      });
     });
   });
 
diff --git a/spec/javascripts/clusters/components/application_row_spec.js b/spec/javascripts/clusters/components/application_row_spec.js
index ba38ed6f180..392cebc5e35 100644
--- a/spec/javascripts/clusters/components/application_row_spec.js
+++ b/spec/javascripts/clusters/components/application_row_spec.js
@@ -1,6 +1,8 @@
 import Vue from 'vue';
 import eventHub from '~/clusters/event_hub';
 import {
+  APPLICATION_NOT_INSTALLABLE,
+  APPLICATION_SCHEDULED,
   APPLICATION_INSTALLABLE,
   APPLICATION_INSTALLING,
   APPLICATION_INSTALLED,
@@ -60,7 +62,18 @@ describe('Application Row', () => {
       expect(vm.installButtonLabel).toBeUndefined();
     });
 
-    it('has enabled "Install" when `status=installable`', () => {
+    it('has disabled "Install" when APPLICATION_NOT_INSTALLABLE', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_NOT_INSTALLABLE,
+      });
+
+      expect(vm.installButtonLabel).toEqual('Install');
+      expect(vm.installButtonLoading).toEqual(false);
+      expect(vm.installButtonDisabled).toEqual(true);
+    });
+
+    it('has enabled "Install" when APPLICATION_INSTALLABLE', () => {
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
         status: APPLICATION_INSTALLABLE,
@@ -71,7 +84,18 @@ describe('Application Row', () => {
       expect(vm.installButtonDisabled).toEqual(false);
     });
 
-    it('has loading "Installing" when `status=installing`', () => {
+    it('has loading "Installing" when APPLICATION_SCHEDULED', () => {
+      vm = mountComponent(ApplicationRow, {
+        ...DEFAULT_APPLICATION_STATE,
+        status: APPLICATION_SCHEDULED,
+      });
+
+      expect(vm.installButtonLabel).toEqual('Installing');
+      expect(vm.installButtonLoading).toEqual(true);
+      expect(vm.installButtonDisabled).toEqual(true);
+    });
+
+    it('has loading "Installing" when APPLICATION_INSTALLING', () => {
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
         status: APPLICATION_INSTALLING,
@@ -82,7 +106,7 @@ describe('Application Row', () => {
       expect(vm.installButtonDisabled).toEqual(true);
     });
 
-    it('has disabled "Installed" when `status=installed`', () => {
+    it('has disabled "Installed" when APPLICATION_INSTALLED', () => {
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
         status: APPLICATION_INSTALLED,
@@ -93,7 +117,7 @@ describe('Application Row', () => {
       expect(vm.installButtonDisabled).toEqual(true);
     });
 
-    it('has disabled "Install" when `status=error`', () => {
+    it('has disabled "Install" when APPLICATION_ERROR', () => {
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
         status: APPLICATION_ERROR,
@@ -104,7 +128,7 @@ describe('Application Row', () => {
       expect(vm.installButtonDisabled).toEqual(true);
     });
 
-    it('has loading "Install" when `requestStatus=loading`', () => {
+    it('has loading "Install" when REQUEST_LOADING', () => {
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
         status: APPLICATION_INSTALLABLE,
@@ -116,7 +140,7 @@ describe('Application Row', () => {
       expect(vm.installButtonDisabled).toEqual(true);
     });
 
-    it('has disabled "Install" when `requestStatus=success`', () => {
+    it('has disabled "Install" when REQUEST_SUCCESS', () => {
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
         status: APPLICATION_INSTALLABLE,
@@ -128,7 +152,7 @@ describe('Application Row', () => {
       expect(vm.installButtonDisabled).toEqual(true);
     });
 
-    it('has enabled "Install" when `requestStatus=error` (so you can try installing again)', () => {
+    it('has enabled "Install" when REQUEST_FAILURE (so you can try installing again)', () => {
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
         status: APPLICATION_INSTALLABLE,
@@ -181,7 +205,7 @@ describe('Application Row', () => {
       expect(generalErrorMessage).toBeNull();
     });
 
-    it('shows status reason when `status=error`', () => {
+    it('shows status reason when APPLICATION_ERROR', () => {
       const statusReason = 'We broke it 0.0';
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
@@ -195,7 +219,7 @@ describe('Application Row', () => {
       expect(statusErrorMessage.textContent.trim()).toEqual(statusReason);
     });
 
-    it('shows request reason when `requestStatus=error`', () => {
+    it('shows request reason when REQUEST_FAILURE', () => {
       const requestReason = 'We broke thre request 0.0';
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
diff --git a/spec/javascripts/clusters/stores/clusters_store_spec.js b/spec/javascripts/clusters/stores/clusters_store_spec.js
index 9f9d63434f7..cb8b3d38e2e 100644
--- a/spec/javascripts/clusters/stores/clusters_store_spec.js
+++ b/spec/javascripts/clusters/stores/clusters_store_spec.js
@@ -62,18 +62,21 @@ describe('Clusters Store', () => {
         statusReason: mockResponseData.status_reason,
         applications: {
           helm: {
+            title: 'Helm Tiller',
             status: mockResponseData.applications[0].status,
             statusReason: mockResponseData.applications[0].status_reason,
             requestStatus: null,
             requestReason: null,
           },
           ingress: {
+            title: 'Ingress',
             status: mockResponseData.applications[1].status,
             statusReason: mockResponseData.applications[1].status_reason,
             requestStatus: null,
             requestReason: null,
           },
           runner: {
+            title: 'GitLab Runner',
             status: mockResponseData.applications[2].status,
             statusReason: mockResponseData.applications[2].status_reason,
             requestStatus: null,
-- 
cgit v1.2.1


From 2b4fccb7205101480bae2668e681cb3b58fface5 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Mon, 6 Nov 2017 18:06:02 +0100
Subject: Add Helm import/export

---
 lib/gitlab/import_export/import_export.yml   | 3 ++-
 lib/gitlab/import_export/relation_factory.rb | 2 +-
 spec/lib/gitlab/import_export/all_models.yml | 8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 561779182bc..06b1035fec6 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -54,7 +54,8 @@ project_tree:
   - :auto_devops
   - :triggers
   - :pipeline_schedules
-  - :cluster
+  - clusters:
+    - :application_helm
   - :services
   - :hooks
   - protected_branches:
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index a790dcfe8a6..679be1b21fa 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -8,8 +8,8 @@ module Gitlab
                     triggers: 'Ci::Trigger',
                     pipeline_schedules: 'Ci::PipelineSchedule',
                     builds: 'Ci::Build',
-                    cluster: 'Clusters::Cluster',
                     clusters: 'Clusters::Cluster',
+                    application_helm: 'Clusters::Applications::Helm',
                     hooks: 'ProjectHook',
                     merge_access_levels: 'ProtectedBranch::MergeAccessLevel',
                     push_access_levels: 'ProtectedBranch::PushAccessLevel',
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 96efdd0949b..6eb266a7b94 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -147,7 +147,8 @@ deploy_keys:
 - user
 - deploy_keys_projects
 - projects
-cluster:
+clusters:
+- application_helm
 - cluster_projects
 - projects
 - user
@@ -160,6 +161,8 @@ provider_gcp:
 - cluster
 platform_kubernetes:
 - cluster
+application_helm:
+- cluster
 services:
 - project
 - service_hook
@@ -191,6 +194,7 @@ project:
 - tags
 - chat_services
 - cluster
+- clusters
 - cluster_project
 - creator
 - group
@@ -299,4 +303,4 @@ push_event_payload:
 - event
 issue_assignees:
 - issue
-- assignee
\ No newline at end of file
+- assignee
-- 
cgit v1.2.1


From f676f388153fc9b5da0a76b2d5c2af9d8ffe832c Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Mon, 6 Nov 2017 18:21:10 +0100
Subject: Add more tests to Projects::Clusters::ApplicationsController

---
 .../projects/clusters/applications_controller.rb           | 14 ++++++--------
 .../projects/clusters/applications_controller_spec.rb      | 13 +++++++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb
index 4b9d54a8537..90c7fa62216 100644
--- a/app/controllers/projects/clusters/applications_controller.rb
+++ b/app/controllers/projects/clusters/applications_controller.rb
@@ -5,14 +5,12 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
   before_action :authorize_create_cluster!, only: [:create]
 
   def create
-    scheduled = Clusters::Applications::ScheduleInstallationService.new(project, current_user,
-                                                                        application_class: @application_class,
-                                                                        cluster: @cluster).execute
-    if scheduled
-      head :no_content
-    else
-      head :bad_request
-    end
+    Clusters::Applications::ScheduleInstallationService.new(project, current_user,
+                                                            application_class: @application_class,
+                                                            cluster: @cluster).execute
+    head :no_content
+  rescue StandardError
+    head :bad_request
   end
 
   private
diff --git a/spec/controllers/projects/clusters/applications_controller_spec.rb b/spec/controllers/projects/clusters/applications_controller_spec.rb
index b8464b713c4..3213a797756 100644
--- a/spec/controllers/projects/clusters/applications_controller_spec.rb
+++ b/spec/controllers/projects/clusters/applications_controller_spec.rb
@@ -49,6 +49,19 @@ describe Projects::Clusters::ApplicationsController do
           expect(response).to have_http_status(:not_found)
         end
       end
+
+      context 'when application is already installing' do
+        before do
+          other = current_application.new(cluster: cluster)
+          other.make_installing!
+        end
+
+        it 'returns 400' do
+          go
+
+          expect(response).to have_http_status(:bad_request)
+        end
+      end
     end
 
     describe 'security' do
-- 
cgit v1.2.1


From 02f99feec25491c07777682b20f74f3b0b2b074d Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 6 Nov 2017 12:07:21 -0600
Subject: I18n general app error and update attributes from review

---
 .../clusters/components/application_row.vue        | 26 +++++++++++++++-------
 .../clusters/components/applications.vue           |  4 ++--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index 3dc658d0f1f..aee4e86ddac 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -1,5 +1,5 @@
 <script>
-import { s__ } from '../../locale';
+import { s__, sprintf } from '../../locale';
 import eventHub from '../event_hub';
 import loadingButton from '../../vue_shared/components/loading_button.vue';
 import {
@@ -56,9 +56,6 @@ export default {
     rowJsClass() {
       return `js-cluster-application-row-${this.id}`;
     },
-    titleElementType() {
-      return this.titleLink ? 'a' : 'span';
-    },
     installButtonLoading() {
       return !this.status ||
         this.status === APPLICATION_SCHEDULED ||
@@ -92,6 +89,13 @@ export default {
     hasError() {
       return this.status === APPLICATION_ERROR || this.requestStatus === REQUEST_FAILURE;
     },
+    generalErrorDescription() {
+      return sprintf(
+        s__('ClusterIntegration|Something went wrong while installing %{title}'), {
+          title: this.title,
+        },
+      );
+    }
   },
   methods: {
     installClicked() {
@@ -110,8 +114,8 @@ export default {
       class="gl-responsive-table-row-layout"
       role="row"
     >
-      <component
-        :is="titleElementType"
+      <a
+        v-if="titleLink"
         :href="titleLink"
         target="blank"
         rel="noopener noreferrer"
@@ -119,7 +123,13 @@ export default {
         class="table-section section-15 section-align-top js-cluster-application-title"
       >
         {{ title }}
-      </component>
+      </a>
+      <span
+        v-else
+        class="table-section section-15 section-align-top js-cluster-application-title"
+      >
+        {{ title }}
+      </span>
       <div
         class="table-section section-wrap"
         role="gridcell"
@@ -152,7 +162,7 @@ export default {
       >
         <div>
           <p class="js-cluster-application-general-error-message">
-            Something went wrong while installing {{ title }}
+            {{ generalErrorDescription }}
           </p>
           <ul v-if="statusReason || requestReason">
             <li
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 865fa4f702e..28da4cbe89d 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -45,7 +45,7 @@ export default {
       const extraCostParagraph = sprintf(
         _.escape(s__('ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which incur additional costs. See %{pricingLink}')), {
           boldNotice: `<strong>${_.escape(s__('ClusterIntegration|Note:'))}</strong>`,
-          pricingLink: `<a href="https://cloud.google.com/compute/pricing#lb" target="blank" rel="noopener noreferrer">
+          pricingLink: `<a href="https://cloud.google.com/compute/pricing#lb" target="_blank" rel="noopener noreferrer">
             ${_.escape(s__('ClusterIntegration|GKE pricing'))}
           </a>`,
         },
@@ -85,7 +85,7 @@ export default {
     </div>
 
     <div class="settings-content">
-      <div class="form_group append-bottom-20">
+      <div class="append-bottom-20">
         <application-row
           id="helm"
           :title="applications.helm.title"
-- 
cgit v1.2.1


From 7ebf03319881a853405662a390fff13ffb6aefb0 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Mon, 6 Nov 2017 19:37:07 +0100
Subject: Addresses front & backend comments

- Improves CSS files by reusing existing code
- Changes logic in views to avoid future problems in translations
---
 app/assets/stylesheets/framework/wells.scss                 | 5 ++---
 app/views/projects/commit/_limit_exceeded_message.html.haml | 4 ++--
 app/views/projects/commit/branches.html.haml                | 4 ++--
 spec/views/projects/commit/branches.html.haml_spec.rb       | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 556485c2f3b..1a5da56cba0 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -67,10 +67,9 @@
 
   .limit-box {
     background: $blue-100;
-    border-radius: 3px;
+    border-radius: $border-radius-default;
     display: inline-block;
-    margin-left: 5px;
-    padding: 1px 1px 0.5px 0;
+    padding: 1px 1px 0.5px;
     text-align: center;
     vertical-align: bottom;
 
diff --git a/app/views/projects/commit/_limit_exceeded_message.html.haml b/app/views/projects/commit/_limit_exceeded_message.html.haml
index 430ac6df2e4..cdf1a52f5b0 100644
--- a/app/views/projects/commit/_limit_exceeded_message.html.haml
+++ b/app/views/projects/commit/_limit_exceeded_message.html.haml
@@ -1,6 +1,6 @@
-.has-tooltip{ class: "limit-box limit-box-#{objects.singularize}", data: { title: "Project has too many #{objects} to search"} }
+.has-tooltip{ class: "limit-box limit-box-#{objects.to_s.singularize} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
   .limit-icon
-    - if objects == "branches"
+    - if objects == :branches
       = icon('code-fork')
     - else
       = icon('tag')
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 1c4f16b5afa..ed6edf6d112 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,5 +1,5 @@
 - if @branches_limit_exceeded
-  = render 'limit_exceeded_message', objects: 'branches'
+  = render 'limit_exceeded_message', objects: :branches, label_for_message: _('branches')
 - else
   - branch = commit_default_branch(@project, @branches)
   = commit_branch_link(project_ref_path(@project, branch), branch)
@@ -10,6 +10,6 @@
     %span.js-details-content.hide
       = commit_branches_links(@project, @branches)
       - if @tags_limit_exceeded
-        = render 'limit_exceeded_message', objects: 'tags'
+        = render 'limit_exceeded_message', objects: :tags, label_for_message: _('tags')
       - else
         = commit_tags_links(@project, @tags)
diff --git a/spec/views/projects/commit/branches.html.haml_spec.rb b/spec/views/projects/commit/branches.html.haml_spec.rb
index 044b73ce419..b9d4dc80fe0 100644
--- a/spec/views/projects/commit/branches.html.haml_spec.rb
+++ b/spec/views/projects/commit/branches.html.haml_spec.rb
@@ -59,7 +59,7 @@ describe 'projects/commit/branches.html.haml' do
     before do
       assign(:branches, ['master'])
       assign(:branches_limit_exceeded, true)
-      assign(:tags, ['tag1', 'tag2'])
+      assign(:tags, %w(tag1 tag2))
       assign(:tags_limit_exceeded, false)
 
       render
-- 
cgit v1.2.1


From 9c76c44805effc7acb7d3cbd7ff4bd132cbbf100 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 20:29:13 +0100
Subject: Fix small error [ci skip]

---
 app/models/clusters/applications/helm.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 9bc5c026645..c203beb4915 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -18,7 +18,7 @@ module Clusters
       end
 
       def set_initial_status
-        self.status = 0 unless cluster.platform_kubernetes_active?
+        self.status = 0 unless cluster&.platform_kubernetes_active?
       end
 
       def name
-- 
cgit v1.2.1


From 46cac8510bd0da97e5b153db2da734089b994de4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 6 Nov 2017 20:46:05 +0100
Subject: Fix db/schema.rb

---
 db/schema.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index d2019e93475..9e07114a2d1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -464,7 +464,9 @@ ActiveRecord::Schema.define(version: 20171106101200) do
 
   create_table "cluster_platforms_kubernetes", force: :cascade do |t|
     t.integer "cluster_id", null: false
-    t.string "api_url"
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.text "api_url"
     t.text "ca_cert"
     t.string "namespace"
     t.string "username"
@@ -489,6 +491,9 @@ ActiveRecord::Schema.define(version: 20171106101200) do
   create_table "cluster_providers_gcp", force: :cascade do |t|
     t.integer "cluster_id", null: false
     t.integer "status"
+    t.integer "num_nodes", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
     t.text "status_reason"
     t.string "gcp_project_id", null: false
     t.string "zone", null: false
@@ -503,6 +508,10 @@ ActiveRecord::Schema.define(version: 20171106101200) do
 
   create_table "clusters", force: :cascade do |t|
     t.integer "user_id"
+    t.integer "provider_type"
+    t.integer "platform_type"
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
     t.boolean "enabled", default: true
     t.string "name", null: false
   end
-- 
cgit v1.2.1


From 4e07fd71a34bc8003668b7c387f4c46e9e6640d4 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 6 Nov 2017 13:50:10 -0600
Subject: Remove misspelled duplicate endpoint

---
 app/assets/javascripts/clusters/clusters_bundle.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index 9ca0ec407fd..f9d2eab0919 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -43,7 +43,6 @@ export default class Clusters {
       endpoint: statusPath,
       installHelmEndpoint: installHelmPath,
       installIngressEndpoint: installIngressPath,
-      installIngresEndpoint: installIngressPath,
       installRunnerEndpoint: installRunnerPath,
     });
 
-- 
cgit v1.2.1


From a9a086c211b25f9c80bd39f80a9fc8afea81a96d Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 6 Nov 2017 13:55:31 -0600
Subject: Add changelog for Ingress in Cluster applications

---
 changelogs/unreleased/add-ingress-to-cluster-applications.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/add-ingress-to-cluster-applications.yml

diff --git a/changelogs/unreleased/add-ingress-to-cluster-applications.yml b/changelogs/unreleased/add-ingress-to-cluster-applications.yml
new file mode 100644
index 00000000000..0064e8672f8
--- /dev/null
+++ b/changelogs/unreleased/add-ingress-to-cluster-applications.yml
@@ -0,0 +1,5 @@
+---
+title: Add Ingress to available Cluster applications
+merge_request:
+author:
+type: added
-- 
cgit v1.2.1


From 1788cc8e45964bfd537d9aa317e4d44752ce2ad4 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 6 Nov 2017 14:32:57 -0600
Subject: Update Cluster applications screenshot with updated description

---
 .../project/clusters/img/cluster-applications.png   | Bin 38153 -> 39115 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/doc/user/project/clusters/img/cluster-applications.png b/doc/user/project/clusters/img/cluster-applications.png
index 794f3331296..7c82d19297e 100644
Binary files a/doc/user/project/clusters/img/cluster-applications.png and b/doc/user/project/clusters/img/cluster-applications.png differ
-- 
cgit v1.2.1


From dfeb60daa607dd96be689cfd3b2f929138efacdf Mon Sep 17 00:00:00 2001
From: Joe Marty <jmarty@iexposure.com>
Date: Mon, 6 Nov 2017 16:12:40 -0600
Subject: Change Sign Out route from a DELETE to a GET

Closes #39708
---
 app/views/layouts/header/_default.html.haml            | 2 +-
 changelogs/unreleased/feature-change-signout-route.yml | 5 +++++
 config/initializers/devise.rb                          | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/feature-change-signout-route.yml

diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 5ff6ac5fc00..1eca412aff9 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -61,7 +61,7 @@
                       = link_to "Help", help_path
                   %li.divider
                   %li
-                    = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"
+                    = link_to "Sign out", destroy_user_session_path, class: "sign-out-link"
             - if session[:impersonator_id]
               %li.impersonation
                 = link_to admin_impersonation_path, class: 'impersonation-btn', method: :delete, title: "Stop impersonation", aria: { label: 'Stop impersonation' }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do
diff --git a/changelogs/unreleased/feature-change-signout-route.yml b/changelogs/unreleased/feature-change-signout-route.yml
new file mode 100644
index 00000000000..bccb85b3eaf
--- /dev/null
+++ b/changelogs/unreleased/feature-change-signout-route.yml
@@ -0,0 +1,5 @@
+---
+title: Change 'Sign Out' route from a DELETE to a GET
+merge_request: 39708
+author: Joe Marty
+type: changed
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index c6ec0aeda7b..958859be6cf 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -195,7 +195,7 @@ Devise.setup do |config|
   config.navigational_formats = [:"*/*", "*/*", :html, :zip]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :delete
+  config.sign_out_via = :get
 
   # ==> OmniAuth
   # To configure a new OmniAuth provider copy and edit omniauth.rb.sample
-- 
cgit v1.2.1


From cb7d63f90753617920cc6f9168a48dc998dc9ee4 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 6 Nov 2017 16:49:21 -0600
Subject: Fix comma dangle eslint in application_row.vue

---
 app/assets/javascripts/clusters/components/application_row.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index aee4e86ddac..b672111fda8 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -95,7 +95,7 @@ export default {
           title: this.title,
         },
       );
-    }
+    },
   },
   methods: {
     installClicked() {
-- 
cgit v1.2.1


From 09aec97d14738bc156835f50609ec8638b435ca3 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 7 Nov 2017 17:02:50 +0900
Subject: Fix spec/serializers/cluster_entity_spec.rb

---
 spec/serializers/cluster_entity_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/serializers/cluster_entity_spec.rb b/spec/serializers/cluster_entity_spec.rb
index 0a3cd2a65e1..dc24e80d3c9 100644
--- a/spec/serializers/cluster_entity_spec.rb
+++ b/spec/serializers/cluster_entity_spec.rb
@@ -29,8 +29,8 @@ describe ClusterEntity do
     context 'when provider type is user' do
       let(:cluster) { create(:cluster, provider_type: :user) }
 
-      it 'has nil' do
-        expect(subject[:status]).to be_nil
+      it 'has corresponded data' do
+        expect(subject[:status]).to eq(:created)
         expect(subject[:status_reason]).to be_nil
       end
     end
-- 
cgit v1.2.1


From 86d8531748208efdbc430c552bbb89567c86378d Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 09:16:57 +0100
Subject: Remove Clusters::Applications::FinalizeInstallationService

---
 .../check_installation_progress_service.rb         | 30 +++++++++++++++-----
 .../applications/finalize_installation_service.rb  | 11 --------
 .../check_installation_progress_service_spec.rb    | 17 +++++++++---
 .../finalize_installation_service_spec.rb          | 32 ----------------------
 4 files changed, 36 insertions(+), 54 deletions(-)
 delete mode 100644 app/services/clusters/applications/finalize_installation_service.rb
 delete mode 100644 spec/services/clusters/applications/finalize_installation_service_spec.rb

diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index 1bd5dae0584..69bd3613cce 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -6,7 +6,7 @@ module Clusters
 
         case installation_phase
         when Gitlab::Kubernetes::Pod::SUCCEEDED
-          finalize_installation
+          on_success
         when Gitlab::Kubernetes::Pod::FAILED
           on_failed
         else
@@ -18,23 +18,39 @@ module Clusters
 
       private
 
+      def on_success
+        app.make_installed!
+      ensure
+        remove_installation_pod
+      end
+
       def on_failed
         app.make_errored!(installation_errors || 'Installation silently failed')
-        finalize_installation
+      ensure
+        remove_installation_pod
       end
 
       def check_timeout
-        if Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
-          app.make_errored!('Installation timeouted')
-          finalize_installation
+        if timeouted?
+          begin
+            app.make_errored!('Installation timeouted')
+          ensure
+            remove_installation_pod
+          end
         else
           ClusterWaitForAppInstallationWorker.perform_in(
             ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
         end
       end
 
-      def finalize_installation
-        FinalizeInstallationService.new(app).execute
+      def timeouted?
+        Time.now.utc - app.updated_at.to_time.utc > ClusterWaitForAppInstallationWorker::TIMEOUT
+      end
+
+      def remove_installation_pod
+        helm_api.delete_installation_pod!(app)
+      rescue
+        # no-op
       end
 
       def installation_phase
diff --git a/app/services/clusters/applications/finalize_installation_service.rb b/app/services/clusters/applications/finalize_installation_service.rb
deleted file mode 100644
index 292c789b67b..00000000000
--- a/app/services/clusters/applications/finalize_installation_service.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Clusters
-  module Applications
-    class FinalizeInstallationService < BaseHelmService
-      def execute
-        helm_api.delete_installation_pod!(app)
-
-        app.make_installed! if app.installing?
-      end
-    end
-  end
-end
diff --git a/spec/services/clusters/applications/check_installation_progress_service_spec.rb b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
index fe04fac9613..faa5b469069 100644
--- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb
+++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
@@ -9,8 +9,8 @@ describe Clusters::Applications::CheckInstallationProgressService do
   let(:errors) { nil }
 
   shared_examples 'a terminated installation' do
-    it 'finalize the installation' do
-      expect(service).to receive(:finalize_installation).once
+    it 'removes the installation POD' do
+      expect(service).to receive(:remove_installation_pod).once
 
       service.execute
     end
@@ -23,7 +23,7 @@ describe Clusters::Applications::CheckInstallationProgressService do
       context 'when not timeouted' do
         it 'reschedule a new check' do
           expect(ClusterWaitForAppInstallationWorker).to receive(:perform_in).once
-          expect(service).not_to receive(:finalize_installation)
+          expect(service).not_to receive(:remove_installation_pod)
 
           service.execute
 
@@ -53,7 +53,7 @@ describe Clusters::Applications::CheckInstallationProgressService do
     expect(service).to receive(:installation_phase).once.and_return(phase)
 
     allow(service).to receive(:installation_errors).and_return(errors)
-    allow(service).to receive(:finalize_installation).and_return(nil)
+    allow(service).to receive(:remove_installation_pod).and_return(nil)
   end
 
   describe '#execute' do
@@ -61,6 +61,15 @@ describe Clusters::Applications::CheckInstallationProgressService do
       let(:phase) { Gitlab::Kubernetes::Pod::SUCCEEDED }
 
       it_behaves_like 'a terminated installation'
+
+      it 'make the application installed' do
+        expect(ClusterWaitForAppInstallationWorker).not_to receive(:perform_in)
+
+        service.execute
+
+        expect(application).to be_installed
+        expect(application.status_reason).to be_nil
+      end
     end
 
     context 'when installation POD failed' do
diff --git a/spec/services/clusters/applications/finalize_installation_service_spec.rb b/spec/services/clusters/applications/finalize_installation_service_spec.rb
deleted file mode 100644
index 08b7a80dfcd..00000000000
--- a/spec/services/clusters/applications/finalize_installation_service_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-
-describe Clusters::Applications::FinalizeInstallationService do
-  describe '#execute' do
-    let(:application) { create(:applications_helm, :installing) }
-    let(:service) { described_class.new(application) }
-
-    before do
-      expect_any_instance_of(Gitlab::Kubernetes::Helm).to receive(:delete_installation_pod!).with(application)
-    end
-
-    context 'when installation POD succeeded' do
-      it 'make the application installed' do
-        service.execute
-
-        expect(application).to be_installed
-        expect(application.status_reason).to be_nil
-      end
-    end
-
-    context 'when installation POD failed' do
-      let(:application) { create(:applications_helm, :errored) }
-
-      it 'make the application errored' do
-        service.execute
-
-        expect(application).to be_errored
-        expect(application.status_reason).not_to be_nil
-      end
-    end
-  end
-end
-- 
cgit v1.2.1


From 6228b65ff1503e2a3496544c15961139e1fb6cd4 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 7 Nov 2017 17:51:32 +0900
Subject: Fix static analysys in app/models/clusters/applications/helm.rb:15

---
 app/models/clusters/applications/helm.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index c203beb4915..863f9b9d834 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -12,7 +12,7 @@ module Clusters
       validates :cluster, presence: true
 
       after_initialize :set_initial_status
-      
+
       def self.application_name
         self.to_s.demodulize.underscore
       end
-- 
cgit v1.2.1


From f9364929bacf9ed68e32bb50758e24715d404069 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 09:34:07 +0100
Subject: Rename application_helm factory to cluster_application_helm

---
 spec/factories/clusters/applications/helm.rb                   |  8 ++------
 spec/models/clusters/applications/helm_spec.rb                 | 10 +++++-----
 spec/serializers/cluster_application_entity_spec.rb            |  4 ++--
 .../applications/check_installation_progress_service_spec.rb   |  4 ++--
 spec/services/clusters/applications/install_service_spec.rb    |  4 ++--
 .../applications/schedule_installation_service_spec.rb         |  2 +-
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index fd956097115..b63e26125d1 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -1,10 +1,6 @@
 FactoryGirl.define do
-  factory :applications_helm, class: Clusters::Applications::Helm do
-    trait :cluster do
-      before(:create) do |app, _|
-        app.cluster = create(:cluster)
-      end
-    end
+  factory :cluster_applications_helm, class: Clusters::Applications::Helm do
+    cluster factory: :cluster
 
     trait :installable do
       cluster
diff --git a/spec/models/clusters/applications/helm_spec.rb b/spec/models/clusters/applications/helm_spec.rb
index 54fce7d886a..44fb60f0ed0 100644
--- a/spec/models/clusters/applications/helm_spec.rb
+++ b/spec/models/clusters/applications/helm_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do
 
   describe 'status state machine' do
     describe '#make_installing' do
-      subject { create(:applications_helm, :scheduled) }
+      subject { create(:cluster_applications_helm, :scheduled) }
 
       it 'is installing' do
         subject.make_installing!
@@ -38,7 +38,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do
     end
 
     describe '#make_installed' do
-      subject { create(:applications_helm, :installing) }
+      subject { create(:cluster_applications_helm, :installing) }
 
       it 'is installed' do
         subject.make_installed
@@ -48,7 +48,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do
     end
 
     describe '#make_errored' do
-      subject { create(:applications_helm, :installing) }
+      subject { create(:cluster_applications_helm, :installing) }
       let(:reason) { 'some errors' }
 
       it 'is errored' do
@@ -60,7 +60,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do
     end
 
     describe '#make_scheduled' do
-      subject { create(:applications_helm, :installable) }
+      subject { create(:cluster_applications_helm, :installable) }
 
       it 'is scheduled' do
         subject.make_scheduled
@@ -69,7 +69,7 @@ RSpec.describe Clusters::Applications::Helm, type: :model do
       end
 
       describe 'when was errored' do
-        subject { create(:applications_helm, :errored) }
+        subject { create(:cluster_applications_helm, :errored) }
 
         it 'clears #status_reason' do
           expect(subject.status_reason).not_to be_nil
diff --git a/spec/serializers/cluster_application_entity_spec.rb b/spec/serializers/cluster_application_entity_spec.rb
index 61cebcefa28..8a3a081adf8 100644
--- a/spec/serializers/cluster_application_entity_spec.rb
+++ b/spec/serializers/cluster_application_entity_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ClusterApplicationEntity do
   describe '#as_json' do
-    let(:application) { build(:applications_helm) }
+    let(:application) { build(:cluster_applications_helm) }
     subject { described_class.new(application).as_json }
 
     it 'has name' do
@@ -18,7 +18,7 @@ describe ClusterApplicationEntity do
     end
 
     context 'when application is errored' do
-      let(:application) { build(:applications_helm, :errored) }
+      let(:application) { build(:cluster_applications_helm, :errored) }
 
       it 'has corresponded data' do
         expect(subject[:status]).to eq(:errored)
diff --git a/spec/services/clusters/applications/check_installation_progress_service_spec.rb b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
index faa5b469069..75fc05d36e9 100644
--- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb
+++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Clusters::Applications::CheckInstallationProgressService do
   RESCHEDULE_PHASES = Gitlab::Kubernetes::Pod::PHASES - [Gitlab::Kubernetes::Pod::SUCCEEDED, Gitlab::Kubernetes::Pod::FAILED].freeze
 
-  let(:application) { create(:applications_helm, :installing) }
+  let(:application) { create(:cluster_applications_helm, :installing) }
   let(:service) { described_class.new(application) }
   let(:phase) { Gitlab::Kubernetes::Pod::UNKNOWN }
   let(:errors) { nil }
@@ -33,7 +33,7 @@ describe Clusters::Applications::CheckInstallationProgressService do
       end
 
       context 'when timeouted' do
-        let(:application) { create(:applications_helm, :timeouted) }
+        let(:application) { create(:cluster_applications_helm, :timeouted) }
 
         it_behaves_like 'a terminated installation'
 
diff --git a/spec/services/clusters/applications/install_service_spec.rb b/spec/services/clusters/applications/install_service_spec.rb
index a646dac1cae..ae8dc7b2bd9 100644
--- a/spec/services/clusters/applications/install_service_spec.rb
+++ b/spec/services/clusters/applications/install_service_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Clusters::Applications::InstallService do
   describe '#execute' do
-    let(:application) { create(:applications_helm, :scheduled) }
+    let(:application) { create(:cluster_applications_helm, :scheduled) }
     let(:service) { described_class.new(application) }
 
     context 'when there are no errors' do
@@ -39,7 +39,7 @@ describe Clusters::Applications::InstallService do
     end
 
     context 'when application cannot be persisted' do
-      let(:application) { build(:applications_helm, :scheduled) }
+      let(:application) { build(:cluster_applications_helm, :scheduled) }
 
       it 'make the application errored' do
         expect(application).to receive(:make_installing!).once.and_raise(ActiveRecord::RecordInvalid)
diff --git a/spec/services/clusters/applications/schedule_installation_service_spec.rb b/spec/services/clusters/applications/schedule_installation_service_spec.rb
index 6ba587a41db..cf95361c935 100644
--- a/spec/services/clusters/applications/schedule_installation_service_spec.rb
+++ b/spec/services/clusters/applications/schedule_installation_service_spec.rb
@@ -32,7 +32,7 @@ describe Clusters::Applications::ScheduleInstallationService do
     end
 
     context 'when installation is already in progress' do
-      let(:application) { create(:applications_helm, :installing) }
+      let(:application) { create(:cluster_applications_helm, :installing) }
       let(:cluster) { application.cluster }
 
       it_behaves_like 'a failing service'
-- 
cgit v1.2.1


From 3bf2abaa1cc26b8658d870e85d4fc9e60e621944 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 10:07:22 +0100
Subject: More restrictive state machine transitions in
 Clusters::ApplicationStatus

---
 app/models/clusters/concerns/application_status.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index 40140cb71cb..e73abfa9055 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -12,20 +12,20 @@ module Clusters
           state :installing, value: 2
           state :installed, value: 3
 
+          event :make_scheduled do
+            transition %i(installable errored) => :scheduled
+          end
+
           event :make_installing do
-            transition any - [:installing] => :installing
+            transition %i(scheduled) => :installing
           end
 
           event :make_installed do
-            transition any - [:installed] => :installed
+            transition %i(installing) => :installed
           end
 
           event :make_errored do
-            transition any - [:errored] => :errored
-          end
-
-          event :make_scheduled do
-            transition %i(installable errored) => :scheduled
+            transition any => :errored
           end
 
           before_transition any => [:scheduled] do |app_status, _|
-- 
cgit v1.2.1


From 36d69130a2337458a2fec94665d9369feb7a2f02 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 7 Nov 2017 18:54:50 +0900
Subject: Fix cluster_applications_helm factory as cluster always has been
 cerated

---
 spec/factories/clusters/applications/helm.rb | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index b63e26125d1..83595468412 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -1,30 +1,25 @@
 FactoryGirl.define do
   factory :cluster_applications_helm, class: Clusters::Applications::Helm do
-    cluster factory: :cluster
+    cluster factory: :cluster, strategy: :provided_by_gcp
 
     trait :installable do
-      cluster
-      status 0
+      status :installable
     end
 
     trait :scheduled do
-      cluster
-      status 1
+      status :scheduled
     end
 
     trait :installing do
-      cluster
-      status 2
+      status :installing
     end
 
     trait :installed do
-      cluster
-      status 3
+      status :installed
     end
 
     trait :errored do
-      cluster
-      status(-1)
+      status :errored
       status_reason 'something went wrong'
     end
 
-- 
cgit v1.2.1


From a438231616bd2fad748cc6d68350c4091c26b89b Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Tue, 7 Nov 2017 11:02:03 +0100
Subject: Address discussions on the ME

- Fixes thinner right border on the limit box
- Adds and 'elsif' on @branches for the scenario in which a commit is not related to a branch
- Fixes small details on limit_exceeded_for_message partial
---
 app/assets/stylesheets/framework/wells.scss                 | 2 +-
 app/views/projects/commit/_limit_exceeded_message.html.haml | 6 +++---
 app/views/projects/commit/branches.html.haml                | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 1a5da56cba0..175b2ee7152 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -69,7 +69,7 @@
     background: $blue-100;
     border-radius: $border-radius-default;
     display: inline-block;
-    padding: 1px 1px 0.5px;
+    padding: 1px 2px 0.5px;
     text-align: center;
     vertical-align: bottom;
 
diff --git a/app/views/projects/commit/_limit_exceeded_message.html.haml b/app/views/projects/commit/_limit_exceeded_message.html.haml
index cdf1a52f5b0..84a52d49487 100644
--- a/app/views/projects/commit/_limit_exceeded_message.html.haml
+++ b/app/views/projects/commit/_limit_exceeded_message.html.haml
@@ -1,8 +1,8 @@
-.has-tooltip{ class: "limit-box limit-box-#{objects.to_s.singularize} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
+.has-tooltip{ class: "limit-box limit-box-#{objects} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
   .limit-icon
-    - if objects == :branches
+    - if objects == :branch
       = icon('code-fork')
     - else
       = icon('tag')
   .limit-message
-    %span #{objects.capitalize} unavailable
+    %span #{label_for_message.capitalize} unavailable
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index ed6edf6d112..8611129b356 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -1,6 +1,6 @@
 - if @branches_limit_exceeded
-  = render 'limit_exceeded_message', objects: :branches, label_for_message: _('branches')
-- else
+  = render 'limit_exceeded_message', objects: :branch, label_for_message: "branches"
+- elsif @branches.any?
   - branch = commit_default_branch(@project, @branches)
   = commit_branch_link(project_ref_path(@project, branch), branch)
 
@@ -10,6 +10,6 @@
     %span.js-details-content.hide
       = commit_branches_links(@project, @branches)
       - if @tags_limit_exceeded
-        = render 'limit_exceeded_message', objects: :tags, label_for_message: _('tags')
+        = render 'limit_exceeded_message', objects: :tag, label_for_message: "tags"
       - else
         = commit_tags_links(@project, @tags)
-- 
cgit v1.2.1


From ce7b05f41d3941552320c23dc06f9f2b076099ed Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 7 Nov 2017 19:17:20 +0900
Subject: Revert "Fix cluster_applications_helm factory as cluster always has
 been cerated"

This reverts commit 36d69130a2337458a2fec94665d9369feb7a2f02.
---
 spec/factories/clusters/applications/helm.rb | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index 83595468412..b63e26125d1 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -1,25 +1,30 @@
 FactoryGirl.define do
   factory :cluster_applications_helm, class: Clusters::Applications::Helm do
-    cluster factory: :cluster, strategy: :provided_by_gcp
+    cluster factory: :cluster
 
     trait :installable do
-      status :installable
+      cluster
+      status 0
     end
 
     trait :scheduled do
-      status :scheduled
+      cluster
+      status 1
     end
 
     trait :installing do
-      status :installing
+      cluster
+      status 2
     end
 
     trait :installed do
-      status :installed
+      cluster
+      status 3
     end
 
     trait :errored do
-      status :errored
+      cluster
+      status(-1)
       status_reason 'something went wrong'
     end
 
-- 
cgit v1.2.1


From d6134709cbf3802dc690b0eecce2466eff313727 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 10:58:22 +0100
Subject: Remove Project#clusters export

---
 lib/gitlab/import_export/import_export.yml   |  2 --
 lib/gitlab/import_export/relation_factory.rb |  2 --
 spec/lib/gitlab/import_export/all_models.yml | 16 ----------------
 3 files changed, 20 deletions(-)

diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 06b1035fec6..b18cfadded6 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -54,8 +54,6 @@ project_tree:
   - :auto_devops
   - :triggers
   - :pipeline_schedules
-  - clusters:
-    - :application_helm
   - :services
   - :hooks
   - protected_branches:
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 679be1b21fa..352d5032af4 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -8,8 +8,6 @@ module Gitlab
                     triggers: 'Ci::Trigger',
                     pipeline_schedules: 'Ci::PipelineSchedule',
                     builds: 'Ci::Build',
-                    clusters: 'Clusters::Cluster',
-                    application_helm: 'Clusters::Applications::Helm',
                     hooks: 'ProjectHook',
                     merge_access_levels: 'ProtectedBranch::MergeAccessLevel',
                     push_access_levels: 'ProtectedBranch::PushAccessLevel',
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 6eb266a7b94..bc5c481d3a7 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -147,22 +147,6 @@ deploy_keys:
 - user
 - deploy_keys_projects
 - projects
-clusters:
-- application_helm
-- cluster_projects
-- projects
-- user
-- provider_gcp
-- platform_kubernetes
-cluster_projects:
-- projects
-- clusters
-provider_gcp:
-- cluster
-platform_kubernetes:
-- cluster
-application_helm:
-- cluster
 services:
 - project
 - service_hook
-- 
cgit v1.2.1


From 68a9229502de26c191dbd56738828736876217f6 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 11:50:00 +0100
Subject: Fix cluster_applications_helm factory with a configured cluster

---
 spec/factories/clusters/applications/helm.rb                |  7 +------
 spec/services/clusters/applications/install_service_spec.rb | 12 +++++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index b63e26125d1..23818f19edf 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -1,29 +1,24 @@
 FactoryGirl.define do
   factory :cluster_applications_helm, class: Clusters::Applications::Helm do
-    cluster factory: :cluster
+    cluster factory: %i(cluster provided_by_gcp)
 
     trait :installable do
-      cluster
       status 0
     end
 
     trait :scheduled do
-      cluster
       status 1
     end
 
     trait :installing do
-      cluster
       status 2
     end
 
     trait :installed do
-      cluster
       status 3
     end
 
     trait :errored do
-      cluster
       status(-1)
       status_reason 'something went wrong'
     end
diff --git a/spec/services/clusters/applications/install_service_spec.rb b/spec/services/clusters/applications/install_service_spec.rb
index ae8dc7b2bd9..408f7e4354e 100644
--- a/spec/services/clusters/applications/install_service_spec.rb
+++ b/spec/services/clusters/applications/install_service_spec.rb
@@ -4,14 +4,20 @@ describe Clusters::Applications::InstallService do
   describe '#execute' do
     let(:application) { create(:cluster_applications_helm, :scheduled) }
     let(:service) { described_class.new(application) }
+    let(:helm_client) { instance_double(Gitlab::Kubernetes::Helm) }
+
+    before do
+      allow(service).to receive(:helm_api).and_return(helm_client)
+    end
 
     context 'when there are no errors' do
       before do
-        expect_any_instance_of(Gitlab::Kubernetes::Helm).to receive(:install).with(application)
+        expect(helm_client).to receive(:install).with(application)
         allow(ClusterWaitForAppInstallationWorker).to receive(:perform_in).and_return(nil)
       end
 
       it 'make the application installing' do
+        expect(application.cluster).not_to be_nil
         service.execute
 
         expect(application).to be_installing
@@ -27,7 +33,7 @@ describe Clusters::Applications::InstallService do
     context 'when k8s cluster communication fails' do
       before do
         error = KubeException.new(500, 'system failure', nil)
-        expect_any_instance_of(Gitlab::Kubernetes::Helm).to receive(:install).with(application).and_raise(error)
+        expect(helm_client).to receive(:install).with(application).and_raise(error)
       end
 
       it 'make the application errored' do
@@ -43,7 +49,7 @@ describe Clusters::Applications::InstallService do
 
       it 'make the application errored' do
         expect(application).to receive(:make_installing!).once.and_raise(ActiveRecord::RecordInvalid)
-        expect_any_instance_of(Gitlab::Kubernetes::Helm).not_to receive(:install)
+        expect(helm_client).not_to receive(:install)
 
         service.execute
 
-- 
cgit v1.2.1


From 719cdd3a9d7a5dc604a89bb4e63904e4eaeaa290 Mon Sep 17 00:00:00 2001
From: kushalpandya <kushal@gitlab.com>
Date: Tue, 7 Nov 2017 16:50:19 +0530
Subject: Update CSS to use flexbox for branch and tag labels

---
 app/assets/stylesheets/framework/wells.scss | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 175b2ee7152..8e1092c6df8 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -66,30 +66,30 @@
   }
 
   .limit-box {
+    display: inline-flex;
+    align-items: center;
+    padding: 1px;
     background: $blue-100;
     border-radius: $border-radius-default;
-    display: inline-block;
-    padding: 1px 2px 0.5px;
     text-align: center;
-    vertical-align: bottom;
 
     &:hover {
       background: $blue-200;
     }
 
     .limit-icon {
-      float: left;
       width: 15%;
     }
 
     .limit-message {
+      flex: 1;
+      height: 16px;
+      margin-right: 2px;
       background: $white-light;
-      border-radius: 0 3px 3px 0;
+      border-top-right-radius: $border-radius-default;
+      border-bottom-right-radius: $border-radius-default;
       font-family: $regular_font;
       font-size: 12px;
-      float: right;
-      margin-top: 1px;
-      width: 85%;
     }
   }
 }
-- 
cgit v1.2.1


From 0c27de5f45aa1dc9841d10d348292324546685f2 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Tue, 7 Nov 2017 06:27:33 -0600
Subject: Update Cluster application install to be enabled when errored

---
 app/assets/javascripts/clusters/components/application_row.vue | 2 +-
 spec/javascripts/clusters/components/application_row_spec.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index b672111fda8..872abf03ef1 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -66,7 +66,7 @@ export default {
       // Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but
       // we already made a request to install and are just waiting for the real-time
       // to sync up.
-      return this.status !== APPLICATION_INSTALLABLE ||
+      return (this.status !== APPLICATION_INSTALLABLE && this.status !== APPLICATION_ERROR) ||
         this.requestStatus === REQUEST_LOADING ||
         this.requestStatus === REQUEST_SUCCESS;
     },
diff --git a/spec/javascripts/clusters/components/application_row_spec.js b/spec/javascripts/clusters/components/application_row_spec.js
index 392cebc5e35..e671c18e1a5 100644
--- a/spec/javascripts/clusters/components/application_row_spec.js
+++ b/spec/javascripts/clusters/components/application_row_spec.js
@@ -117,7 +117,7 @@ describe('Application Row', () => {
       expect(vm.installButtonDisabled).toEqual(true);
     });
 
-    it('has disabled "Install" when APPLICATION_ERROR', () => {
+    it('has enabled "Install" when APPLICATION_ERROR', () => {
       vm = mountComponent(ApplicationRow, {
         ...DEFAULT_APPLICATION_STATE,
         status: APPLICATION_ERROR,
@@ -125,7 +125,7 @@ describe('Application Row', () => {
 
       expect(vm.installButtonLabel).toEqual('Install');
       expect(vm.installButtonLoading).toEqual(false);
-      expect(vm.installButtonDisabled).toEqual(true);
+      expect(vm.installButtonDisabled).toEqual(false);
     });
 
     it('has loading "Install" when REQUEST_LOADING', () => {
-- 
cgit v1.2.1


From 1bd1d462dab33997c19432b00c867070fb6b1214 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Tue, 7 Nov 2017 06:28:02 -0600
Subject: Use flash for dismissable alerts

---
 app/assets/javascripts/clusters/clusters_bundle.js |  6 ++---
 app/views/projects/clusters/show.html.haml         |  3 ++-
 spec/javascripts/clusters/clusters_bundle_spec.js  | 30 ++++------------------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js
index c486208175f..5f421ea58ba 100644
--- a/app/assets/javascripts/clusters/clusters_bundle.js
+++ b/app/assets/javascripts/clusters/clusters_bundle.js
@@ -163,12 +163,10 @@ export default class Clusters {
       .map(appId => newApplicationMap[appId].title);
 
     if (appTitles.length > 0) {
-      this.successApplicationContainer.textContent = sprintf(s__('ClusterIntegration|%{appList} was successfully installed on your cluster'), {
+      const text = sprintf(s__('ClusterIntegration|%{appList} was successfully installed on your cluster'), {
         appList: appTitles.join(', '),
       });
-      this.successApplicationContainer.classList.remove('hidden');
-    } else {
-      this.successApplicationContainer.classList.add('hidden');
+      Flash(text, 'notice', this.successApplicationContainer);
     }
   }
 
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index f116c4f7dba..be6784058ae 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -13,7 +13,8 @@
   help_path: help_page_path('user/project/clusters/index.md', anchor: 'installing-applications') } }
 
 
-  .hidden.js-cluster-application-notice.alert.alert-info.alert-block.append-bottom-10{ role: 'alert' }
+  .js-cluster-application-notice
+    .flash-container
 
   %section.settings.no-animate.expanded
     %h4= s_('ClusterIntegration|Enable cluster integration')
diff --git a/spec/javascripts/clusters/clusters_bundle_spec.js b/spec/javascripts/clusters/clusters_bundle_spec.js
index 86e9cb22be8..027e8001053 100644
--- a/spec/javascripts/clusters/clusters_bundle_spec.js
+++ b/spec/javascripts/clusters/clusters_bundle_spec.js
@@ -49,7 +49,7 @@ describe('Clusters', () => {
         helm: { status: APPLICATION_INSTALLABLE, title: 'Helm Tiller' },
       });
 
-      expect(document.querySelector('.js-cluster-application-notice.hidden')).toBeDefined();
+      expect(document.querySelector('.js-cluster-application-notice .flash-text')).toBeNull();
     });
 
     it('shows an alert when something gets newly installed', () => {
@@ -61,8 +61,8 @@ describe('Clusters', () => {
         helm: { status: APPLICATION_INSTALLED, title: 'Helm Tiller' },
       });
 
-      expect(document.querySelector('.js-cluster-application-notice:not(.hidden)')).toBeDefined();
-      expect(document.querySelector('.js-cluster-application-notice').textContent.trim()).toEqual('Helm Tiller was successfully installed on your cluster');
+      expect(document.querySelector('.js-cluster-application-notice .flash-text')).toBeDefined();
+      expect(document.querySelector('.js-cluster-application-notice .flash-text').textContent.trim()).toEqual('Helm Tiller was successfully installed on your cluster');
     });
 
     it('shows an alert when multiple things gets newly installed', () => {
@@ -76,28 +76,8 @@ describe('Clusters', () => {
         ingress: { status: APPLICATION_INSTALLED, title: 'Ingress' },
       });
 
-      expect(document.querySelector('.js-cluster-application-notice:not(.hidden)')).toBeDefined();
-      expect(document.querySelector('.js-cluster-application-notice').textContent.trim()).toEqual('Helm Tiller, Ingress was successfully installed on your cluster');
-    });
-
-    it('hides existing alert when we call again and nothing is newly installed', () => {
-      const installedState = {
-        ...INITIAL_APP_MAP,
-        helm: { status: APPLICATION_INSTALLED, title: 'Helm Tiller' },
-      };
-
-      // Show the banner
-      cluster.checkForNewInstalls({
-        ...INITIAL_APP_MAP,
-        helm: { status: APPLICATION_INSTALLING, title: 'Helm Tiller' },
-      }, installedState);
-
-      expect(document.querySelector('.js-cluster-application-notice:not(.hidden)')).toBeDefined();
-
-      // Banner should go back hidden
-      cluster.checkForNewInstalls(installedState, installedState);
-
-      expect(document.querySelector('.js-cluster-application-notice.hidden')).toBeDefined();
+      expect(document.querySelector('.js-cluster-application-notice .flash-text')).toBeDefined();
+      expect(document.querySelector('.js-cluster-application-notice .flash-text').textContent.trim()).toEqual('Helm Tiller, Ingress was successfully installed on your cluster');
     });
   });
 
-- 
cgit v1.2.1


From bb112f0fe3eed7a2200e30ab766c67c57e0461d6 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Tue, 7 Nov 2017 13:40:24 +0100
Subject: Ensure enough space between branch links

---
 app/assets/stylesheets/framework/wells.scss | 4 ++++
 app/helpers/commits_helper.rb               | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 8e1092c6df8..e4703db773d 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -65,6 +65,10 @@
     display: inline;
   }
 
+  .branch-link {
+    margin-bottom: 2px;
+  }
+
   .limit-box {
     display: inline-flex;
     align-items: center;
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 95fc50a476a..f9a666fa1e6 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -62,7 +62,7 @@ module CommitsHelper
 
   # Returns a link formatted as a commit branch link
   def commit_branch_link(url, text)
-    link_to(url, class: 'label label-gray ref-name') do
+    link_to(url, class: 'label label-gray ref-name branch-link') do
       icon('code-fork') + " #{text}"
     end
   end
-- 
cgit v1.2.1


From 67e12219bf6257568f91c1a9c883e4821337c80d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 13:50:04 +0100
Subject: Rework initial state

---
 app/models/clusters/applications/helm.rb           | 10 ++++++----
 app/models/clusters/concerns/application_status.rb |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 863f9b9d834..d60bb7dcd02 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -11,14 +11,16 @@ module Clusters
 
       validates :cluster, presence: true
 
-      after_initialize :set_initial_status
-
       def self.application_name
         self.to_s.demodulize.underscore
       end
 
-      def set_initial_status
-        self.status = 0 unless cluster&.platform_kubernetes_active?
+      def initial_status
+        if cluster&.platform_kubernetes_active?
+          :installable
+        else
+          :not_installable
+        end
       end
 
       def name
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index e73abfa9055..3e15da7fc32 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -4,7 +4,7 @@ module Clusters
       extend ActiveSupport::Concern
 
       included do
-        state_machine :status, initial: :installable do
+        state_machine :status, initial: ->(application) { application.initial_status } do
           state :not_installable, value: -2
           state :errored, value: -1
           state :installable, value: 0
-- 
cgit v1.2.1


From f96b5eae20dbba3c2ce79556c4a9b034a590ee39 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 13:55:21 +0100
Subject: Fix initial_status

---
 app/models/clusters/applications/ingress.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index 8cb1ed68de9..c97e9db925e 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -9,8 +9,6 @@ module Clusters
 
       validates :cluster, presence: true
 
-      after_initialize :set_initial_status
-
       default_value_for :ingress_type, :nginx
       default_value_for :version, :nginx
 
@@ -22,8 +20,12 @@ module Clusters
         self.to_s.demodulize.underscore
       end
 
-      def set_initial_status
-        self.status = 0 unless cluster.application_helm_installed?
+      def initial_status
+        if cluster&.application_helm_installed?
+          :installable
+        else
+          :not_installable
+        end
       end
 
       def name
-- 
cgit v1.2.1


From 134e840d23ea08bfd578f9622ffec60c01ed665c Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 7 Nov 2017 21:59:02 +0900
Subject: Fix wildcard route and use param style

---
 config/routes/project.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes/project.rb b/config/routes/project.rb
index cb0e6078db0..bdafaba3ab3 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -193,7 +193,7 @@ constraints(ProjectUrlConstrainer.new) do
           get :status, format: :json
 
           scope :applications do
-            post '/*application', to: 'clusters/applications#create', as: :install_applications
+            post '/:application', to: 'clusters/applications#create', as: :install_applications
           end
         end
       end
-- 
cgit v1.2.1


From 3f261a499e37daf81716f9c3f8e71db7afdf0d5c Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 13:50:39 +0100
Subject: Add k8s namespace implementation and tests

---
 lib/gitlab/kubernetes/helm.rb                | 31 +++----------
 lib/gitlab/kubernetes/namespace.rb           | 29 ++++++++++++
 spec/lib/gitlab/kubernetes/namespace_spec.rb | 66 ++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 25 deletions(-)
 create mode 100644 lib/gitlab/kubernetes/namespace.rb
 create mode 100644 spec/lib/gitlab/kubernetes/namespace_spec.rb

diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb
index 76bb14a0609..16b2abb7de2 100644
--- a/lib/gitlab/kubernetes/helm.rb
+++ b/lib/gitlab/kubernetes/helm.rb
@@ -14,6 +14,7 @@ module Gitlab
 
       def initialize(kubeclient)
         @kubeclient = kubeclient
+        @namespace = Namespace.new(NAMESPACE, kubeclient)
       end
 
       def init!
@@ -21,7 +22,7 @@ module Gitlab
       end
 
       def install(app)
-        create_namespace! unless has_namespace?
+        @namespace.ensure_exists!
         @kubeclient.create_pod(pod_resource(app))
       end
 
@@ -33,15 +34,15 @@ module Gitlab
       # values: "Pending", "Running", "Succeeded", "Failed", "Unknown"
       #
       def installation_status(app)
-        @kubeclient.get_pod(pod_name(app), NAMESPACE).status.phase
+        @kubeclient.get_pod(pod_name(app), @namespace.name).status.phase
       end
 
       def installation_log(app)
-        @kubeclient.get_pod_log(pod_name(app), NAMESPACE).body
+        @kubeclient.get_pod_log(pod_name(app), @namespace.name).body
       end
 
       def delete_installation_pod!(app)
-        @kubeclient.delete_pod(pod_name(app), NAMESPACE)
+        @kubeclient.delete_pod(pod_name(app), @namespace.name)
       end
 
       private
@@ -52,7 +53,7 @@ module Gitlab
 
       def pod_resource(app)
         labels = { 'gitlab.org/action': 'install', 'gitlab.org/application': app.name }
-        metadata = { name: pod_name(app), namespace: NAMESPACE, labels: labels }
+        metadata = { name: pod_name(app), namespace: @namespace.name, labels: labels }
         container = {
           name: 'helm',
           image: 'alpine:3.6',
@@ -83,26 +84,6 @@ module Gitlab
       def helm_install_comand(app)
         "install #{app.chart} --name #{app.name} --namespace #{NAMESPACE}"
       end
-
-      def has_namespace?
-        return @has_namespace if defined?(@has_namespace)
-
-        begin
-          @kubeclient.get_namespace(NAMESPACE)
-          @has_namespace = true
-        rescue KubeException => ke
-          raise ke unless ke.error_code == 404
-          false
-        end
-      end
-
-      def create_namespace!
-        namespace_resource = ::Kubeclient::Resource.new
-        namespace_resource.metadata = {}
-        namespace_resource.metadata.name = NAMESPACE
-
-        @kubeclient.create_namespace(namespace_resource)
-      end
     end
   end
 end
diff --git a/lib/gitlab/kubernetes/namespace.rb b/lib/gitlab/kubernetes/namespace.rb
new file mode 100644
index 00000000000..17c6317f32f
--- /dev/null
+++ b/lib/gitlab/kubernetes/namespace.rb
@@ -0,0 +1,29 @@
+module Gitlab
+  module Kubernetes
+    class Namespace
+      attr_accessor :name
+
+      def initialize(name, client)
+        self.name = name
+        @client = client
+      end
+
+      def exists?
+        @client.get_namespace(name)
+      rescue ::KubeException => ke
+        raise ke unless ke.error_code == 404
+        false
+      end
+
+      def create!
+        resource = ::Kubeclient::Resource.new(metadata: { name: name })
+
+        @client.create_namespace(resource)
+      end
+
+      def ensure_exists!
+        exists? || create!
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/kubernetes/namespace_spec.rb b/spec/lib/gitlab/kubernetes/namespace_spec.rb
new file mode 100644
index 00000000000..b3c987f9344
--- /dev/null
+++ b/spec/lib/gitlab/kubernetes/namespace_spec.rb
@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe Gitlab::Kubernetes::Namespace do
+  let(:name) { 'a_namespace' }
+  let(:client) { double('kubernetes client') }
+  subject { described_class.new(name, client) }
+
+  it { expect(subject.name).to eq(name) }
+
+  describe '#exists?' do
+    context 'when namespace do not exits' do
+      let(:exception) { ::KubeException.new(404, "namespace #{name} not found", nil) }
+
+      it 'returns false' do
+        expect(client).to receive(:get_namespace).with(name).once.and_raise(exception)
+
+        expect(subject.exists?).to be_falsey
+      end
+    end
+
+    context 'when namespace exits' do
+      let(:namespace) { ::Kubeclient::Resource.new(kind: 'Namespace', metadata: { name: name }) } # partial representation
+
+      it 'returns true' do
+        expect(client).to receive(:get_namespace).with(name).once.and_return(namespace)
+
+        expect(subject.exists?).to be_truthy
+      end
+    end
+
+    context 'when cluster cannot be reached' do
+      let(:exception) { Errno::ECONNREFUSED.new }
+
+      it 'raises exception' do
+        expect(client).to receive(:get_namespace).with(name).once.and_raise(exception)
+
+        expect { subject.exists? }.to raise_error(exception)
+      end
+    end
+  end
+
+  describe '#create!' do
+    it 'creates a namespace' do
+      matcher = have_attributes(metadata: have_attributes(name: name))
+      expect(client).to receive(:create_namespace).with(matcher).once
+
+      expect { subject.create! }.not_to raise_error
+    end
+  end
+
+  describe '#ensure_exists!' do
+    it 'checks for existing namespace before creating' do
+      expect(subject).to receive(:exists?).once.ordered.and_return(false)
+      expect(subject).to receive(:create!).once.ordered
+
+      subject.ensure_exists!
+    end
+
+    it 'do not re-create an existing namespace' do
+      expect(subject).to receive(:exists?).once.and_return(true)
+      expect(subject).not_to receive(:create!)
+
+      subject.ensure_exists!
+    end
+  end
+end
-- 
cgit v1.2.1


From 0562b02bc2be0716be3cd11da151bf6531a8c59a Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 13:58:36 +0100
Subject: Do not use %i() in state machines

---
 app/models/clusters/concerns/application_status.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index 3e15da7fc32..ce1b6621479 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -13,15 +13,15 @@ module Clusters
           state :installed, value: 3
 
           event :make_scheduled do
-            transition %i(installable errored) => :scheduled
+            transition [:installable, :errored] => :scheduled
           end
 
           event :make_installing do
-            transition %i(scheduled) => :installing
+            transition [:scheduled] => :installing
           end
 
           event :make_installed do
-            transition %i(installing) => :installed
+            transition [:installing] => :installed
           end
 
           event :make_errored do
-- 
cgit v1.2.1


From 16b9e289fd5d9b96f0de96719a8d87e8342a50e6 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 14:05:37 +0100
Subject: Do not use RSpec.describe

---
 spec/models/clusters/applications/helm_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/clusters/applications/helm_spec.rb b/spec/models/clusters/applications/helm_spec.rb
index 44fb60f0ed0..2b1922fdd5b 100644
--- a/spec/models/clusters/applications/helm_spec.rb
+++ b/spec/models/clusters/applications/helm_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Clusters::Applications::Helm, type: :model do
+describe Clusters::Applications::Helm do
   it { is_expected.to belong_to(:cluster) }
   it { is_expected.to validate_presence_of(:cluster) }
 
-- 
cgit v1.2.1


From 3cb4614273bfc10a6d3acc98d7a450dbe9f1aaaf Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 14:26:14 +0100
Subject: Fix initial status again

---
 app/models/clusters/applications/helm.rb           | 10 ++++------
 app/models/clusters/applications/ingress.rb        | 10 ++++------
 app/models/clusters/concerns/application_status.rb |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index d60bb7dcd02..0bbe5219715 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -11,16 +11,14 @@ module Clusters
 
       validates :cluster, presence: true
 
+      after_initialize :set_initial_status
+
       def self.application_name
         self.to_s.demodulize.underscore
       end
 
-      def initial_status
-        if cluster&.platform_kubernetes_active?
-          :installable
-        else
-          :not_installable
-        end
+      def set_initial_status
+        self.status = 'installable' if cluster&.platform_kubernetes_active?
       end
 
       def name
diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index c97e9db925e..02c14a33e23 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -12,6 +12,8 @@ module Clusters
       default_value_for :ingress_type, :nginx
       default_value_for :version, :nginx
 
+      after_initialize :set_initial_status
+
       enum ingress_type: {
         nginx: 1
       }
@@ -20,12 +22,8 @@ module Clusters
         self.to_s.demodulize.underscore
       end
 
-      def initial_status
-        if cluster&.application_helm_installed?
-          :installable
-        else
-          :not_installable
-        end
+      def set_initial_status
+        self.status = 'installable' if cluster&.application_helm_installed?
       end
 
       def name
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index 3e15da7fc32..516fb0d1a7d 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -4,7 +4,7 @@ module Clusters
       extend ActiveSupport::Concern
 
       included do
-        state_machine :status, initial: ->(application) { application.initial_status } do
+        state_machine :status, initial: :not_installable do
           state :not_installable, value: -2
           state :errored, value: -1
           state :installable, value: 0
-- 
cgit v1.2.1


From 55d098c94b4f7e39931d5e4084be19872386fa18 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 14:26:14 +0100
Subject: Fix initial status again

---
 app/models/clusters/applications/helm.rb           | 10 ++++------
 app/models/clusters/concerns/application_status.rb |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index d60bb7dcd02..0bbe5219715 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -11,16 +11,14 @@ module Clusters
 
       validates :cluster, presence: true
 
+      after_initialize :set_initial_status
+
       def self.application_name
         self.to_s.demodulize.underscore
       end
 
-      def initial_status
-        if cluster&.platform_kubernetes_active?
-          :installable
-        else
-          :not_installable
-        end
+      def set_initial_status
+        self.status = 'installable' if cluster&.platform_kubernetes_active?
       end
 
       def name
diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index ce1b6621479..7b7c8eac773 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -4,7 +4,7 @@ module Clusters
       extend ActiveSupport::Concern
 
       included do
-        state_machine :status, initial: ->(application) { application.initial_status } do
+        state_machine :status, initial: :not_installable do
           state :not_installable, value: -2
           state :errored, value: -1
           state :installable, value: 0
-- 
cgit v1.2.1


From 760a154a032319a90e15dcf4d54ec1c1cdde9e1c Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 14:52:11 +0100
Subject: Fix tests for initial status

---
 app/models/clusters/applications/helm.rb       |  2 ++
 spec/factories/clusters/applications/helm.rb   |  4 ++++
 spec/models/clusters/applications/helm_spec.rb | 16 ++++++++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 0bbe5219715..7ea84841118 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -18,6 +18,8 @@ module Clusters
       end
 
       def set_initial_status
+        return unless not_installable?
+
         self.status = 'installable' if cluster&.platform_kubernetes_active?
       end
 
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index 23818f19edf..a0c874b103b 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -2,6 +2,10 @@ FactoryGirl.define do
   factory :cluster_applications_helm, class: Clusters::Applications::Helm do
     cluster factory: %i(cluster provided_by_gcp)
 
+    trait :not_installable do
+      status -2
+    end
+
     trait :installable do
       status 0
     end
diff --git a/spec/models/clusters/applications/helm_spec.rb b/spec/models/clusters/applications/helm_spec.rb
index 2b1922fdd5b..beb10bf38c9 100644
--- a/spec/models/clusters/applications/helm_spec.rb
+++ b/spec/models/clusters/applications/helm_spec.rb
@@ -21,8 +21,20 @@ describe Clusters::Applications::Helm do
   end
 
   describe '#status' do
-    it 'defaults to :installable' do
-      expect(subject.status_name).to be(:installable)
+    let(:cluster) { create(:cluster) }
+
+    subject { described_class.new(cluster: cluster) }
+
+    it 'defaults to :not_installable' do
+      expect(subject.status_name).to be(:not_installable)
+    end
+
+    context 'when platform kubernetes is defined' do
+      let(:cluster) { create(:cluster, :provided_by_gcp) }
+
+      it 'defaults to :installable' do
+        expect(subject.status_name).to be(:installable)
+      end
     end
   end
 
-- 
cgit v1.2.1


From e40021cd3cba0a889f43fcfec7b25c757391f11c Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 14:55:26 +0100
Subject: Fix ingress.rb

---
 app/models/clusters/applications/ingress.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index 02c14a33e23..c9584476f3c 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -23,6 +23,8 @@ module Clusters
       end
 
       def set_initial_status
+        return unless not_installable?
+
         self.status = 'installable' if cluster&.application_helm_installed?
       end
 
-- 
cgit v1.2.1


From 389c9bfc516531f850d6fe4098db0572f90478ab Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 15:10:40 +0100
Subject: Add specs for ingress

---
 spec/factories/clusters/applications/ingress.rb   | 35 +++++++++
 spec/models/clusters/applications/ingress_spec.rb | 92 +++++++++++++++++++++++
 spec/models/clusters/cluster_spec.rb              | 21 ++++++
 3 files changed, 148 insertions(+)
 create mode 100644 spec/factories/clusters/applications/ingress.rb
 create mode 100644 spec/models/clusters/applications/ingress_spec.rb

diff --git a/spec/factories/clusters/applications/ingress.rb b/spec/factories/clusters/applications/ingress.rb
new file mode 100644
index 00000000000..63016d9c15c
--- /dev/null
+++ b/spec/factories/clusters/applications/ingress.rb
@@ -0,0 +1,35 @@
+FactoryGirl.define do
+  factory :cluster_applications_ingress, class: Clusters::Applications::Ingress do
+    cluster factory: %i(cluster provided_by_gcp)
+
+    trait :not_installable do
+      status -2
+    end
+
+    trait :installable do
+      status 0
+    end
+
+    trait :scheduled do
+      status 1
+    end
+
+    trait :installing do
+      status 2
+    end
+
+    trait :installed do
+      status 3
+    end
+
+    trait :errored do
+      status(-1)
+      status_reason 'something went wrong'
+    end
+
+    trait :timeouted do
+      installing
+      updated_at ClusterWaitForAppInstallationWorker::TIMEOUT.ago
+    end
+  end
+end
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
new file mode 100644
index 00000000000..495a5014190
--- /dev/null
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -0,0 +1,92 @@
+require 'rails_helper'
+
+describe Clusters::Applications::Ingress do
+  it { is_expected.to belong_to(:cluster) }
+  it { is_expected.to validate_presence_of(:cluster) }
+
+  describe '#name' do
+    it 'is .application_name' do
+      expect(subject.name).to eq(described_class.application_name)
+    end
+
+    it 'is recorded in Clusters::Cluster::APPLICATIONS' do
+      expect(Clusters::Cluster::APPLICATIONS[subject.name]).to eq(described_class)
+    end
+  end
+
+  describe '#status' do
+    let(:cluster) { create(:cluster, :provided_by_gcp) }
+
+    subject { described_class.new(cluster: cluster) }
+
+    it 'defaults to :not_installable' do
+      expect(subject.status_name).to be(:not_installable)
+    end
+
+    context 'when application helm is defined' do
+      before do
+        create(:cluster_applications_ingress, cluster: cluster)
+      end
+
+      it 'defaults to :installable' do
+        expect(subject.status_name).to be(:installable)
+      end
+    end
+  end
+
+  describe 'status state machine' do
+    describe '#make_installing' do
+      subject { create(:cluster_applications_ingress, :scheduled) }
+
+      it 'is installing' do
+        subject.make_installing!
+
+        expect(subject).to be_installing
+      end
+    end
+
+    describe '#make_installed' do
+      subject { create(:cluster_applications_ingress, :installing) }
+
+      it 'is installed' do
+        subject.make_installed
+
+        expect(subject).to be_installed
+      end
+    end
+
+    describe '#make_errored' do
+      subject { create(:cluster_applications_ingress, :installing) }
+      let(:reason) { 'some errors' }
+
+      it 'is errored' do
+        subject.make_errored(reason)
+
+        expect(subject).to be_errored
+        expect(subject.status_reason).to eq(reason)
+      end
+    end
+
+    describe '#make_scheduled' do
+      subject { create(:cluster_applications_ingress, :installable) }
+
+      it 'is scheduled' do
+        subject.make_scheduled
+
+        expect(subject).to be_scheduled
+      end
+
+      describe 'when was errored' do
+        subject { create(:cluster_applications_ingress, :errored) }
+
+        it 'clears #status_reason' do
+          expect(subject.status_reason).not_to be_nil
+
+          subject.make_scheduled!
+
+          expect(subject.status_reason).to be_nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb
index 12123a3d753..b91a5e7a272 100644
--- a/spec/models/clusters/cluster_spec.rb
+++ b/spec/models/clusters/cluster_spec.rb
@@ -178,4 +178,25 @@ describe Clusters::Cluster do
       it { is_expected.to be_nil }
     end
   end
+
+  describe '#applications' do
+    set(:cluster) { create(:cluster) }
+
+    subject { cluster.applications }
+
+    context 'when none of applications are created' do
+      it 'returns a list of a new objects' do
+        is_expected.not_to be_empty
+      end
+    end
+
+    context 'when applications are created' do
+      let!(:helm) { create(:cluster_applications_helm, cluster: cluster) }
+      let!(:ingress) { create(:cluster_applications_ingress, cluster: cluster) }
+
+      it 'returns a list of created applications' do
+        is_expected.to contain_exactly(helm, ingress)
+      end
+    end
+  end
 end
-- 
cgit v1.2.1


From ca3c86856722ec94c30669cb1fa684c68ff80930 Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@iotcl.com>
Date: Tue, 7 Nov 2017 16:49:07 +0100
Subject: When deleting merged branches, ignore protected tags

In gitlab-org/gitlab-ce!13251 wildcard Protected Branches were handled
properly when deleting all merged branches. But this fix wasn't that
good. It also checked branch names against Protected Tags. That's not
correct.

This change will **only** check if there is a Protected Branch
matching the merged branch, and ignores Protected Tags.

Closes gitlab-org/gitlab-ce#39732.
---
 app/services/delete_merged_branches_service.rb                | 2 +-
 changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml | 5 +++++
 spec/services/delete_merged_branches_service_spec.rb          | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml

diff --git a/app/services/delete_merged_branches_service.rb b/app/services/delete_merged_branches_service.rb
index 077268b2388..cb235a85daf 100644
--- a/app/services/delete_merged_branches_service.rb
+++ b/app/services/delete_merged_branches_service.rb
@@ -13,7 +13,7 @@ class DeleteMergedBranchesService < BaseService
       # Prevent deletion of branches relevant to open merge requests
       branches -= merge_request_branch_names
       # Prevent deletion of protected branches
-      branches = branches.reject { |branch| project.protected_for?(branch) }
+      branches = branches.reject { |branch| ProtectedBranch.protected?(project, branch) }
 
       branches.each do |branch|
         DeleteBranchService.new(project, current_user).execute(branch)
diff --git a/changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml b/changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml
new file mode 100644
index 00000000000..5d5c39108b0
--- /dev/null
+++ b/changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml
@@ -0,0 +1,5 @@
+---
+title: When deleting merged branches, ignore protected tags
+merge_request: 15252
+author:
+type: fixed
diff --git a/spec/services/delete_merged_branches_service_spec.rb b/spec/services/delete_merged_branches_service_spec.rb
index 5a9eb359ee1..0de02576203 100644
--- a/spec/services/delete_merged_branches_service_spec.rb
+++ b/spec/services/delete_merged_branches_service_spec.rb
@@ -42,6 +42,14 @@ describe DeleteMergedBranchesService do
       expect(project.repository.branch_names).to include('improve/awesome')
     end
 
+    it 'ignores protected tags' do
+      create(:protected_tag, project: project, name: 'improve/*')
+
+      service.execute
+
+      expect(project.repository.branch_names).not_to include('improve/awesome')
+    end
+
     context 'user without rights' do
       let(:user) { create(:user) }
 
-- 
cgit v1.2.1


From 8ec618a6ede619d9f75279f03c03b24d106c79c7 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 15:26:14 +0100
Subject: Add Helm InstallCommand

---
 app/models/clusters/applications/helm.rb           |   4 +
 .../clusters/applications/base_helm_service.rb     |   4 +
 .../check_installation_progress_service.rb         |   6 +-
 .../clusters/applications/install_service.rb       |   2 +-
 lib/gitlab/kubernetes/helm.rb                      |  77 ++++++++--------
 spec/lib/gitlab/kubernetes/helm_spec.rb            | 100 +++++++++++++++++++++
 spec/models/clusters/applications/helm_spec.rb     |   6 ++
 .../clusters/applications/install_service_spec.rb  |   4 +-
 8 files changed, 162 insertions(+), 41 deletions(-)
 create mode 100644 spec/lib/gitlab/kubernetes/helm_spec.rb

diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index 7ea84841118..c7949d11ef8 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -26,6 +26,10 @@ module Clusters
       def name
         self.class.application_name
       end
+
+      def install_command
+        Gitlab::Kubernetes::Helm::InstallCommand.new(name, true)
+      end
     end
   end
 end
diff --git a/app/services/clusters/applications/base_helm_service.rb b/app/services/clusters/applications/base_helm_service.rb
index 68320a3b267..9a4ce31cb39 100644
--- a/app/services/clusters/applications/base_helm_service.rb
+++ b/app/services/clusters/applications/base_helm_service.rb
@@ -20,6 +20,10 @@ module Clusters
       def helm_api
         @helm_api ||= Gitlab::Kubernetes::Helm.new(kubeclient)
       end
+
+      def install_command
+        @install_command ||= app.install_command
+      end
     end
   end
 end
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index 69bd3613cce..bde090eaeec 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -48,17 +48,17 @@ module Clusters
       end
 
       def remove_installation_pod
-        helm_api.delete_installation_pod!(app)
+        helm_api.delete_installation_pod!(install_command.pod_name)
       rescue
         # no-op
       end
 
       def installation_phase
-        helm_api.installation_status(app)
+        helm_api.installation_status(install_command.pod_name)
       end
 
       def installation_errors
-        helm_api.installation_log(app)
+        helm_api.installation_log(install_command.pod_name)
       end
     end
   end
diff --git a/app/services/clusters/applications/install_service.rb b/app/services/clusters/applications/install_service.rb
index 4eba19a474e..8ceeec687cd 100644
--- a/app/services/clusters/applications/install_service.rb
+++ b/app/services/clusters/applications/install_service.rb
@@ -6,7 +6,7 @@ module Clusters
 
         begin
           app.make_installing!
-          helm_api.install(app)
+          helm_api.install(install_command)
 
           ClusterWaitForAppInstallationWorker.perform_in(
             ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
diff --git a/lib/gitlab/kubernetes/helm.rb b/lib/gitlab/kubernetes/helm.rb
index 16b2abb7de2..7a50f07f3c5 100644
--- a/lib/gitlab/kubernetes/helm.rb
+++ b/lib/gitlab/kubernetes/helm.rb
@@ -3,27 +3,27 @@ module Gitlab
     class Helm
       HELM_VERSION = '2.7.0'.freeze
       NAMESPACE = 'gitlab-managed-apps'.freeze
-      COMMAND_SCRIPT = <<-EOS.freeze
+      INSTALL_DEPS = <<-EOS.freeze
         set -eo pipefail
         apk add -U ca-certificates openssl >/dev/null
         wget -q -O - https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz | tar zxC /tmp >/dev/null
         mv /tmp/linux-amd64/helm /usr/bin/
-        helm init ${HELM_INIT_OPTS} >/dev/null
-        [[ -z "${HELM_COMMAND+x}" ]] || helm ${HELM_COMMAND} >/dev/null
       EOS
 
+      InstallCommand = Struct.new(:name, :install_helm, :chart) do
+        def pod_name
+          "install-#{name}"
+        end
+      end
+
       def initialize(kubeclient)
         @kubeclient = kubeclient
         @namespace = Namespace.new(NAMESPACE, kubeclient)
       end
 
-      def init!
-        install(OpenStruct.new(name: 'helm'))
-      end
-
-      def install(app)
+      def install(command)
         @namespace.ensure_exists!
-        @kubeclient.create_pod(pod_resource(app))
+        @kubeclient.create_pod(pod_resource(command))
       end
 
       ##
@@ -33,31 +33,27 @@ module Gitlab
       #
       # values: "Pending", "Running", "Succeeded", "Failed", "Unknown"
       #
-      def installation_status(app)
-        @kubeclient.get_pod(pod_name(app), @namespace.name).status.phase
+      def installation_status(pod_name)
+        @kubeclient.get_pod(pod_name, @namespace.name).status.phase
       end
 
-      def installation_log(app)
-        @kubeclient.get_pod_log(pod_name(app), @namespace.name).body
+      def installation_log(pod_name)
+        @kubeclient.get_pod_log(pod_name, @namespace.name).body
       end
 
-      def delete_installation_pod!(app)
-        @kubeclient.delete_pod(pod_name(app), @namespace.name)
+      def delete_installation_pod!(pod_name)
+        @kubeclient.delete_pod(pod_name, @namespace.name)
       end
 
       private
 
-      def pod_name(app)
-        "install-#{app.name}"
-      end
-
-      def pod_resource(app)
-        labels = { 'gitlab.org/action': 'install', 'gitlab.org/application': app.name }
-        metadata = { name: pod_name(app), namespace: @namespace.name, labels: labels }
+      def pod_resource(command)
+        labels = { 'gitlab.org/action': 'install', 'gitlab.org/application': command.name }
+        metadata = { name: command.pod_name, namespace: @namespace.name, labels: labels }
         container = {
           name: 'helm',
           image: 'alpine:3.6',
-          env: generate_pod_env(app),
+          env: generate_pod_env(command),
           command: %w(/bin/sh),
           args: %w(-c $(COMMAND_SCRIPT))
         }
@@ -66,23 +62,34 @@ module Gitlab
         ::Kubeclient::Resource.new(metadata: metadata, spec: spec)
       end
 
-      def generate_pod_env(app)
-        env = {
+      def generate_pod_env(command)
+        {
           HELM_VERSION: HELM_VERSION,
-          TILLER_NAMESPACE: NAMESPACE,
-          COMMAND_SCRIPT: COMMAND_SCRIPT
-        }
+          TILLER_NAMESPACE: @namespace.name,
+          COMMAND_SCRIPT: generate_script(command)
+        }.map { |key, value| { name: key, value: value } }
+      end
 
-        if app.name != 'helm'
-          env[:HELM_INIT_OPTS] = '--client-only'
-          env[:HELM_COMMAND] = helm_install_comand(app)
-        end
+      def generate_script(command)
+        [
+            INSTALL_DEPS,
+            helm_init_command(command),
+            helm_install_command(command)
+        ].join("\n")
+      end
 
-        env.map { |key, value| { name: key, value: value } }
+      def helm_init_command(command)
+        if command.install_helm
+          'helm init >/dev/null'
+        else
+          'helm init --client-only >/dev/null'
+        end
       end
 
-      def helm_install_comand(app)
-        "install #{app.chart} --name #{app.name} --namespace #{NAMESPACE}"
+      def helm_install_command(command)
+        return if command.chart.nil?
+
+        "helm install #{command.chart} --name #{command.name} --namespace #{@namespace.name} >/dev/null"
       end
     end
   end
diff --git a/spec/lib/gitlab/kubernetes/helm_spec.rb b/spec/lib/gitlab/kubernetes/helm_spec.rb
new file mode 100644
index 00000000000..15f99b0401f
--- /dev/null
+++ b/spec/lib/gitlab/kubernetes/helm_spec.rb
@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+describe Gitlab::Kubernetes::Helm do
+  let(:client) { double('kubernetes client') }
+  let(:helm) { described_class.new(client) }
+  let(:namespace) { Gitlab::Kubernetes::Namespace.new(described_class::NAMESPACE, client) }
+  let(:install_helm) { true }
+  let(:chart) { 'stable/a_chart' }
+  let(:application_name) { 'app_name' }
+  let(:command) { Gitlab::Kubernetes::Helm::InstallCommand.new(application_name, install_helm, chart) }
+  subject { helm }
+
+  before do
+    allow(Gitlab::Kubernetes::Namespace).to receive(:new).with(described_class::NAMESPACE, client).and_return(namespace)
+  end
+
+  describe '#initialize' do
+    it 'creates a namespace object' do
+      expect(Gitlab::Kubernetes::Namespace).to receive(:new).with(described_class::NAMESPACE, client)
+
+      subject
+    end
+  end
+
+  describe '#install' do
+    before do
+      allow(client).to receive(:create_pod).and_return(nil)
+      allow(namespace).to receive(:ensure_exists!).once
+    end
+
+    it 'ensures the namespace exists before creating the POD' do
+      expect(namespace).to receive(:ensure_exists!).once.ordered
+      expect(client).to receive(:create_pod).once.ordered
+
+      subject.install(command)
+    end
+  end
+
+  describe '#installation_status' do
+    let(:phase) { Gitlab::Kubernetes::Pod::RUNNING }
+    let(:pod) { Kubeclient::Resource.new(status: { phase: phase }) } # partial representation
+
+    it 'fetches POD phase from kubernetes cluster' do
+      expect(client).to receive(:get_pod).with(command.pod_name, described_class::NAMESPACE).once.and_return(pod)
+
+      expect(subject.installation_status(command.pod_name)).to eq(phase)
+    end
+  end
+
+  describe '#installation_log' do
+    let(:log) { 'some output' }
+    let(:response) { RestClient::Response.new(log) }
+
+    it 'fetches POD phase from kubernetes cluster' do
+      expect(client).to receive(:get_pod_log).with(command.pod_name, described_class::NAMESPACE).once.and_return(response)
+
+      expect(subject.installation_log(command.pod_name)).to eq(log)
+    end
+  end
+
+  describe '#delete_installation_pod!' do
+    it 'deletes the POD from kubernetes cluster' do
+      expect(client).to receive(:delete_pod).with(command.pod_name, described_class::NAMESPACE).once
+
+      subject.delete_installation_pod!(command.pod_name)
+    end
+  end
+
+  describe '#helm_init_command' do
+    subject { helm.send(:helm_init_command, command) }
+
+    context 'when command.install_helm is true' do
+      let(:install_helm) { true }
+
+      it { is_expected.to eq('helm init >/dev/null') }
+    end
+
+    context 'when command.install_helm is false' do
+      let(:install_helm) { false }
+
+      it { is_expected.to eq('helm init --client-only >/dev/null') }
+    end
+  end
+
+  describe '#helm_install_command' do
+    subject { helm.send(:helm_install_command, command) }
+
+    context 'when command.chart is nil' do
+      let(:chart) { nil }
+
+      it { is_expected.to be_nil }
+    end
+
+    context 'when command.chart is set' do
+      let(:chart) { 'stable/a_chart' }
+
+      it { is_expected.to eq("helm install #{chart} --name #{application_name} --namespace #{namespace.name} >/dev/null")}
+    end
+  end
+end
diff --git a/spec/models/clusters/applications/helm_spec.rb b/spec/models/clusters/applications/helm_spec.rb
index beb10bf38c9..f8855079842 100644
--- a/spec/models/clusters/applications/helm_spec.rb
+++ b/spec/models/clusters/applications/helm_spec.rb
@@ -38,6 +38,12 @@ describe Clusters::Applications::Helm do
     end
   end
 
+  describe '#install_command' do
+    it 'has all the needed information' do
+      expect(subject.install_command).to have_attributes(name: subject.name, install_helm: true, chart: nil)
+    end
+  end
+
   describe 'status state machine' do
     describe '#make_installing' do
       subject { create(:cluster_applications_helm, :scheduled) }
diff --git a/spec/services/clusters/applications/install_service_spec.rb b/spec/services/clusters/applications/install_service_spec.rb
index 408f7e4354e..054a49ffedf 100644
--- a/spec/services/clusters/applications/install_service_spec.rb
+++ b/spec/services/clusters/applications/install_service_spec.rb
@@ -12,7 +12,7 @@ describe Clusters::Applications::InstallService do
 
     context 'when there are no errors' do
       before do
-        expect(helm_client).to receive(:install).with(application)
+        expect(helm_client).to receive(:install).with(application.install_command)
         allow(ClusterWaitForAppInstallationWorker).to receive(:perform_in).and_return(nil)
       end
 
@@ -33,7 +33,7 @@ describe Clusters::Applications::InstallService do
     context 'when k8s cluster communication fails' do
       before do
         error = KubeException.new(500, 'system failure', nil)
-        expect(helm_client).to receive(:install).with(application).and_raise(error)
+        expect(helm_client).to receive(:install).with(application.install_command).and_raise(error)
       end
 
       it 'make the application errored' do
-- 
cgit v1.2.1


From e3b5dfdf20b2617cc706d82e9d52d67ec92d26b6 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 15:31:49 +0100
Subject: Fix rubocop warning

---
 spec/factories/clusters/applications/helm.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index a0c874b103b..fab37195113 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -3,7 +3,7 @@ FactoryGirl.define do
     cluster factory: %i(cluster provided_by_gcp)
 
     trait :not_installable do
-      status -2
+      status(-2)
     end
 
     trait :installable do
-- 
cgit v1.2.1


From 93fe65702bfaaa12fd748c57fbbb819e3074ecef Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 8 Nov 2017 01:22:28 +0900
Subject: Add feature spec for app installation

---
 spec/features/projects/clusters_spec.rb | 42 +++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb
index 368aad860e7..03d866f8bc1 100644
--- a/spec/features/projects/clusters_spec.rb
+++ b/spec/features/projects/clusters_spec.rb
@@ -50,10 +50,22 @@ feature 'Clusters', :js do
         it 'user sees a cluster details page and creation status' do
           expect(page).to have_content('Cluster is being created on Google Container Engine...')
 
+          # Application Installation buttons
+          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+          expect(page.find(:css, '.js-cluster-application-install-button').text).to eq('Install')
+
           Clusters::Cluster.last.provider.make_created!
 
           expect(page).to have_content('Cluster was successfully created on Google Container Engine')
         end
+
+        it 'user sees a error if something worng during creation' do
+          expect(page).to have_content('Cluster is being created on Google Container Engine...')
+
+          Clusters::Cluster.last.provider.make_errored!('Something wrong!')
+
+          expect(page).to have_content('Something wrong!')
+        end
       end
 
       context 'when user filled form with invalid parameters' do
@@ -78,6 +90,36 @@ feature 'Clusters', :js do
       it 'user sees an cluster details page' do
         expect(page).to have_button('Save')
         expect(page.find(:css, '.cluster-name').value).to eq(cluster.name)
+
+        # Application Installation buttons
+        expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to be_nil
+        expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+      end
+
+      context 'when user installs application: tiller' do
+        before do
+          allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
+
+          page.find(:css, '.js-cluster-application-install-button').click
+        end
+
+        it 'user sees status transition' do
+          # FE sends request and gets the responce, then the buttons is "Install"
+          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+
+          Clusters::Cluster.last.application_helm.make_installing!
+
+          # FE starts pooling and update the buttons to "Installing"
+          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
+
+          Clusters::Cluster.last.application_helm.make_installed!
+
+          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
+          expect(page).to have_content('Helm Tiller was successfully installed on your cluster')
+        end
       end
 
       context 'when user disables the cluster' do
-- 
cgit v1.2.1


From 18760259182050ee92e8e10dc5d46e56ca7f601f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 17:27:46 +0100
Subject: Fix ingress rubocop failure

---
 spec/factories/clusters/applications/ingress.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/factories/clusters/applications/ingress.rb b/spec/factories/clusters/applications/ingress.rb
index 63016d9c15c..b103a980655 100644
--- a/spec/factories/clusters/applications/ingress.rb
+++ b/spec/factories/clusters/applications/ingress.rb
@@ -3,7 +3,7 @@ FactoryGirl.define do
     cluster factory: %i(cluster provided_by_gcp)
 
     trait :not_installable do
-      status -2
+      status(-2)
     end
 
     trait :installable do
-- 
cgit v1.2.1


From 02878cd958557128cd9c22b27bd2fb97a843266b Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 8 Nov 2017 01:32:12 +0900
Subject: Fix spec. spec/serializers/cluster_application_entity_spec.rb and
 spec/serializers/cluster_entity_spec.rb

---
 spec/serializers/cluster_application_entity_spec.rb | 2 +-
 spec/serializers/cluster_entity_spec.rb             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/serializers/cluster_application_entity_spec.rb b/spec/serializers/cluster_application_entity_spec.rb
index 8a3a081adf8..87c7b2ad36e 100644
--- a/spec/serializers/cluster_application_entity_spec.rb
+++ b/spec/serializers/cluster_application_entity_spec.rb
@@ -10,7 +10,7 @@ describe ClusterApplicationEntity do
     end
 
     it 'has status' do
-      expect(subject[:status]).to eq(:installable)
+      expect(subject[:status]).to eq(:not_installable)
     end
 
     it 'has no status_reason' do
diff --git a/spec/serializers/cluster_entity_spec.rb b/spec/serializers/cluster_entity_spec.rb
index f50f5999bfc..d6a43fd0f00 100644
--- a/spec/serializers/cluster_entity_spec.rb
+++ b/spec/serializers/cluster_entity_spec.rb
@@ -39,12 +39,12 @@ describe ClusterEntity do
       let(:cluster) { create(:cluster) }
       subject { described_class.new(cluster).as_json[:applications]}
 
-      it 'contains helm as installable' do
+      it 'contains helm as not_installable' do
         expect(subject).not_to be_empty
 
         helm = subject[0]
         expect(helm[:name]).to eq('helm')
-        expect(helm[:status]).to eq(:installable)
+        expect(helm[:status]).to eq(:not_installable)
       end
     end
   end
-- 
cgit v1.2.1


From a194d3125956a854792902797ab5124d659b4caa Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 17:42:58 +0100
Subject: Fix Projects::Clusters::ApplicationsController failures

---
 spec/controllers/projects/clusters/applications_controller_spec.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/controllers/projects/clusters/applications_controller_spec.rb b/spec/controllers/projects/clusters/applications_controller_spec.rb
index 3213a797756..8b460646059 100644
--- a/spec/controllers/projects/clusters/applications_controller_spec.rb
+++ b/spec/controllers/projects/clusters/applications_controller_spec.rb
@@ -8,7 +8,7 @@ describe Projects::Clusters::ApplicationsController do
   end
 
   describe 'POST create' do
-    let(:cluster) { create(:cluster, :project, :providing_by_gcp) }
+    let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
     let(:project) { cluster.project }
     let(:application) { 'helm' }
     let(:params) { { application: application, id: cluster.id } }
@@ -52,8 +52,7 @@ describe Projects::Clusters::ApplicationsController do
 
       context 'when application is already installing' do
         before do
-          other = current_application.new(cluster: cluster)
-          other.make_installing!
+          create(:cluster_applications_helm, :installing, cluster: cluster)
         end
 
         it 'returns 400' do
-- 
cgit v1.2.1


From 1625adf5bab8faa4291fdce1e75174d7d1faa99d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 17:49:27 +0100
Subject: Make ingress to use install_command

---
 app/models/clusters/applications/ingress.rb       |  4 ++++
 spec/models/clusters/applications/ingress_spec.rb | 20 ++++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb
index c9584476f3c..44bd979741e 100644
--- a/app/models/clusters/applications/ingress.rb
+++ b/app/models/clusters/applications/ingress.rb
@@ -35,6 +35,10 @@ module Clusters
       def chart
         'stable/nginx-ingress'
       end
+
+      def install_command
+        Gitlab::Kubernetes::Helm::InstallCommand.new(name, false, chart)
+      end
     end
   end
 end
diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb
index 495a5014190..b83472e1944 100644
--- a/spec/models/clusters/applications/ingress_spec.rb
+++ b/spec/models/clusters/applications/ingress_spec.rb
@@ -23,9 +23,19 @@ describe Clusters::Applications::Ingress do
       expect(subject.status_name).to be(:not_installable)
     end
 
-    context 'when application helm is defined' do
+    context 'when application helm is scheduled' do
       before do
-        create(:cluster_applications_ingress, cluster: cluster)
+        create(:cluster_applications_helm, :scheduled, cluster: cluster)
+      end
+
+      it 'defaults to :not_installable' do
+        expect(subject.status_name).to be(:not_installable)
+      end
+    end
+
+    context 'when application helm is installed' do
+      before do
+        create(:cluster_applications_helm, :installed, cluster: cluster)
       end
 
       it 'defaults to :installable' do
@@ -34,6 +44,12 @@ describe Clusters::Applications::Ingress do
     end
   end
 
+  describe '#install_command' do
+    it 'has all the needed information' do
+      expect(subject.install_command).to have_attributes(name: subject.name, install_helm: false, chart: subject.chart)
+    end
+  end
+
   describe 'status state machine' do
     describe '#make_installing' do
       subject { create(:cluster_applications_ingress, :scheduled) }
-- 
cgit v1.2.1


From c3b79df72474068325d39e2214dd9b3275b04874 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Wed, 8 Nov 2017 01:50:14 +0900
Subject: Fix schema version

---
 db/schema.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 1d2bf3a8e23..82e71a4dfe9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171106101200) do
+ActiveRecord::Schema.define(version: 20171101134435) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
-- 
cgit v1.2.1


From 1471495e15add514b6b5eaa40d04fb758c466bb4 Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 17:51:30 +0100
Subject: Review Gitlab::Kubernetes::Namespace

---
 lib/gitlab/kubernetes/namespace.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/kubernetes/namespace.rb b/lib/gitlab/kubernetes/namespace.rb
index 17c6317f32f..c8479fbc0e8 100644
--- a/lib/gitlab/kubernetes/namespace.rb
+++ b/lib/gitlab/kubernetes/namespace.rb
@@ -4,7 +4,7 @@ module Gitlab
       attr_accessor :name
 
       def initialize(name, client)
-        self.name = name
+        @name = name
         @client = client
       end
 
-- 
cgit v1.2.1


From a2e2b11cf596b7c95ba6d7d852cba0aa3f140ed5 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Tue, 7 Nov 2017 08:47:09 -0700
Subject: Fix merge_request_spec

---
 spec/support/features/discussion_comments_shared_example.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb
index aabc64d972b..c24940393f9 100644
--- a/spec/support/features/discussion_comments_shared_example.rb
+++ b/spec/support/features/discussion_comments_shared_example.rb
@@ -71,7 +71,7 @@ shared_examples 'discussion comments' do |resource_name|
       expect(page).not_to have_selector menu_selector
 
       find(toggle_selector).click
-      find('body').click
+      execute_script("document.querySelector('body').click()")
 
       expect(page).not_to have_selector menu_selector
     end
-- 
cgit v1.2.1


From 28fcf777c84ed5204719247fc5d7499de9305986 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Tue, 7 Nov 2017 18:33:58 +0100
Subject: Addresses frontend comments.

Make small improvements over well.css files
---
 app/assets/stylesheets/framework/wells.scss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index e4703db773d..d3c116920ce 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -73,26 +73,26 @@
     display: inline-flex;
     align-items: center;
     padding: 1px;
-    background: $blue-100;
+    background-color: $blue-100;
     border-radius: $border-radius-default;
     text-align: center;
 
     &:hover {
-      background: $blue-200;
+      background-color: $blue-200;
     }
 
     .limit-icon {
-      width: 15%;
+      width: 20px;
     }
 
     .limit-message {
+      @include str-truncated(100%);
       flex: 1;
-      height: 16px;
+      line-height: 16px;
       margin-right: 2px;
-      background: $white-light;
+      background-color: $white-light;
       border-top-right-radius: $border-radius-default;
       border-bottom-right-radius: $border-radius-default;
-      font-family: $regular_font;
       font-size: 12px;
     }
   }
-- 
cgit v1.2.1


From 4dea7944c46287707b6b65ca10e0af0b69a57a21 Mon Sep 17 00:00:00 2001
From: Joe Marty <jmarty@iexposure.com>
Date: Tue, 7 Nov 2017 11:42:25 -0600
Subject: Updates tests to reflect sign_out route change

- Also remove sign_out DELETE route from read-only whitelist routes
---
 lib/gitlab/middleware/read_only.rb           | 6 +-----
 spec/lib/gitlab/middleware/read_only_spec.rb | 7 -------
 spec/routing/routing_spec.rb                 | 6 ++++--
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/lib/gitlab/middleware/read_only.rb b/lib/gitlab/middleware/read_only.rb
index 8853dfa3d2d..5e4932e4e57 100644
--- a/lib/gitlab/middleware/read_only.rb
+++ b/lib/gitlab/middleware/read_only.rb
@@ -66,11 +66,7 @@ module Gitlab
       end
 
       def whitelisted_routes
-        logout_route || grack_route || @whitelisted.any? { |path| request.path.include?(path) } || lfs_route || sidekiq_route
-      end
-
-      def logout_route
-        route_hash[:controller] == 'sessions' && route_hash[:action] == 'destroy'
+        grack_route || @whitelisted.any? { |path| request.path.include?(path) } || lfs_route || sidekiq_route
       end
 
       def sidekiq_route
diff --git a/spec/lib/gitlab/middleware/read_only_spec.rb b/spec/lib/gitlab/middleware/read_only_spec.rb
index 86be06ff595..b14735943a5 100644
--- a/spec/lib/gitlab/middleware/read_only_spec.rb
+++ b/spec/lib/gitlab/middleware/read_only_spec.rb
@@ -91,13 +91,6 @@ describe Gitlab::Middleware::ReadOnly do
     end
 
     context 'whitelisted requests' do
-      it 'expects DELETE request to logout to be allowed' do
-        response = request.delete('/users/sign_out')
-
-        expect(response).not_to be_a_redirect
-        expect(subject).not_to disallow_request
-      end
-
       it 'expects a POST internal request to be allowed' do
         response = request.post("/api/#{API::API.version}/internal")
 
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 609481603af..17cea6f238b 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -257,8 +257,10 @@ describe "Authentication", "routing" do
     expect(post("/users/sign_in")).to route_to('sessions#create')
   end
 
-  it "DELETE /users/sign_out" do
-    expect(delete("/users/sign_out")).to route_to('sessions#destroy')
+  # sign_out with GET instead of DELETE facilitates ad-hoc single-sign-out processes
+  # (https://gitlab.com/gitlab-org/gitlab-ce/issues/39708)
+  it "GET /users/sign_out" do
+    expect(get("/users/sign_out")).to route_to('sessions#destroy')
   end
 
   it "POST /users/password" do
-- 
cgit v1.2.1


From 90edcb45cda088927f4af378c0aa0e7d7004f582 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 7 Nov 2017 19:23:52 +0100
Subject: Make BackgroundTransaction#labels public

as are all other Transaction implementations
---
 lib/gitlab/metrics/background_transaction.rb           | 2 --
 spec/lib/gitlab/metrics/background_transaction_spec.rb | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/metrics/background_transaction.rb b/lib/gitlab/metrics/background_transaction.rb
index d01de5eef0a..5919ebb1493 100644
--- a/lib/gitlab/metrics/background_transaction.rb
+++ b/lib/gitlab/metrics/background_transaction.rb
@@ -6,8 +6,6 @@ module Gitlab
         @worker_class = worker_class
       end
 
-      protected
-
       def labels
         { controller: @worker_class.name, action: 'perform' }
       end
diff --git a/spec/lib/gitlab/metrics/background_transaction_spec.rb b/spec/lib/gitlab/metrics/background_transaction_spec.rb
index 96052b8dc2f..17445fe6de5 100644
--- a/spec/lib/gitlab/metrics/background_transaction_spec.rb
+++ b/spec/lib/gitlab/metrics/background_transaction_spec.rb
@@ -10,4 +10,10 @@ describe Gitlab::Metrics::BackgroundTransaction do
       expect(subject.action).to eq('TestWorker#perform')
     end
   end
+
+  describe '#label' do
+    it 'returns labels based on class name' do
+      expect(subject.labels).to eq(controller: 'TestWorker', action: 'perform')
+    end
+  end
 end
-- 
cgit v1.2.1


From 3940fa0dcef5caf3e835d6d07b3f2532690a255b Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Tue, 7 Nov 2017 12:34:19 -0600
Subject: Add feature spec for Ingress

---
 spec/features/projects/clusters_spec.rb | 76 ++++++++++++++++++++++++++-------
 1 file changed, 60 insertions(+), 16 deletions(-)

diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb
index 03d866f8bc1..197e6df4997 100644
--- a/spec/features/projects/clusters_spec.rb
+++ b/spec/features/projects/clusters_spec.rb
@@ -51,8 +51,10 @@ feature 'Clusters', :js do
           expect(page).to have_content('Cluster is being created on Google Container Engine...')
 
           # Application Installation buttons
-          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-          expect(page.find(:css, '.js-cluster-application-install-button').text).to eq('Install')
+          page.within('.js-cluster-application-row-helm') do
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button').text).to eq('Install')
+          end
 
           Clusters::Cluster.last.provider.make_created!
 
@@ -92,36 +94,78 @@ feature 'Clusters', :js do
         expect(page.find(:css, '.cluster-name').value).to eq(cluster.name)
 
         # Application Installation buttons
-        expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to be_nil
-        expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+        page.within('.js-cluster-application-row-helm') do
+          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to be_nil
+          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+        end
       end
 
-      context 'when user installs application: tiller' do
+      context 'when user installs application: Helm Tiller' do
         before do
           allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
 
-          page.find(:css, '.js-cluster-application-install-button').click
+          page.within('.js-cluster-application-row-helm') do
+            page.find(:css, '.js-cluster-application-install-button').click
+          end
         end
 
         it 'user sees status transition' do
-          # FE sends request and gets the responce, then the buttons is "Install"
-          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+          page.within('.js-cluster-application-row-helm') do
+            # FE sends request and gets the response, then the buttons is "Install"
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+
+            Clusters::Cluster.last.application_helm.make_installing!
 
-          Clusters::Cluster.last.application_helm.make_installing!
+            # FE starts polling and update the buttons to "Installing"
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
 
-          # FE starts pooling and update the buttons to "Installing"
-          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
+            Clusters::Cluster.last.application_helm.make_installed!
 
-          Clusters::Cluster.last.application_helm.make_installed!
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
+          end
 
-          expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
-          expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
           expect(page).to have_content('Helm Tiller was successfully installed on your cluster')
         end
       end
 
+      context 'when user installs application: Ingress' do
+        before do
+          allow(ClusterInstallAppWorker).to receive(:perform_async).and_return(nil)
+          # Helm Tiller needs to be installed before you can install Ingress
+          create(:cluster_applications_helm, :installed, cluster: cluster)
+
+          visit project_clusters_path(project)
+
+          page.within('.js-cluster-application-row-ingress') do
+            page.find(:css, '.js-cluster-application-install-button').click
+          end
+        end
+
+        it 'user sees status transition' do
+          page.within('.js-cluster-application-row-ingress') do
+            # FE sends request and gets the response, then the buttons is "Install"
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Install')
+
+            Clusters::Cluster.last.application_ingress.make_installing!
+
+            # FE starts polling and update the buttons to "Installing"
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installing')
+
+            Clusters::Cluster.last.application_ingress.make_installed!
+
+            expect(page.find(:css, '.js-cluster-application-install-button')['disabled']).to eq('true')
+            expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
+          end
+
+          expect(page).to have_content('Ingress was successfully installed on your cluster')
+        end
+      end
+
       context 'when user disables the cluster' do
         before do
           page.find(:css, '.js-toggle-cluster').click
-- 
cgit v1.2.1


From fa3af6de66a9737d47dd475a36d3e4965fc69692 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Nov 2017 19:46:45 +0100
Subject: Fix db/schema.rb

---
 db/schema.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index d8f44d1dcf1..c60cb729b75 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171101134435) do
+ActiveRecord::Schema.define(version: 20171106101200) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1914,7 +1914,6 @@ ActiveRecord::Schema.define(version: 20171101134435) do
   add_foreign_key "cluster_providers_gcp", "clusters", on_delete: :cascade
   add_foreign_key "clusters", "users", on_delete: :nullify
   add_foreign_key "clusters_applications_helm", "clusters", on_delete: :cascade
-  add_foreign_key "clusters_applications_ingress", "clusters", on_delete: :cascade
   add_foreign_key "container_repositories", "projects"
   add_foreign_key "deploy_keys_projects", "projects", name: "fk_58a901ca7e", on_delete: :cascade
   add_foreign_key "deployments", "projects", name: "fk_b9a3851b82", on_delete: :cascade
-- 
cgit v1.2.1


From 414c4e3fd83a6a3cae623dcc8135d6ef09a30562 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Thu, 26 Oct 2017 16:06:51 +0200
Subject: Add helper methods to redirect legacy paths

---
 changelogs/unreleased/bvl-free-paths.yml             |  5 +++++
 lib/gitlab/routing.rb                                |  9 +++++++++
 spec/support/legacy_path_redirect_shared_examples.rb | 13 +++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 changelogs/unreleased/bvl-free-paths.yml
 create mode 100644 spec/support/legacy_path_redirect_shared_examples.rb

diff --git a/changelogs/unreleased/bvl-free-paths.yml b/changelogs/unreleased/bvl-free-paths.yml
new file mode 100644
index 00000000000..f15459cc788
--- /dev/null
+++ b/changelogs/unreleased/bvl-free-paths.yml
@@ -0,0 +1,5 @@
+---
+title: Free up some reserved group names
+merge_request: 15052
+author:
+type: other
diff --git a/lib/gitlab/routing.rb b/lib/gitlab/routing.rb
index e57890f1143..abfd413b7ea 100644
--- a/lib/gitlab/routing.rb
+++ b/lib/gitlab/routing.rb
@@ -40,5 +40,14 @@ module Gitlab
     def self.url_helpers
       @url_helpers ||= Gitlab::Application.routes.url_helpers
     end
+
+    def self.redirect_legacy_paths(router, *paths)
+      paths.each do |path|
+        router.match "/#{path}(/*rest)",
+                     via: [:get, :post, :patch, :delete],
+                     to: router.redirect { |_params, request| request.fullpath.gsub(%r{/#{path}/*}, "/-/#{path}/") },
+                     as: "legacy_#{path}_redirect"
+      end
+    end
   end
 end
diff --git a/spec/support/legacy_path_redirect_shared_examples.rb b/spec/support/legacy_path_redirect_shared_examples.rb
new file mode 100644
index 00000000000..f300bdd48b1
--- /dev/null
+++ b/spec/support/legacy_path_redirect_shared_examples.rb
@@ -0,0 +1,13 @@
+shared_examples 'redirecting a legacy path' do |source, target|
+  include RSpec::Rails::RequestExampleGroup
+
+  it "redirects #{source} to #{target} when the resource does not exist" do
+    expect(get(source)).to redirect_to(target)
+  end
+
+  it "does not redirect #{source} to #{target} when the resource exists" do
+    resource
+
+    expect(get(source)).not_to redirect_to(target)
+  end
+end
-- 
cgit v1.2.1


From 5d14337baff9c2ae8091b7b4ab954f8024449a52 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Thu, 26 Oct 2017 16:10:03 +0200
Subject: Free up `labels` as a group name

---
 config/routes/group.rb             | 14 ++++++++++----
 lib/gitlab/path_regex.rb           |  1 -
 spec/routing/group_routing_spec.rb | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 spec/routing/group_routing_spec.rb

diff --git a/config/routes/group.rb b/config/routes/group.rb
index f4d520a2518..ccd4ea7a8dd 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -34,10 +34,6 @@ constraints(GroupUrlConstrainer.new) do
       end
     end
 
-    resources :labels, except: [:show] do
-      post :toggle_subscription, on: :member
-    end
-
     scope path: '-' do
       namespace :settings do
         resource :ci_cd, only: [:show], controller: 'ci_cd'
@@ -46,6 +42,10 @@ constraints(GroupUrlConstrainer.new) do
       resources :variables, only: [:index, :show, :update, :create, :destroy]
 
       resources :children, only: [:index]
+
+      resources :labels, except: [:show] do
+        post :toggle_subscription, on: :member
+      end
     end
   end
 
@@ -58,4 +58,10 @@ constraints(GroupUrlConstrainer.new) do
     put '/', action: :update
     delete '/', action: :destroy
   end
+
+  # Legacy paths should be defined last, so they would be ignored if routes with
+  # one of the previously reserved words exist.
+  scope(path: 'groups/*group_id') do
+    Gitlab::Routing.redirect_legacy_paths(self, :labels)
+  end
 end
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index 22f8dd669d0..5b9c60f945c 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -120,7 +120,6 @@ module Gitlab
       group_members
       hooks
       issues
-      labels
       ldap
       ldap_group_links
       merge_requests
diff --git a/spec/routing/group_routing_spec.rb b/spec/routing/group_routing_spec.rb
new file mode 100644
index 00000000000..39fbf082b4d
--- /dev/null
+++ b/spec/routing/group_routing_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'group routing' do
+  let!(:existing_group) { create(:group, parent: create(:group, path: 'gitlab-org'), path: 'infra') }
+
+  describe 'GET #labels' do
+    it 'routes to the correct controller' do
+      expect(get('/groups/gitlab-org/infra/-/labels'))
+        .to route_to(group_id: 'gitlab-org/infra',
+                     controller: 'groups/labels',
+                     action: 'index')
+    end
+
+    it_behaves_like 'redirecting a legacy path', '/groups/gitlab-org/infra/labels', '/groups/gitlab-org/infra/-/labels' do
+      let(:resource) { create(:group, parent: existing_group, path: 'labels') }
+    end
+  end
+end
-- 
cgit v1.2.1


From 5dde0536c323d14fef2327a8d553b5f8a8a7b2d0 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Thu, 26 Oct 2017 17:49:07 +0200
Subject: Free up `avatar`, `group_members` and `milestones` as paths

---
 config/routes/group.rb             | 31 +++++++-------
 lib/gitlab/path_regex.rb           |  3 --
 spec/lib/gitlab/path_regex_spec.rb | 14 -------
 spec/routing/group_routing_spec.rb | 82 +++++++++++++++++++++++++++++++++-----
 spec/routing/routing_spec.rb       | 30 --------------
 5 files changed, 87 insertions(+), 73 deletions(-)

diff --git a/config/routes/group.rb b/config/routes/group.rb
index ccd4ea7a8dd..11124eaec51 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -20,20 +20,6 @@ constraints(GroupUrlConstrainer.new) do
         module: :groups,
         as: :group,
         constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
-    resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
-      post :resend_invite, on: :member
-      delete :leave, on: :collection
-    end
-
-    resource :avatar, only: [:destroy]
-    resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
-      member do
-        get :merge_requests
-        get :participants
-        get :labels
-      end
-    end
-
     scope path: '-' do
       namespace :settings do
         resource :ci_cd, only: [:show], controller: 'ci_cd'
@@ -46,6 +32,21 @@ constraints(GroupUrlConstrainer.new) do
       resources :labels, except: [:show] do
         post :toggle_subscription, on: :member
       end
+
+      resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
+        member do
+          get :merge_requests
+          get :participants
+          get :labels
+        end
+      end
+
+      resource :avatar, only: [:destroy]
+
+      resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
+        post :resend_invite, on: :member
+        delete :leave, on: :collection
+      end
     end
   end
 
@@ -62,6 +63,6 @@ constraints(GroupUrlConstrainer.new) do
   # Legacy paths should be defined last, so they would be ignored if routes with
   # one of the previously reserved words exist.
   scope(path: 'groups/*group_id') do
-    Gitlab::Routing.redirect_legacy_paths(self, :labels)
+    Gitlab::Routing.redirect_legacy_paths(self, :labels, :milestones, :group_members)
   end
 end
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index 5b9c60f945c..12e54013be1 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -115,15 +115,12 @@ module Gitlab
       activity
       analytics
       audit_events
-      avatar
       edit
-      group_members
       hooks
       issues
       ldap
       ldap_group_links
       merge_requests
-      milestones
       notification_setting
       pipeline_quota
       projects
diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb
index ee63c9338c5..c76084114cb 100644
--- a/spec/lib/gitlab/path_regex_spec.rb
+++ b/spec/lib/gitlab/path_regex_spec.rb
@@ -225,8 +225,6 @@ describe Gitlab::PathRegex do
 
     it 'accepts group routes' do
       expect(subject).to match('activity/')
-      expect(subject).to match('group_members/')
-      expect(subject).to match('labels/')
     end
 
     it 'is not case sensitive' do
@@ -258,8 +256,6 @@ describe Gitlab::PathRegex do
 
         it 'accepts group routes' do
           expect(subject).to match('activity/')
-          expect(subject).to match('group_members/')
-          expect(subject).to match('labels/')
         end
       end
 
@@ -280,8 +276,6 @@ describe Gitlab::PathRegex do
 
         it 'accepts group routes' do
           expect(subject).to match('activity/more/')
-          expect(subject).to match('group_members/more/')
-          expect(subject).to match('labels/more/')
         end
       end
     end
@@ -304,8 +298,6 @@ describe Gitlab::PathRegex do
 
         it 'rejects group routes' do
           expect(subject).not_to match('root/activity/')
-          expect(subject).not_to match('root/group_members/')
-          expect(subject).not_to match('root/labels/')
         end
       end
 
@@ -326,8 +318,6 @@ describe Gitlab::PathRegex do
 
         it 'rejects group routes' do
           expect(subject).not_to match('root/activity/more/')
-          expect(subject).not_to match('root/group_members/more/')
-          expect(subject).not_to match('root/labels/more/')
         end
       end
     end
@@ -361,8 +351,6 @@ describe Gitlab::PathRegex do
 
     it 'accepts group routes' do
       expect(subject).to match('activity/')
-      expect(subject).to match('group_members/')
-      expect(subject).to match('labels/')
     end
 
     it 'is not case sensitive' do
@@ -394,8 +382,6 @@ describe Gitlab::PathRegex do
 
     it 'accepts group routes' do
       expect(subject).to match('root/activity/')
-      expect(subject).to match('root/group_members/')
-      expect(subject).to match('root/labels/')
     end
 
     it 'is not case sensitive' do
diff --git a/spec/routing/group_routing_spec.rb b/spec/routing/group_routing_spec.rb
index 39fbf082b4d..b3e55f5e3c9 100644
--- a/spec/routing/group_routing_spec.rb
+++ b/spec/routing/group_routing_spec.rb
@@ -1,18 +1,78 @@
 require 'spec_helper'
 
-describe 'group routing' do
-  let!(:existing_group) { create(:group, parent: create(:group, path: 'gitlab-org'), path: 'infra') }
-
-  describe 'GET #labels' do
-    it 'routes to the correct controller' do
-      expect(get('/groups/gitlab-org/infra/-/labels'))
-        .to route_to(group_id: 'gitlab-org/infra',
-                     controller: 'groups/labels',
-                     action: 'index')
+describe "Groups", "routing" do
+  let(:group_path) { 'complex.group-namegit' }
+  let!(:group) { create(:group, path: group_path) }
+
+  it "to #show" do
+    expect(get("/groups/#{group_path}")).to route_to('groups#show', id: group_path)
+  end
+
+  it "also supports nested groups" do
+    nested_group = create(:group, parent: group)
+    expect(get("/#{group_path}/#{nested_group.path}")).to route_to('groups#show', id: "#{group_path}/#{nested_group.path}")
+  end
+
+  it "also display group#show on the short path" do
+    expect(get("/#{group_path}")).to route_to('groups#show', id: group_path)
+  end
+
+  it "to #activity" do
+    expect(get("/groups/#{group_path}/activity")).to route_to('groups#activity', id: group_path)
+  end
+
+  it "to #issues" do
+    expect(get("/groups/#{group_path}/issues")).to route_to('groups#issues', id: group_path)
+  end
+
+  it "to #members" do
+    expect(get("/groups/#{group_path}/-/group_members")).to route_to('groups/group_members#index', group_id: group_path)
+  end
+
+  describe 'legacy redirection' do
+    shared_examples 'canonical groups route' do |path|
+      it "#{path} routes to the correct controller" do
+        expect(get("/groups/#{group_path}/-/#{path}"))
+          .to route_to(group_id: group_path,
+                       controller: "groups/#{path}",
+                       action: 'index')
+      end
+
+      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/#{path}", "/groups/complex.group-namegit/-/#{path}/" do
+        let(:resource) { create(:group, parent: group, path: path) }
+      end
+    end
+
+    describe 'labels' do
+      it_behaves_like 'canonical groups route', 'labels'
+    end
+
+    describe 'group_members' do
+      it_behaves_like 'canonical groups route', 'group_members'
     end
 
-    it_behaves_like 'redirecting a legacy path', '/groups/gitlab-org/infra/labels', '/groups/gitlab-org/infra/-/labels' do
-      let(:resource) { create(:group, parent: existing_group, path: 'labels') }
+    describe 'avatar' do
+      it 'routes to the avatars controller' do
+        expect(delete("/groups/#{group_path}/-/avatar"))
+          .to route_to(group_id: group_path,
+                       controller: 'groups/avatars',
+                       action: 'destroy')
+      end
+    end
+
+    describe 'milestones' do
+      it_behaves_like 'canonical groups route', 'milestones'
+
+      context 'nested routes' do
+        include RSpec::Rails::RequestExampleGroup
+
+        let(:milestone) { create(:milestone, group: group) }
+
+        it 'redirects the nested routes' do
+          request = get("/groups/#{group_path}/milestones/#{milestone.id}/merge_requests")
+          expect(request).to redirect_to("/groups/#{group_path}/-/milestones/#{milestone.id}/merge_requests")
+        end
+      end
     end
   end
 end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 609481603af..32aa6e5ad52 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -278,36 +278,6 @@ describe "Authentication", "routing" do
   end
 end
 
-describe "Groups", "routing" do
-  let(:name) { 'complex.group-namegit' }
-  let!(:group) { create(:group, name: name) }
-
-  it "to #show" do
-    expect(get("/groups/#{name}")).to route_to('groups#show', id: name)
-  end
-
-  it "also supports nested groups" do
-    nested_group = create(:group, parent: group)
-    expect(get("/#{name}/#{nested_group.name}")).to route_to('groups#show', id: "#{name}/#{nested_group.name}")
-  end
-
-  it "also display group#show on the short path" do
-    expect(get("/#{name}")).to route_to('groups#show', id: name)
-  end
-
-  it "to #activity" do
-    expect(get("/groups/#{name}/activity")).to route_to('groups#activity', id: name)
-  end
-
-  it "to #issues" do
-    expect(get("/groups/#{name}/issues")).to route_to('groups#issues', id: name)
-  end
-
-  it "to #members" do
-    expect(get("/groups/#{name}/group_members")).to route_to('groups/group_members#index', group_id: name)
-  end
-end
-
 describe HealthCheckController, 'routing' do
   it 'to #index' do
     expect(get('/health_check')).to route_to('health_check#index')
-- 
cgit v1.2.1


From 58d1d6a5c7e0a45c9aa8a9d4d1be24dbdce5a08a Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Fri, 27 Oct 2017 11:29:51 +0200
Subject: Free up some group reserved words

---
 config/routes/group.rb             | 57 +++++++++++++++--------------
 lib/gitlab/path_regex.rb           |  5 ---
 lib/gitlab/routing.rb              | 10 +++++-
 spec/helpers/labels_helper_spec.rb |  2 +-
 spec/lib/gitlab/path_regex_spec.rb |  8 ++---
 spec/models/group_spec.rb          |  6 ----
 spec/routing/group_routing_spec.rb | 73 +++++++++++++++++++++++++++++---------
 7 files changed, 100 insertions(+), 61 deletions(-)

diff --git a/config/routes/group.rb b/config/routes/group.rb
index 11124eaec51..db99e10bb9a 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -8,45 +8,46 @@ constraints(GroupUrlConstrainer.new) do
   scope(path: 'groups/*id',
         controller: :groups,
         constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }) do
-    get :edit, as: :edit_group
-    get :issues, as: :issues_group
-    get :merge_requests, as: :merge_requests_group
-    get :projects, as: :projects_group
-    get :activity, as: :activity_group
+    scope(path: '-') do
+      get :edit, as: :edit_group
+      get :issues, as: :issues_group
+      get :merge_requests, as: :merge_requests_group
+      get :projects, as: :projects_group
+      get :activity, as: :activity_group
+    end
+
     get '/', action: :show, as: :group_canonical
   end
 
-  scope(path: 'groups/*group_id',
+  scope(path: 'groups/*group_id/-',
         module: :groups,
         as: :group,
         constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
-    scope path: '-' do
-      namespace :settings do
-        resource :ci_cd, only: [:show], controller: 'ci_cd'
-      end
+    namespace :settings do
+      resource :ci_cd, only: [:show], controller: 'ci_cd'
+    end
 
-      resources :variables, only: [:index, :show, :update, :create, :destroy]
+    resources :variables, only: [:index, :show, :update, :create, :destroy]
 
-      resources :children, only: [:index]
+    resources :children, only: [:index]
 
-      resources :labels, except: [:show] do
-        post :toggle_subscription, on: :member
-      end
+    resources :labels, except: [:show] do
+      post :toggle_subscription, on: :member
+    end
 
-      resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
-        member do
-          get :merge_requests
-          get :participants
-          get :labels
-        end
+    resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
+      member do
+        get :merge_requests
+        get :participants
+        get :labels
       end
+    end
 
-      resource :avatar, only: [:destroy]
+    resource :avatar, only: [:destroy]
 
-      resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
-        post :resend_invite, on: :member
-        delete :leave, on: :collection
-      end
+    resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
+      post :resend_invite, on: :member
+      delete :leave, on: :collection
     end
   end
 
@@ -63,6 +64,8 @@ constraints(GroupUrlConstrainer.new) do
   # Legacy paths should be defined last, so they would be ignored if routes with
   # one of the previously reserved words exist.
   scope(path: 'groups/*group_id') do
-    Gitlab::Routing.redirect_legacy_paths(self, :labels, :milestones, :group_members)
+    Gitlab::Routing.redirect_legacy_paths(self, :labels, :milestones, :group_members,
+                                          :edit, :issues, :merge_requests, :projects,
+                                          :activity)
   end
 end
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index 12e54013be1..6b8a4442ebd 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -112,18 +112,13 @@ module Gitlab
     # this would map to the activity-page of its parent.
     GROUP_ROUTES = %w[
       -
-      activity
       analytics
       audit_events
-      edit
       hooks
-      issues
       ldap
       ldap_group_links
-      merge_requests
       notification_setting
       pipeline_quota
-      projects
     ].freeze
 
     ILLEGAL_PROJECT_PATH_WORDS = PROJECT_WILDCARD_ROUTES
diff --git a/lib/gitlab/routing.rb b/lib/gitlab/routing.rb
index abfd413b7ea..defb47663cb 100644
--- a/lib/gitlab/routing.rb
+++ b/lib/gitlab/routing.rb
@@ -42,10 +42,18 @@ module Gitlab
     end
 
     def self.redirect_legacy_paths(router, *paths)
+      build_redirect_path = lambda do |request, _params, path|
+        # Only replace the last occurence of `path`.
+        path = request.fullpath.sub(%r{/#{path}/*(?!.*#{path})}, "/-/#{path}/")
+        path << request.query_string if request.query_string.present?
+
+        path
+      end
+
       paths.each do |path|
         router.match "/#{path}(/*rest)",
                      via: [:get, :post, :patch, :delete],
-                     to: router.redirect { |_params, request| request.fullpath.gsub(%r{/#{path}/*}, "/-/#{path}/") },
+                     to: router.redirect { |params, request| build_redirect_path.call(request, params, path) },
                      as: "legacy_#{path}_redirect"
       end
     end
diff --git a/spec/helpers/labels_helper_spec.rb b/spec/helpers/labels_helper_spec.rb
index 36d6e495ed0..4ac4302adfd 100644
--- a/spec/helpers/labels_helper_spec.rb
+++ b/spec/helpers/labels_helper_spec.rb
@@ -24,7 +24,7 @@ describe LabelsHelper do
       let(:group) { build(:group, name: 'bar') }
 
       it 'links to group issues page' do
-        expect(link_to_label(label, subject: group)).to match %r{<a href="/groups/bar/issues\?label_name%5B%5D=#{label.name}">.*</a>}
+        expect(link_to_label(label, subject: group)).to match %r{<a href="/groups/bar/-/issues\?label_name%5B%5D=#{label.name}">.*</a>}
       end
     end
 
diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb
index c76084114cb..98fcc84c416 100644
--- a/spec/lib/gitlab/path_regex_spec.rb
+++ b/spec/lib/gitlab/path_regex_spec.rb
@@ -297,7 +297,7 @@ describe Gitlab::PathRegex do
         end
 
         it 'rejects group routes' do
-          expect(subject).not_to match('root/activity/')
+          expect(subject).not_to match('root/analytics/')
         end
       end
 
@@ -317,7 +317,7 @@ describe Gitlab::PathRegex do
         end
 
         it 'rejects group routes' do
-          expect(subject).not_to match('root/activity/more/')
+          expect(subject).not_to match('root/analytics/more/')
         end
       end
     end
@@ -350,7 +350,7 @@ describe Gitlab::PathRegex do
     end
 
     it 'accepts group routes' do
-      expect(subject).to match('activity/')
+      expect(subject).to match('analytics/')
     end
 
     it 'is not case sensitive' do
@@ -381,7 +381,7 @@ describe Gitlab::PathRegex do
     end
 
     it 'accepts group routes' do
-      expect(subject).to match('root/activity/')
+      expect(subject).to match('root/analytics/')
     end
 
     it 'is not case sensitive' do
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index c8caa11b8b0..d4052a64570 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -65,12 +65,6 @@ describe Group do
 
         expect(group).not_to be_valid
       end
-
-      it 'rejects reserved group paths' do
-        group = build(:group, path: 'activity', parent: create(:group))
-
-        expect(group).not_to be_valid
-      end
     end
 
     describe '#visibility_level_allowed_by_parent' do
diff --git a/spec/routing/group_routing_spec.rb b/spec/routing/group_routing_spec.rb
index b3e55f5e3c9..3e56d34bc9d 100644
--- a/spec/routing/group_routing_spec.rb
+++ b/spec/routing/group_routing_spec.rb
@@ -18,37 +18,36 @@ describe "Groups", "routing" do
   end
 
   it "to #activity" do
-    expect(get("/groups/#{group_path}/activity")).to route_to('groups#activity', id: group_path)
+    expect(get("/groups/#{group_path}/-/activity")).to route_to('groups#activity', id: group_path)
   end
 
   it "to #issues" do
-    expect(get("/groups/#{group_path}/issues")).to route_to('groups#issues', id: group_path)
+    expect(get("/groups/#{group_path}/-/issues")).to route_to('groups#issues', id: group_path)
   end
 
   it "to #members" do
     expect(get("/groups/#{group_path}/-/group_members")).to route_to('groups/group_members#index', group_id: group_path)
   end
 
-  describe 'legacy redirection' do
-    shared_examples 'canonical groups route' do |path|
-      it "#{path} routes to the correct controller" do
-        expect(get("/groups/#{group_path}/-/#{path}"))
-          .to route_to(group_id: group_path,
-                       controller: "groups/#{path}",
-                       action: 'index')
-      end
+  it "to #labels" do
+    expect(get("/groups/#{group_path}/-/labels")).to route_to('groups/labels#index', group_id: group_path)
+  end
 
-      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/#{path}", "/groups/complex.group-namegit/-/#{path}/" do
-        let(:resource) { create(:group, parent: group, path: path) }
-      end
-    end
+  it "to #milestones" do
+    expect(get("/groups/#{group_path}/-/milestones")).to route_to('groups/milestones#index', group_id: group_path)
+  end
 
+  describe 'legacy redirection' do
     describe 'labels' do
-      it_behaves_like 'canonical groups route', 'labels'
+      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/labels", "/groups/complex.group-namegit/-/labels/" do
+        let(:resource) { create(:group, parent: group, path: 'labels') }
+      end
     end
 
     describe 'group_members' do
-      it_behaves_like 'canonical groups route', 'group_members'
+      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/group_members", "/groups/complex.group-namegit/-/group_members/" do
+        let(:resource) { create(:group, parent: group, path: 'group_members') }
+      end
     end
 
     describe 'avatar' do
@@ -61,7 +60,9 @@ describe "Groups", "routing" do
     end
 
     describe 'milestones' do
-      it_behaves_like 'canonical groups route', 'milestones'
+      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/milestones", "/groups/complex.group-namegit/-/milestones/" do
+        let(:resource) { create(:group, parent: group, path: 'milestones') }
+      end
 
       context 'nested routes' do
         include RSpec::Rails::RequestExampleGroup
@@ -74,5 +75,43 @@ describe "Groups", "routing" do
         end
       end
     end
+
+    describe 'edit' do
+      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/edit", "/groups/complex.group-namegit/-/edit/" do
+        let(:resource) do
+          pending('still rejected because of the wildcard reserved word')
+          create(:group, parent: group, path: 'edit')
+        end
+      end
+    end
+
+    describe 'issues' do
+      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/issues", "/groups/complex.group-namegit/-/issues/" do
+        let(:resource) { create(:group, parent: group, path: 'issues') }
+      end
+    end
+
+    describe 'merge_requests' do
+      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/merge_requests", "/groups/complex.group-namegit/-/merge_requests/" do
+        let(:resource) { create(:group, parent: group, path: 'merge_requests') }
+      end
+    end
+
+    describe 'projects' do
+      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/projects", "/groups/complex.group-namegit/-/projects/" do
+        let(:resource) { create(:group, parent: group, path: 'projects') }
+      end
+    end
+
+    describe 'activity' do
+      it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/activity", "/groups/complex.group-namegit/-/activity/" do
+        let(:resource) { create(:group, parent: group, path: 'activity') }
+      end
+
+      it_behaves_like 'redirecting a legacy path', "/groups/activity/activity", "/groups/activity/-/activity/" do
+        let!(:parent) { create(:group, path: 'activity') }
+        let(:resource) { create(:group, parent: parent, path: 'activity') }
+      end
+    end
   end
 end
-- 
cgit v1.2.1


From e070e216c80efb897eb6c5a7d13872e4762205c1 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Fri, 27 Oct 2017 16:47:08 +0200
Subject: Update failure message when finding new routes in `PathRegex`

---
 spec/lib/gitlab/path_regex_spec.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb
index 98fcc84c416..751cde79a94 100644
--- a/spec/lib/gitlab/path_regex_spec.rb
+++ b/spec/lib/gitlab/path_regex_spec.rb
@@ -45,21 +45,16 @@ describe Gitlab::PathRegex do
       Found new routes that could cause conflicts with existing namespaced routes
       for groups or projects.
 
-      Add <#{missing_words.join(', ')}> to `Gitlab::PathRegex::#{constant_name}
-      to make sure no projects or namespaces can be created with those paths.
-
-      To rename any existing records with those paths you can use the
-      `Gitlab::Database::RenameReservedpathsMigration::<VERSION>.#{migration_helper}`
-      migration helper.
-
-      Make sure to make a note of the renamed records in the release blog post.
+      Nest <#{missing_words.join(', ')}> in a route containing `-`, that way
+      we know there will be no conflicts with groups or projects created with those
+      paths.
 
       MISSING
     end
 
     if additional_words.any?
       message += <<-ADDITIONAL
-      Why are <#{additional_words.join(', ')}> in `#{constant_name}`?
+      Is <#{additional_words.join(', ')}> in `#{constant_name}` required?
       If they are really required, update these specs to reflect that.
 
       ADDITIONAL
-- 
cgit v1.2.1


From 2414c69ee981cf6432e513dfdcf57a9badc5d51f Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Tue, 7 Nov 2017 13:04:46 +0100
Subject: Check redirecting with a querystring

---
 lib/gitlab/routing.rb              |  6 ++++--
 spec/routing/group_routing_spec.rb | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/routing.rb b/lib/gitlab/routing.rb
index defb47663cb..910533076b0 100644
--- a/lib/gitlab/routing.rb
+++ b/lib/gitlab/routing.rb
@@ -44,8 +44,10 @@ module Gitlab
     def self.redirect_legacy_paths(router, *paths)
       build_redirect_path = lambda do |request, _params, path|
         # Only replace the last occurence of `path`.
-        path = request.fullpath.sub(%r{/#{path}/*(?!.*#{path})}, "/-/#{path}/")
-        path << request.query_string if request.query_string.present?
+        #
+        # `request.fullpath` includes the querystring
+        path = request.path.sub(%r{/#{path}/*(?!.*#{path})}, "/-/#{path}/")
+        path << "?#{request.query_string}" if request.query_string.present?
 
         path
       end
diff --git a/spec/routing/group_routing_spec.rb b/spec/routing/group_routing_spec.rb
index 3e56d34bc9d..7a4c8304e62 100644
--- a/spec/routing/group_routing_spec.rb
+++ b/spec/routing/group_routing_spec.rb
@@ -74,6 +74,16 @@ describe "Groups", "routing" do
           expect(request).to redirect_to("/groups/#{group_path}/-/milestones/#{milestone.id}/merge_requests")
         end
       end
+
+      context 'with a query string' do
+        it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/milestones?hello=world", "/groups/complex.group-namegit/-/milestones/?hello=world" do
+          let(:resource) { create(:group, parent: group, path: 'milestones') }
+        end
+
+        it_behaves_like 'redirecting a legacy path', "/groups/complex.group-namegit/milestones?milestones=/milestones", "/groups/complex.group-namegit/-/milestones/?milestones=/milestones" do
+          let(:resource) { create(:group, parent: group, path: 'milestones') }
+        end
+      end
     end
 
     describe 'edit' do
-- 
cgit v1.2.1


From 9b0899cb809d826249bb3ad2eb35beec5bdf2190 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Tue, 7 Nov 2017 13:05:08 +0100
Subject: Remove EE-specific group paths

---
 lib/gitlab/path_regex.rb           |  7 -------
 spec/lib/gitlab/path_regex_spec.rb | 15 +++------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index 6b8a4442ebd..9a91f8bf96a 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -112,13 +112,6 @@ module Gitlab
     # this would map to the activity-page of its parent.
     GROUP_ROUTES = %w[
       -
-      analytics
-      audit_events
-      hooks
-      ldap
-      ldap_group_links
-      notification_setting
-      pipeline_quota
     ].freeze
 
     ILLEGAL_PROJECT_PATH_WORDS = PROJECT_WILDCARD_ROUTES
diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb
index 751cde79a94..0ae90069b7f 100644
--- a/spec/lib/gitlab/path_regex_spec.rb
+++ b/spec/lib/gitlab/path_regex_spec.rb
@@ -152,16 +152,7 @@ describe Gitlab::PathRegex do
   let(:paths_after_group_id) do
     group_routes.map do |route|
       route.gsub(STARTING_WITH_GROUP, '').split('/').first
-    end.uniq + ee_paths_after_group_id
-  end
-
-  let(:ee_paths_after_group_id) do
-    %w(analytics
-       ldap
-       ldap_group_links
-       notification_setting
-       audit_events
-       pipeline_quota hooks)
+    end.uniq
   end
 
   describe 'TOP_LEVEL_ROUTES' do
@@ -292,7 +283,7 @@ describe Gitlab::PathRegex do
         end
 
         it 'rejects group routes' do
-          expect(subject).not_to match('root/analytics/')
+          expect(subject).not_to match('root/-/')
         end
       end
 
@@ -312,7 +303,7 @@ describe Gitlab::PathRegex do
         end
 
         it 'rejects group routes' do
-          expect(subject).not_to match('root/analytics/more/')
+          expect(subject).not_to match('root/-/')
         end
       end
     end
-- 
cgit v1.2.1


From 761a403d8edfe292ad2f804371a5b4f5d6690ffd Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Tue, 7 Nov 2017 20:07:28 +0100
Subject: Upgrade vendored templates

---
 vendor/gitignore/Composer.gitignore            |  2 +-
 vendor/gitignore/Global/Windows.gitignore      |  2 +-
 vendor/gitignore/Terraform.gitignore           | 15 +++--
 vendor/gitignore/VisualStudio.gitignore        |  6 +-
 vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml |  4 +-
 vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml   |  6 +-
 vendor/gitlab-ci-yml/Rust.gitlab-ci.yml        |  6 +-
 vendor/gitlab-ci-yml/dotNET.gitlab-ci.yml      | 86 ++++++++++++++++++++++++++
 8 files changed, 107 insertions(+), 20 deletions(-)
 create mode 100644 vendor/gitlab-ci-yml/dotNET.gitlab-ci.yml

diff --git a/vendor/gitignore/Composer.gitignore b/vendor/gitignore/Composer.gitignore
index c4222678424..a67d42b32f8 100644
--- a/vendor/gitignore/Composer.gitignore
+++ b/vendor/gitignore/Composer.gitignore
@@ -1,6 +1,6 @@
 composer.phar
 /vendor/
 
-# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 # composer.lock
diff --git a/vendor/gitignore/Global/Windows.gitignore b/vendor/gitignore/Global/Windows.gitignore
index dff26a9ab70..846a1db836c 100644
--- a/vendor/gitignore/Global/Windows.gitignore
+++ b/vendor/gitignore/Global/Windows.gitignore
@@ -7,7 +7,7 @@ ehthumbs_vista.db
 *.stackdump
 
 # Folder config file
-Desktop.ini
+[Dd]esktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
diff --git a/vendor/gitignore/Terraform.gitignore b/vendor/gitignore/Terraform.gitignore
index 9b5aebb1b35..1fef4ab91e1 100644
--- a/vendor/gitignore/Terraform.gitignore
+++ b/vendor/gitignore/Terraform.gitignore
@@ -1,10 +1,9 @@
-# Compiled files
-*.tfstate
-*.tfstate.*.backup
-*.tfstate.backup
+#  Local .terraform directories
+**/.terraform/*
 
-# Module directory
-.terraform/
+# .tfstate files
+*.tfstate
+*.tfstate.*
 
-# Variable values for development
-terraform.tfvars
+# .tfvars files
+*.tfvars
diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore
index 0867ec5a7ee..509668db67a 100644
--- a/vendor/gitignore/VisualStudio.gitignore
+++ b/vendor/gitignore/VisualStudio.gitignore
@@ -171,11 +171,11 @@ PublishScripts/
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
-**/packages/*
+**/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
+#!**/[Pp]ackages/repositories.config
 # NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
index c93e6567baf..88261502d7f 100644
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
@@ -335,7 +335,9 @@ production:
 
   function check_kube_domain() {
     if [ -z ${AUTO_DEVOPS_DOMAIN+x} ]; then
-      echo "In order to deploy, AUTO_DEVOPS_DOMAIN must be set as a variable at the group or project level, or manually added in .gitlab-cy.yml"
+      echo "In order to deploy or use Review Apps, AUTO_DEVOPS_DOMAIN variable must be set"
+      echo "You can do it in Auto DevOps project settings or defining a secret variable at group or project level"
+      echo "You can also manually add it in .gitlab-ci.yml"
       false
     else
       true
diff --git a/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml b/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
index 636cb0a9a99..290b9997084 100644
--- a/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/OpenShift.gitlab-ci.yml
@@ -31,14 +31,14 @@ test2:
     - oc project "$CI_PROJECT_NAME-$CI_PROJECT_ID" 2> /dev/null || oc new-project "$CI_PROJECT_NAME-$CI_PROJECT_ID"
   script:
     - "oc get services $APP 2> /dev/null || oc new-app . --name=$APP --strategy=docker"
-    - "oc start-build $APP --from-dir=. --follow || sleep 3s || oc start-build $APP --from-dir=. --follow"
+    - "oc start-build $APP --from-dir=. --follow || sleep 3s && oc start-build $APP --from-dir=. --follow"
     - "oc get routes $APP 2> /dev/null || oc expose service $APP --hostname=$APP_HOST"
 
 review:
   <<: *deploy
   stage: review
   variables:
-    APP: $CI_COMMIT_REF_NAME
+    APP: review-$CI_COMMIT_REF_NAME
     APP_HOST: $CI_PROJECT_NAME-$CI_ENVIRONMENT_SLUG.$OPENSHIFT_DOMAIN
   environment:
     name: review/$CI_COMMIT_REF_NAME
@@ -56,7 +56,7 @@ stop-review:
     - oc delete all -l "app=$APP"
   when: manual
   variables:
-    APP: $CI_COMMIT_REF_NAME
+    APP: review-$CI_COMMIT_REF_NAME
     GIT_STRATEGY: none
   environment:
     name: review/$CI_COMMIT_REF_NAME
diff --git a/vendor/gitlab-ci-yml/Rust.gitlab-ci.yml b/vendor/gitlab-ci-yml/Rust.gitlab-ci.yml
index 7810121c350..6573eceaa59 100644
--- a/vendor/gitlab-ci-yml/Rust.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Rust.gitlab-ci.yml
@@ -1,6 +1,6 @@
-# Unofficial language image. Look for the different tagged releases at:
-# https://hub.docker.com/r/scorpil/rust/tags/
-image: "scorpil/rust:stable"
+# Official language image. Look for the different tagged releases at:
+# https://hub.docker.com/r/library/rust/tags/
+image: "rust:latest"
 
 # Optional: Pick zero or more services to be used on all builds.
 # Only needed when using a docker container to run your tests in.
diff --git a/vendor/gitlab-ci-yml/dotNET.gitlab-ci.yml b/vendor/gitlab-ci-yml/dotNET.gitlab-ci.yml
new file mode 100644
index 00000000000..fc3d4ecdbba
--- /dev/null
+++ b/vendor/gitlab-ci-yml/dotNET.gitlab-ci.yml
@@ -0,0 +1,86 @@
+# The following script will work for any project that can be built from command line by msbuild
+# It uses powershell shell executor, so you need to add the following line to your config.toml file
+# (located in gitlab-runner.exe directory):
+#   shell = "powershell"
+#
+# The script is composed of 3 stages: build, test and deploy.  
+#
+# The build stage restores NuGet packages and uses msbuild to build the exe and msi
+# One major issue you'll find is that you can't build msi projects from command line
+# if you use vdproj.  There are workarounds building msi via devenv, but they rarely work
+# The best solution is migrating your vdproj projects to WiX, as it can be build directly 
+# by msbuild.
+#
+# The test stage runs nunit from command line against Test project inside your solution
+# It also saves the resulting TestResult.xml file
+#
+# The deploy stage copies the exe and msi from build stage to a network drive
+# You need to have the network drive mapped as Local System user for gitlab-runner service to see it
+# The best way to persist the mapping is via a scheduled task (see: https://stackoverflow.com/a/7867064/1288473),
+# running the following batch command: net use P: \\x.x.x.x\Projects /u:your_user your_pass /persistent:yes
+
+
+# place project specific paths in variables to make the rest of the script more generic
+variables:
+  EXE_RELEASE_FOLDER: 'YourApp\bin\Release'
+  MSI_RELEASE_FOLDER: 'Setup\bin\Release'
+  TEST_FOLDER: 'Tests\bin\Release'
+  DEPLOY_FOLDER: 'P:\Projects\YourApp\Builds'
+  
+  NUGET_PATH: 'C:\NuGet\nuget.exe'
+  MSBUILD_PATH: 'C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe'
+  NUNIT_PATH: 'C:\Program Files (x86)\NUnit.org\nunit-console\nunit3-console.exe'
+
+stages:
+  - build
+  - test
+  - deploy
+
+build_job:
+  stage: build
+  only:
+    - tags # the build process will only be started by git tag commits
+  script:
+    - '& "$env:NUGET_PATH" restore' # restore Nuget dependencies
+    - '& "$env:MSBUILD_PATH" /p:Configuration=Release' # build the project
+  artifacts:
+    expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on
+    paths:
+      - '$env:EXE_RELEASE_FOLDER\YourApp.exe' # saving exe to copy to deploy folder
+      - '$env:MSI_RELEASE_FOLDER\YourApp Setup.msi' # saving msi to copy to deploy folder
+      - '$env:TEST_FOLDER\' # saving entire Test project so NUnit can run tests 
+
+test_job:
+  stage: test
+  only:
+    - tags
+  script:
+    - '& "$env:NUNIT_PATH" ".\$env:TEST_FOLDER\Tests.dll"' # running NUnit tests
+  artifacts:
+    expire_in: 1 week # save gitlab server space, we copy the files we need to deploy folder later on
+    paths:
+      - '.\TestResult.xml' # saving NUnit results to copy to deploy folder
+  dependencies:
+    - build_job
+
+deploy_job:
+  stage: deploy
+  only:
+    - tags
+  script:
+    # Compose a folder for each release based on commit tag.
+    # Assuming your tag is Rev1.0.0.1, and your last commit message is 'First commit'
+    # the artifact files will be copied to:
+    # P:\Projects\YourApp\Builds\Rev1.0.0.1 - First commit\
+    - '$commitSubject = git log -1 --pretty=%s'
+    - '$deployFolder = $($env:DEPLOY_FOLDER) + "\" + $($env:CI_BUILD_TAG) + " - " + $commitSubject + "\"'
+
+    # xcopy takes care of recursively creating required folders
+    - 'xcopy /y ".\$env:EXE_RELEASE_FOLDER\YourApp.exe" "$deployFolder"'
+    - 'xcopy /y ".\$env:MSI_RELEASE_FOLDER\YourApp Setup.msi" "$deployFolder"'
+    - 'xcopy /y ".\TestResult.xml" "$deployFolder"'
+
+  dependencies:
+    - build_job
+    - test_job
+  
\ No newline at end of file
-- 
cgit v1.2.1


From 1c8af321ddd0f4c768caf54cfe8119c325b689e2 Mon Sep 17 00:00:00 2001
From: James Lopez <james@gitlab.com>
Date: Tue, 7 Nov 2017 19:11:42 +0000
Subject: Improve GitLab Import rake task to work with Hashed Storage and
 Subgroups

---
 .../feature-hashed-storage-repo-import.yml         |   5 +
 doc/raketasks/import.md                            |  47 +++---
 lib/gitlab/bare_repository_import/importer.rb      | 101 +++++++++++++
 lib/gitlab/bare_repository_import/repository.rb    |  42 ++++++
 lib/gitlab/bare_repository_importer.rb             |  97 ------------
 lib/tasks/gitlab/import.rake                       |  14 +-
 .../gitlab/bare_repository_import/importer_spec.rb | 168 +++++++++++++++++++++
 .../bare_repository_import/repository_spec.rb      |  51 +++++++
 spec/lib/gitlab/bare_repository_importer_spec.rb   | 100 ------------
 9 files changed, 398 insertions(+), 227 deletions(-)
 create mode 100644 changelogs/unreleased/feature-hashed-storage-repo-import.yml
 create mode 100644 lib/gitlab/bare_repository_import/importer.rb
 create mode 100644 lib/gitlab/bare_repository_import/repository.rb
 delete mode 100644 lib/gitlab/bare_repository_importer.rb
 create mode 100644 spec/lib/gitlab/bare_repository_import/importer_spec.rb
 create mode 100644 spec/lib/gitlab/bare_repository_import/repository_spec.rb
 delete mode 100644 spec/lib/gitlab/bare_repository_importer_spec.rb

diff --git a/changelogs/unreleased/feature-hashed-storage-repo-import.yml b/changelogs/unreleased/feature-hashed-storage-repo-import.yml
new file mode 100644
index 00000000000..73c16a99053
--- /dev/null
+++ b/changelogs/unreleased/feature-hashed-storage-repo-import.yml
@@ -0,0 +1,5 @@
+---
+title: Improve GitLab Import rake task to work with Hashed Storage and Subgroups
+merge_request:
+author:
+type: changed
diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md
index 2b305cb5c99..97e9b36d1a6 100644
--- a/doc/raketasks/import.md
+++ b/doc/raketasks/import.md
@@ -3,49 +3,47 @@
 ## Notes
 
 - The owner of the project will be the first admin
-- The groups will be created as needed
+- The groups will be created as needed, including subgroups
 - The owner of the group will be the first admin
 - Existing projects will be skipped
+- The existing Git repos will be moved from disk (removed from the original path)
 
 ## How to use
 
-### Create a new folder inside the git repositories path. This will be the name of the new group.
+### Create a new folder to import your Git repositories from.
 
-- For omnibus-gitlab, it is located at: `/var/opt/gitlab/git-data/repositories` by default, unless you changed
-it in the `/etc/gitlab/gitlab.rb` file.
-- For installations from source, it is usually located at: `/home/git/repositories` or you can see where
-your repositories are located by looking at `config/gitlab.yml` under the `repositories => storages` entries
-(you'll usually use the `default` storage path to start).
-
-New folder needs to have git user ownership and read/write/execute access for git user and its group:
+The new folder needs to have git user ownership and read/write/execute access for git user and its group:
 
 ```
-sudo -u git mkdir /var/opt/gitlab/git-data/repositories/new_group
+sudo -u git mkdir /var/opt/gitlab/git-data/repository-import-<date>/new_group
 ```
 
-If you are using an installation from source, replace `/var/opt/gitlab/git-data`
-with `/home/git`.
-
 ### Copy your bare repositories inside this newly created folder:
 
+- Any .git repositories found on any of the subfolders will be imported as projects
+- Groups will be created as needed, these could be nested folders. Example:
+
+If we copy the repos to `/var/opt/gitlab/git-data/repository-import-<date>`, and repo A needs to be under the groups G1 and G2, it will
+have to be created under those folders: `/var/opt/gitlab/git-data/repository-import-<date>/G1/G2/A.git`.
+
+
 ```
-sudo cp -r /old/git/foo.git /var/opt/gitlab/git-data/repositories/new_group/
+sudo cp -r /old/git/foo.git /var/opt/gitlab/git-data/repository-import-<date>/new_group/
 
 # Do this once when you are done copying git repositories
-sudo chown -R git:git /var/opt/gitlab/git-data/repositories/new_group/
+sudo chown -R git:git /var/opt/gitlab/git-data/repository-import-<date>
 ```
 
 `foo.git` needs to be owned by the git user and git users group.
 
-If you are using an installation from source, replace `/var/opt/gitlab/git-data`
-with `/home/git`.
+If you are using an installation from source, replace `/var/opt/gitlab/` with `/home/git`.
 
 ### Run the command below depending on your type of installation:
 
 #### Omnibus Installation
 
 ```
-$ sudo gitlab-rake gitlab:import:repos
+$ sudo gitlab-rake gitlab:import:repos['/var/opt/gitlab/git-data/repository-import-<date>']
 ```
 
 #### Installation from source
@@ -54,16 +52,21 @@ Before running this command you need to change the directory to where your GitLa
 
 ```
 $ cd /home/git/gitlab
-$ sudo -u git -H bundle exec rake gitlab:import:repos RAILS_ENV=production
+$ sudo -u git -H bundle exec rake gitlab:import:repos['/var/opt/gitlab/git-data/repository-import-<date>'] RAILS_ENV=production
 ```
 
 #### Example output
 
 ```
-Processing abcd.git
+Processing /var/opt/gitlab/git-data/repository-import-1/a/b/c/blah.git
+ * Using namespace: a/b/c
+ * Created blah (a/b/c/blah)
+ * Skipping repo  /var/opt/gitlab/git-data/repository-import-1/a/b/c/blah.wiki.git
+Processing /var/opt/gitlab/git-data/repository-import-1/abcd.git
  * Created abcd (abcd.git)
-Processing group/xyz.git
- * Created Group group (2)
+Processing /var/opt/gitlab/git-data/repository-import-1/group/xyz.git
+ * Using namespace: group (2)
  * Created xyz (group/xyz.git)
+ * Skipping repo /var/opt/gitlab/git-data/repository-import-1/@shared/a/b/abcd.git
 [...]
 ```
diff --git a/lib/gitlab/bare_repository_import/importer.rb b/lib/gitlab/bare_repository_import/importer.rb
new file mode 100644
index 00000000000..196de667805
--- /dev/null
+++ b/lib/gitlab/bare_repository_import/importer.rb
@@ -0,0 +1,101 @@
+module Gitlab
+  module BareRepositoryImport
+    class Importer
+      NoAdminError = Class.new(StandardError)
+
+      def self.execute(import_path)
+        import_path << '/' unless import_path.ends_with?('/')
+        repos_to_import = Dir.glob(import_path + '**/*.git')
+
+        unless user = User.admins.order_id_asc.first
+          raise NoAdminError.new('No admin user found to import repositories')
+        end
+
+        repos_to_import.each do |repo_path|
+          bare_repo = Gitlab::BareRepositoryImport::Repository.new(import_path, repo_path)
+
+          if bare_repo.hashed? || bare_repo.wiki?
+            log " * Skipping repo #{bare_repo.repo_path}".color(:yellow)
+
+            next
+          end
+
+          log "Processing #{repo_path}".color(:yellow)
+
+          new(user, bare_repo).create_project_if_needed
+        end
+      end
+
+      attr_reader :user, :project_name, :bare_repo
+
+      delegate :log, to: :class
+      delegate :project_name, :project_full_path, :group_path, :repo_path, :wiki_path, to: :bare_repo
+
+      def initialize(user, bare_repo)
+        @user = user
+        @bare_repo = bare_repo
+      end
+
+      def create_project_if_needed
+        if project = Project.find_by_full_path(project_full_path)
+          log " * #{project.name} (#{project_full_path}) exists"
+
+          return project
+        end
+
+        create_project
+      end
+
+      private
+
+      def create_project
+        group = find_or_create_groups
+
+        project = Projects::CreateService.new(user,
+                                              name: project_name,
+                                              path: project_name,
+                                              skip_disk_validation: true,
+                                              namespace_id: group&.id).execute
+
+        if project.persisted? && mv_repo(project)
+          log " * Created #{project.name} (#{project_full_path})".color(:green)
+
+          ProjectCacheWorker.perform_async(project.id)
+        else
+          log " * Failed trying to create #{project.name} (#{project_full_path})".color(:red)
+          log "   Errors: #{project.errors.messages}".color(:red) if project.errors.any?
+        end
+
+        project
+      end
+
+      def mv_repo(project)
+        FileUtils.mv(repo_path, File.join(project.repository_storage_path, project.disk_path + '.git'))
+
+        if bare_repo.wiki_exists?
+          FileUtils.mv(wiki_path, File.join(project.repository_storage_path, project.disk_path + '.wiki.git'))
+        end
+
+        true
+      rescue => e
+        log " * Failed to move repo: #{e.message}".color(:red)
+
+        false
+      end
+
+      def find_or_create_groups
+        return nil unless group_path.present?
+
+        log " * Using namespace: #{group_path}"
+
+        Groups::NestedCreateService.new(user, group_path: group_path).execute
+      end
+
+      # This is called from within a rake task only used by Admins, so allow writing
+      # to STDOUT
+      def self.log(message)
+        puts message # rubocop:disable Rails/Output
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/bare_repository_import/repository.rb b/lib/gitlab/bare_repository_import/repository.rb
new file mode 100644
index 00000000000..8574ac6eb30
--- /dev/null
+++ b/lib/gitlab/bare_repository_import/repository.rb
@@ -0,0 +1,42 @@
+module Gitlab
+  module BareRepositoryImport
+    class Repository
+      attr_reader :group_path, :project_name, :repo_path
+
+      def initialize(root_path, repo_path)
+        @root_path = root_path
+        @repo_path = repo_path
+
+        # Split path into 'all/the/namespaces' and 'project_name'
+        @group_path, _, @project_name = repo_relative_path.rpartition('/')
+      end
+
+      def wiki_exists?
+        File.exist?(wiki_path)
+      end
+
+      def wiki?
+        @wiki ||= repo_path.end_with?('.wiki.git')
+      end
+
+      def wiki_path
+        @wiki_path ||= repo_path.sub(/\.git$/, '.wiki.git')
+      end
+
+      def hashed?
+        @hashed ||= group_path.start_with?('@hashed')
+      end
+
+      def project_full_path
+        @project_full_path ||= "#{group_path}/#{project_name}"
+      end
+
+      private
+
+      def repo_relative_path
+        # Remove root path and `.git` at the end
+        repo_path[@root_path.size...-4]
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/bare_repository_importer.rb b/lib/gitlab/bare_repository_importer.rb
deleted file mode 100644
index 1d98d187805..00000000000
--- a/lib/gitlab/bare_repository_importer.rb
+++ /dev/null
@@ -1,97 +0,0 @@
-module Gitlab
-  class BareRepositoryImporter
-    NoAdminError = Class.new(StandardError)
-
-    def self.execute
-      Gitlab.config.repositories.storages.each do |storage_name, repository_storage|
-        git_base_path = repository_storage['path']
-        repos_to_import = Dir.glob(git_base_path + '/**/*.git')
-
-        repos_to_import.each do |repo_path|
-          if repo_path.end_with?('.wiki.git')
-            log " * Skipping wiki repo"
-            next
-          end
-
-          log "Processing #{repo_path}".color(:yellow)
-
-          repo_relative_path = repo_path[repository_storage['path'].length..-1]
-                                 .sub(/^\//, '') # Remove leading `/`
-                                 .sub(/\.git$/, '') # Remove `.git` at the end
-          new(storage_name, repo_relative_path).create_project_if_needed
-        end
-      end
-    end
-
-    attr_reader :storage_name, :full_path, :group_path, :project_path, :user
-    delegate :log, to: :class
-
-    def initialize(storage_name, repo_path)
-      @storage_name = storage_name
-      @full_path = repo_path
-
-      unless @user = User.admins.order_id_asc.first
-        raise NoAdminError.new('No admin user found to import repositories')
-      end
-
-      @group_path, @project_path = File.split(repo_path)
-      @group_path = nil if @group_path == '.'
-    end
-
-    def create_project_if_needed
-      if project = Project.find_by_full_path(full_path)
-        log " * #{project.name} (#{full_path}) exists"
-        return project
-      end
-
-      create_project
-    end
-
-    private
-
-    def create_project
-      group = find_or_create_group
-
-      project_params = {
-        name: project_path,
-        path: project_path,
-        repository_storage: storage_name,
-        namespace_id: group&.id,
-        skip_disk_validation: true
-      }
-
-      project = Projects::CreateService.new(user, project_params).execute
-
-      if project.persisted?
-        log " * Created #{project.name} (#{full_path})".color(:green)
-        ProjectCacheWorker.perform_async(project.id)
-      else
-        log " * Failed trying to create #{project.name} (#{full_path})".color(:red)
-        log "   Errors: #{project.errors.messages}".color(:red)
-      end
-
-      project
-    end
-
-    def find_or_create_group
-      return nil unless group_path
-
-      if namespace = Namespace.find_by_full_path(group_path)
-        log " * Namespace #{group_path} exists.".color(:green)
-        return namespace
-      end
-
-      log " * Creating Group: #{group_path}"
-      Groups::NestedCreateService.new(user, group_path: group_path).execute
-    end
-
-    # This is called from within a rake task only used by Admins, so allow writing
-    # to STDOUT
-    #
-    # rubocop:disable Rails/Output
-    def self.log(message)
-      puts message
-    end
-    # rubocop:enable Rails/Output
-  end
-end
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index d227a0c8bdb..adfcc3cda22 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -2,23 +2,21 @@ namespace :gitlab do
   namespace :import do
     # How to use:
     #
-    #  1. copy the bare repos under the repository storage paths (commonly the default path is /home/git/repositories)
-    #  2. run: bundle exec rake gitlab:import:repos RAILS_ENV=production
+    #  1. copy the bare repos to a specific path that contain the group or subgroups structure as folders
+    #  2. run: bundle exec rake gitlab:import:repos[/path/to/repos] RAILS_ENV=production
     #
     # Notes:
     #  * The project owner will set to the first administator of the system
     #  * Existing projects will be skipped
-    #
-    #
     desc "GitLab | Import bare repositories from repositories -> storages into GitLab project instance"
-    task repos: :environment do
-      if Project.current_application_settings.hashed_storage_enabled
-        puts 'Cannot import repositories when Hashed Storage is enabled'.color(:red)
+    task :repos, [:import_path] => :environment do |_t, args|
+      unless args.import_path
+        puts 'Please specify an import path that contains the repositories'.color(:red)
 
         exit 1
       end
 
-      Gitlab::BareRepositoryImporter.execute
+      Gitlab::BareRepositoryImport::Importer.execute(args.import_path)
     end
   end
 end
diff --git a/spec/lib/gitlab/bare_repository_import/importer_spec.rb b/spec/lib/gitlab/bare_repository_import/importer_spec.rb
new file mode 100644
index 00000000000..7f3bf5fc41c
--- /dev/null
+++ b/spec/lib/gitlab/bare_repository_import/importer_spec.rb
@@ -0,0 +1,168 @@
+require 'spec_helper'
+
+describe Gitlab::BareRepositoryImport::Importer, repository: true do
+  let!(:admin) { create(:admin) }
+  let!(:base_dir) { Dir.mktmpdir + '/' }
+  let(:bare_repository) { Gitlab::BareRepositoryImport::Repository.new(base_dir, File.join(base_dir, "#{project_path}.git")) }
+
+  subject(:importer) { described_class.new(admin, bare_repository) }
+
+  before do
+    allow(described_class).to receive(:log)
+  end
+
+  after do
+    FileUtils.rm_rf(base_dir)
+  end
+
+  shared_examples 'importing a repository' do
+    describe '.execute' do
+      it 'creates a project for a repository in storage' do
+        FileUtils.mkdir_p(File.join(base_dir, "#{project_path}.git"))
+        fake_importer = double
+
+        expect(described_class).to receive(:new).and_return(fake_importer)
+        expect(fake_importer).to receive(:create_project_if_needed)
+
+        described_class.execute(base_dir)
+      end
+
+      it 'skips wiki repos' do
+        repo_dir = File.join(base_dir, 'the-group', 'the-project.wiki.git')
+        FileUtils.mkdir_p(File.join(repo_dir))
+
+        expect(described_class).to receive(:log).with(" * Skipping repo #{repo_dir}")
+        expect(described_class).not_to receive(:new)
+
+        described_class.execute(base_dir)
+      end
+
+      context 'without admin users' do
+        let(:admin) { nil }
+
+        it 'raises an error' do
+          expect { described_class.execute(base_dir) }.to raise_error(Gitlab::BareRepositoryImport::Importer::NoAdminError)
+        end
+      end
+    end
+
+    describe '#create_project_if_needed' do
+      it 'starts an import for a project that did not exist' do
+        expect(importer).to receive(:create_project)
+
+        importer.create_project_if_needed
+      end
+
+      it 'skips importing when the project already exists' do
+        project = create(:project, path: 'a-project', namespace: existing_group)
+
+        expect(importer).not_to receive(:create_project)
+        expect(importer).to receive(:log).with(" * #{project.name} (#{project_path}) exists")
+
+        importer.create_project_if_needed
+      end
+
+      it 'creates a project with the correct path in the database' do
+        importer.create_project_if_needed
+
+        expect(Project.find_by_full_path(project_path)).not_to be_nil
+      end
+
+      it 'creates the Git repo in disk' do
+        FileUtils.mkdir_p(File.join(base_dir, "#{project_path}.git"))
+
+        importer.create_project_if_needed
+
+        project = Project.find_by_full_path(project_path)
+
+        expect(File).to exist(File.join(project.repository_storage_path, project.disk_path + '.git'))
+      end
+
+      context 'hashed storage enabled' do
+        it 'creates a project with the correct path in the database' do
+          stub_application_setting(hashed_storage_enabled: true)
+
+          importer.create_project_if_needed
+
+          expect(Project.find_by_full_path(project_path)).not_to be_nil
+        end
+      end
+    end
+  end
+
+  context 'with subgroups', :nested_groups do
+    let(:project_path) { 'a-group/a-sub-group/a-project' }
+
+    let(:existing_group) do
+      group = create(:group, path: 'a-group')
+      create(:group, path: 'a-sub-group', parent: group)
+    end
+
+    it_behaves_like 'importing a repository'
+  end
+
+  context 'without subgroups' do
+    let(:project_path) { 'a-group/a-project' }
+    let(:existing_group) { create(:group, path: 'a-group') }
+
+    it_behaves_like 'importing a repository'
+  end
+
+  context 'without groups' do
+    let(:project_path) { 'a-project' }
+
+    it 'starts an import for a project that did not exist' do
+      expect(importer).to receive(:create_project)
+
+      importer.create_project_if_needed
+    end
+
+    it 'creates a project with the correct path in the database' do
+      importer.create_project_if_needed
+
+      expect(Project.find_by_full_path("#{admin.full_path}/#{project_path}")).not_to be_nil
+    end
+
+    it 'creates the Git repo in disk' do
+      FileUtils.mkdir_p(File.join(base_dir, "#{project_path}.git"))
+
+      importer.create_project_if_needed
+
+      project = Project.find_by_full_path("#{admin.full_path}/#{project_path}")
+
+      expect(File).to exist(File.join(project.repository_storage_path, project.disk_path + '.git'))
+    end
+  end
+
+  context 'with Wiki' do
+    let(:project_path) { 'a-group/a-project' }
+    let(:existing_group) { create(:group, path: 'a-group') }
+
+    it_behaves_like 'importing a repository'
+
+    it 'creates the Wiki git repo in disk' do
+      FileUtils.mkdir_p(File.join(base_dir, "#{project_path}.git"))
+      FileUtils.mkdir_p(File.join(base_dir, "#{project_path}.wiki.git"))
+
+      importer.create_project_if_needed
+
+      project = Project.find_by_full_path(project_path)
+
+      expect(File).to exist(File.join(project.repository_storage_path, project.disk_path + '.wiki.git'))
+    end
+  end
+
+  context 'when subgroups are not available' do
+    let(:project_path) { 'a-group/a-sub-group/a-project' }
+
+    before do
+      expect(Group).to receive(:supports_nested_groups?) { false }
+    end
+
+    describe '#create_project_if_needed' do
+      it 'raises an error' do
+        expect { importer.create_project_if_needed }.to raise_error('Nested groups are not supported on MySQL')
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/bare_repository_import/repository_spec.rb b/spec/lib/gitlab/bare_repository_import/repository_spec.rb
new file mode 100644
index 00000000000..2db737f5fb6
--- /dev/null
+++ b/spec/lib/gitlab/bare_repository_import/repository_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe ::Gitlab::BareRepositoryImport::Repository do
+  let(:project_repo_path) { described_class.new('/full/path/', '/full/path/to/repo.git') }
+
+  it 'stores the repo path' do
+    expect(project_repo_path.repo_path).to eq('/full/path/to/repo.git')
+  end
+
+  it 'stores the group path' do
+    expect(project_repo_path.group_path).to eq('to')
+  end
+
+  it 'stores the project name' do
+    expect(project_repo_path.project_name).to eq('repo')
+  end
+
+  it 'stores the wiki path' do
+    expect(project_repo_path.wiki_path).to eq('/full/path/to/repo.wiki.git')
+  end
+
+  describe '#wiki?' do
+    it 'returns true if it is a wiki' do
+      wiki_path = described_class.new('/full/path/', '/full/path/to/a/b/my.wiki.git')
+
+      expect(wiki_path.wiki?).to eq(true)
+    end
+
+    it 'returns false if it is not a wiki' do
+      expect(project_repo_path.wiki?).to eq(false)
+    end
+  end
+
+  describe '#hashed?' do
+    it 'returns true if it is a hashed folder' do
+      path = described_class.new('/full/path/', '/full/path/@hashed/my.repo.git')
+
+      expect(path.hashed?).to eq(true)
+    end
+
+    it 'returns false if it is not a hashed folder' do
+      expect(project_repo_path.hashed?).to eq(false)
+    end
+  end
+
+  describe '#project_full_path' do
+    it 'returns the project full path' do
+      expect(project_repo_path.repo_path).to eq('/full/path/to/repo.git')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/bare_repository_importer_spec.rb b/spec/lib/gitlab/bare_repository_importer_spec.rb
deleted file mode 100644
index 36d1844b5b1..00000000000
--- a/spec/lib/gitlab/bare_repository_importer_spec.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::BareRepositoryImporter, repository: true do
-  subject(:importer) { described_class.new('default', project_path) }
-
-  let!(:admin) { create(:admin) }
-
-  before do
-    allow(described_class).to receive(:log)
-  end
-
-  shared_examples 'importing a repository' do
-    describe '.execute' do
-      it 'creates a project for a repository in storage' do
-        FileUtils.mkdir_p(File.join(TestEnv.repos_path, "#{project_path}.git"))
-        fake_importer = double
-
-        expect(described_class).to receive(:new).with('default', project_path)
-                                     .and_return(fake_importer)
-        expect(fake_importer).to receive(:create_project_if_needed)
-
-        described_class.execute
-      end
-
-      it 'skips wiki repos' do
-        FileUtils.mkdir_p(File.join(TestEnv.repos_path, 'the-group', 'the-project.wiki.git'))
-
-        expect(described_class).to receive(:log).with(' * Skipping wiki repo')
-        expect(described_class).not_to receive(:new)
-
-        described_class.execute
-      end
-    end
-
-    describe '#initialize' do
-      context 'without admin users' do
-        let(:admin) { nil }
-
-        it 'raises an error' do
-          expect { importer }.to raise_error(Gitlab::BareRepositoryImporter::NoAdminError)
-        end
-      end
-    end
-
-    describe '#create_project_if_needed' do
-      it 'starts an import for a project that did not exist' do
-        expect(importer).to receive(:create_project)
-
-        importer.create_project_if_needed
-      end
-
-      it 'skips importing when the project already exists' do
-        project = create(:project, path: 'a-project', namespace: existing_group)
-
-        expect(importer).not_to receive(:create_project)
-        expect(importer).to receive(:log).with(" * #{project.name} (#{project_path}) exists")
-
-        importer.create_project_if_needed
-      end
-
-      it 'creates a project with the correct path in the database' do
-        importer.create_project_if_needed
-
-        expect(Project.find_by_full_path(project_path)).not_to be_nil
-      end
-    end
-  end
-
-  context 'with subgroups', :nested_groups do
-    let(:project_path) { 'a-group/a-sub-group/a-project' }
-
-    let(:existing_group) do
-      group = create(:group, path: 'a-group')
-      create(:group, path: 'a-sub-group', parent: group)
-    end
-
-    it_behaves_like 'importing a repository'
-  end
-
-  context 'without subgroups' do
-    let(:project_path) { 'a-group/a-project' }
-    let(:existing_group) { create(:group, path: 'a-group') }
-
-    it_behaves_like 'importing a repository'
-  end
-
-  context 'when subgroups are not available' do
-    let(:project_path) { 'a-group/a-sub-group/a-project' }
-
-    before do
-      expect(Group).to receive(:supports_nested_groups?) { false }
-    end
-
-    describe '#create_project_if_needed' do
-      it 'raises an error' do
-        expect { importer.create_project_if_needed }.to raise_error('Nested groups are not supported on MySQL')
-      end
-    end
-  end
-end
-- 
cgit v1.2.1


From 2a6c8647435f7a44227d4a23aeab7d4b08b49f9e Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 7 Nov 2017 20:04:36 +0000
Subject: Cleanup tests

---
 .../vue_mr_widget/mr_widget_options_spec.js        | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
index ba3721e7c84..832ed5915ca 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -316,28 +316,6 @@ describe('mrWidgetOptions', () => {
         expect(vm.pollingInterval.stopTimer).toHaveBeenCalled();
       });
     });
-
-    describe('createService', () => {
-      it('should instantiate a Service', () => {
-        const endpoints = {
-          mergePath: '/nice/path',
-          mergeCheckPath: '/nice/path',
-          cancelAutoMergePath: '/nice/path',
-          removeWIPPath: '/nice/path',
-          sourceBranchPath: '/nice/path',
-          ciEnvironmentsStatusPath: '/nice/path',
-          statusPath: '/nice/path',
-          mergeActionsContentPath: '/nice/path',
-        };
-
-        const serviceInstance = vm.createService(endpoints);
-        const isInstanceOfMRService = serviceInstance instanceof MRWidgetService;
-        expect(isInstanceOfMRService).toBe(true);
-        Object.keys(serviceInstance).forEach((key) => {
-          expect(serviceInstance[key]).toBeDefined();
-        });
-      });
-    });
   });
 
   describe('components', () => {
-- 
cgit v1.2.1


From 2acfb6141e5f8f8335a62b7ce46f0383b7763765 Mon Sep 17 00:00:00 2001
From: tauriedavis <taurie@gitlab.com>
Date: Tue, 7 Nov 2017 12:36:07 -0800
Subject: Simplify design for no tags, branches

---
 app/assets/stylesheets/framework/wells.scss | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index d3c116920ce..cae10f20b7a 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -53,14 +53,6 @@
     background-color: $well-expand-item;
   }
 
-  .limit-box-branch {
-    width: 160px;
-  }
-
-  .limit-box-tag {
-    width: 125px;
-  }
-
   .branches {
     display: inline;
   }
@@ -72,27 +64,22 @@
   .limit-box {
     display: inline-flex;
     align-items: center;
-    padding: 1px;
-    background-color: $blue-100;
+    background-color: $red-100;
     border-radius: $border-radius-default;
     text-align: center;
 
     &:hover {
-      background-color: $blue-200;
+      background-color: $red-200;
     }
 
     .limit-icon {
-      width: 20px;
+      margin: 0 8px;
     }
 
     .limit-message {
       @include str-truncated(100%);
-      flex: 1;
       line-height: 16px;
-      margin-right: 2px;
-      background-color: $white-light;
-      border-top-right-radius: $border-radius-default;
-      border-bottom-right-radius: $border-radius-default;
+      margin-right: 8px;
       font-size: 12px;
     }
   }
-- 
cgit v1.2.1


From a613b19baaf075d1566c6247e8c21f2e0fe1487c Mon Sep 17 00:00:00 2001
From: tauriedavis <taurie@gitlab.com>
Date: Tue, 7 Nov 2017 12:38:51 -0800
Subject: Change cursor to pointer on hover

---
 app/assets/stylesheets/framework/wells.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index cae10f20b7a..40020ee6331 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -62,6 +62,7 @@
   }
 
   .limit-box {
+    cursor: pointer;
     display: inline-flex;
     align-items: center;
     background-color: $red-100;
-- 
cgit v1.2.1


From 1aa4604f37d3e70715d7ec65f2fe44a8c036e6e9 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 7 Nov 2017 20:47:32 +0000
Subject: Update mr_widget_options_spec.js

---
 spec/javascripts/vue_mr_widget/mr_widget_options_spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
index 832ed5915ca..8832dd161c7 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
 import mrWidgetOptions from '~/vue_merge_request_widget/mr_widget_options';
 import eventHub from '~/vue_merge_request_widget/event_hub';
 import notify from '~/lib/utils/notify';
-- 
cgit v1.2.1


From fb41187b7ff6154675ab07b75c8be1067efa8f69 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Tue, 7 Nov 2017 14:03:01 -0700
Subject: Remove truncate mixin

---
 app/assets/stylesheets/framework/wells.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/framework/wells.scss b/app/assets/stylesheets/framework/wells.scss
index 40020ee6331..68824ff8418 100644
--- a/app/assets/stylesheets/framework/wells.scss
+++ b/app/assets/stylesheets/framework/wells.scss
@@ -78,7 +78,6 @@
     }
 
     .limit-message {
-      @include str-truncated(100%);
       line-height: 16px;
       margin-right: 8px;
       font-size: 12px;
-- 
cgit v1.2.1


From 4bd90ec31161acbba0febcac51beeece08c1dd5a Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Tue, 7 Nov 2017 15:48:11 -0600
Subject: fix karma config file

---
 config/karma.config.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/config/karma.config.js b/config/karma.config.js
index e459f5cdac3..9f018d14b8f 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -67,14 +67,5 @@ module.exports = function(config) {
     karmaConfig.customLaunchers.ChromeHeadlessCustom.flags.push('--enable-logging', '--v=1');
   }
 
-  if (process.env.DEBUG) {
-    karmaConfig.logLevel = config.LOG_DEBUG;
-    process.env.CHROME_LOG_FILE = process.env.CHROME_LOG_FILE || 'chrome_debug.log';
-  }
-
-  if (process.env.CHROME_LOG_FILE) {
-    karmaConfig.customLaunchers.ChromeHeadlessCustom.flags.push('--enable-logging', '--v=1');
-  }
-
   config.set(karmaConfig);
 };
-- 
cgit v1.2.1


From b67d72958f27983631fbdd1dbd209616342da0cc Mon Sep 17 00:00:00 2001
From: Chenjerai Katanda <ckatanda@gitlab.com>
Date: Tue, 7 Nov 2017 22:03:06 +0000
Subject: Add note on registry restrictions on GitLab.com

---
 doc/user/project/container_registry.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/user/project/container_registry.md b/doc/user/project/container_registry.md
index 2c4dfcff4a6..394aa9209e4 100644
--- a/doc/user/project/container_registry.md
+++ b/doc/user/project/container_registry.md
@@ -27,7 +27,8 @@ to enable it.
 1. First, ask your system administrator to enable GitLab Container Registry
    following the [administration documentation](../../administration/container_registry.md).
    If you are using GitLab.com, this is enabled by default so you can start using
-   the Registry immediately.
+   the Registry immediately. Currently there is a soft (10GB) size restriction for 
+   registry on GitLab.com, as part of the [repository size limit](repository/index.html#repository-size).
 1. Go to your [project's General settings](settings/index.md#sharing-and-permissions)
    and enable the **Container Registry** feature on your project. For new
    projects this might be enabled by default. For existing projects
-- 
cgit v1.2.1


From c2555e7298cb1549214afc319e8eda6e7248215d Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Tue, 7 Nov 2017 17:26:48 -0500
Subject: Adds typescript support in webpack. With Mike G.

---
 config/webpack.config.js |   6 +-
 package.json             |   2 +
 tsconfig.json            |  11 +++
 yarn.lock                | 195 ++++++++++++++---------------------------------
 4 files changed, 74 insertions(+), 140 deletions(-)
 create mode 100644 tsconfig.json

diff --git a/config/webpack.config.js b/config/webpack.config.js
index f7a7182a627..67d7cae3ccf 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -107,6 +107,10 @@ var config = {
         test: /\.vue$/,
         loader: 'vue-loader',
       },
+      {
+        test: /\.ts$/,
+        loader: 'ts-loader',
+      },
       {
         test: /\.svg$/,
         loader: 'raw-loader',
@@ -252,7 +256,7 @@ var config = {
   ],
 
   resolve: {
-    extensions: ['.js'],
+    extensions: ['.js', '.ts'],
     alias: {
       '~':              path.join(ROOT_PATH, 'app/assets/javascripts'),
       'emojis':         path.join(ROOT_PATH, 'fixtures/emojis'),
diff --git a/package.json b/package.json
index e607981143d..6315f9eced9 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,8 @@
     "three-orbit-controls": "^82.1.0",
     "three-stl-loader": "^1.0.4",
     "timeago.js": "^2.0.5",
+    "ts-loader": "^3.1.1",
+    "typescript": "^2.6.1",
     "underscore": "^1.8.3",
     "url-loader": "^0.5.8",
     "visibilityjs": "^1.2.4",
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000000..be66851155d
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    // this aligns with Vue's browser support
+    "target": "es5",
+    // this enables stricter inference for data properties on `this`
+    "strict": true,
+    // if using webpack 2+ or rollup, to leverage tree shaking:
+    "module": "es2015",
+    "moduleResolution": "node"
+  }
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index bf92370d44f..efae3892c31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -101,6 +101,12 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
+ansi-styles@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -217,18 +223,12 @@ async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@2.4.1:
+async@2.4.1, async@^2.1.2, async@^2.1.4:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
   dependencies:
     lodash "^4.14.0"
 
-async@^2.1.2, async@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
-  dependencies:
-    lodash "^4.14.0"
-
 async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
@@ -267,7 +267,7 @@ axios@^0.16.2:
     follow-redirects "^1.2.3"
     is-buffer "^1.1.5"
 
-babel-code-frame@^6.11.0, babel-code-frame@^6.22.0:
+babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
   dependencies:
@@ -275,14 +275,6 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-code-frame@^6.16.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
 babel-core@^6.22.1, babel-core@^6.23.0:
   version "6.23.1"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
@@ -932,11 +924,7 @@ bluebird@^2.10.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
-bluebird@^3.0.5, bluebird@^3.1.1:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
-
-bluebird@^3.3.0:
+bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.3.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c"
 
@@ -1067,10 +1055,6 @@ buffer-indexof@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.0.tgz#f54f647c4f4e25228baa656a2e57e43d5f270982"
 
-buffer-shims@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
 buffer-xor@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1170,6 +1154,14 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.0, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1253,7 +1245,7 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-color-convert@^1.3.0:
+color-convert@^1.3.0, color-convert@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
@@ -1454,11 +1446,7 @@ copy-webpack-plugin@^4.0.1:
     minimatch "^3.0.0"
     node-dir "^0.1.10"
 
-core-js@^2.2.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086"
-
-core-js@^2.4.0, core-js@^2.4.1:
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
@@ -1997,7 +1985,7 @@ engine.io@1.8.3:
     engine.io-parser "1.3.2"
     ws "1.1.2"
 
-enhanced-resolve@^3.4.0:
+enhanced-resolve@^3.0.0, enhanced-resolve@^3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
   dependencies:
@@ -2078,11 +2066,7 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
-es6-promise@^3.0.2:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
-
-es6-promise@~3.0.2:
+es6-promise@^3.0.2, es6-promise@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
 
@@ -2263,10 +2247,6 @@ esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-
 esprima@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
@@ -2667,11 +2647,11 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
-function-bind@^1.0.2:
+function-bind@^1.0.2, function-bind@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
 
-function-bind@^1.1.1, function-bind@~1.1.0:
+function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
@@ -2757,25 +2737,25 @@ glob@^6.0.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.1.1, glob@~7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.0.2"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.0.5:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+glob@~7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.2"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -2978,14 +2958,10 @@ html-comment-regex@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
 
-html-entities@1.2.0:
+html-entities@1.2.0, html-entities@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz#41948caf85ce82fed36e4e6a0ed371a6664379e2"
 
-html-entities@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-
 htmlparser2@^3.8.2:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
@@ -3391,10 +3367,6 @@ isexe@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
@@ -3538,18 +3510,7 @@ js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-
-js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.7.0:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^3.1.1"
-
-js-yaml@^3.5.1:
+js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.1.tgz#08775cebdfdd359209f0d2acd383c8f86a6904a0"
   dependencies:
@@ -4090,7 +4051,7 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.29.0 < 2", mime-db@~1.29.0:
+"mime-db@>= 1.29.0 < 2":
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878"
 
@@ -4098,13 +4059,7 @@ mime-db@~1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
 
-mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.16"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23"
-  dependencies:
-    mime-db "~1.29.0"
-
-mime-types@~2.1.11, mime-types@~2.1.15:
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   version "2.1.15"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
   dependencies:
@@ -4328,16 +4283,7 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.2:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
@@ -4512,7 +4458,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -5208,7 +5154,7 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.9:
+readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.0, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.9:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
@@ -5231,18 +5177,6 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readable-stream@^2.1.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
 readable-stream@~1.0.2:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -5528,14 +5462,10 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
-semver@^5.0.3:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
 semver@~4.3.3:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
@@ -5943,7 +5873,7 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2, supports-co
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.2.1:
+supports-color@^4.0.0, supports-color@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
   dependencies:
@@ -6057,10 +5987,6 @@ thunky@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz#bf30146824e2b6e67b0f2d7a4ac8beb26908684e"
 
-time-stamp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
-
 timeago.js@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-2.0.5.tgz#730c74fbdb0b0917a553675a4460e3a7f80db86c"
@@ -6089,18 +6015,12 @@ tiny-emitter@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-1.1.0.tgz#ab405a21ffed814a76c19739648093d70654fecb"
 
-tmp@0.0.31:
+tmp@0.0.31, tmp@0.0.x:
   version "0.0.31"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.0.x:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
@@ -6141,6 +6061,15 @@ tryit@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
 
+ts-loader@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.1.1.tgz#602d93c12029eaf8fa1ee478a90785d40c5f6658"
+  dependencies:
+    chalk "^2.3.0"
+    enhanced-resolve "^3.0.0"
+    loader-utils "^1.0.2"
+    semver "^5.0.1"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -6172,6 +6101,10 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
+typescript@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631"
+
 uglify-js@^2.6, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
@@ -6447,7 +6380,7 @@ webpack-bundle-analyzer@^2.8.2:
     opener "^1.4.3"
     ws "^2.3.1"
 
-webpack-dev-middleware@^1.0.11:
+webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.11.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz#09691d0973a30ad1f82ac73a12e2087f0a4754f9"
   dependencies:
@@ -6456,16 +6389,6 @@ webpack-dev-middleware@^1.0.11:
     path-is-absolute "^1.0.0"
     range-parser "^1.0.3"
 
-webpack-dev-middleware@^1.11.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz#d34efefb2edda7e1d3b5dbe07289513219651709"
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^1.3.4"
-    path-is-absolute "^1.0.0"
-    range-parser "^1.0.3"
-    time-stamp "^2.0.0"
-
 webpack-dev-server@^2.6.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.7.1.tgz#21580f5a08cd065c71144cf6f61c345bca59a8b8"
@@ -6554,18 +6477,12 @@ which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
 
-which@^1.1.1, which@^1.2.1:
+which@^1.1.1, which@^1.2.1, which@^1.2.9:
   version "1.2.12"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
   dependencies:
     isexe "^1.1.1"
 
-which@^1.2.9:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-  dependencies:
-    isexe "^2.0.0"
-
 wide-align@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
-- 
cgit v1.2.1


From 430c42e1c0fe223a61949ead4031e5470086c9ec Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Tue, 7 Nov 2017 17:28:31 -0500
Subject: Add changelog

---
 changelogs/unreleased/add-typescript.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/add-typescript.yml

diff --git a/changelogs/unreleased/add-typescript.yml b/changelogs/unreleased/add-typescript.yml
new file mode 100644
index 00000000000..a048f240855
--- /dev/null
+++ b/changelogs/unreleased/add-typescript.yml
@@ -0,0 +1,5 @@
+---
+title: Adds typescript support
+merge_request:
+author:
+type: added
-- 
cgit v1.2.1


From 98b6175ef4933e58e58295ff5c3e67f88134c5f7 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Tue, 7 Nov 2017 17:31:04 -0500
Subject: Remove comments in JSON.

---
 tsconfig.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index be66851155d..3a569cf7c19 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,10 +1,7 @@
 {
   "compilerOptions": {
-    // this aligns with Vue's browser support
     "target": "es5",
-    // this enables stricter inference for data properties on `this`
     "strict": true,
-    // if using webpack 2+ or rollup, to leverage tree shaking:
     "module": "es2015",
     "moduleResolution": "node"
   }
-- 
cgit v1.2.1