Merge branch 'master' into '3730-allow-admins-to-disable-mirroring'

# Conflicts:
#   db/schema.rb

PROCESS.md

@@ -130,7 +130,8 @@ freeze date (the 7th) should have a corresponding Enterprise Edition merge
 request, even if there are no conflicts. This is to reduce the size of the
 subsequent EE merge, as we often merge a lot to CE on the release date. For more
 information, see
-[limit conflicts with EE when developing on CE][limit_ee_conflicts].
+[Automatic CE->EE merge][automatic_ce_ee_merge] and
+[Guidelines for implementing Enterprise Edition features][ee_features].
 
 ### After the 7th
 
@@ -281,4 +282,5 @@ still an issue I encourage you to open it on the [GitLab.com issue tracker](http
 ["Implement design & UI elements" guidelines]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#implement-design-ui-elements
 [Thoughtbot code review guide]: https://github.com/thoughtbot/guides/tree/master/code-review
 [done]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#definition-of-done
-[limit_ee_conflicts]: https://docs.gitlab.com/ce/development/limit_ee_conflicts.html
+[automatic_ce_ee_merge]: https://docs.gitlab.com/ce/development/automatic_ce_ee_merge.html
+[ee_features]: https://docs.gitlab.com/ce/development/ee_features.html

app/assets/javascripts/clusters/clusters_bundle.js

@@ -150,8 +150,8 @@ export default class Clusters {
   }
 
   toggle() {
-    this.toggleButton.classList.toggle('checked');
-    this.toggleInput.setAttribute('value', this.toggleButton.classList.contains('checked').toString());
+    this.toggleButton.classList.toggle('is-checked');
+    this.toggleInput.setAttribute('value', this.toggleButton.classList.contains('is-checked').toString());
   }
 
   showToken() {

app/assets/javascripts/clusters/clusters_index.js

+import Flash from '../flash';
+import { s__ } from '../locale';
+import ClustersService from './services/clusters_service';
+/**
+ * Toggles loading and disabled classes.
+ * @param {HTMLElement} button
+ */
+const toggleLoadingButton = (button) => {
+  if (button.getAttribute('disabled')) {
+    button.removeAttribute('disabled');
+  } else {
+    button.setAttribute('disabled', true);
+  }
+
+  button.classList.toggle('is-loading');
+};
+
+/**
+ * Toggles checked class for the given button
+ * @param {HTMLElement} button
+ */
+const toggleValue = (button) => {
+  button.classList.toggle('is-checked');
+};
+
+/**
+ * Handles toggle buttons in the cluster's table.
+ *
+ * When the user clicks the toggle button for each cluster, it:
+ * - toggles the button
+ * - shows a loading and disables button
+ * - Makes a put request to the given endpoint
+ * Once we receive the response, either:
+ * 1) Show updated status in case of successfull response
+ * 2) Show initial status in case of failed response
+ */
+export default function setClusterTableToggles() {
+  document.querySelectorAll('.js-toggle-cluster-list')
+    .forEach(button => button.addEventListener('click', (e) => {
+      const toggleButton = e.currentTarget;
+      const endpoint = toggleButton.getAttribute('data-endpoint');
+
+      toggleValue(toggleButton);
+      toggleLoadingButton(toggleButton);
+
+      const value = toggleButton.classList.contains('is-checked');
+
+      ClustersService.updateCluster(endpoint, { cluster: { enabled: value } })
+        .then(() => {
+          toggleLoadingButton(toggleButton);
+        })
+        .catch(() => {
+          toggleLoadingButton(toggleButton);
+          toggleValue(toggleButton);
+          Flash(s__('ClusterIntegration|Something went wrong on our end.'));
+        });
+    }));
+}

app/assets/javascripts/clusters/services/clusters_service.js

@@ -17,4 +17,8 @@ export default class ClusterService {
   installApplication(appId) {
     return axios.post(this.appInstallEndpointMap[appId]);
   }
+
+  static updateCluster(endpoint, data) {
+    return axios.put(endpoint, data);
+  }
 }

app/assets/javascripts/dispatcher.js

@@ -621,7 +621,15 @@ import initGroupAnalytics from './init_group_analytics';
           import(/* webpackChunkName: "clusters" */ './clusters/clusters_bundle')
             .then(cluster => new cluster.default()) // eslint-disable-line new-cap
             .catch((err) => {
-              Flash(s__('ClusterIntegration|Problem setting up the cluster JavaScript'));
+              Flash(s__('ClusterIntegration|Problem setting up the cluster'));
+              throw err;
+            });
+          break;
+        case 'projects:clusters:index':
+          import(/* webpackChunkName: "clusters_index" */ './clusters/clusters_index')
+            .then(clusterIndex => clusterIndex.default())
+            .catch((err) => {
+              Flash(s__('ClusterIntegration|Problem setting up the clusters list'));
               throw err;
             });
           break;

app/assets/javascripts/projects/permissions/components/project_feature_setting.vue

 <script>
-import projectFeatureToggle from './project_feature_toggle.vue';
+import projectFeatureToggle from '../../../vue_shared/components/toggle_button.vue';
 
 export default {
   props: {

app/assets/javascripts/projects/permissions/components/project_feature_toggle.vue

-<script>
-export default {
-  props: {
-    name: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    value: {
-      type: Boolean,
-      required: true,
-    },
-    disabledInput: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-  },
-
-  model: {
-    prop: 'value',
-    event: 'change',
-  },
-
-  methods: {
-    toggleFeature() {
-      if (!this.disabledInput) this.$emit('change', !this.value);
-    },
-  },
-};
-</script>
-
-<template>
-  <label class="toggle-wrapper">
-    <input
-      v-if="name"
-      type="hidden"
-      :name="name"
-      :value="value"
-    />
-    <button
-      type="button"
-      aria-label="Toggle"
-      class="project-feature-toggle"
-      data-enabled-text="Enabled"
-      data-disabled-text="Disabled"
-      :class="{ checked: value, disabled: disabledInput }"
-      @click="toggleFeature"
-    />
-  </label>
-</template>

app/assets/javascripts/projects/permissions/components/settings_panel.vue

 <script>
 import projectFeatureSetting from './project_feature_setting.vue';
-import projectFeatureToggle from './project_feature_toggle.vue';
+import projectFeatureToggle from '../../../vue_shared/components/toggle_button.vue';
 import projectSettingRow from './project_setting_row.vue';
 import { visibilityOptions, visibilityLevelDescriptions } from '../constants';
 import { toggleHiddenClassBySelector } from '../external';

app/assets/javascripts/vue_shared/components/toggle_button.vue

+<script>
+  import loadingIcon from './loading_icon.vue';
+
+  export default {
+    props: {
+      name: {
+        type: String,
+        required: false,
+        default: '',
+      },
+      value: {
+        type: Boolean,
+        required: true,
+      },
+      disabledInput: {
+        type: Boolean,
+        required: false,
+        default: false,
+      },
+      isLoading: {
+        type: Boolean,
+        required: false,
+        default: false,
+      },
+      enabledText: {
+        type: String,
+        required: false,
+        default: 'Enabled',
+      },
+      disabledText: {
+        type: String,
+        required: false,
+        default: 'Disabled',
+      },
+    },
+
+    components: {
+      loadingIcon,
+    },
+
+    model: {
+      prop: 'value',
+      event: 'change',
+    },
+
+    methods: {
+      toggleFeature() {
+        if (!this.disabledInput) this.$emit('change', !this.value);
+      },
+    },
+  };
+</script>
+
+<template>
+  <label class="toggle-wrapper">
+    <input
+      type="hidden"
+      :name="name"
+      :value="value"
+    />
+    <button
+      type="button"
+      aria-label="Toggle"
+      class="project-feature-toggle"
+      :data-enabled-text="enabledText"
+      :data-disabled-text="disabledText"
+      :class="{
+        'is-checked': value,
+        'is-disabled': disabledInput,
+        'is-loading': isLoading
+      }"
+      @click="toggleFeature"
+    >
+      <loadingIcon class="loading-icon" />
+    </button>
+  </label>
+</template>

app/assets/stylesheets/framework.scss

@@ -43,6 +43,7 @@
 @import "framework/tabs";
 @import "framework/timeline";
 @import "framework/tooltips";
+@import "framework/toggle";
 @import "framework/typography";
 @import "framework/zen";
 @import "framework/blank";

app/assets/stylesheets/framework/toggle.scss

+/**
+* Toggle button
+*
+* @usage
+*  ### Active and Inactive text should be provided as data attributes:
+*  <button type="button" class="project-feature-toggle" data-enabled-text="Enabled" data-disabled-text="Disabled">
+*  <i class="fa fa-spinner fa-spin loading-icon hidden"></i>
+*  </button>
+
+*  ### Checked should have `is-checked` class
+*  <button type="button" class="project-feature-toggle is-checked" data-enabled-text="Enabled" data-disabled-text="Disabled">
+*  <i class="fa fa-spinner fa-spin loading-icon hidden"></i>
+*  </button>
+
+*  ### Disabled should have `is-disabled` class
+*  <button type="button" class="project-feature-toggle is-disabled" data-enabled-text="Enabled" data-disabled-text="Disabled" disabled="true">
+*  <i class="fa fa-spinner fa-spin loading-icon hidden"></i>
+*  </button>
+
+*  ### Loading should have `is-loading` and an icon with `loading-icon` class
+*  <button type="button" class="project-feature-toggle is-loading" data-enabled-text="Enabled" data-disabled-text="Disabled">
+*  <i class="fa fa-spinner fa-spin loading-icon"></i>
+*  </button>
+*/
+.project-feature-toggle {
+  position: relative;
+  border: 0;
+  outline: 0;
+  display: block;
+  width: 100px;
+  height: 24px;
+  cursor: pointer;
+  user-select: none;
+  background: $feature-toggle-color-disabled;
+  border-radius: 12px;
+  padding: 3px;
+  transition: all .4s ease;
+
+  &::selection,
+  &::before::selection,
+  &::after::selection {
+    background: none;
+  }
+
+  &::before {
+    color: $feature-toggle-text-color;
+    font-size: 12px;
+    line-height: 24px;
+    position: absolute;
+    top: 0;
+    left: 25px;
+    right: 5px;
+    text-align: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    animation: animate-disabled .2s ease-in;
+    content: attr(data-disabled-text);
+  }
+
+  &::after {
+    position: relative;
+    display: block;
+    content: "";
+    width: 22px;
+    height: 18px;
+    left: 0;
+    border-radius: 9px;
+    background: $feature-toggle-color;
+    transition: all .2s ease;
+  }
+
+  .loading-icon {
+    display: none;
+    font-size: 12px;
+    color: $white-light;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+
+  }
+
+  &.is-loading {
+    &::before {
+      display: none;
+    }
+
+    .loading-icon {
+      display: block;
+
+      &::before {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+      }
+    }
+  }
+
+  &.is-checked {
+    background: $feature-toggle-color-enabled;
+
+    &::before {
+      left: 5px;
+      right: 25px;
+      animation: animate-enabled .2s ease-in;
+      content: attr(data-enabled-text);
+    }
+
+    &::after {
+      left: calc(100% - 22px);
+    }
+  }
+
+  &.is-disabled {
+    opacity: 0.4;
+    cursor: not-allowed;
+  }
+
+  @media (max-width: $screen-xs-min) {
+    width: 50px;
+
+    &::before,
+    &.is-checked::before {
+      display: none;
+    }
+  }
+
+  @keyframes animate-enabled {
+    0%, 35% { opacity: 0; }
+    100% { opacity: 1; }
+  }
+
+  @keyframes animate-disabled {
+    0%, 35% { opacity: 0; }
+    100% { opacity: 1; }
+  }
+}

app/assets/stylesheets/pages/clusters.scss

@@ -14,3 +14,17 @@
 }
 
 @include new-style-dropdown('.clusters-dropdown ');
+
+.clusters-container {
+  .nav-bar-right {
+    padding: $gl-padding-top $gl-padding;
+  }
+
+  .empty-state .svg-content img {
+    width: 145px;
+  }
+
+  .top-area .nav-controls > .btn.btn-add-cluster {
+    margin-right: 0;
+  }
+}

app/assets/stylesheets/pages/projects.scss

@@ -134,93 +134,6 @@
   }
 }
 
-.project-feature-toggle {
-  position: relative;
-  border: 0;
-  outline: 0;
-  display: block;
-  width: 100px;
-  height: 24px;
-  cursor: pointer;
-  user-select: none;
-  background: $feature-toggle-color-disabled;
-  border-radius: 12px;
-  padding: 3px;
-  transition: all .4s ease;
-
-  &::selection,
-  &::before::selection,
-  &::after::selection {
-    background: none;
-  }
-
-  &::before {
-    color: $feature-toggle-text-color;
-    font-size: 12px;
-    line-height: 24px;
-    position: absolute;
-    top: 0;
-    left: 25px;
-    right: 5px;
-    text-align: center;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    animation: animate-disabled .2s ease-in;
-    content: attr(data-disabled-text);
-  }
-
-  &::after {
-    position: relative;
-    display: block;
-    content: "";
-    width: 22px;
-    height: 18px;
-    left: 0;
-    border-radius: 9px;
-    background: $feature-toggle-color;
-    transition: all .2s ease;
-  }
-
-  &.checked {
-    background: $feature-toggle-color-enabled;
-
-    &::before {
-      left: 5px;
-      right: 25px;
-      animation: animate-enabled .2s ease-in;
-      content: attr(data-enabled-text);
-    }
-
-    &::after {
-      left: calc(100% - 22px);
-    }
-  }
-
-  &.disabled {
-    opacity: 0.4;
-    cursor: not-allowed;
-  }
-
-  @media (max-width: $screen-xs-min) {
-    width: 50px;
-
-    &::before,
-    &.checked::before {
-      display: none;
-    }
-  }
-
-  @keyframes animate-enabled {
-    0%, 35% { opacity: 0; }
-    100% { opacity: 1; }
-  }
-
-  @keyframes animate-disabled {
-    0%, 35% { opacity: 0; }
-    100% { opacity: 1; }
-  }
-}
-
 .project-home-panel,
 .group-home-panel {
   padding-top: 24px;

app/controllers/projects/clusters_controller.rb

@@ -8,11 +8,11 @@ class Projects::ClustersController < Projects::ApplicationController
   STATUS_POLLING_INTERVAL = 10_000
 
   def index
-    if project.cluster
-      redirect_to project_cluster_path(project, project.cluster)
-    else
-      redirect_to new_project_cluster_path(project)
-    end
+    @scope = params[:scope] || 'all'
+    @clusters = ClustersFinder.new(project, current_user, @scope).execute.page(params[:page])
+    @active_count = ClustersFinder.new(project, current_user, :active).execute.count
+    @inactive_count = ClustersFinder.new(project, current_user, :inactive).execute.count
+    @all_count = @active_count + @inactive_count
   end
 
   def new
@@ -39,10 +39,20 @@ class Projects::ClustersController < Projects::ApplicationController
       .execute(cluster)
 
     if cluster.valid?
-      flash[:notice] = "Cluster was successfully updated."
-      redirect_to project_cluster_path(project, project.cluster)
+      respond_to do |format|
+        format.json do
+          head :no_content
+        end
+        format.html do
+          flash[:notice] = "Cluster was successfully updated."
+          redirect_to project_cluster_path(project, cluster)
+        end
+      end
     else
-      render :show
+      respond_to do |format|
+        format.json { head :bad_request }
+        format.html { render :show }
+      end
     end
   end
 
@@ -63,6 +73,19 @@ class Projects::ClustersController < Projects::ApplicationController
                                  .present(current_user: current_user)
   end
 
+  def create_params
+    params.require(:cluster).permit(
+      :enabled,
+      :name,
+      :provider_type,
+      provider_gcp_attributes: [
+        :gcp_project_id,
+        :zone,
+        :num_nodes,
+        :machine_type
+      ])
+  end
+
   def update_params
     if cluster.managed?
       params.require(:cluster).permit(

app/finders/clusters_finder.rb

+class ClustersFinder
+  def initialize(project, user, scope)
+    @project = project
+    @user = user
+    @scope = scope || :active
+  end
+
+  def execute
+    clusters = project.clusters
+    filter_by_scope(clusters)
+  end
+
+  private
+
+  attr_reader :project, :user, :scope
+
+  def filter_by_scope(clusters)
+    case scope.to_sym
+    when :all
+      clusters
+    when :inactive
+      clusters.disabled
+    when :active
+      clusters.enabled
+    else
+      raise "Invalid scope #{scope}"
+    end
+  end
+end

app/models/clusters/cluster.rb

@@ -55,6 +55,10 @@ module Clusters
       end
     end
 
+    def created?
+      status_name == :created
+    end
+
     def applications
       [
         application_helm || build_application_helm,

app/models/project.rb

@@ -194,7 +194,6 @@ class Project < ActiveRecord::Base
   has_one :statistics, class_name: 'ProjectStatistics'
 
   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,

app/presenters/clusters/cluster_presenter.rb

@@ -5,5 +5,9 @@ module Clusters
     def gke_cluster_url
       "https://console.cloud.google.com/kubernetes/clusters/details/#{provider.zone}/#{name}" if gcp?
     end
+
+    def can_toggle_cluster?
+      can?(current_user, :update_cluster, cluster) && created?
+    end
   end
 end

app/services/clusters/create_service.rb

@@ -5,6 +5,8 @@ module Clusters
     def execute(access_token = nil)
       @access_token = access_token
 
+      raise ArgumentError.new('Instance does not support multiple clusters') unless can_create_cluster?
+
       create_cluster.tap do |cluster|
         ClusterProvisionWorker.perform_async(cluster.id) if cluster.persisted?
       end
@@ -25,5 +27,11 @@ module Clusters
 
       @cluster_params = params.merge(user: current_user, projects: [project])
     end
+
+    def can_create_cluster?
+      return true if project.clusters.empty?
+
+      project.feature_available?(:multiple_clusters)
+    end
   end
 end

app/services/projects/fork_service.rb

 module Projects
   class ForkService < BaseService
-    def execute
+    def execute(fork_to_project = nil)
+      if fork_to_project
+        link_existing_project(fork_to_project)
+      else
+        fork_new_project
+      end
+    end
+
+    private
+
+    def link_existing_project(fork_to_project)
+      return if fork_to_project.forked?
+
+      link_fork_network(fork_to_project)
+
+      fork_to_project
+    end
+
+    def fork_new_project
       new_params = {
         forked_from_project_id: @project.id,
         visibility_level:       allowed_visibility_level,
@@ -21,15 +39,11 @@ module Projects
       builds_access_level = @project.project_feature.builds_access_level
       new_project.project_feature.update_attributes(builds_access_level: builds_access_level)
 
-      refresh_forks_count
-
       link_fork_network(new_project)
 
       new_project
     end
 
-    private
-
     def fork_network
       if @project.fork_network
         @project.fork_network
@@ -43,9 +57,17 @@ module Projects
       end
     end
 
-    def link_fork_network(new_project)
-      fork_network.fork_network_members.create(project: new_project,
+    def link_fork_network(fork_to_project)
+      fork_network.fork_network_members.create(project: fork_to_project,
                                                forked_from_project: @project)
+
+      # TODO: remove this when ForkedProjectLink model is removed
+      unless fork_to_project.forked_project_link
+        fork_to_project.create_forked_project_link(forked_to_project: fork_to_project,
+                                                   forked_from_project: @project)
+      end
+
+      refresh_forks_count
     end
 
     def refresh_forks_count

app/views/layouts/nav/sidebar/_project.html.haml

@@ -201,7 +201,7 @@
               = nav_link(controller: [:clusters, :user, :gcp]) do
                 = link_to project_clusters_path(@project), title: 'Cluster', class: 'shortcuts-cluster' do
                   %span
-                    Cluster
+                    Clusters
 
             - if @project.feature_available?(:builds, current_user) && !@project.empty_repo?
               = nav_link(path: 'pipelines#charts') do

app/views/projects/clusters/_cluster.html.haml

+.gl-responsive-table-row
+  .table-section.section-30
+    .table-mobile-header{ role: "rowheader" }= s_("ClusterIntegration|Cluster")
+    .table-mobile-content
+      = link_to cluster.name, namespace_project_cluster_path(@project.namespace, @project, cluster)
+  .table-section.section-30
+    .table-mobile-header{ role: "rowheader" }= s_("ClusterIntegration|Environment pattern")
+    .table-mobile-content= cluster.environment_scope
+  .table-section.section-30
+    .table-mobile-header{ role: "rowheader" }= s_("ClusterIntegration|Project namespace")
+    .table-mobile-content= cluster.platform_kubernetes&.actual_namespace
+  .table-section.section-10
+    .table-mobile-header{ role: "rowheader" }
+    .table-mobile-content
+      %button{ type: "button",
+        class: "js-toggle-cluster-list project-feature-toggle #{'is-checked' if cluster.enabled?} #{'is-disabled' if !cluster.can_toggle_cluster?}",
+        "aria-label": s_("ClusterIntegration|Toggle Cluster"),
+        disabled: !cluster.can_toggle_cluster?,
+        data: { "enabled-text": s_("ClusterIntegration|Active"),
+          "disabled-text": s_("ClusterIntegration|Inactive"),
+          endpoint: namespace_project_cluster_path(@project.namespace, @project, cluster, format: :json) } }
+        = icon("spinner spin", class: "loading-icon")

app/views/projects/clusters/_empty_state.html.haml

+.row.empty-state
+  .col-xs-12
+    .svg-content= image_tag 'illustrations/clusters_empty.svg'
+  .col-xs-12.text-center
+    .text-content
+      %h4= s_('ClusterIntegration|Integrate cluster automation')
+      - link_to_help_page = link_to(s_('ClusterIntegration|Learn more about Clusters'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer')
+      %p= s_('ClusterIntegration|Clusters allow you to use review apps, deploy your applications, run your pipelines, and much more in an easy way. %{link_to_help_page}').html_safe % { link_to_help_page: link_to_help_page}
+
+      %p
+        = link_to s_('ClusterIntegration|Add cluster'), new_project_cluster_path(@project), class: 'btn btn-success'
+

app/views/projects/clusters/_enabled.html.haml

@@ -5,12 +5,11 @@
       = field.hidden_field :enabled, { class: 'js-toggle-input'}
 
       %button{ type: 'button',
-        class: "js-toggle-cluster project-feature-toggle #{'checked' unless !@cluster.enabled?} #{'disabled' unless can?(current_user, :update_cluster, @cluster)}",
-        'aria-label': s_('ClusterIntegration|Toggle Cluster'),
+        class: "js-toggle-cluster project-feature-toggle #{'is-checked' unless !@cluster.enabled?} #{'is-disabled' unless can?(current_user, :update_cluster, @cluster)}",
+        "aria-label": s_("ClusterIntegration|Toggle Cluster"),
         disabled: !can?(current_user, :update_cluster, @cluster),
-        data: { 'enabled-text': 'Enabled', 'disabled-text': 'Disabled' } }
+        data: { "enabled-text": s_("ClusterIntegration|Active"), "disabled-text": s_("ClusterIntegration|Inactive"), } }
 
     - if can?(current_user, :update_cluster, @cluster)
       .form-group
         = field.submit _('Save'), class: 'btn btn-success'
-

app/views/projects/clusters/_tabs.html.haml

+.top-area.scrolling-tabs-container.inner-page-scroll-tabs
+  .fade-left= icon("angle-left")
+  .fade-right= icon("angle-right")
+  %ul.nav-links.scrolling-tabs
+    %li{ class: ('active' if @scope == 'active') }>
+      = link_to project_clusters_path(@project, scope: :active), class: "js-active-tab" do
+        = s_("ClusterIntegration|Active")
+        %span.badge= @active_count
+    %li{ class: ('active' if @scope == 'inactive') }>
+      = link_to project_clusters_path(@project, scope: :inactive), class: "js-inactive-tab" do
+        = s_("ClusterIntegration|Inactive")
+        %span.badge= @inactive_count
+    %li{ class: ('active' if @scope.nil? || @scope == 'all') }>
+      = link_to project_clusters_path(@project), class: "js-all-tab" do
+        = s_("ClusterIntegration|All")
+        %span.badge= @all_count
+  .nav-controls
+    = link_to s_("ClusterIntegration|Add cluster"), new_project_cluster_path(@project), class: "btn btn-success btn-add-cluster disabled has-tooltip js-add-cluster", title: s_("ClusterIntegration|Multiple clusters are available in GitLab Entreprise Edition Premium and Ultimate")

app/views/projects/clusters/index.html.haml

+- breadcrumb_title "Clusters"
+- page_title "Clusters"
+
+.clusters-container
+  - if !@clusters.empty?
+    = render "tabs"
+    .ci-table.js-clusters-list
+      .gl-responsive-table-row.table-row-header{ role: "row" }
+        .table-section.section-30{ role: "rowheader" }
+          = s_("ClusterIntegration|Cluster")
+        .table-section.section-30{ role: "rowheader" }
+          = s_("ClusterIntegration|Environment pattern")
+        .table-section.section-30{ role: "rowheader" }
+          = s_("ClusterIntegration|Project namespace")
+        .table-section.section-10{ role: "rowheader" }
+      - @clusters.each do |cluster|
+        = render "cluster", cluster: cluster.present(current_user: current_user)
+    = paginate @clusters, theme: "gitlab"
+  - elsif @scope == 'all'
+    = render "empty_state"
+  - else
+    = render "tabs"
+    .prepend-top-20.text-center
+      = s_("ClusterIntegration|There are no clusters to show")

app/views/projects/clusters/show.html.haml

 - @content_class = "limit-container-width" unless fluid_layout
-- breadcrumb_title "Cluster"
+- add_to_breadcrumbs "Clusters", project_clusters_path(@project)
+- breadcrumb_title @cluster.id
 - page_title _("Cluster")
 
 - expanded = Rails.env.test?
@@ -28,7 +29,6 @@
       %button.btn.js-settings-toggle
         = expanded ? 'Collapse' : 'Expand'
       %p= s_('ClusterIntegration|See and edit the details for your cluster')
-
     .settings-content
       - if @cluster.managed?
         = render 'projects/clusters/gcp/show'

changelogs/unreleased/fj-40752-forks-api-not-using-services.yml

+---
+title: Using appropiate services in the API for managing forks
+merge_request: 15709
+author:
+type: fixed

db/post_migrate/20171205190711_reschedule_fork_network_creation_caller.rb

+class RescheduleForkNetworkCreationCaller < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  MIGRATION = 'PopulateForkNetworksRange'.freeze
+  BATCH_SIZE = 100
+  DELAY_INTERVAL = 15.seconds
+
+  disable_ddl_transaction!
+
+  class ForkedProjectLink < ActiveRecord::Base
+    include EachBatch
+
+    self.table_name = 'forked_project_links'
+  end
+
+  def up
+    say 'Populating the `fork_networks` based on existing `forked_project_links`'
+
+    queue_background_migration_jobs_by_range_at_intervals(ForkedProjectLink, MIGRATION, DELAY_INTERVAL, batch_size: BATCH_SIZE)
+  end
+
+  def down
+    # nothing
+  end
+end

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: 20171201140229) do
+ActiveRecord::Schema.define(version: 20171205190711) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

doc/development/README.md

@@ -16,8 +16,8 @@ comments: false
 - [GitLab core team & GitLab Inc. contribution process](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/PROCESS.md)
 - [Generate a changelog entry with `bin/changelog`](changelog.md)
 - [Code review guidelines](code_review.md) for reviewing code and having code reviewed.
-- [Limit conflicts with EE when developing on CE](limit_ee_conflicts.md)
-- [Guidelines for implementing Enterprise Edition feature](ee_features.md)
+- [Automatic CE->EE merge](automatic_ce_ee_merge.md)
+- [Guidelines for implementing Enterprise Edition features](ee_features.md)
 
 ## UX and frontend guides
 

doc/development/automatic_ce_ee_merge.md

+# Automatic CE->EE merge
+
+GitLab Community Edition is merged automatically every 3 hours into the
+Enterprise Edition (look for the [`CE Upstream` merge requests]).
+
+This merge is done automatically in a
+[scheduled pipeline](https://gitlab.com/gitlab-org/release-tools/-/jobs/43201679).
+If a merge is already in progress, the job [doesn't create a new one](https://gitlab.com/gitlab-org/release-tools/-/jobs/43157687).
+
+**If you are pinged in a `CE Upstream` merge request to resolve a conflict,
+please resolve the conflict as soon as possible or ask someone else to do it!**
+
+>**Note:**
+It's ok to resolve more conflicts than the one that you are asked to resolve. In
+that case, it's a good habit to ask for a double-check on your resolution by
+someone who is familiar with the code you touched.
+
+[`CE Upstream` merge requests]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=CE+upstream
+
+### Always merge EE merge requests before their CE counterparts
+
+**In order to avoid conflicts in the CE->EE merge, you should always merge the
+EE version of your CE merge request first, if present.**
+
+The rationale for this is that as CE->EE merges are done automatically every few
+hours, it can happen that:
+
+1. A CE merge request that needs EE-specific changes is merged
+1. The automatic CE->EE merge happens
+1. Conflicts due to the CE merge request occur since its EE merge request isn't
+  merged yet
+1. The automatic merge bot will ping someone to resolve the conflict **that are
+  already resolved in the EE merge request that isn't merged yet**
+
+That's a waste of time, and that's why you should merge EE merge request before
+their CE counterpart.
+
+## Avoiding CE->EE merge conflicts beforehand
+
+To avoid the conflicts beforehand, check out the
+[Guidelines for implementing Enterprise Edition features](ee_features.md).
+
+In any case, the CI `ee_compat_check` job will tell you if you need to open an
+EE version of your CE merge request.
+
+### Conflicts detection in CE merge requests
+
+For each commit (except on `master`), the `ee_compat_check` CI job tries to
+detect if the current branch's changes will conflict during the CE->EE merge.
+
+The job reports what files are conflicting and how to setup a merge request
+against EE.
+
+#### How the job works
+
+1. Generates the diff between your branch and current CE `master`
+1. Tries to apply it to current EE `master`
+1. If it applies cleanly, the job succeeds, otherwise...
+1. Detects a branch with the `ee-` prefix or `-ee` suffix in EE
+1. If it exists, generate the diff between this branch and current EE `master`
+1. Tries to apply it to current EE `master`
+1. If it applies cleanly, the job succeeds
+
+In the case where the job fails, it means you should create a `ee-<ce_branch>`
+or `<ce_branch>-ee` branch, push it to EE and open a merge request against EE
+`master`.
+At this point if you retry the failing job in your CE merge request, it should
+now pass.
+
+Notes:
+
+- This task is not a silver-bullet, its current goal is to bring awareness to
+  developers that their work needs to be ported to EE.
+- Community contributors shouldn't be required to submit merge requests against
+  EE, but reviewers should take actions by either creating such EE merge request
+  or asking a GitLab developer to do it **before the merge request is merged**.
+- If you branch is too far behind `master`, the job will fail. In that case you
+  should rebase your branch upon latest `master`.
+- Code reviews for merge requests often consist of multiple iterations of
+  feedback and fixes. There is no need to update your EE MR after each
+  iteration. Instead, create an EE MR as soon as you see the
+  `ee_compat_check` job failing. After you receive the final approval
+  from a Maintainer (but **before the CE MR is merged**) update the EE MR.
+  This helps to identify significant conflicts sooner, but also reduces the
+  number of times you have to resolve conflicts.
+- Please remember to
+  [always have your EE merge request merged before the CE version](#always-merge-ee-merge-requests-before-their-ce-counterparts).
+- You can use [`git rerere`](https://git-scm.com/blog/2010/03/08/rerere.html)
+  to avoid resolving the same conflicts multiple times.
+
+---
+
+[Return to Development documentation](README.md)

doc/development/ee_features.md

-# Guidelines for implementing Enterprise Edition feature
+# Guidelines for implementing Enterprise Edition features
 
 - **Write the code and the tests.**: As with any code, EE features should have
   good test coverage to prevent regressions.
@@ -380,3 +380,9 @@ to avoid conflicts during CE to EE merge.
   }
 }
 ```
+
+## gitlab-svgs
+
+Conflicts in `app/assets/images/icons.json` or `app/assets/images/icons.svg` can
+be resolved simply by regenerating those assets with
+[`yarn run svg`](https://gitlab.com/gitlab-org/gitlab-svgs).

doc/development/writing_documentation.md

@@ -142,7 +142,7 @@ tests. If it doesn't, the whole test suite will run (including docs).
 ---
 
 When you submit a merge request to GitLab Community Edition (CE), there is an
-additional job called `rake ee_compat_check` that runs against Enterprise
+additional job called `ee_compat_check` that runs against Enterprise
 Edition (EE) and checks if your changes can apply cleanly to the EE codebase.
 If that job fails, read the instructions in the job log for what to do next.
 Contributors do not need to submit their changes to EE, GitLab Inc. employees

doc/gitlab-geo/configuration.md

@@ -5,62 +5,42 @@ This is the documentation for the Omnibus GitLab packages. For installations
 from source, follow the [**GitLab Geo nodes configuration for installations
 from source**](configuration_source.md) guide.
 
+## Configuring a new secondary node
+
 >**Note:**
-Stages of the setup process must be completed in the documented order.
-Before attempting the steps in this stage, [complete all prior stages][toc].
+This is the final step in setting up a secondary Geo node. Stages of the
+setup process must be completed in the documented order.
+Before attempting the steps in this stage, [complete all prior stages](README.md#using-omnibus-gitlab).
+
+The basic steps of configuring a secondary node are:
 
-This is the final step you need to follow in order to setup a Geo node.
+1. replicate required configurations between the primary and the secondaries;
+1. configure a second, tracking database on each secondary;
+1. start GitLab on the secondary node's machine.
 
 You are encouraged to first read through all the steps before executing them
 in your testing/production environment.
 
-## Setting up GitLab
-
 >**Notes:**
 - **Do not** setup any custom authentication in the secondary nodes, this will be
   handled by the primary node.
 - **Do not** add anything in the secondaries Geo nodes admin area
   (**Admin Area ➔ Geo Nodes**). This is handled solely by the primary node.
 
-After having installed GitLab Enterprise Edition in the instance that will serve
-as a Geo node and set up the [database replication](database.md), the next steps
-can be summed up to:
-
-1. Replicate some required configurations between the primary and the secondaries
-1. Configure a second, tracking database on each secondary
-1. Start GitLab on the secondary node's machine
-
-### Prerequisites
-
-This is the last step of configuring a Geo secondary node. Make sure you have
-followed the first two steps of the [Setup instructions](README.md#setup-instructions):
-
-1. You have already installed on the secondary server the same version of
-   GitLab Enterprise Edition that is present on the primary server.
-1. You have set up the database replication.
-1. Your secondary node is allowed to communicate via HTTP/HTTPS with
-   your primary node (make sure your firewall is not blocking that).
-1. Your nodes must have an NTP service running to synchronize the clocks.
-   You can use different timezones, but the hour relative to UTC can't be more
-   than 60 seconds off from each node.
-
 ### Step 1. Copying the database encryption key
 
-GitLab stores a unique encryption key in disk that we use to safely store
-sensitive data in the database. Any secondary node must have the
-**exact same value** for `db_key_base` as defined in the primary one.
+GitLab stores a unique encryption key on disk that is used to encrypt
+sensitive data stored in the database. All secondary nodes must have the
+**exact same value** for `db_key_base` as defined on the primary node.
 
-1. SSH into the **primary** node and login as root:
+1. SSH into the **primary** node, and execute the command below
+to display the current encryption key:
 
+    ```bash
+    sudo gitlab-rake geo:db:show_encryption_key
     ```
-    sudo -i
-    ```
-
-1. Execute the command below to display the current encryption key and copy it:
 
-    ```
-    gitlab-rake geo:db:show_encryption_key
-    ```
+Copy the encryption key to bring it to the secondary node in the following steps.
 
 1. SSH into the **secondary** node and login as root:
 
@@ -81,18 +61,22 @@ sensitive data in the database. Any secondary node must have the
     gitlab-ctl reconfigure
     ```
 
-Once reconfigured, the secondary will start automatically
+Once reconfigured, the secondary will automatically start
 replicating missing data from the primary in a process known as backfill.
-Meanwhile, the primary node will start to notify changes to the secondary, which
-will act on those notifications immediately. Make sure the secondary instance is
-running and accessible.
+Meanwhile, the primary node will start to notify the secondary of any changes, so
+that the secondary can act on those notifications immediately.
 
-### Step 2. Enabling hashed storage (optional, from GitLab 10.0)
+Make sure the secondary instance is
+running and accessible. You can login to the secondary node
+with the same credentials as used in the primary.
+
+### Step 2. (Optional) Enabling hashed storage (from GitLab 10.0)
 
 >**Warning**
 Hashed storage is in **Alpha**. It is considered experimental and not
-production-ready. See [Hashed
-Storage](../administration/repository_storage_types.md) for more detail.
+production-ready. See [Hashed Storage](../administration/repository_storage_types.md)
+for more detail, and for the latest updates, check
+[infrastructure issue #2821](https://gitlab.com/gitlab-com/infrastructure/issues/2821).
 
 Using hashed storage significantly improves Geo replication - project and group
 renames no longer require synchronization between nodes.
@@ -120,7 +104,17 @@ method to be enabled. Navigate to **Admin Area ➔ Settings**
 (`/admin/application_settings`) on the primary node, and set
 `Enabled Git access protocols` to `Both SSH and HTTP(S)` or `Only HTTP(S)`.
 
-### Step 5. Managing the secondary GitLab node
+### Verify proper functioning of the secondary node
+
+Your nodes should now be ready to use. You can login to the secondary node
+with the same credentials as used in the primary. Visit the secondary node's
+**Admin Area ➔ Geo Nodes** (`/admin/geo_nodes`) in your browser to check if it's
+correctly identified as a secondary Geo node and if Geo is enabled.
+
+If your installation isn't working properly, check the
+[troubleshooting document](troubleshooting.md).
+
+Point your users to the ["Using a Geo Server" guide](using_a_geo_server.md).
 
 You can monitor the status of the syncing process on a secondary node
 by visiting the primary node's **Admin Area ➔ Geo Nodes** (`/admin/geo_nodes`)
@@ -139,36 +133,23 @@ The two most obvious issues that replication can have here are:
 1. Instance to instance notification not working. In that case, it can be
    something of the following:
      - You are using a custom certificate or custom CA (see the
-       [Troubleshooting](configuration.md#troubleshooting) section)
-     - Instance is firewalled (check your firewall rules)
+       [troubleshooting document](troubleshooting.md))
+     - The instance is firewalled (check your firewall rules)
 
 Currently, this is what is synced:
 
 * Git repositories
 * Wikis
 * LFS objects
-* Issue, merge request, snippet and comment attachments
-* User, group, and project avatars
-
-## Next steps
-
-Your nodes should now be ready to use. You can login to the secondary node
-with the same credentials as used in the primary. Visit the secondary node's
-**Admin Area ➔ Geo Nodes** (`/admin/geo_nodes`) in your browser to check if it's
-correctly identified as a secondary Geo node and if Geo is enabled.
-
-If your installation isn't working properly, check the
-[troubleshooting](#troubleshooting) section.
-
-Point your users to the ["Using a Geo Server" guide](using_a_geo_server.md).
+* Issues, merge requests, snippets, and comment attachments
+* Users, groups, and project avatars
 
 ## Selective replication
 
-With GitLab 9.5, GitLab Geo now supports the first iteration of selective
-replication, which allows admins to choose which groups should be
-replicated by secondary nodes.
+GitLab Geo supports selective replication, which allows admins to choose which
+groups should be replicated by secondary nodes.
 
-It is important to notice that selective replication:
+It is important to note that selective replication:
 
 1. Does not restrict permissions from secondary nodes.
 1. Does not hide projects metadata from secondary nodes. Since Geo currently
@@ -177,12 +158,10 @@ secondary nodes, but repositories that have not been selected will be empty.
 1. Secondary nodes won't pull repositories that do not belong to the selected
 groups to be replicated.
 
-### Upgrading Geo
+## Upgrading Geo
 
 See the [updating the Geo nodes document](updating_the_geo_nodes.md).
 
 ## Troubleshooting
 
 See the [troubleshooting document](troubleshooting.md).
-
-[toc]: README.md#using-omnibus-gitlab

doc/gitlab-geo/configuration_source.md

@@ -5,16 +5,22 @@ This is the documentation for installations from source. For installations
 using the Omnibus GitLab packages, follow the
 [**Omnibus GitLab Geo nodes configuration**](configuration.md) guide.
 
+## Configuring a new secondary node
+
 >**Note:**
-Stages of the setup process must be completed in the documented order.
-Before attempting the steps in this stage, [complete all prior stages][toc].
+This is the final step in setting up a secondary Geo node. Stages of the setup
+process must be completed in the documented order. Before attempting the steps
+in this stage, [complete all prior stages](README.md#using-gitlab-installed-from-source).
+
+The basic steps of configuring a secondary node are:
 
-This is the final step you need to follow in order to setup a Geo node.
+1. replicate required configurations between the primary and the secondaries;
+1. configure a second, tracking database on each secondary;
+1. start GitLab on the secondary node's machine.
 
 You are encouraged to first read through all the steps before executing them
 in your testing/production environment.
 
-## Setting up GitLab
 
 >**Notes:**
 - **Do not** setup any custom authentication in the secondary nodes, this will be
@@ -22,90 +28,48 @@ in your testing/production environment.
 - **Do not** add anything in the secondaries Geo nodes admin area
   (**Admin Area ➔ Geo Nodes**). This is handled solely by the primary node.
 
-After having installed GitLab Enterprise Edition in the instance that will serve
-as a Geo node and set up the [database replication](database_source.md), the
-next steps can be summed up to:
-
-1. Replicate some required configurations between the primary and the secondaries
-1. Configure a second, tracking database on each secondary
-1. Start GitLab on the secondary node's machine
-
-### Prerequisites
-
-This is the last step of configuring a Geo secondary node. Make sure you have
-followed the first two steps of the [Setup instructions](README.md#setup-instructions):
-
-1. You have already installed on the secondary server the same version of
-   GitLab Enterprise Edition that is present on the primary server.
-1. You have set up the database replication.
-1. Your secondary node is allowed to communicate via HTTP/HTTPS with
-   your primary node (make sure your firewall is not blocking that).
-1. Your nodes must have an NTP service running to synchronize the clocks.
-   You can use different timezones, but the hour relative to UTC can't be more
-   than 60 seconds off from each node.
-1. You have set up another PostgreSQL database that can store writes for the secondary.
-   Note that this MUST be on another instance, since the primary replicated database
-   is read-only.
-
 ### Step 1. Copying the database encryption key
 
-GitLab stores a unique encryption key in disk that we use to safely store
-sensitive data in the database. Any secondary node must have the
-**exact same value** for `db_key_base` as defined in the primary one.
-
-1. SSH into the **primary** node and login as root:
+GitLab stores a unique encryption key on disk that is used to encrypt
+sensitive data stored in the database. All secondary nodes must have the
+**exact same value** for `db_key_base` as defined on the primary node.
 
-    ```
-    sudo -i
-    ```
+1. SSH into the **primary** node,  and execute the command below to display the
+current encryption key:
 
-1. Execute the command below to display the current encryption key and copy it:
-
-    ```
+    ```bash
     sudo -u git -H bundle exec rake geo:db:show_encryption_key RAILS_ENV=production
     ```
 
-1. SSH into the **secondary** node and login as root:
+Copy the encryption key to bring it to the secondary node in the following steps.
 
-    ```
-    sudo -i
-    ```
+1. SSH into the **secondary**, and execute the command below to open the
+`secrets.yml` file:
 
-1. Open the `secrets.yml` file and change the value of `db_key_base` to the
-   output of the previous step:
-
-    ```
+    ```bash
     sudo -u git -H editor config/secrets.yml
     ```
 
-1. Save and close the file.
+1. Change the value of `db_key_base` to the output from the primary node.
+Then save and close the file.
 
 1. Restart GitLab for the changes to take effect:
 
-    ```
+    ```bash
     service gitlab restart
     ```
 
-The secondary will start automatically replicating missing data from the
-primary in a process known as backfill. Meanwhile, the primary node will start
-to notify changes to the secondary, which will act on those notifications
-immediately. Make sure the secondary instance is running and accessible.
-
-### Step 2. Enabling hashed storage (optional, GitLab 10.0)
+Once restarted, the secondary will automatically start replicating missing data
+from the primary in a process known as backfill. Meanwhile, the primary node
+will start to notify the secondary of any changes, so that the secondary can
+act on those notifications immediately.
 
->**Warning**
-Hashed storage is in **Alpha**. It is considered experimental and not
-production-ready. See [Hashed
-Storage](../administration/repository_storage_types.md) for more detail.
+Make sure the secondary instance is running and accessible. You can login to
+the secondary node with the same credentials as used in the primary.
 
-Using hashed storage significantly improves Geo replication - project and group
-renames no longer require synchronization between nodes.
+### Step 2. (Optional) Enabling hashed storage (from GitLab 10.0)
 
-1. Visit the **primary** node's **Admin Area ➔ Settings**
-   (`/admin/application_settings`) in your browser
-1. In the `Repository Storages` section, check `Create new projects using hashed storage paths`:
-
-    ![](img/hashed-storage.png)
+Read [Enabling Hashed Storage](configuration.md#step-2-optional-enabling-hashed-storage-from-gitlab-10-0)
 
 ### Step 3. (Optional) Configuring the secondary to trust the primary
 
@@ -130,52 +94,10 @@ method to be enabled. Navigate to **Admin Area ➔ Settings**
 (`/admin/application_settings`) on the primary node, and set
 `Enabled Git access protocols` to `Both SSH and HTTP(S)` or `Only HTTP(S)`.
 
+### Verify proper functioning of the secondary node
 
-### Step 5. Managing the secondary GitLab node
-
-You can monitor the status of the syncing process on a secondary node
-by visiting the primary node's **Admin Area ➔ Geo Nodes** (`/admin/geo_nodes`)
-in your browser.
-
-Please note that if `git_data_dirs` is customized on the primary for multiple
-repository shards you must duplicate the same configuration on the secondary.
-
-![GitLab Geo dashboard](img/geo-node-dashboard.png)
-
-Disabling a secondary node stops the syncing process.
-
-The two most obvious issues that replication can have here are:
+Read [Verify proper functioning of the secondary node](configuration.md#verify-proper-functioning-of-the-secondary-node).
 
-1. Database replication not working well
-1. Instance to instance notification not working. In that case, it can be
-   something of the following:
-     - You are using a custom certificate or custom CA (see the
-       [Troubleshooting](configuration.md#troubleshooting) section)
-     - Instance is firewalled (check your firewall rules)
-
-Currently, this is what is synced:
-
-* Git repositories
-* Wikis
-* LFS objects
-* Issue, merge request, snippet and comment attachments
-* User, group, and project avatars
-
-You can monitor the status of the syncing process on a secondary node
-by visiting the primary node's **Admin Area ➔ Geo Nodes** (`/admin/geo_nodes`)
-in your browser.
-
-## Next steps
-
-Your nodes should now be ready to use. You can login to the secondary node
-with the same credentials as used in the primary. Visit the secondary node's
-**Admin Area ➔ Geo Nodes** (`/admin/geo_nodes`) in your browser to check if it's
-correctly identified as a secondary Geo node and if Geo is enabled.
-
-If your installation isn't working properly, check the
-[troubleshooting](configuration.md#troubleshooting) section.
-
-Point your users to the ["Using a Geo Server" guide](using_a_geo_server.md).
 
 ## Selective replication
 
@@ -184,5 +106,3 @@ Read [Selective replication](configuration.md#selective-replication).
 ## Troubleshooting
 
 Read the [troubleshooting document](troubleshooting.md).
-
-[toc]: README.md#using-gitlab-installed-from-source

doc/user/markdown.md

@@ -446,6 +446,7 @@ For example:
 # This header has Unicode in it: 한글
 ## This header has spaces in it
 ### This header has spaces in it
+## This header has 3.5 in it (and parentheses)
 ```
 
 Would generate the following link IDs:
@@ -455,6 +456,7 @@ Would generate the following link IDs:
 1. `this-header-has-unicode-in-it-한글`
 1. `this-header-has-spaces-in-it`
 1. `this-header-has-spaces-in-it-1`
+1. `this-header-has-3-5-in-it-and-parentheses`
 
 Note that the Emoji processing happens before the header IDs are generated, so the Emoji is converted to an image which then gets removed from the ID.
 

ee/app/models/license.rb

@@ -44,6 +44,7 @@ class License < ActiveRecord::Base
     group_issue_boards
     jira_dev_panel_integration
     ldap_group_sync_filter
+    multiple_clusters
     object_storage
     service_desk
     variable_environment_scope

lib/api/projects.rb

@@ -379,15 +379,16 @@ module API
       post ":id/fork/:forked_from_id" do
         authenticated_as_admin!
 
-        forked_from_project = find_project!(params[:forked_from_id])
-        not_found!("Source Project") unless forked_from_project
+        fork_from_project = find_project!(params[:forked_from_id])
 
-        if user_project.forked_from_project.nil?
-          user_project.create_forked_project_link(forked_to_project_id: user_project.id, forked_from_project_id: forked_from_project.id)
+        not_found!("Source Project") unless fork_from_project
 
-          ::Projects::ForksCountService.new(forked_from_project).refresh_cache
+        result = ::Projects::ForkService.new(fork_from_project, current_user).execute(user_project)
+
+        if result
+          present user_project.reload, with: Entities::Project
         else
-          render_api_error!("Project already forked", 409)
+          render_api_error!("Project already forked", 409) if user_project.forked?
         end
       end
 
@@ -395,11 +396,11 @@ module API
       delete ":id/fork" do
         authorize! :remove_fork_project, user_project
 
-        if user_project.forked?
-          destroy_conditionally!(user_project.forked_project_link)
-        else
-          not_modified!
+        result = destroy_conditionally!(user_project) do
+          ::Projects::UnlinkForkService.new(user_project, current_user).execute
         end
+
+        result ? status(204) : not_modified!
       end
 
       desc 'Share the project with a group' do

lib/gitlab/ee_compat_check.rb

@@ -280,7 +280,7 @@ module Gitlab
         The `#{branch}` branch applies cleanly to EE/master!
 
         Much ❤️! For more information, see
-        https://docs.gitlab.com/ce/development/limit_ee_conflicts.html#check-the-rake-ee_compat_check-in-your-merge-requests
+        https://docs.gitlab.com/ce/development/automatic_ce_ee_merge.html
         #{THANKS_FOR_READING_BANNER}
       }
     end
@@ -357,7 +357,7 @@ module Gitlab
         Once this is done, you can retry this failed build, and it should pass.
 
         Stay 💪 ! For more information, see
-        https://docs.gitlab.com/ce/development/limit_ee_conflicts.html#check-the-rake-ee_compat_check-in-your-merge-requests
+        https://docs.gitlab.com/ce/development/automatic_ce_ee_merge.html
         #{THANKS_FOR_READING_BANNER}
       }
     end
@@ -378,7 +378,7 @@ module Gitlab
         retry this build.
 
         Stay 💪 ! For more information, see
-        https://docs.gitlab.com/ce/development/limit_ee_conflicts.html#check-the-rake-ee_compat_check-in-your-merge-requests
+        https://docs.gitlab.com/ce/development/automatic_ce_ee_merge.html
         #{THANKS_FOR_READING_BANNER}
       }
     end

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-02 14:42+0100\n"
-"PO-Revision-Date: 2017-11-02 14:42+0100\n"
+"POT-Creation-Date: 2017-12-05 20:31+0100\n"
+"PO-Revision-Date: 2017-12-05 20:31+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -58,6 +58,9 @@ msgid_plural "%{storage_name}: %{failed_attempts} failed storage access attempts
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%{text} is available"
+msgstr ""
+
 msgid "(checkout the %{link} for information on how to install it)."
 msgstr ""
 
@@ -102,24 +105,15 @@ msgstr ""
 msgid "Activity"
 msgstr ""
 
-msgid "Add"
-msgstr ""
-
 msgid "Add Changelog"
 msgstr ""
 
 msgid "Add Contribution guide"
 msgstr ""
 
-msgid "Add Group Webhooks and GitLab Enterprise Edition."
-msgstr ""
-
 msgid "Add License"
 msgstr ""
 
-msgid "Add an SSH key to your profile to pull or push via SSH."
-msgstr ""
-
 msgid "Add new directory"
 msgstr ""
 
@@ -132,6 +126,12 @@ msgstr ""
 msgid "All"
 msgstr ""
 
+msgid "An error occurred when toggling the notification subscription"
+msgstr ""
+
+msgid "An error occurred while fetching sidebar data"
+msgstr ""
+
 msgid "An error occurred. Please try again."
 msgstr ""
 
@@ -141,6 +141,12 @@ msgstr ""
 msgid "Applications"
 msgstr ""
 
+msgid "Apr"
+msgstr ""
+
+msgid "April"
+msgstr ""
+
 msgid "Archived project! Repository is read-only"
 msgstr ""
 
@@ -168,6 +174,12 @@ msgstr ""
 msgid "Attach a file by drag &amp; drop or %{upload_link}"
 msgstr ""
 
+msgid "Aug"
+msgstr ""
+
+msgid "August"
+msgstr ""
+
 msgid "Authentication Log"
 msgstr ""
 
@@ -201,58 +213,7 @@ msgstr ""
 msgid "AutoDevOps|You can activate %{link_to_settings} for this project."
 msgstr ""
 
-msgid "Billing"
-msgstr ""
-
-msgid "BillingPlans|%{group_name} is currently on the %{plan_link} plan."
-msgstr ""
-
-msgid "BillingPlans|Automatic downgrade and upgrade to some plans is currently not available."
-msgstr ""
-
-msgid "BillingPlans|Current plan"
-msgstr ""
-
-msgid "BillingPlans|Customer Support"
-msgstr ""
-
-msgid "BillingPlans|Downgrade"
-msgstr ""
-
-msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}."
-msgstr ""
-
-msgid "BillingPlans|Manage plan"
-msgstr ""
-
-msgid "BillingPlans|Please contact %{customer_support_link} in that case."
-msgstr ""
-
-msgid "BillingPlans|See all %{plan_name} features"
-msgstr ""
-
-msgid "BillingPlans|This group uses the plan associated with its parent group."
-msgstr ""
-
-msgid "BillingPlans|To manage the plan for this group, visit the billing section of %{parent_billing_page_link}."
-msgstr ""
-
-msgid "BillingPlans|Upgrade"
-msgstr ""
-
-msgid "BillingPlans|You are currently on the %{plan_link} plan."
-msgstr ""
-
-msgid "BillingPlans|frequently asked questions"
-msgstr ""
-
-msgid "BillingPlans|monthly"
-msgstr ""
-
-msgid "BillingPlans|paid annually at %{price_per_year}"
-msgstr ""
-
-msgid "BillingPlans|per user"
+msgid "Available"
 msgstr ""
 
 msgid "Branch"
@@ -266,6 +227,12 @@ msgstr ""
 msgid "Branch has changed"
 msgstr ""
 
+msgid "Branch is already taken"
+msgstr ""
+
+msgid "Branch name"
+msgstr ""
+
 msgid "BranchSwitcherPlaceholder|Search branches"
 msgstr ""
 
@@ -326,9 +293,6 @@ msgstr ""
 msgid "Branches|Sort by"
 msgstr ""
 
-msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart."
-msgstr ""
-
 msgid "Branches|The default branch cannot be deleted"
 msgstr ""
 
@@ -341,15 +305,9 @@ msgstr ""
 msgid "Branches|To confirm, type %{branch_name_confirmation}:"
 msgstr ""
 
-msgid "Branches|To discard the local changes and overwrite the branch with the upstream version, delete it here and choose 'Update Now' above."
-msgstr ""
-
 msgid "Branches|You’re about to permanently delete the protected branch %{branch_name}."
 msgstr ""
 
-msgid "Branches|diverged from upstream"
-msgstr ""
-
 msgid "Branches|merged"
 msgstr ""
 
@@ -389,9 +347,6 @@ msgstr ""
 msgid "Cancel edit"
 msgstr ""
 
-msgid "Change Weight"
-msgstr ""
-
 msgid "ChangeTypeActionLabel|Pick into branch"
 msgstr ""
 
@@ -413,13 +368,16 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-msgid "Cherry-pick this commit"
+msgid "Checking %{text} availability…"
 msgstr ""
 
-msgid "Cherry-pick this merge request"
+msgid "Checking branch availability..."
 msgstr ""
 
-msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all."
+msgid "Cherry-pick this commit"
+msgstr ""
+
+msgid "Cherry-pick this merge request"
 msgstr ""
 
 msgid "CiStatusLabel|canceled"
@@ -482,13 +440,43 @@ msgstr ""
 msgid "Clone repository"
 msgstr ""
 
-msgid "Close"
+msgid "Cluster"
 msgstr ""
 
-msgid "Cluster"
+msgid "ClusterIntegration|%{appList} was successfully installed on your cluster"
 msgstr ""
 
-msgid "ClusterIntegration|This account must have permissions to create a cluster in the %{link_to_container_project} specified below"
+msgid "ClusterIntegration|%{boldNotice} This will add some extra resources like a load balancer, which incur additional costs. See %{pricingLink}"
+msgstr ""
+
+msgid "ClusterIntegration|API URL"
+msgstr ""
+
+msgid "ClusterIntegration|Active"
+msgstr ""
+
+msgid "ClusterIntegration|Add an existing cluster"
+msgstr ""
+
+msgid "ClusterIntegration|Add cluster"
+msgstr ""
+
+msgid "ClusterIntegration|All"
+msgstr ""
+
+msgid "ClusterIntegration|Applications"
+msgstr ""
+
+msgid "ClusterIntegration|CA Certificate"
+msgstr ""
+
+msgid "ClusterIntegration|Certificate Authority bundle (PEM format)"
+msgstr ""
+
+msgid "ClusterIntegration|Choose how to set up cluster integration"
+msgstr ""
+
+msgid "ClusterIntegration|Cluster"
 msgstr ""
 
 msgid "ClusterIntegration|Cluster details"
@@ -512,21 +500,54 @@ msgstr ""
 msgid "ClusterIntegration|Cluster name"
 msgstr ""
 
-msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine"
+msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine. Refresh the page to see cluster's details"
+msgstr ""
+
+msgid "ClusterIntegration|Clusters allow you to use review apps, deploy your applications, run your pipelines, and much more in an easy way. %{link_to_help_page}"
+msgstr ""
+
+msgid "ClusterIntegration|Copy API URL"
+msgstr ""
+
+msgid "ClusterIntegration|Copy CA Certificate"
+msgstr ""
+
+msgid "ClusterIntegration|Copy Token"
 msgstr ""
 
 msgid "ClusterIntegration|Copy cluster name"
 msgstr ""
 
+msgid "ClusterIntegration|Create a new cluster on Google Engine right from GitLab"
+msgstr ""
+
 msgid "ClusterIntegration|Create cluster"
 msgstr ""
 
-msgid "ClusterIntegration|Create new cluster on Google Container Engine"
+msgid "ClusterIntegration|Create cluster on Google Container Engine"
+msgstr ""
+
+msgid "ClusterIntegration|Create on GKE"
 msgstr ""
 
 msgid "ClusterIntegration|Enable cluster integration"
 msgstr ""
 
+msgid "ClusterIntegration|Enter the details for an existing Kubernetes cluster"
+msgstr ""
+
+msgid "ClusterIntegration|Enter the details for your cluster"
+msgstr ""
+
+msgid "ClusterIntegration|Environment pattern"
+msgstr ""
+
+msgid "ClusterIntegration|GKE pricing"
+msgstr ""
+
+msgid "ClusterIntegration|GitLab Runner"
+msgstr ""
+
 msgid "ClusterIntegration|Google Cloud Platform project ID"
 msgstr ""
 
@@ -536,27 +557,75 @@ msgstr ""
 msgid "ClusterIntegration|Google Container Engine project"
 msgstr ""
 
+msgid "ClusterIntegration|Helm Tiller"
+msgstr ""
+
+msgid "ClusterIntegration|Inactive"
+msgstr ""
+
+msgid "ClusterIntegration|Ingress"
+msgstr ""
+
+msgid "ClusterIntegration|Install"
+msgstr ""
+
+msgid "ClusterIntegration|Install applications on your cluster. Read more about %{helpLink}"
+msgstr ""
+
+msgid "ClusterIntegration|Installed"
+msgstr ""
+
+msgid "ClusterIntegration|Installing"
+msgstr ""
+
+msgid "ClusterIntegration|Integrate cluster automation"
+msgstr ""
+
 msgid "ClusterIntegration|Learn more about %{link_to_documentation}"
 msgstr ""
 
+msgid "ClusterIntegration|Learn more about Clusters"
+msgstr ""
+
 msgid "ClusterIntegration|Machine type"
 msgstr ""
 
 msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters"
 msgstr ""
 
-msgid "ClusterIntegration|Manage Cluster integration on your GitLab project"
+msgid "ClusterIntegration|Manage cluster integration on your GitLab project"
 msgstr ""
 
 msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}"
 msgstr ""
 
+msgid "ClusterIntegration|Multiple clusters are available in GitLab Entreprise Edition Premium and Ultimate"
+msgstr ""
+
+msgid "ClusterIntegration|Note:"
+msgstr ""
+
 msgid "ClusterIntegration|Number of nodes"
 msgstr ""
 
+msgid "ClusterIntegration|Please enter access information for your cluster. If you need help, you can read our %{link_to_help_page} on clusters"
+msgstr ""
+
 msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:"
 msgstr ""
 
+msgid "ClusterIntegration|Problem setting up the cluster"
+msgstr ""
+
+msgid "ClusterIntegration|Problem setting up the clusters list"
+msgstr ""
+
+msgid "ClusterIntegration|Project ID"
+msgstr ""
+
+msgid "ClusterIntegration|Project namespace"
+msgstr ""
+
 msgid "ClusterIntegration|Project namespace (optional, unique)"
 msgstr ""
 
@@ -572,6 +641,12 @@ msgstr ""
 msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your cluster on Google Container Engine."
 msgstr ""
 
+msgid "ClusterIntegration|Request to begin installing failed"
+msgstr ""
+
+msgid "ClusterIntegration|Save changes"
+msgstr ""
+
 msgid "ClusterIntegration|See and edit the details for your cluster"
 msgstr ""
 
@@ -584,15 +659,33 @@ msgstr ""
 msgid "ClusterIntegration|See zones"
 msgstr ""
 
+msgid "ClusterIntegration|Service token"
+msgstr ""
+
+msgid "ClusterIntegration|Show"
+msgstr ""
+
 msgid "ClusterIntegration|Something went wrong on our end."
 msgstr ""
 
 msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine"
 msgstr ""
 
+msgid "ClusterIntegration|Something went wrong while installing %{title}"
+msgstr ""
+
+msgid "ClusterIntegration|There are no clusters to show"
+msgstr ""
+
+msgid "ClusterIntegration|This account must have permissions to create a cluster in the %{link_to_container_project} specified below"
+msgstr ""
+
 msgid "ClusterIntegration|Toggle Cluster"
 msgstr ""
 
+msgid "ClusterIntegration|Token"
+msgstr ""
+
 msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way."
 msgstr ""
 
@@ -608,9 +701,15 @@ msgstr ""
 msgid "ClusterIntegration|cluster"
 msgstr ""
 
+msgid "ClusterIntegration|documentation"
+msgstr ""
+
 msgid "ClusterIntegration|help page"
 msgstr ""
 
+msgid "ClusterIntegration|installing applications"
+msgstr ""
+
 msgid "ClusterIntegration|meets the requirements"
 msgstr ""
 
@@ -625,11 +724,6 @@ msgid_plural "Commits"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Commit %d file"
-msgid_plural "Commit %d files"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "Commit Message"
 msgstr ""
 
@@ -711,13 +805,13 @@ msgstr ""
 msgid "Contributors"
 msgstr ""
 
-msgid "Control the maximum concurrency of LFS/attachment backfill for this secondary node"
+msgid "ContributorsPage|Building repository graph."
 msgstr ""
 
-msgid "Control the maximum concurrency of repository backfill for this secondary node"
+msgid "ContributorsPage|Commits to %{branch_name}, excluding merge commits. Limited to 6,000 commits."
 msgstr ""
 
-msgid "Copy SSH public key to clipboard"
+msgid "ContributorsPage|Please wait a moment, this page will automatically refresh when ready."
 msgstr ""
 
 msgid "Copy URL to clipboard"
@@ -810,6 +904,12 @@ msgstr ""
 msgid "DashboardProjects|Personal"
 msgstr ""
 
+msgid "Dec"
+msgstr ""
+
+msgid "December"
+msgstr ""
+
 msgid "Define a custom pattern with cron syntax"
 msgstr ""
 
@@ -827,9 +927,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project."
-msgstr ""
-
 msgid "Details"
 msgstr ""
 
@@ -842,9 +939,6 @@ msgstr ""
 msgid "Dismiss Cycle Analytics introduction box"
 msgstr ""
 
-msgid "Dismiss Merge Request promotion"
-msgstr ""
-
 msgid "Don't show again"
 msgstr ""
 
@@ -884,6 +978,60 @@ msgstr ""
 msgid "Emails"
 msgstr ""
 
+msgid "Environments|An error occurred while fetching the environments."
+msgstr ""
+
+msgid "Environments|An error occurred while making the request."
+msgstr ""
+
+msgid "Environments|Commit"
+msgstr ""
+
+msgid "Environments|Deployment"
+msgstr ""
+
+msgid "Environments|Environment"
+msgstr ""
+
+msgid "Environments|Environments"
+msgstr ""
+
+msgid "Environments|Environments are places where code gets deployed, such as staging or production."
+msgstr ""
+
+msgid "Environments|Job"
+msgstr ""
+
+msgid "Environments|New environment"
+msgstr ""
+
+msgid "Environments|No deployments yet"
+msgstr ""
+
+msgid "Environments|Open"
+msgstr ""
+
+msgid "Environments|Re-deploy"
+msgstr ""
+
+msgid "Environments|Read more about environments"
+msgstr ""
+
+msgid "Environments|Rollback"
+msgstr ""
+
+msgid "Environments|Show all"
+msgstr ""
+
+msgid "Environments|Updated"
+msgstr ""
+
+msgid "Environments|You don't have any environments right now."
+msgstr ""
+
+msgid "Error occurred when toggling the notification subscription"
+msgstr ""
+
 msgid "EventFilterBy|Filter by all"
 msgstr ""
 
@@ -923,6 +1071,12 @@ msgstr ""
 msgid "Failed to remove the pipeline schedule"
 msgstr ""
 
+msgid "Feb"
+msgstr ""
+
+msgid "February"
+msgstr ""
+
 msgid "File name"
 msgstr ""
 
@@ -967,21 +1121,6 @@ msgstr ""
 msgid "GPG Keys"
 msgstr ""
 
-msgid "Geo Nodes"
-msgstr ""
-
-msgid "Geo|File sync capacity"
-msgstr ""
-
-msgid "Geo|Groups to replicate"
-msgstr ""
-
-msgid "Geo|Repository sync capacity"
-msgstr ""
-
-msgid "Geo|Select groups to replicate."
-msgstr ""
-
 msgid "Git storage health information has been reset"
 msgstr ""
 
@@ -1093,51 +1232,46 @@ msgstr ""
 msgid "Import repository"
 msgstr ""
 
-msgid "Improve Issue boards with GitLab Enterprise Edition."
+msgid "Install a Runner compatible with GitLab CI"
 msgstr ""
 
-msgid "Improve issues management with Issue weight and GitLab Enterprise Edition."
+msgid "Internal - The group and any internal projects can be viewed by any logged in user."
 msgstr ""
 
-msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
+msgid "Internal - The project can be accessed by any logged in user."
 msgstr ""
 
-msgid "Install a Runner compatible with GitLab CI"
+msgid "Interval Pattern"
 msgstr ""
 
-msgid "Instance"
-msgid_plural "Instances"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Internal - The group and any internal projects can be viewed by any logged in user."
+msgid "Introducing Cycle Analytics"
 msgstr ""
 
-msgid "Internal - The project can be accessed by any logged in user."
+msgid "Issue events"
 msgstr ""
 
-msgid "Interval Pattern"
+msgid "IssueBoards|Board"
 msgstr ""
 
-msgid "Introducing Cycle Analytics"
+msgid "Issues"
 msgstr ""
 
-msgid "Issue board focus mode"
+msgid "Jan"
 msgstr ""
 
-msgid "Issue boards with milestones"
+msgid "January"
 msgstr ""
 
-msgid "Issue events"
+msgid "Jul"
 msgstr ""
 
-msgid "IssueBoards|Board"
+msgid "July"
 msgstr ""
 
-msgid "IssueBoards|Boards"
+msgid "Jun"
 msgstr ""
 
-msgid "Issues"
+msgid "June"
 msgstr ""
 
 msgid "LFSStatus|Disabled"
@@ -1193,9 +1327,6 @@ msgstr ""
 msgid "Leave project"
 msgstr ""
 
-msgid "License"
-msgstr ""
-
 msgid "Limited to showing %d event at most"
 msgid_plural "Limited to showing %d events at most"
 msgstr[0] ""
@@ -1207,15 +1338,21 @@ msgstr ""
 msgid "Locked"
 msgstr ""
 
-msgid "Locked Files"
+msgid "Login"
 msgstr ""
 
-msgid "Login"
+msgid "Mar"
+msgstr ""
+
+msgid "March"
 msgstr ""
 
 msgid "Maximum git storage failures"
 msgstr ""
 
+msgid "May"
+msgstr ""
+
 msgid "Median"
 msgstr ""
 
@@ -1243,9 +1380,6 @@ msgstr ""
 msgid "More information is available|here"
 msgstr ""
 
-msgid "Multiple issue boards"
-msgstr ""
-
 msgid "New Cluster"
 msgstr ""
 
@@ -1260,6 +1394,9 @@ msgstr ""
 msgid "New branch"
 msgstr ""
 
+msgid "New branch unavailable"
+msgstr ""
+
 msgid "New directory"
 msgstr ""
 
@@ -1299,6 +1436,9 @@ msgstr ""
 msgid "No schedules"
 msgstr ""
 
+msgid "No time spent"
+msgstr ""
+
 msgid "None"
 msgstr ""
 
@@ -1365,12 +1505,24 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
+msgid "Nov"
+msgstr ""
+
+msgid "November"
+msgstr ""
+
 msgid "Number of access attempts"
 msgstr ""
 
 msgid "Number of failures before backing off"
 msgstr ""
 
+msgid "Oct"
+msgstr ""
+
+msgid "October"
+msgstr ""
+
 msgid "OfSearchInADropdown|Filter"
 msgstr ""
 
@@ -1422,9 +1574,6 @@ msgstr ""
 msgid "Pipeline Schedules"
 msgstr ""
 
-msgid "Pipeline quota"
-msgstr ""
-
 msgid "PipelineCharts|Failed:"
 msgstr ""
 
@@ -1611,22 +1760,10 @@ msgstr ""
 msgid "ProjectNetworkGraph|Graph"
 msgstr ""
 
-msgid "ProjectSettings|Contact an admin to change this setting."
-msgstr ""
-
-msgid "ProjectSettings|Only signed commits can be pushed to this repository."
-msgstr ""
-
-msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin."
-msgstr ""
-
-msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project."
-msgstr ""
-
-msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin."
+msgid "ProjectSettings|Immediately run a pipeline on the default branch"
 msgstr ""
 
-msgid "ProjectSettings|Users can only push commits to this repository that were committed with one of their own verified emails."
+msgid "ProjectSettings|Problem setting up the CI/CD settings JavaScript"
 msgstr ""
 
 msgid "Projects"
@@ -1653,19 +1790,46 @@ msgstr ""
 msgid "ProjectsDropdown|This feature requires browser localStorage support"
 msgstr ""
 
-msgid "Public - The group and any public projects can be viewed without any authentication."
+msgid "PrometheusService|By default, Prometheus listens on ‘http://localhost:9090’. It’s not recommended to change the default address and port as this might affect or conflict with other services running on the GitLab server."
 msgstr ""
 
-msgid "Public - The project can be accessed without any authentication."
+msgid "PrometheusService|Finding and configuring metrics..."
 msgstr ""
 
-msgid "Push Rules"
+msgid "PrometheusService|Metrics"
 msgstr ""
 
-msgid "Push events"
+msgid "PrometheusService|Metrics are automatically configured and monitored based on a library of metrics from popular exporters."
+msgstr ""
+
+msgid "PrometheusService|Missing environment variable"
+msgstr ""
+
+msgid "PrometheusService|Monitored"
+msgstr ""
+
+msgid "PrometheusService|More information"
+msgstr ""
+
+msgid "PrometheusService|No metrics are being monitored. To start monitoring, deploy to an environment."
 msgstr ""
 
-msgid "PushRule|Committer restriction"
+msgid "PrometheusService|Prometheus API Base URL, like http://prometheus.example.com/"
+msgstr ""
+
+msgid "PrometheusService|Prometheus monitoring"
+msgstr ""
+
+msgid "PrometheusService|View environments"
+msgstr ""
+
+msgid "Public - The group and any public projects can be viewed without any authentication."
+msgstr ""
+
+msgid "Public - The project can be accessed without any authentication."
+msgstr ""
+
+msgid "Push events"
 msgstr ""
 
 msgid "Read more"
@@ -1680,9 +1844,6 @@ msgstr ""
 msgid "RefSwitcher|Tags"
 msgstr ""
 
-msgid "Registry"
-msgstr ""
-
 msgid "Related Commits"
 msgstr ""
 
@@ -1770,6 +1931,12 @@ msgstr ""
 msgid "Select target branch"
 msgstr ""
 
+msgid "Sep"
+msgstr ""
+
+msgid "September"
+msgstr ""
+
 msgid "Service Templates"
 msgstr ""
 
@@ -1808,7 +1975,7 @@ msgstr ""
 msgid "Something went wrong on our end."
 msgstr ""
 
-msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}"
+msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName}"
 msgstr ""
 
 msgid "Something went wrong while fetching the projects."
@@ -1859,9 +2026,6 @@ msgstr ""
 msgid "SortOptions|Least popular"
 msgstr ""
 
-msgid "SortOptions|Less weight"
-msgstr ""
-
 msgid "SortOptions|Milestone"
 msgstr ""
 
@@ -1871,9 +2035,6 @@ msgstr ""
 msgid "SortOptions|Milestone due soon"
 msgstr ""
 
-msgid "SortOptions|More weight"
-msgstr ""
-
 msgid "SortOptions|Most popular"
 msgstr ""
 
@@ -1913,12 +2074,15 @@ msgstr ""
 msgid "SortOptions|Start soon"
 msgstr ""
 
-msgid "SortOptions|Weight"
+msgid "Source"
 msgstr ""
 
 msgid "Source code"
 msgstr ""
 
+msgid "Source is not available"
+msgstr ""
+
 msgid "Spam Logs"
 msgstr ""
 
@@ -1937,6 +2101,9 @@ msgstr ""
 msgid "Start the Runner!"
 msgstr ""
 
+msgid "Stopped"
+msgstr ""
+
 msgid "Subgroups"
 msgstr ""
 
@@ -1957,16 +2124,79 @@ msgstr[1] ""
 msgid "Tags"
 msgstr ""
 
-msgid "Target Branch"
+msgid "TagsPage|Browse commits"
 msgstr ""
 
-msgid "Team"
+msgid "TagsPage|Browse files"
+msgstr ""
+
+msgid "TagsPage|Can't find HEAD commit for this tag"
+msgstr ""
+
+msgid "TagsPage|Cancel"
+msgstr ""
+
+msgid "TagsPage|Create tag"
+msgstr ""
+
+msgid "TagsPage|Delete tag"
+msgstr ""
+
+msgid "TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?"
+msgstr ""
+
+msgid "TagsPage|Edit release notes"
+msgstr ""
+
+msgid "TagsPage|Existing branch name, tag, or commit SHA"
+msgstr ""
+
+msgid "TagsPage|Filter by tag name"
+msgstr ""
+
+msgid "TagsPage|New Tag"
+msgstr ""
+
+msgid "TagsPage|New tag"
 msgstr ""
 
-msgid "Thanks! Don't show me this again"
+msgid "TagsPage|Optionally, add a message to the tag."
 msgstr ""
 
-msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project."
+msgid "TagsPage|Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page."
+msgstr ""
+
+msgid "TagsPage|Release notes"
+msgstr ""
+
+msgid "TagsPage|Repository has no tags yet."
+msgstr ""
+
+msgid "TagsPage|Sort by"
+msgstr ""
+
+msgid "TagsPage|Tags"
+msgstr ""
+
+msgid "TagsPage|Tags give the ability to mark specific points in history as being important"
+msgstr ""
+
+msgid "TagsPage|This tag has no release notes."
+msgstr ""
+
+msgid "TagsPage|Use git tag command to add a new one:"
+msgstr ""
+
+msgid "TagsPage|Write your release notes or drag files here..."
+msgstr ""
+
+msgid "TagsPage|protected"
+msgstr ""
+
+msgid "Target Branch"
+msgstr ""
+
+msgid "Team"
 msgstr ""
 
 msgid "The circuitbreaker backoff threshold should be lower than the failure count threshold"
@@ -2210,10 +2440,10 @@ msgstr ""
 msgid "Total Time"
 msgstr ""
 
-msgid "Total test time for all commits/merges"
+msgid "Total issue time spent"
 msgstr ""
 
-msgid "Track activity with Contribution Analytics."
+msgid "Total test time for all commits/merges"
 msgstr ""
 
 msgid "Unlock"
@@ -2228,21 +2458,6 @@ msgstr ""
 msgid "Unsubscribe"
 msgstr ""
 
-msgid "Upgrade your plan to activate Advanced Global Search."
-msgstr ""
-
-msgid "Upgrade your plan to activate Contribution Analytics."
-msgstr ""
-
-msgid "Upgrade your plan to activate Group Webhooks."
-msgstr ""
-
-msgid "Upgrade your plan to activate Issue weight."
-msgstr ""
-
-msgid "Upgrade your plan to improve Issue boards."
-msgstr ""
-
 msgid "Upload New File"
 msgstr ""
 
@@ -2285,12 +2500,6 @@ msgstr ""
 msgid "We don't have enough data to show this stage."
 msgstr ""
 
-msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
-msgstr ""
-
-msgid "Weight"
-msgstr ""
-
 msgid "When access to a storage fails. GitLab will prevent access to the storage for the time specified here. This allows the filesystem to recover. Repositories on failing shards are temporarly unavailable"
 msgstr ""
 
@@ -2396,9 +2605,6 @@ msgstr ""
 msgid "Wiki|Wiki Pages"
 msgstr ""
 
-msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members."
-msgstr ""
-
 msgid "Withdraw Access Request"
 msgstr ""
 
@@ -2417,15 +2623,9 @@ msgstr ""
 msgid "You are on a read-only GitLab instance."
 msgstr ""
 
-msgid "You are on a read-only GitLab instance. If you want to make any changes, you must visit the %{link_to_primary_node}."
-msgstr ""
-
 msgid "You can only add files when you are on a branch"
 msgstr ""
 
-msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
-msgstr ""
-
 msgid "You cannot write to this read-only GitLab instance."
 msgstr ""
 
@@ -2459,6 +2659,9 @@ msgstr ""
 msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile"
 msgstr ""
 
+msgid "You won't be able to pull or push project code via SSH until you add an SSH key to your profile"
+msgstr ""
+
 msgid "Your comment will not be visible to the public."
 msgstr ""
 
@@ -2471,7 +2674,7 @@ msgstr ""
 msgid "Your projects"
 msgstr ""
 
-msgid "commit"
+msgid "branch name"
 msgstr ""
 
 msgid "day"
@@ -2496,7 +2699,7 @@ msgstr ""
 msgid "personal access token"
 msgstr ""
 
-msgid "to help your contributors communicate effectively!"
+msgid "source"
 msgstr ""
 
 msgid "username"

spec/controllers/projects/clusters/gcp_controller_spec.rb

@@ -143,9 +143,9 @@ describe Projects::Clusters::GcpController do
             expect(ClusterProvisionWorker).to receive(:perform_async)
             expect { go }.to change { Clusters::Cluster.count }
               .and change { Clusters::Providers::Gcp.count }
-            expect(response).to redirect_to(project_cluster_path(project, project.cluster))
-            expect(project.cluster).to be_gcp
-            expect(project.cluster).to be_kubernetes
+            expect(response).to redirect_to(project_cluster_path(project, project.clusters.first))
+            expect(project.clusters.first).to be_gcp
+            expect(project.clusters.first).to be_kubernetes
           end
         end
       end

spec/controllers/projects/clusters/user_controller_spec.rb

@@ -64,7 +64,9 @@ describe Projects::Clusters::UserController do
           expect(ClusterProvisionWorker).to receive(:perform_async)
           expect { go }.to change { Clusters::Cluster.count }
             .and change { Clusters::Platforms::Kubernetes.count }
-          expect(response).to redirect_to(project_cluster_path(project, project.cluster))
+          expect(response).to redirect_to(project_cluster_path(project, project.clusters.first))
+          expect(project.clusters.first).to be_user
+          expect(project.clusters.first).to be_kubernetes
         end
       end
     end

spec/controllers/projects/clusters_controller_spec.rb

@@ -15,14 +15,72 @@ describe Projects::ClustersController do
         sign_in(user)
       end
 
-      context 'when project has a cluster' do
-        let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+      context 'when project has one or more clusters' do
+        let(:project) { create(:project) }
+        let!(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+        let!(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, projects: [project]) }
+        it 'lists available clusters' do
+          go
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to render_template(:index)
+          expect(assigns(:clusters)).to match_array([enabled_cluster, disabled_cluster])
+        end
+
+        it 'assigns counters to correct values' do
+          go
+
+          expect(assigns(:active_count)).to eq(1)
+          expect(assigns(:inactive_count)).to eq(1)
+        end
+
+        context 'when page is specified' do
+          let(:last_page) { project.clusters.page.total_pages }
 
-        it { expect(go).to redirect_to(project_cluster_path(project, project.cluster)) }
+          before do
+            allow(Clusters::Cluster).to receive(:paginates_per).and_return(1)
+            create_list(:cluster, 2, :provided_by_gcp, projects: [project])
+            get :index, namespace_id: project.namespace, project_id: project, page: last_page
+          end
+
+          it 'redirects to the page' do
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(assigns(:clusters).current_page).to eq(last_page)
+          end
+        end
+
+        context 'when only enabled clusters are requested' do
+          it 'returns only enabled clusters' do
+            get :index, namespace_id: project.namespace, project_id: project, scope: 'active'
+            expect(assigns(:clusters)).to all(have_attributes(enabled: true))
+          end
+        end
+
+        context 'when only disabled clusters are requested' do
+          it 'returns only disabled clusters' do
+            get :index, namespace_id: project.namespace, project_id: project, scope: 'inactive'
+            expect(assigns(:clusters)).to all(have_attributes(enabled: false))
+          end
+        end
       end
 
       context 'when project does not have a cluster' do
-        it { expect(go).to redirect_to(new_project_cluster_path(project)) }
+        let(:project) { create(:project) }
+
+        it 'returns an empty state page' do
+          go
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to render_template(:index, partial: :empty_state)
+          expect(assigns(:clusters)).to eq([])
+        end
+
+        it 'assigns counters to zero' do
+          go
+
+          expect(assigns(:active_count)).to eq(0)
+          expect(assigns(:inactive_count)).to eq(0)
+        end
       end
     end
 
@@ -146,7 +204,7 @@ describe Projects::ClustersController do
           go
 
           cluster.reload
-          expect(response).to redirect_to(project_cluster_path(project, project.cluster))
+          expect(response).to redirect_to(project_cluster_path(project, cluster))
           expect(flash[:notice]).to eq('Cluster was successfully updated.')
           expect(cluster.enabled).to be_falsey
         end
@@ -180,28 +238,77 @@ describe Projects::ClustersController do
         sign_in(user)
       end
 
-      context 'when changing parameters' do
-        let(:params) do
-          {
-            cluster: {
-              enabled: false,
-              name: 'my-new-cluster-name',
-              platform_kubernetes_attributes: {
-                namespace: 'my-namespace'
+      context 'when format is json' do
+        context 'when changing parameters' do
+          context 'when valid parameters are used' do
+            let(:params) do
+              {
+                cluster: {
+                  enabled: false,
+                  name: 'my-new-cluster-name',
+                  platform_kubernetes_attributes: {
+                    namespace: 'my-namespace'
+                  }
+                }
               }
-            }
-          }
+            end
+
+            it "updates and redirects back to show page" do
+              go_json
+
+              cluster.reload
+              expect(response).to have_http_status(:no_content)
+              expect(cluster.enabled).to be_falsey
+              expect(cluster.name).to eq('my-new-cluster-name')
+              expect(cluster.platform_kubernetes.namespace).to eq('my-namespace')
+            end
+          end
+
+          context 'when invalid parameters are used' do
+            let(:params) do
+              {
+                cluster: {
+                  enabled: false,
+                  platform_kubernetes_attributes: {
+                    namespace: 'my invalid namespace #@'
+                  }
+                }
+              }
+            end
+
+            it "rejects changes" do
+              go_json
+
+              expect(response).to have_http_status(:bad_request)
+            end
+          end
         end
+      end
 
-        it "updates and redirects back to show page" do
-          go
+      context 'when format is html' do
+        context 'when update enabled' do
+          let(:params) do
+            {
+              cluster: {
+                enabled: false,
+                name: 'my-new-cluster-name',
+                platform_kubernetes_attributes: {
+                  namespace: 'my-namespace'
+                }
+              }
+            }
+          end
 
-          cluster.reload
-          expect(response).to redirect_to(project_cluster_path(project, project.cluster))
-          expect(flash[:notice]).to eq('Cluster was successfully updated.')
-          expect(cluster.enabled).to be_falsey
-          expect(cluster.name).to eq('my-new-cluster-name')
-          expect(cluster.platform_kubernetes.namespace).to eq('my-namespace')
+          it "updates and redirects back to show page" do
+            go
+
+            cluster.reload
+            expect(response).to redirect_to(project_cluster_path(project, cluster))
+            expect(flash[:notice]).to eq('Cluster was successfully updated.')
+            expect(cluster.enabled).to be_falsey
+            expect(cluster.name).to eq('my-new-cluster-name')
+            expect(cluster.platform_kubernetes.namespace).to eq('my-namespace')
+          end
         end
       end
     end
@@ -228,6 +335,13 @@ describe Projects::ClustersController do
                                 project_id: project,
                                 id: cluster)
     end
+
+    def go_json
+      put :update, params.merge(namespace_id: project.namespace,
+                                project_id: project,
+                                id: cluster,
+                                format: :json)
+    end
   end
 
   describe 'DELETE destroy' do

spec/ee/spec/services/ee/projects/hashed_storage/migrate_attachments_service_spec.rb

@@ -14,6 +14,7 @@ describe Projects::HashedStorage::MigrateAttachmentsService do
 
     context 'on success' do
       before do
+        TestEnv.clean_test_path
         FileUtils.mkdir_p(FileUploader.dynamic_path_builder(old_attachments_path))
       end
 

spec/factories/clusters/clusters.rb

@@ -28,5 +28,9 @@ FactoryGirl.define do
       provider_type :gcp
       provider_gcp factory: [:cluster_provider_gcp, :creating]
     end
+
+    trait :disabled do
+      enabled false
+    end
   end
 end

spec/features/projects/clusters/gcp_spec.rb

@@ -24,6 +24,7 @@ feature 'Gcp Cluster', :js do
       before do
         visit project_clusters_path(project)
 
+        click_link 'Add cluster'
         click_link 'Create on GKE'
       end
 
@@ -116,7 +117,7 @@ feature 'Gcp Cluster', :js do
 
         it 'user sees creation form with the successful message' do
           expect(page).to have_content('Cluster integration was successfully removed.')
-          expect(page).to have_link('Create on GKE')
+          expect(page).to have_link('Add cluster')
         end
       end
     end
@@ -126,6 +127,7 @@ feature 'Gcp Cluster', :js do
     before do
       visit project_clusters_path(project)
 
+      click_link 'Add cluster'
       click_link 'Create on GKE'
     end
 

spec/features/projects/clusters/user_spec.rb

@@ -16,6 +16,7 @@ feature 'User Cluster', :js do
     before do
       visit project_clusters_path(project)
 
+      click_link 'Add cluster'
       click_link 'Add an existing cluster'
     end
 
@@ -94,7 +95,7 @@ feature 'User Cluster', :js do
 
       it 'user sees creation form with the successful message' do
         expect(page).to have_content('Cluster integration was successfully removed.')
-        expect(page).to have_link('Add an existing cluster')
+        expect(page).to have_link('Add cluster')
       end
     end
   end

spec/features/projects/clusters_spec.rb

@@ -14,12 +14,82 @@ feature 'Clusters', :js do
   context 'when user does not have a cluster and visits cluster index page' do
     before do
       visit project_clusters_path(project)
+    end
+
+    it 'sees empty state' do
+      expect(page).to have_link('Add cluster')
+      expect(page).to have_selector('.empty-state')
+    end
+  end
+
+  context 'when user has a cluster and visits cluster index page' do
+    let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+    let(:project) { cluster.project }
+
+    before do
+      visit project_clusters_path(project)
+    end
 
-      click_link 'Create on GKE'
+    it 'user sees a table with one cluster' do
+      # One is the header row, the other the cluster row
+      expect(page).to have_selector('.gl-responsive-table-row', count: 2)
     end
 
-    it 'user sees a new page' do
-      expect(page).to have_button('Create cluster')
+    it 'user sees a disabled add cluster button ' do
+      expect(page).to have_selector('.js-add-cluster.disabled')
+    end
+
+    it 'user sees navigation tabs' do
+      expect(page.find('.js-active-tab').text).to include('Active')
+      expect(page.find('.js-active-tab .badge').text).to include('1')
+
+      expect(page.find('.js-inactive-tab').text).to include('Inactive')
+      expect(page.find('.js-inactive-tab .badge').text).to include('0')
+
+      expect(page.find('.js-all-tab').text).to include('All')
+      expect(page.find('.js-all-tab .badge').text).to include('1')
+    end
+
+    context 'inline update of cluster' do
+      it 'user can update cluster' do
+        expect(page).to have_selector('.js-toggle-cluster-list')
+      end
+
+      context 'with sucessfull request' do
+        it 'user sees updated cluster' do
+          expect do
+            page.find('.js-toggle-cluster-list').click
+            wait_for_requests
+          end.to change { cluster.reload.enabled }
+
+          expect(page).not_to have_selector('.is-checked')
+          expect(cluster.reload).not_to be_enabled
+        end
+      end
+
+      context 'with failed request' do
+        it 'user sees not update cluster and error message' do
+          expect_any_instance_of(Clusters::UpdateService).to receive(:execute).and_call_original
+          allow_any_instance_of(Clusters::Cluster).to receive(:valid?) { false }
+
+          page.find('.js-toggle-cluster-list').click
+
+          expect(page).to have_content('Something went wrong on our end.')
+          expect(page).to have_selector('.is-checked')
+          expect(cluster.reload).to be_enabled
+        end
+      end
+    end
+
+    context 'when user clicks on a cluster' do
+      before do
+        click_link cluster.name
+      end
+
+      it 'user sees a cluster details page' do
+        expect(page).to have_button('Save')
+        expect(page.find(:css, '.cluster-name').value).to eq(cluster.name)
+      end
     end
   end
 end

spec/features/projects/features_visibility_spec.rb

@@ -177,7 +177,7 @@ describe 'Edit Project Settings' do
         click_button "Save changes"
       end
 
-      expect(find(".sharing-permissions")).to have_selector(".project-feature-toggle.disabled", count: 2)
+      expect(find(".sharing-permissions")).to have_selector(".project-feature-toggle.is-disabled", count: 2)
     end
 
     it "shows empty features project homepage" do
@@ -272,10 +272,10 @@ describe 'Edit Project Settings' do
   end
 
   def toggle_feature_off(feature_name)
-    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle.checked").click
+    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle.is-checked").click
   end
 
   def toggle_feature_on(feature_name)
-    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle:not(.checked)").click
+    find(".project-feature-controls[data-for=\"#{feature_name}\"] .project-feature-toggle:not(.is-checked)").click
   end
 end

spec/finders/clusters_finder_spec.rb

+require 'spec_helper'
+
+describe ClustersFinder do
+  let(:project) { create(:project) }
+  set(:user) { create(:user) }
+
+  describe '#execute' do
+    let(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+    let(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, projects: [project]) }
+
+    subject { described_class.new(project, user, scope).execute }
+
+    context 'when scope is all' do
+      let(:scope) { :all }
+
+      it { is_expected.to match_array([enabled_cluster, disabled_cluster]) }
+    end
+
+    context 'when scope is active' do
+      let(:scope) { :active }
+
+      it { is_expected.to match_array([enabled_cluster]) }
+    end
+
+    context 'when scope is inactive' do
+      let(:scope) { :inactive }
+
+      it { is_expected.to match_array([disabled_cluster]) }
+    end
+  end
+end

spec/javascripts/clusters/clusters_bundle_spec.js

@@ -28,7 +28,7 @@ describe('Clusters', () => {
 
       expect(
         cluster.toggleButton.classList,
-      ).not.toContain('checked');
+      ).not.toContain('is-checked');
 
       expect(
         cluster.toggleInput.getAttribute('value'),

spec/javascripts/clusters/clusters_index_spec.js

+import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
+import setClusterTableToggles from '~/clusters/clusters_index';
+import { setTimeout } from 'core-js/library/web/timers';
+
+describe('Clusters table', () => {
+  preloadFixtures('clusters/index_cluster.html.raw');
+  let mock;
+
+  beforeEach(() => {
+    loadFixtures('clusters/index_cluster.html.raw');
+    mock = new MockAdapter(axios);
+    setClusterTableToggles();
+  });
+
+  describe('update cluster', () => {
+    it('renders loading state while request is made', () => {
+      const button = document.querySelector('.js-toggle-cluster-list');
+
+      button.click();
+
+      expect(button.classList).toContain('is-loading');
+      expect(button.getAttribute('disabled')).toEqual('true');
+    });
+
+    afterEach(() => {
+      mock.restore();
+    });
+
+    it('shows updated state after sucessfull request', (done) => {
+      mock.onPut().reply(200, {}, {});
+      const button = document.querySelector('.js-toggle-cluster-list');
+      button.click();
+
+      expect(button.classList).toContain('is-loading');
+
+      setTimeout(() => {
+        expect(button.classList).not.toContain('is-loading');
+        expect(button.classList).not.toContain('is-checked');
+        done();
+      }, 0);
+    });
+
+    it('shows inital state after failed request', (done) => {
+      mock.onPut().reply(500, {}, {});
+      const button = document.querySelector('.js-toggle-cluster-list');
+
+      button.click();
+      expect(button.classList).toContain('is-loading');
+
+      setTimeout(() => {
+        expect(button.classList).not.toContain('is-loading');
+        expect(button.classList).toContain('is-checked');
+        done();
+      }, 0);
+    });
+  });
+});

spec/javascripts/fixtures/clusters.rb

@@ -31,4 +31,19 @@ describe Projects::ClustersController, '(JavaScript fixtures)', type: :controlle
     expect(response).to be_success
     store_frontend_fixture(response, example.description)
   end
+
+  context 'rendering non-empty state' do
+    before do
+      cluster
+    end
+
+    it 'clusters/index_cluster.html.raw' do |example|
+      get :index,
+        namespace_id: namespace,
+        project_id: project
+
+      expect(response).to be_success
+      store_frontend_fixture(response, example.description)
+    end
+  end
 end

spec/javascripts/vue_shared/components/toggle_button_spec.js

+import Vue from 'vue';
+import toggleButton from '~/vue_shared/components/toggle_button.vue';
+import mountComponent from '../../helpers/vue_mount_component_helper';
+
+describe('Toggle Button', () => {
+  let vm;
+  let Component;
+
+  beforeEach(() => {
+    Component = Vue.extend(toggleButton);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('render output', () => {
+    beforeEach(() => {
+      vm = mountComponent(Component, {
+        value: true,
+        name: 'foo',
+      });
+    });
+
+    it('renders input with provided name', () => {
+      expect(vm.$el.querySelector('input').getAttribute('name')).toEqual('foo');
+    });
+
+    it('renders input with provided value', () => {
+      expect(vm.$el.querySelector('input').getAttribute('value')).toEqual('true');
+    });
+
+    it('renders Enabled and Disabled text data attributes', () => {
+      expect(vm.$el.querySelector('button').getAttribute('data-enabled-text')).toEqual('Enabled');
+      expect(vm.$el.querySelector('button').getAttribute('data-disabled-text')).toEqual('Disabled');
+    });
+  });
+
+  describe('is-checked', () => {
+    beforeEach(() => {
+      vm = mountComponent(Component, {
+        value: true,
+      });
+
+      spyOn(vm, '$emit');
+    });
+
+    it('renders is checked class', () => {
+      expect(vm.$el.querySelector('button').classList.contains('is-checked')).toEqual(true);
+    });
+
+    it('emits change event when clicked', () => {
+      vm.$el.querySelector('button').click();
+
+      expect(vm.$emit).toHaveBeenCalledWith('change', false);
+    });
+  });
+
+  describe('is-disabled', () => {
+    beforeEach(() => {
+      vm = mountComponent(Component, {
+        value: true,
+        disabledInput: true,
+      });
+      spyOn(vm, '$emit');
+    });
+
+    it('renders disabled button', () => {
+      expect(vm.$el.querySelector('button').classList.contains('is-disabled')).toEqual(true);
+    });
+
+    it('does not emit change event when clicked', () => {
+      vm.$el.querySelector('button').click();
+
+      expect(vm.$emit).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('is-loading', () => {
+    beforeEach(() => {
+      vm = mountComponent(Component, {
+        value: true,
+        isLoading: true,
+      });
+    });
+
+    it('renders loading class', () => {
+      expect(vm.$el.querySelector('button').classList.contains('is-loading')).toEqual(true);
+    });
+  });
+});

spec/models/clusters/cluster_spec.rb

@@ -198,4 +198,26 @@ describe Clusters::Cluster do
       end
     end
   end
+
+  describe '#created?' do
+    let(:cluster) { create(:cluster, :provided_by_gcp) }
+
+    subject { cluster.created? }
+
+    context 'when status_name is :created' do
+      before do
+        allow(cluster).to receive_message_chain(:provider, :status_name).and_return(:created)
+      end
+
+      it { is_expected.to eq(true) }
+    end
+
+    context 'when status_name is not :created' do
+      before do
+        allow(cluster).to receive_message_chain(:provider, :status_name).and_return(:creating)
+      end
+
+      it { is_expected.to eq(false) }
+    end
+  end
 end

spec/models/project_spec.rb

@@ -79,7 +79,7 @@ describe Project do
     it { is_expected.to have_many(:uploads).dependent(:destroy) }
     it { is_expected.to have_many(:pipeline_schedules) }
     it { is_expected.to have_many(:members_and_requesters) }
-    it { is_expected.to have_one(:cluster) }
+    it { is_expected.to have_many(:clusters) }
     it { is_expected.to have_many(:custom_attributes).class_name('ProjectCustomAttribute') }
 
     context 'after initialized' do

spec/presenters/clusters/cluster_presenter_spec.rb

@@ -31,4 +31,44 @@ describe Clusters::ClusterPresenter do
     it { is_expected.to include(cluster.provider.zone) }
     it { is_expected.to include(cluster.name) }
   end
+
+  describe '#can_toggle_cluster' do
+    let(:user) { create(:user) }
+
+    before do
+      allow(cluster).to receive(:current_user).and_return(user)
+    end
+
+    subject { described_class.new(cluster).can_toggle_cluster? }
+
+    context 'when user can update' do
+      before do
+        allow_any_instance_of(described_class).to receive(:can?).with(user, :update_cluster, cluster).and_return(true)
+      end
+
+      context 'when cluster is created' do
+        before do
+          allow(cluster).to receive(:created?).and_return(true)
+        end
+
+        it { is_expected.to eq(true) }
+      end
+
+      context 'when cluster is not created' do
+        before do
+          allow(cluster).to receive(:created?).and_return(false)
+        end
+
+        it { is_expected.to eq(false) }
+      end
+    end
+
+    context 'when user can not update' do
+      before do
+        allow_any_instance_of(described_class).to receive(:can?).with(user, :update_cluster, cluster).and_return(false)
+      end
+
+      it { is_expected.to eq(false) }
+    end
+  end
 end

spec/services/clusters/create_service_spec.rb

@@ -4,10 +4,11 @@ describe Clusters::CreateService do
   let(:access_token) { 'xxx' }
   let(:project) { create(:project) }
   let(:user) { create(:user) }
-  let(:result) { described_class.new(project, user, params).execute(access_token) }
+
+  subject { described_class.new(project, user, params).execute(access_token) }
 
   context 'when provider is gcp' do
-    context 'when correct params' do
+    shared_context 'valid params' do
       let(:params) do
         {
           name: 'test-cluster',
@@ -20,27 +21,9 @@ describe Clusters::CreateService do
           }
         }
       end
-
-      it 'creates a cluster object and performs a worker' do
-        expect(ClusterProvisionWorker).to receive(:perform_async)
-
-        expect { result }
-          .to change { Clusters::Cluster.count }.by(1)
-          .and change { Clusters::Providers::Gcp.count }.by(1)
-
-        expect(result.name).to eq('test-cluster')
-        expect(result.user).to eq(user)
-        expect(result.project).to eq(project)
-        expect(result.provider.gcp_project_id).to eq('gcp-project')
-        expect(result.provider.zone).to eq('us-central1-a')
-        expect(result.provider.num_nodes).to eq(1)
-        expect(result.provider.machine_type).to eq('machine_type-a')
-        expect(result.provider.access_token).to eq(access_token)
-        expect(result.platform).to be_nil
-      end
     end
 
-    context 'when invalid params' do
+    shared_context 'invalid params' do
       let(:params) do
         {
           name: 'test-cluster',
@@ -53,11 +36,86 @@ describe Clusters::CreateService do
           }
         }
       end
+    end
+
+    shared_examples 'create cluster' do
+      it 'creates a cluster object and performs a worker' do
+        expect(ClusterProvisionWorker).to receive(:perform_async)
+
+        expect { subject }
+          .to change { Clusters::Cluster.count }.by(1)
+          .and change { Clusters::Providers::Gcp.count }.by(1)
+
+        expect(subject.name).to eq('test-cluster')
+        expect(subject.user).to eq(user)
+        expect(subject.project).to eq(project)
+        expect(subject.provider.gcp_project_id).to eq('gcp-project')
+        expect(subject.provider.zone).to eq('us-central1-a')
+        expect(subject.provider.num_nodes).to eq(1)
+        expect(subject.provider.machine_type).to eq('machine_type-a')
+        expect(subject.provider.access_token).to eq(access_token)
+        expect(subject.platform).to be_nil
+      end
+    end
 
+    shared_examples 'error' do
       it 'returns an error' do
         expect(ClusterProvisionWorker).not_to receive(:perform_async)
-        expect { result }.to change { Clusters::Cluster.count }.by(0)
-        expect(result.errors[:"provider_gcp.gcp_project_id"]).to be_present
+        expect { subject }.to change { Clusters::Cluster.count }.by(0)
+        expect(subject.errors[:"provider_gcp.gcp_project_id"]).to be_present
+      end
+    end
+
+    context 'when project has no clusters' do
+      context 'when correct params' do
+        include_context 'valid params'
+
+        include_examples 'create cluster'
+      end
+
+      context 'when invalid params' do
+        include_context 'invalid params'
+
+        include_examples 'error'
+      end
+    end
+
+    context 'when project has a cluster' do
+      let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+
+      before do
+        allow(project).to receive(:feature_available?).and_call_original
+      end
+
+      context 'when license has multiple clusters feature' do
+        before do
+          allow(project).to receive(:feature_available?).with(:multiple_clusters).and_return(true)
+        end
+
+        context 'when correct params' do
+          include_context 'valid params'
+
+          include_examples 'create cluster'
+        end
+
+        context 'when invalid params' do
+          include_context 'invalid params'
+
+          include_examples 'error'
+        end
+      end
+
+      context 'when license does not have multiple clusters feature' do
+        include_context 'valid params'
+
+        before do
+          allow(project).to receive(:feature_available?).with(:multiple_clusters).and_return(false)
+        end
+
+        it 'does not create a cluster' do
+          expect(ClusterProvisionWorker).not_to receive(:perform_async)
+          expect { subject }.to raise_error(ArgumentError).and change { Clusters::Cluster.count }.by(0)
+        end
       end
     end
   end

spec/services/projects/fork_service_spec.rb

@@ -3,210 +3,253 @@ require 'spec_helper'
 describe Projects::ForkService do
   include ProjectForksHelper
   let(:gitlab_shell) { Gitlab::Shell.new }
+  context 'when forking a new project' do
+    describe 'fork by user' do
+      before do
+        @from_user = create(:user)
+        @from_namespace = @from_user.namespace
+        avatar = fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")
+        @from_project = create(:project,
+                               :repository,
+                               creator_id: @from_user.id,
+                               namespace: @from_namespace,
+                               star_count: 107,
+                               avatar: avatar,
+                               description: 'wow such project')
+        @to_user = create(:user)
+        @to_namespace = @to_user.namespace
+        @from_project.add_user(@to_user, :developer)
+      end
 
-  describe 'fork by user' do
-    before do
-      @from_user = create(:user)
-      @from_namespace = @from_user.namespace
-      avatar = fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")
-      @from_project = create(:project,
-                             :repository,
-                             creator_id: @from_user.id,
-                             namespace: @from_namespace,
-                             star_count: 107,
-                             avatar: avatar,
-                             description: 'wow such project')
-      @to_user = create(:user)
-      @to_namespace = @to_user.namespace
-      @from_project.add_user(@to_user, :developer)
-    end
+      context 'fork project' do
+        context 'when forker is a guest' do
+          before do
+            @guest = create(:user)
+            @from_project.add_user(@guest, :guest)
+          end
+          subject { fork_project(@from_project, @guest) }
 
-    context 'fork project' do
-      context 'when forker is a guest' do
-        before do
-          @guest = create(:user)
-          @from_project.add_user(@guest, :guest)
+          it { is_expected.not_to be_persisted }
+          it { expect(subject.errors[:forked_from_project_id]).to eq(['is forbidden']) }
         end
-        subject { fork_project(@from_project, @guest) }
 
-        it { is_expected.not_to be_persisted }
-        it { expect(subject.errors[:forked_from_project_id]).to eq(['is forbidden']) }
-      end
+        describe "successfully creates project in the user namespace" do
+          let(:to_project) { fork_project(@from_project, @to_user, namespace: @to_user.namespace) }
 
-      describe "successfully creates project in the user namespace" do
-        let(:to_project) { fork_project(@from_project, @to_user, namespace: @to_user.namespace) }
-
-        it { expect(to_project).to be_persisted }
-        it { expect(to_project.errors).to be_empty }
-        it { expect(to_project.owner).to eq(@to_user) }
-        it { expect(to_project.namespace).to eq(@to_user.namespace) }
-        it { expect(to_project.star_count).to be_zero }
-        it { expect(to_project.description).to eq(@from_project.description) }
-        it { expect(to_project.avatar.file).to be_exists }
-
-        # This test is here because we had a bug where the from-project lost its
-        # avatar after being forked.
-        # https://gitlab.com/gitlab-org/gitlab-ce/issues/26158
-        it "after forking the from-project still has its avatar" do
-          # If we do not fork the project first we cannot detect the bug.
-          expect(to_project).to be_persisted
-
-          expect(@from_project.avatar.file).to be_exists
-        end
+          it { expect(to_project).to be_persisted }
+          it { expect(to_project.errors).to be_empty }
+          it { expect(to_project.owner).to eq(@to_user) }
+          it { expect(to_project.namespace).to eq(@to_user.namespace) }
+          it { expect(to_project.star_count).to be_zero }
+          it { expect(to_project.description).to eq(@from_project.description) }
+          it { expect(to_project.avatar.file).to be_exists }
 
-        it 'flushes the forks count cache of the source project' do
-          expect(@from_project.forks_count).to be_zero
+          # This test is here because we had a bug where the from-project lost its
+          # avatar after being forked.
+          # https://gitlab.com/gitlab-org/gitlab-ce/issues/26158
+          it "after forking the from-project still has its avatar" do
+            # If we do not fork the project first we cannot detect the bug.
+            expect(to_project).to be_persisted
 
-          fork_project(@from_project, @to_user)
+            expect(@from_project.avatar.file).to be_exists
+          end
 
-          expect(@from_project.forks_count).to eq(1)
-        end
+          it 'flushes the forks count cache of the source project' do
+            expect(@from_project.forks_count).to be_zero
 
-        it 'creates a fork network with the new project and the root project set' do
-          to_project
-          fork_network = @from_project.reload.fork_network
+            fork_project(@from_project, @to_user)
 
-          expect(fork_network).not_to be_nil
-          expect(fork_network.root_project).to eq(@from_project)
-          expect(fork_network.projects).to contain_exactly(@from_project, to_project)
-        end
-      end
+            expect(@from_project.forks_count).to eq(1)
+          end
 
-      context 'creating a fork of a fork' do
-        let(:from_forked_project) { fork_project(@from_project, @to_user) }
-        let(:other_namespace) do
-          group = create(:group)
-          group.add_owner(@to_user)
-          group
-        end
-        let(:to_project) { fork_project(from_forked_project, @to_user, namespace: other_namespace) }
+          it 'creates a fork network with the new project and the root project set' do
+            to_project
+            fork_network = @from_project.reload.fork_network
 
-        it 'sets the root of the network to the root project' do
-          expect(to_project.fork_network.root_project).to eq(@from_project)
+            expect(fork_network).not_to be_nil
+            expect(fork_network.root_project).to eq(@from_project)
+            expect(fork_network.projects).to contain_exactly(@from_project, to_project)
+          end
         end
 
-        it 'sets the forked_from_project on the membership' do
-          expect(to_project.fork_network_member.forked_from_project).to eq(from_forked_project)
+        context 'creating a fork of a fork' do
+          let(:from_forked_project) { fork_project(@from_project, @to_user) }
+          let(:other_namespace) do
+            group = create(:group)
+            group.add_owner(@to_user)
+            group
+          end
+          let(:to_project) { fork_project(from_forked_project, @to_user, namespace: other_namespace) }
+
+          it 'sets the root of the network to the root project' do
+            expect(to_project.fork_network.root_project).to eq(@from_project)
+          end
+
+          it 'sets the forked_from_project on the membership' do
+            expect(to_project.fork_network_member.forked_from_project).to eq(from_forked_project)
+          end
         end
       end
-    end
 
-    context 'project already exists' do
-      it "fails due to validation, not transaction failure" do
-        @existing_project = create(:project, :repository, creator_id: @to_user.id, name: @from_project.name, namespace: @to_namespace)
-        @to_project = fork_project(@from_project, @to_user, namespace: @to_namespace)
-        expect(@existing_project).to be_persisted
+      context 'project already exists' do
+        it "fails due to validation, not transaction failure" do
+          @existing_project = create(:project, :repository, creator_id: @to_user.id, name: @from_project.name, namespace: @to_namespace)
+          @to_project = fork_project(@from_project, @to_user, namespace: @to_namespace)
+          expect(@existing_project).to be_persisted
 
-        expect(@to_project).not_to be_persisted
-        expect(@to_project.errors[:name]).to eq(['has already been taken'])
-        expect(@to_project.errors[:path]).to eq(['has already been taken'])
+          expect(@to_project).not_to be_persisted
+          expect(@to_project.errors[:name]).to eq(['has already been taken'])
+          expect(@to_project.errors[:path]).to eq(['has already been taken'])
+        end
       end
-    end
 
-    context 'repository already exists' do
-      let(:repository_storage) { 'default' }
-      let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage]['path'] }
+      context 'repository already exists' do
+        let(:repository_storage) { 'default' }
+        let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage]['path'] }
 
-      before do
-        gitlab_shell.add_repository(repository_storage, "#{@to_user.namespace.full_path}/#{@from_project.path}")
-      end
+        before do
+          gitlab_shell.add_repository(repository_storage, "#{@to_user.namespace.full_path}/#{@from_project.path}")
+        end
 
-      after do
-        gitlab_shell.remove_repository(repository_storage_path, "#{@to_user.namespace.full_path}/#{@from_project.path}")
-      end
+        after do
+          gitlab_shell.remove_repository(repository_storage_path, "#{@to_user.namespace.full_path}/#{@from_project.path}")
+        end
 
-      it 'does not allow creation' do
-        to_project = fork_project(@from_project, @to_user, namespace: @to_user.namespace)
+        it 'does not allow creation' do
+          to_project = fork_project(@from_project, @to_user, namespace: @to_user.namespace)
 
-        expect(to_project).not_to be_persisted
-        expect(to_project.errors.messages).to have_key(:base)
-        expect(to_project.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+          expect(to_project).not_to be_persisted
+          expect(to_project.errors.messages).to have_key(:base)
+          expect(to_project.errors.messages[:base].first).to match('There is already a repository with that name on disk')
+        end
       end
-    end
 
-    context 'GitLab CI is enabled' do
-      it "forks and enables CI for fork" do
-        @from_project.enable_ci
-        @to_project = fork_project(@from_project, @to_user)
-        expect(@to_project.builds_enabled?).to be_truthy
+      context 'GitLab CI is enabled' do
+        it "forks and enables CI for fork" do
+          @from_project.enable_ci
+          @to_project = fork_project(@from_project, @to_user)
+          expect(@to_project.builds_enabled?).to be_truthy
+        end
       end
-    end
 
-    context "when project has restricted visibility level" do
-      context "and only one visibility level is restricted" do
-        before do
-          @from_project.update_attributes(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
-          stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::INTERNAL])
+      context "when project has restricted visibility level" do
+        context "and only one visibility level is restricted" do
+          before do
+            @from_project.update_attributes(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
+            stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::INTERNAL])
+          end
+
+          it "creates fork with highest allowed level" do
+            forked_project = fork_project(@from_project, @to_user)
+
+            expect(forked_project.visibility_level).to eq(Gitlab::VisibilityLevel::PUBLIC)
+          end
         end
 
-        it "creates fork with highest allowed level" do
-          forked_project = fork_project(@from_project, @to_user)
+        context "and all visibility levels are restricted" do
+          before do
+            stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PUBLIC, Gitlab::VisibilityLevel::INTERNAL, Gitlab::VisibilityLevel::PRIVATE])
+          end
+
+          it "creates fork with private visibility levels" do
+            forked_project = fork_project(@from_project, @to_user)
 
-          expect(forked_project.visibility_level).to eq(Gitlab::VisibilityLevel::PUBLIC)
+            expect(forked_project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE)
+          end
         end
       end
+    end
 
-      context "and all visibility levels are restricted" do
-        before do
-          stub_application_setting(restricted_visibility_levels: [Gitlab::VisibilityLevel::PUBLIC, Gitlab::VisibilityLevel::INTERNAL, Gitlab::VisibilityLevel::PRIVATE])
+    describe 'fork to namespace' do
+      before do
+        @group_owner = create(:user)
+        @developer   = create(:user)
+        @project     = create(:project, :repository,
+                              creator_id: @group_owner.id,
+                              star_count: 777,
+                              description: 'Wow, such a cool project!')
+        @group = create(:group)
+        @group.add_user(@group_owner, GroupMember::OWNER)
+        @group.add_user(@developer,   GroupMember::DEVELOPER)
+        @project.add_user(@developer,   :developer)
+        @project.add_user(@group_owner, :developer)
+        @opts = { namespace: @group }
+      end
+
+      context 'fork project for group' do
+        it 'group owner successfully forks project into the group' do
+          to_project = fork_project(@project, @group_owner, @opts)
+
+          expect(to_project).to             be_persisted
+          expect(to_project.errors).to      be_empty
+          expect(to_project.owner).to       eq(@group)
+          expect(to_project.namespace).to   eq(@group)
+          expect(to_project.name).to        eq(@project.name)
+          expect(to_project.path).to        eq(@project.path)
+          expect(to_project.description).to eq(@project.description)
+          expect(to_project.star_count).to  be_zero
         end
+      end
 
-        it "creates fork with private visibility levels" do
-          forked_project = fork_project(@from_project, @to_user)
+      context 'fork project for group when user not owner' do
+        it 'group developer fails to fork project into the group' do
+          to_project = fork_project(@project, @developer, @opts)
+          expect(to_project.errors[:namespace]).to eq(['is not valid'])
+        end
+      end
 
-          expect(forked_project.visibility_level).to eq(Gitlab::VisibilityLevel::PRIVATE)
+      context 'project already exists in group' do
+        it 'fails due to validation, not transaction failure' do
+          existing_project = create(:project, :repository,
+                                    name: @project.name,
+                                    namespace: @group)
+          to_project = fork_project(@project, @group_owner, @opts)
+          expect(existing_project.persisted?).to be_truthy
+          expect(to_project.errors[:name]).to eq(['has already been taken'])
+          expect(to_project.errors[:path]).to eq(['has already been taken'])
         end
       end
     end
   end
 
-  describe 'fork to namespace' do
-    before do
-      @group_owner = create(:user)
-      @developer   = create(:user)
-      @project     = create(:project, :repository,
-                            creator_id: @group_owner.id,
-                            star_count: 777,
-                            description: 'Wow, such a cool project!')
-      @group = create(:group)
-      @group.add_user(@group_owner, GroupMember::OWNER)
-      @group.add_user(@developer,   GroupMember::DEVELOPER)
-      @project.add_user(@developer,   :developer)
-      @project.add_user(@group_owner, :developer)
-      @opts = { namespace: @group }
+  context 'when linking fork to an existing project' do
+    let(:fork_from_project) { create(:project, :public) }
+    let(:fork_to_project) { create(:project, :public) }
+    let(:user) { create(:user) }
+
+    subject { described_class.new(fork_from_project, user) }
+
+    def forked_from_project(project)
+      project.fork_network_member&.forked_from_project
     end
 
-    context 'fork project for group' do
-      it 'group owner successfully forks project into the group' do
-        to_project = fork_project(@project, @group_owner, @opts)
-
-        expect(to_project).to             be_persisted
-        expect(to_project.errors).to      be_empty
-        expect(to_project.owner).to       eq(@group)
-        expect(to_project.namespace).to   eq(@group)
-        expect(to_project.name).to        eq(@project.name)
-        expect(to_project.path).to        eq(@project.path)
-        expect(to_project.description).to eq(@project.description)
-        expect(to_project.star_count).to  be_zero
+    context 'if project is already forked' do
+      it 'does not create fork relation' do
+        allow(fork_to_project).to receive(:forked?).and_return(true)
+        expect(forked_from_project(fork_to_project)).to be_nil
+        expect(subject.execute(fork_to_project)).to be_nil
+        expect(forked_from_project(fork_to_project)).to be_nil
       end
     end
 
-    context 'fork project for group when user not owner' do
-      it 'group developer fails to fork project into the group' do
-        to_project = fork_project(@project, @developer, @opts)
-        expect(to_project.errors[:namespace]).to eq(['is not valid'])
+    context 'if project is not forked' do
+      it 'creates fork relation' do
+        expect(fork_to_project.forked?).to be false
+        expect(forked_from_project(fork_to_project)).to be_nil
+
+        subject.execute(fork_to_project)
+
+        expect(fork_to_project.forked?).to be true
+        expect(forked_from_project(fork_to_project)).to eq fork_from_project
+        expect(fork_to_project.forked_from_project).to eq fork_from_project
       end
-    end
 
-    context 'project already exists in group' do
-      it 'fails due to validation, not transaction failure' do
-        existing_project = create(:project, :repository,
-                                  name: @project.name,
-                                  namespace: @group)
-        to_project = fork_project(@project, @group_owner, @opts)
-        expect(existing_project.persisted?).to be_truthy
-        expect(to_project.errors[:name]).to eq(['has already been taken'])
-        expect(to_project.errors[:path]).to eq(['has already been taken'])
+      it 'flushes the forks count cache of the source project' do
+        expect(fork_from_project.forks_count).to be_zero
+
+        subject.execute(fork_to_project)
+
+        expect(fork_from_project.forks_count).to eq(1)
       end
     end
   end