From efa0502386a1868f7120ffd4291175291f0094ed Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 3 Feb 2017 14:28:44 +0100
Subject: [PATCH 01/73] Enable grouping and pagination in environmnets API

---
 .../projects/environments_controller.rb       |  4 ++-
 .../projects/environments_controller_spec.rb  | 26 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 0ec8f5bd64a..0d1095da6c2 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -16,7 +16,9 @@ class Projects::EnvironmentsController < Projects::ApplicationController
       format.html
       format.json do
         render json: EnvironmentSerializer
-          .new(project: @project, user: current_user)
+          .new(project: @project, user: @current_user)
+          .with_pagination(request, response)
+          .within_folders
           .represent(@environments)
       end
     end
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 7ac1d62d1b1..4ec91738b9b 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -3,9 +3,13 @@ require 'spec_helper'
 describe Projects::EnvironmentsController do
   include ApiHelpers
 
-  let(:environment) { create(:environment) }
-  let(:project)     { environment.project }
-  let(:user)        { create(:user) }
+  let(:user) { create(:user) }
+  let(:project) { create(:empty_project) }
+
+  let(:environment) do
+    create(:environment, name: 'production',
+                         project: project)
+  end
 
   before do
     project.team << [user, :master]
@@ -22,14 +26,20 @@ describe Projects::EnvironmentsController do
       end
     end
 
-    context 'when requesting JSON response' do
+    context 'when requesting JSON response for folders' do
+      before do
+        create(:environment, project: project, name: 'staging/review-1')
+        create(:environment, project: project, name: 'staging/review-2')
+      end
+
       it 'responds with correct JSON' do
         get :index, environment_params(format: :json)
 
-        first_environment = json_response.first
-
-        expect(first_environment).not_to be_empty
-        expect(first_environment['name']). to eq environment.name
+        expect(json_response.count).to eq 2
+        expect(json_response.first['name']).to eq 'production'
+        expect(json_response.second['name']).to eq 'staging'
+        expect(json_response.second['size']).to eq 2
+        expect(json_response.second['latest']['name']).to eq 'staging/review-2'
       end
     end
   end

From b3309bb2fad36372b1e4821410691fa9f720bbe4 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 3 Feb 2017 19:47:56 +0000
Subject: [PATCH 02/73] Adjustments to receive new data schema

---
 .../components/environment.js.es6             |  35 +--
 .../components/environment_item.js.es6        | 211 +++++++-----------
 .../stores/environments_store.js.es6          | 168 ++------------
 .../stylesheets/pages/environments.scss       |  16 +-
 .../environments/environment_item_spec.js.es6 | 137 +++++-------
 .../environments_store_spec.js.es6            |  48 +---
 .../javascripts/environments/mock_data.js.es6 | 180 ++++-----------
 7 files changed, 219 insertions(+), 576 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 91553bda4dc..93f65ba0ea8 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -69,12 +69,10 @@ require('./environment_item');
      * Toggles loading property.
      */
     created() {
-      gl.environmentsService = new EnvironmentsService(this.endpoint);
+      const scope = this.$options.getQueryParameter('scope') || this.visibility;
+      const endpoint = `${this.endpoint}?scope=${scope}`;
 
-      const scope = this.$options.getQueryParameter('scope');
-      if (scope) {
-        this.store.storeVisibility(scope);
-      }
+      gl.environmentsService = new EnvironmentsService(endpoint);
 
       this.isLoading = true;
 
@@ -82,6 +80,8 @@ require('./environment_item');
         .then(resp => resp.json())
         .then((json) => {
           this.store.storeEnvironments(json);
+        })
+        .then(() => {
           this.isLoading = false;
         })
         .catch(() => {
@@ -165,8 +165,7 @@ require('./environment_item');
               </a>
             </p>
 
-            <a
-              v-if="canCreateEnvironmentParsed"
+            <a v-if="canCreateEnvironmentParsed"
               :href="newEnvironmentPath"
               class="btn btn-create js-new-environment-button">
               New Environment
@@ -174,7 +173,7 @@ require('./environment_item');
           </div>
 
           <div class="table-holder"
-            v-if="!isLoading && state.filteredEnvironments.length > 0">
+            v-if="!isLoading && state.environments.length > 0">
             <table class="table ci-table environments">
               <thead>
                 <tr>
@@ -187,31 +186,15 @@ require('./environment_item');
                 </tr>
               </thead>
               <tbody>
-                <template v-for="model in state.filteredEnvironments"
+                <template v-for="model in state.environments"
                   v-bind:model="model">
-
-                  <tr
-                    is="environment-item"
+                  <tr is="environment-item"
                     :model="model"
-                    :toggleRow="toggleRow.bind(model)"
                     :can-create-deployment="canCreateDeploymentParsed"
                     :can-read-environment="canReadEnvironmentParsed"
                     :play-icon-svg="playIconSvg"
                     :terminal-icon-svg="terminalIconSvg"
                     :commit-icon-svg="commitIconSvg"></tr>
-
-                  <tr v-if="model.isOpen && model.children && model.children.length > 0"
-                    is="environment-item"
-                    v-for="children in model.children"
-                    :model="children"
-                    :toggleRow="toggleRow.bind(children)"
-                    :can-create-deployment="canCreateDeploymentParsed"
-                    :can-read-environment="canReadEnvironmentParsed"
-                    :play-icon-svg="playIconSvg"
-                    :terminal-icon-svg="terminalIconSvg"
-                    :commit-icon-svg="commitIconSvg">
-                    </tr>
-
                 </template>
               </tbody>
             </table>
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 33a99231315..ae37bc24396 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -15,12 +15,7 @@ require('./environment_terminal_button');
   /**
    * Envrionment Item Component
    *
-   * Used in a hierarchical structure to show folders with children
-   * in a table.
-   * Recursive component based on [Tree View](https://vuejs.org/examples/tree-view.html)
-   *
-   * See this [issue](https://gitlab.com/gitlab-org/gitlab-ce/issues/22539)
-   * for more information.15
+   * Renders a table row for each environment.
    */
 
   window.gl = window.gl || {};
@@ -45,11 +40,6 @@ require('./environment_terminal_button');
         default: () => ({}),
       },
 
-      toggleRow: {
-        type: Function,
-        required: false,
-      },
-
       canCreateDeployment: {
         type: Boolean,
         required: false,
@@ -76,50 +66,9 @@ require('./environment_terminal_button');
         type: String,
         required: false,
       },
-
-    },
-
-    data() {
-      return {
-        rowClass: {
-          'children-row': this.model['vue-isChildren'],
-        },
-      };
     },
 
     computed: {
-
-      /**
-       * If an item has a `children` entry it means it is a folder.
-       * Folder items have different behaviours - it is possible to toggle
-       * them and show their children.
-       *
-       * @returns {Boolean|Undefined}
-       */
-      isFolder() {
-        return this.model.children && this.model.children.length > 0;
-      },
-
-      /**
-       * If an item is inside a folder structure will return true.
-       * Used for css purposes.
-       *
-       * @returns {Boolean|undefined}
-       */
-      isChildren() {
-        return this.model['vue-isChildren'];
-      },
-
-      /**
-       * Counts the number of environments in each folder.
-       * Used to show a badge with the counter.
-       *
-       * @returns {Number|Undefined}  The number of environments for the current folder.
-       */
-      childrenCounter() {
-        return this.model.children && this.model.children.length;
-      },
-
       /**
        * Verifies if `last_deployment` key exists in the current Envrionment.
        * This key is required to render most of the html - this method works has
@@ -128,8 +77,8 @@ require('./environment_terminal_button');
        * @returns {Boolean}
        */
       hasLastDeploymentKey() {
-        if (this.model.last_deployment &&
-          !this.$options.isObjectEmpty(this.model.last_deployment)) {
+        if (this.model.latest.last_deployment &&
+          !this.$options.isObjectEmpty(this.model.latest.last_deployment)) {
           return true;
         }
         return false;
@@ -142,8 +91,9 @@ require('./environment_terminal_button');
        * @returns {Boolean|Undefined}
        */
       hasManualActions() {
-        return this.model.last_deployment && this.model.last_deployment.manual_actions &&
-          this.model.last_deployment.manual_actions.length > 0;
+        return this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.manual_actions &&
+          this.model.latest.last_deployment.manual_actions.length > 0;
       },
 
       /**
@@ -163,8 +113,8 @@ require('./environment_terminal_button');
        */
       canRetry() {
         return this.hasLastDeploymentKey &&
-          this.model.last_deployment &&
-          this.model.last_deployment.deployable;
+          this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.deployable;
       },
 
       /**
@@ -173,9 +123,9 @@ require('./environment_terminal_button');
        * @returns {Boolean|Undefined}
        */
       canShowDate() {
-        return this.model.last_deployment &&
-          this.model.last_deployment.deployable &&
-          this.model.last_deployment.deployable !== undefined;
+        return this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.deployable &&
+          this.model.latest.last_deployment.deployable !== undefined;
       },
 
       /**
@@ -185,7 +135,7 @@ require('./environment_terminal_button');
        */
       createdDate() {
         return gl.environmentsList.timeagoInstance.format(
-          this.model.last_deployment.deployable.created_at,
+          this.model.latest.last_deployment.deployable.created_at,
         );
       },
 
@@ -196,7 +146,7 @@ require('./environment_terminal_button');
        */
       manualActions() {
         if (this.hasManualActions) {
-          return this.model.last_deployment.manual_actions.map((action) => {
+          return this.model.latest.last_deployment.manual_actions.map((action) => {
             const parsedAction = {
               name: gl.text.humanize(action.name),
               play_path: action.play_path,
@@ -213,10 +163,10 @@ require('./environment_terminal_button');
        * @returns {String}
        */
       userImageAltDescription() {
-        if (this.model.last_deployment &&
-          this.model.last_deployment.user &&
-          this.model.last_deployment.user.username) {
-          return `${this.model.last_deployment.user.username}'s avatar'`;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.user &&
+          this.model.latest.last_deployment.user.username) {
+          return `${this.model.latest.last_deployment.user.username}'s avatar'`;
         }
         return '';
       },
@@ -227,9 +177,9 @@ require('./environment_terminal_button');
        * @returns {String|Undefined}
        */
       commitTag() {
-        if (this.model.last_deployment &&
-          this.model.last_deployment.tag) {
-          return this.model.last_deployment.tag;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.tag) {
+          return this.model.latest.last_deployment.tag;
         }
         return undefined;
       },
@@ -240,8 +190,9 @@ require('./environment_terminal_button');
        * @returns {Object|Undefined}
        */
       commitRef() {
-        if (this.model.last_deployment && this.model.last_deployment.ref) {
-          return this.model.last_deployment.ref;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.ref) {
+          return this.model.latest.last_deployment.ref;
         }
         return undefined;
       },
@@ -252,10 +203,10 @@ require('./environment_terminal_button');
        * @returns {String|Undefined}
        */
       commitUrl() {
-        if (this.model.last_deployment &&
-          this.model.last_deployment.commit &&
-          this.model.last_deployment.commit.commit_path) {
-          return this.model.last_deployment.commit.commit_path;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.commit &&
+          this.model.latest.last_deployment.commit.commit_path) {
+          return this.model.latest.last_deployment.commit.commit_path;
         }
         return undefined;
       },
@@ -266,10 +217,10 @@ require('./environment_terminal_button');
        * @returns {String|Undefined}
        */
       commitShortSha() {
-        if (this.model.last_deployment &&
-          this.model.last_deployment.commit &&
-          this.model.last_deployment.commit.short_id) {
-          return this.model.last_deployment.commit.short_id;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.commit &&
+          this.model.latest.last_deployment.commit.short_id) {
+          return this.model.latest.last_deployment.commit.short_id;
         }
         return undefined;
       },
@@ -280,10 +231,10 @@ require('./environment_terminal_button');
        * @returns {String|Undefined}
        */
       commitTitle() {
-        if (this.model.last_deployment &&
-          this.model.last_deployment.commit &&
-          this.model.last_deployment.commit.title) {
-          return this.model.last_deployment.commit.title;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.commit &&
+          this.model.latest.last_deployment.commit.title) {
+          return this.model.latest.last_deployment.commit.title;
         }
         return undefined;
       },
@@ -294,10 +245,10 @@ require('./environment_terminal_button');
        * @returns {Object|Undefined}
        */
       commitAuthor() {
-        if (this.model.last_deployment &&
-          this.model.last_deployment.commit &&
-          this.model.last_deployment.commit.author) {
-          return this.model.last_deployment.commit.author;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.commit &&
+          this.model.latest.last_deployment.commit.author) {
+          return this.model.latest.last_deployment.commit.author;
         }
 
         return undefined;
@@ -309,10 +260,10 @@ require('./environment_terminal_button');
        * @returns {String|Undefined}
        */
       retryUrl() {
-        if (this.model.last_deployment &&
-          this.model.last_deployment.deployable &&
-          this.model.last_deployment.deployable.retry_path) {
-          return this.model.last_deployment.deployable.retry_path;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.deployable &&
+          this.model.latest.last_deployment.deployable.retry_path) {
+          return this.model.latest.last_deployment.deployable.retry_path;
         }
         return undefined;
       },
@@ -323,7 +274,8 @@ require('./environment_terminal_button');
        * @returns {Boolean|Undefined}
        */
       isLastDeployment() {
-        return this.model.last_deployment && this.model.last_deployment['last?'];
+        return this.model.latest.last_deployment &&
+          this.model.latest.last_deployment['last?'];
       },
 
       /**
@@ -332,9 +284,9 @@ require('./environment_terminal_button');
        * @returns {String}
        */
       buildName() {
-        if (this.model.last_deployment &&
-          this.model.last_deployment.deployable) {
-          return `${this.model.last_deployment.deployable.name} #${this.model.last_deployment.deployable.id}`;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.deployable) {
+          return `${this.model.latest.last_deployment.deployable.name} #${this.model.latest.last_deployment.deployable.id}`;
         }
         return '';
       },
@@ -345,9 +297,9 @@ require('./environment_terminal_button');
        * @returns {String}
        */
       deploymentInternalId() {
-        if (this.model.last_deployment &&
-          this.model.last_deployment.iid) {
-          return `#${this.model.last_deployment.iid}`;
+        if (this.model.latest.last_deployment &&
+          this.model.latest.last_deployment.iid) {
+          return `#${this.model.latest.last_deployment.iid}`;
         }
         return '';
       },
@@ -358,8 +310,8 @@ require('./environment_terminal_button');
        * @returns {Boolean}
        */
       deploymentHasUser() {
-        return !this.$options.isObjectEmpty(this.model.last_deployment) &&
-          !this.$options.isObjectEmpty(this.model.last_deployment.user);
+        return !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+          !this.$options.isObjectEmpty(this.model.latest.last_deployment.user);
       },
 
       /**
@@ -369,9 +321,9 @@ require('./environment_terminal_button');
        * @returns {Object}
        */
       deploymentUser() {
-        if (!this.$options.isObjectEmpty(this.model.last_deployment) &&
-          !this.$options.isObjectEmpty(this.model.last_deployment.user)) {
-          return this.model.last_deployment.user;
+        if (!this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+          !this.$options.isObjectEmpty(this.model.latest.last_deployment.user)) {
+          return this.model.latest.last_deployment.user;
         }
         return {};
       },
@@ -384,9 +336,9 @@ require('./environment_terminal_button');
        * @returns {Boolean}
        */
       shouldRenderBuildName() {
-        return !this.isFolder &&
-          !this.$options.isObjectEmpty(this.model.last_deployment) &&
-          !this.$options.isObjectEmpty(this.model.last_deployment.deployable);
+        return !this.model.isFolder &&
+          !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+          !this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
       },
 
       /**
@@ -397,9 +349,9 @@ require('./environment_terminal_button');
        * @returns {Boolean}
        */
       shouldRenderDeploymentID() {
-        return !this.isFolder &&
-          !this.$options.isObjectEmpty(this.model.last_deployment) &&
-          this.model.last_deployment.iid !== undefined;
+        return !this.model.isFolder &&
+          !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+          this.model.latest.last_deployment.iid !== undefined;
       },
     },
 
@@ -420,16 +372,16 @@ require('./environment_terminal_button');
 
     template: `
       <tr>
-        <td v-bind:class="{ 'children-row': isChildren}">
-          <a v-if="!isFolder"
+        <td>
+          <a v-if="!model.isFolder"
             class="environment-name"
-            :href="model.environment_path">
+            :href="model.latest.environment_path">
             {{model.name}}
           </a>
-          <span v-else v-on:click="toggleRow(model)" class="folder-name">
+          <a v-else class="folder-name">
             <span class="folder-icon">
-              <i v-show="model.isOpen" class="fa fa-caret-down"></i>
-              <i v-show="!model.isOpen" class="fa fa-caret-right"></i>
+              <i class="fa fa-caret-right" aria-hidden="true"></i>
+              <i class="fa fa-folder" aria-hidden="true"></i>
             </span>
 
             <span>
@@ -437,9 +389,9 @@ require('./environment_terminal_button');
             </span>
 
             <span class="badge">
-              {{childrenCounter}}
+              {{model.size}}
             </span>
-          </span>
+          </a>
         </td>
 
         <td class="deployment-column">
@@ -447,7 +399,7 @@ require('./environment_terminal_button');
             {{deploymentInternalId}}
           </span>
 
-          <span v-if="!isFolder && deploymentHasUser">
+          <span v-if="!model.isFolder && deploymentHasUser">
             by
             <a :href="deploymentUser.web_url" class="js-deploy-user-container">
               <img class="avatar has-tooltip s20"
@@ -461,13 +413,13 @@ require('./environment_terminal_button');
         <td class="environments-build-cell">
           <a v-if="shouldRenderBuildName"
             class="build-link"
-            :href="model.last_deployment.deployable.build_path">
+            :href="model.latest.last_deployment.deployable.build_path">
             {{buildName}}
           </a>
         </td>
 
         <td>
-          <div v-if="!isFolder && hasLastDeploymentKey" class="js-commit-component">
+          <div v-if="!model.isFolder && hasLastDeploymentKey" class="js-commit-component">
             <commit-component
               :tag="commitTag"
               :commit-ref="commitRef"
@@ -478,21 +430,20 @@ require('./environment_terminal_button');
               :commit-icon-svg="commitIconSvg">
             </commit-component>
           </div>
-          <p v-if="!isFolder && !hasLastDeploymentKey" class="commit-title">
+          <p v-if="!model.isFolder && !hasLastDeploymentKey" class="commit-title">
             No deployments yet
           </p>
         </td>
 
         <td>
-          <span
-            v-if="!isFolder && canShowDate"
+          <span v-if="!model.isFolder && canShowDate"
             class="environment-created-date-timeago">
             {{createdDate}}
           </span>
         </td>
 
         <td class="hidden-xs">
-          <div v-if="!isFolder">
+          <div v-if="!model.isFolder">
             <div v-if="hasManualActions && canCreateDeployment"
               class="inline js-manual-actions-container">
               <actions-component
@@ -501,25 +452,25 @@ require('./environment_terminal_button');
               </actions-component>
             </div>
 
-            <div v-if="model.external_url && canReadEnvironment"
+            <div v-if="model.latest.external_url && canReadEnvironment"
               class="inline js-external-url-container">
               <external-url-component
-                :external-url="model.external_url">
+                :external-url="model.latest.external_url">
               </external-url-component>
             </div>
 
             <div v-if="hasStopAction && canCreateDeployment"
               class="inline js-stop-component-container">
               <stop-component
-                :stop-url="model.stop_path">
+                :stop-url="model.latest.stop_path">
               </stop-component>
             </div>
 
-            <div v-if="model.terminal_path"
+            <div v-if="model.latest.terminal_path"
               class="inline js-terminal-button-container">
               <terminal-button-component
                 :terminal-icon-svg="terminalIconSvg"
-                :terminal-path="model.terminal_path">
+                :terminal-path="model.latest.terminal_path">
               </terminal-button-component>
             </div>
 
diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index 9b4090100da..a533b8b61d6 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -10,181 +10,41 @@
       this.state.environments = [];
       this.state.stoppedCounter = 0;
       this.state.availableCounter = 0;
-      this.state.visibility = 'available';
       this.state.filteredEnvironments = [];
 
       return this;
     },
 
     /**
-     * In order to display a tree view we need to modify the received
-     * data in to a tree structure based on `environment_type`
-     * sorted alphabetically.
-     * In each children a `vue-` property will be added. This property will be
-     * used to know if an item is a children mostly for css purposes. This is
-     * needed because the children row is a fragment instance and therfore does
-     * not accept non-prop attributes.
      *
+     * Stores the received environments.
      *
-     * @example
-     * it will transform this:
-     * [
-     *   { name: "environment", environment_type: "review" },
-     *   { name: "environment_1", environment_type: null }
-     *   { name: "environment_2, environment_type: "review" }
-     * ]
-     * into this:
-     * [
-     *   { name: "review", children:
-     *      [
-     *        { name: "environment", environment_type: "review", vue-isChildren: true},
-     *        { name: "environment_2", environment_type: "review", vue-isChildren: true}
-     *      ]
-     *   },
-     *  {name: "environment_1", environment_type: null}
-     * ]
+     * Each environment has the following schema
+     * { name: String, size: Number, latest: Object }
      *
+     * If the `size` is bigger than 1, it means it should be rendered as a folder.
+     * In those cases we add `isFolder` key in order to render it properly.
      *
-     * @param  {Array} environments List of environments.
-     * @returns {Array} Tree structured array with the received environments.
+     * @param  {Array} environments
+     * @returns {Array}
      */
     storeEnvironments(environments = []) {
-      this.state.stoppedCounter = this.countByState(environments, 'stopped');
-      this.state.availableCounter = this.countByState(environments, 'available');
-
-      const environmentsTree = environments.reduce((acc, environment) => {
-        if (environment.environment_type !== null) {
-          const occurs = acc.filter(element => element.children &&
-             element.name === environment.environment_type);
-
-          environment['vue-isChildren'] = true;
-
-          if (occurs.length) {
-            acc[acc.indexOf(occurs[0])].children.push(environment);
-            acc[acc.indexOf(occurs[0])].children.slice().sort(this.sortByName);
-          } else {
-            acc.push({
-              name: environment.environment_type,
-              children: [environment],
-              isOpen: false,
-              'vue-isChildren': environment['vue-isChildren'],
-            });
-          }
-        } else {
-          acc.push(environment);
-        }
-
-        return acc;
-      }, []).slice().sort(this.sortByName);
-
-      this.state.environments = environmentsTree;
-
-      this.filterEnvironmentsByVisibility(this.state.environments);
-
-      return environmentsTree;
-    },
-
-    storeVisibility(visibility) {
-      this.state.visibility = visibility;
-    },
-    /**
-     * Given the visibility prop provided by the url query parameter and which
-     * changes according to the active tab we need to filter which environments
-     * should be visible.
-     *
-     * The environments array is a recursive tree structure and we need to filter
-     * both root level environments and children environments.
-     *
-     * In order to acomplish that, both `filterState` and `filterEnvironmentsByVisibility`
-     * functions work together.
-     * The first one works as the filter that verifies if the given environment matches
-     * the given state.
-     * The second guarantees both root level and children elements are filtered as well.
-     *
-     * Given array of environments will return only
-     * the environments that match the state stored.
-     *
-     * @param {Array} array
-     * @return {Array}
-     */
-    filterEnvironmentsByVisibility(arr) {
-      const filteredEnvironments = arr.map((item) => {
-        if (item.children) {
-          const filteredChildren = this.filterEnvironmentsByVisibility(
-            item.children,
-          ).filter(Boolean);
-
-          if (filteredChildren.length) {
-            item.children = filteredChildren;
-            return item;
-          }
-        }
-
-        return this.filterState(this.state.visibility, item);
-      }).filter(Boolean);
-
-      this.state.filteredEnvironments = filteredEnvironments;
-      return filteredEnvironments;
-    },
-
-    /**
-     * Given the state and the environment,
-     * returns only if the environment state matches the one provided.
-     *
-     * @param  {String} state
-     * @param  {Object} environment
-     * @return {Object}
-     */
-    filterState(state, environment) {
-      return environment.state === state && environment;
-    },
-
-    /**
-     * Toggles folder open property given the environment type.
-     *
-     * @param  {String} envType
-     * @return {Array}
-     */
-    toggleFolder(envType) {
-      const environments = this.state.environments;
-
-      const environmentsCopy = environments.map((env) => {
-        if (env['vue-isChildren'] && env.name === envType) {
-          env.isOpen = !env.isOpen;
+      const filteredEnvironments = environments.map((env) => {
+        if (env.size > 1) {
+          return Object.assign({}, env, { isFolder: true });
         }
 
         return env;
       });
 
-      this.state.environments = environmentsCopy;
+      this.state.environments = filteredEnvironments;
 
-      return environmentsCopy;
+      return filteredEnvironments;
     },
 
-    /**
-     * Given an array of environments, returns the number of environments
-     * that have the given state.
-     *
-     * @param  {Array} environments
-     * @param  {String} state
-     * @returns {Number}
-     */
-    countByState(environments, state) {
-      return environments.filter(env => env.state === state).length;
+    storeCounts() {
+      //TODO
     },
 
-    /**
-     * Sorts the two objects provided by their name.
-     *
-     * @param  {Object} a
-     * @param  {Object} b
-     * @returns {Number}
-     */
-    sortByName(a, b) {
-      const nameA = a.name.toUpperCase();
-      const nameB = b.name.toUpperCase();
-
-      return nameA < nameB ? -1 : nameA > nameB ? 1 : 0; // eslint-disable-line
-    },
   };
 })();
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index 778ef01430e..1d4d85ba6de 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -110,17 +110,19 @@
     }
   }
 
-  .children-row .environment-name {
-    margin-left: 17px;
-    margin-right: -17px;
-  }
-
   .folder-icon {
-    padding: 0 5px 0 0;
+    margin-right: 3px;
+    color: $gl-text-color-secondary;
+
+    .fa:nth-child(1) {
+      margin-right: 3px;
+    }
   }
 
   .folder-name {
     cursor: pointer;
+    text-decoration: none;
+    color: $gl-text-color-secondary;
   }
 }
 
@@ -135,4 +137,4 @@
       margin-right: 0;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6
index d87cc0996c9..14478f1401d 100644
--- a/spec/javascripts/environments/environment_item_spec.js.es6
+++ b/spec/javascripts/environments/environment_item_spec.js.es6
@@ -14,33 +14,13 @@ describe('Environment item', () => {
     beforeEach(() => {
       mockItem = {
         name: 'review',
-        children: [
-          {
-            name: 'review-app',
-            id: 1,
-            state: 'available',
-            external_url: '',
-            last_deployment: {},
-            created_at: '2016-11-07T11:11:16.525Z',
-            updated_at: '2016-11-10T15:55:58.778Z',
-          },
-          {
-            name: 'production',
-            id: 2,
-            state: 'available',
-            external_url: '',
-            last_deployment: {},
-            created_at: '2016-11-07T11:11:16.525Z',
-            updated_at: '2016-11-10T15:55:58.778Z',
-          },
-        ],
+        size: 3
       };
 
       component = new window.gl.environmentsList.EnvironmentItem({
         el: document.querySelector('tr#environment-row'),
         propsData: {
           model: mockItem,
-          toggleRow: () => {},
           canCreateDeployment: false,
           canReadEnvironment: true,
         },
@@ -53,7 +33,7 @@ describe('Environment item', () => {
     });
 
     it('Should render the number of children in a badge', () => {
-      expect(component.$el.querySelector('.folder-name .badge').textContent).toContain(mockItem.children.length);
+      expect(component.$el.querySelector('.folder-name .badge').textContent).toContain(mockItem.size);
     });
   });
 
@@ -63,38 +43,23 @@ describe('Environment item', () => {
 
     beforeEach(() => {
       environment = {
-        id: 31,
         name: 'production',
-        state: 'stopped',
-        external_url: 'http://external.com',
-        environment_type: null,
-        last_deployment: {
-          id: 66,
-          iid: 6,
-          sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-          ref: {
-            name: 'master',
-            ref_path: 'root/ci-folders/tree/master',
-          },
-          tag: true,
-          'last?': true,
-          user: {
-            name: 'Administrator',
-            username: 'root',
-            id: 1,
-            state: 'active',
-            avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
-            web_url: 'http://localhost:3000/root',
-          },
-          commit: {
-            id: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-            short_id: '500aabcb',
-            title: 'Update .gitlab-ci.yml',
-            author_name: 'Administrator',
-            author_email: 'admin@example.com',
-            created_at: '2016-11-07T18:28:13.000+00:00',
-            message: 'Update .gitlab-ci.yml',
-            author: {
+        size: 1,
+        latest: {
+          state: 'stopped',
+          external_url: 'http://external.com',
+          environment_type: null,
+          last_deployment: {
+            id: 66,
+            iid: 6,
+            sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
+            ref: {
+              name: 'master',
+              ref_path: 'root/ci-folders/tree/master',
+            },
+            tag: true,
+            'last?': true,
+            user: {
               name: 'Administrator',
               username: 'root',
               id: 1,
@@ -102,34 +67,50 @@ describe('Environment item', () => {
               avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
               web_url: 'http://localhost:3000/root',
             },
-            commit_path: '/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-          },
-          deployable: {
-            id: 1279,
-            name: 'deploy',
-            build_path: '/root/ci-folders/builds/1279',
-            retry_path: '/root/ci-folders/builds/1279/retry',
-            created_at: '2016-11-29T18:11:58.430Z',
-            updated_at: '2016-11-29T18:11:58.430Z',
-          },
-          manual_actions: [
-            {
-              name: 'action',
-              play_path: '/play',
+            commit: {
+              id: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
+              short_id: '500aabcb',
+              title: 'Update .gitlab-ci.yml',
+              author_name: 'Administrator',
+              author_email: 'admin@example.com',
+              created_at: '2016-11-07T18:28:13.000+00:00',
+              message: 'Update .gitlab-ci.yml',
+              author: {
+                name: 'Administrator',
+                username: 'root',
+                id: 1,
+                state: 'active',
+                avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
+                web_url: 'http://localhost:3000/root',
+              },
+              commit_path: '/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
             },
-          ],
+            deployable: {
+              id: 1279,
+              name: 'deploy',
+              build_path: '/root/ci-folders/builds/1279',
+              retry_path: '/root/ci-folders/builds/1279/retry',
+              created_at: '2016-11-29T18:11:58.430Z',
+              updated_at: '2016-11-29T18:11:58.430Z',
+            },
+            manual_actions: [
+              {
+                name: 'action',
+                play_path: '/play',
+              },
+            ],
+          },
+          'stop_action?': true,
+          environment_path: 'root/ci-folders/environments/31',
+          created_at: '2016-11-07T11:11:16.525Z',
+          updated_at: '2016-11-10T15:55:58.778Z',
         },
-        'stop_action?': true,
-        environment_path: 'root/ci-folders/environments/31',
-        created_at: '2016-11-07T11:11:16.525Z',
-        updated_at: '2016-11-10T15:55:58.778Z',
       };
 
       component = new window.gl.environmentsList.EnvironmentItem({
         el: document.querySelector('tr#environment-row'),
         propsData: {
           model: environment,
-          toggleRow: () => {},
           canCreateDeployment: true,
           canReadEnvironment: true,
         },
@@ -144,7 +125,7 @@ describe('Environment item', () => {
       it('should render deployment internal id', () => {
         expect(
           component.$el.querySelector('.deployment-column span').textContent,
-        ).toContain(environment.last_deployment.iid);
+        ).toContain(environment.latest.last_deployment.iid);
 
         expect(
           component.$el.querySelector('.deployment-column span').textContent,
@@ -154,7 +135,7 @@ describe('Environment item', () => {
       it('should render last deployment date', () => {
         const timeagoInstance = new timeago(); // eslint-disable-line
         const formatedDate = timeagoInstance.format(
-          environment.last_deployment.deployable.created_at,
+          environment.latest.last_deployment.deployable.created_at,
         );
 
         expect(
@@ -166,7 +147,7 @@ describe('Environment item', () => {
         it('should render user avatar with link to profile', () => {
           expect(
             component.$el.querySelector('.js-deploy-user-container').getAttribute('href'),
-          ).toEqual(environment.last_deployment.user.web_url);
+          ).toEqual(environment.latest.last_deployment.user.web_url);
         });
       });
 
@@ -174,13 +155,13 @@ describe('Environment item', () => {
         it('Should link to build url provided', () => {
           expect(
             component.$el.querySelector('.build-link').getAttribute('href'),
-          ).toEqual(environment.last_deployment.deployable.build_path);
+          ).toEqual(environment.latest.last_deployment.deployable.build_path);
         });
 
         it('Should render deployable name and id', () => {
           expect(
             component.$el.querySelector('.build-link').getAttribute('href'),
-          ).toEqual(environment.last_deployment.deployable.build_path);
+          ).toEqual(environment.latest.last_deployment.deployable.build_path);
         });
       });
 
diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6
index 9a8300d3832..d073e120290 100644
--- a/spec/javascripts/environments/environments_store_spec.js.es6
+++ b/spec/javascripts/environments/environments_store_spec.js.es6
@@ -20,50 +20,10 @@ require('./mock_data');
         gl.environmentsList.EnvironmentsStore.storeEnvironments(environmentsList);
       });
 
-      it('should count stopped environments and save the count in the state', () => {
-        expect(gl.environmentsList.EnvironmentsStore.state.stoppedCounter).toBe(1);
-      });
-
-      it('should count available environments and save the count in the state', () => {
-        expect(gl.environmentsList.EnvironmentsStore.state.availableCounter).toBe(3);
-      });
-
-      it('should store environments with same environment_type as sibilings', () => {
-        expect(gl.environmentsList.EnvironmentsStore.state.environments.length).toBe(3);
-
-        const parentFolder = gl.environmentsList.EnvironmentsStore.state.environments
-        .filter(env => env.children && env.children.length > 0);
-
-        expect(parentFolder[0].children.length).toBe(2);
-        expect(parentFolder[0].children[0].environment_type).toBe('review');
-        expect(parentFolder[0].children[1].environment_type).toBe('review');
-        expect(parentFolder[0].children[0].name).toBe('test-environment');
-        expect(parentFolder[0].children[1].name).toBe('test-environment-1');
-      });
-
-      it('should sort the environments alphabetically', () => {
-        const { environments } = gl.environmentsList.EnvironmentsStore.state;
-
-        expect(environments[0].name).toBe('production');
-        expect(environments[1].name).toBe('review');
-        expect(environments[1].children[0].name).toBe('test-environment');
-        expect(environments[1].children[1].name).toBe('test-environment-1');
-        expect(environments[2].name).toBe('review_app');
-      });
-    });
-
-    describe('toggleFolder', () => {
-      beforeEach(() => {
-        gl.environmentsList.EnvironmentsStore.storeEnvironments(environmentsList);
-      });
-
-      it('should toggle the open property for the given environment', () => {
-        gl.environmentsList.EnvironmentsStore.toggleFolder('review');
-
-        const { environments } = gl.environmentsList.EnvironmentsStore.state;
-        const environment = environments.filter(env => env['vue-isChildren'] === true && env.name === 'review');
-
-        expect(environment[0].isOpen).toBe(true);
+      it('should store environments', () => {
+        expect(
+          gl.environmentsList.EnvironmentsStore.state.environments.length
+        ).toBe(environmentsList.length);
       });
     });
   });
diff --git a/spec/javascripts/environments/mock_data.js.es6 b/spec/javascripts/environments/mock_data.js.es6
index 80e1cbc6f4d..91595c049b0 100644
--- a/spec/javascripts/environments/mock_data.js.es6
+++ b/spec/javascripts/environments/mock_data.js.es6
@@ -1,153 +1,59 @@
 
 const environmentsList = [
   {
-    id: 31,
-    name: 'production',
-    state: 'available',
-    external_url: 'https://www.gitlab.com',
-    environment_type: null,
-    last_deployment: {
-      id: 64,
-      iid: 5,
-      sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-      ref: {
-        name: 'master',
-        ref_url: 'http://localhost:3000/root/ci-folders/tree/master',
-      },
-      tag: false,
-      'last?': true,
-      user: {
-        name: 'Administrator',
-        username: 'root',
-        id: 1,
-        state: 'active',
-        avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
-        web_url: 'http://localhost:3000/root',
-      },
-      commit: {
-        id: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-        short_id: '500aabcb',
-        title: 'Update .gitlab-ci.yml',
-        author_name: 'Administrator',
-        author_email: 'admin@example.com',
-        created_at: '2016-11-07T18:28:13.000+00:00',
-        message: 'Update .gitlab-ci.yml',
-        author: {
-          name: 'Administrator',
-          username: 'root',
-          id: 1,
-          state: 'active',
-          avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
-          web_url: 'http://localhost:3000/root',
-        },
-        commit_path: '/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-      },
-      deployable: {
-        id: 1278,
-        name: 'build',
-        build_path: '/root/ci-folders/builds/1278',
-        retry_path: '/root/ci-folders/builds/1278/retry',
-      },
-      manual_actions: [],
+    name: 'DEV',
+    size: 1,
+    latest: {
+      id: 7,
+      name: 'DEV',
+      state: 'available',
+      external_url: null,
+      environment_type: null,
+      last_deployment: null,
+      'stop_action?': false,
+      environment_path: '/root/review-app/environments/7',
+      stop_path: '/root/review-app/environments/7/stop',
+      created_at: '2017-01-31T10:53:46.894Z',
+      updated_at: '2017-01-31T10:53:46.894Z',
     },
-    'stop_action?': true,
-    environment_path: '/root/ci-folders/environments/31',
-    created_at: '2016-11-07T11:11:16.525Z',
-    updated_at: '2016-11-07T11:11:16.525Z',
   },
   {
-    id: 32,
-    name: 'review_app',
-    state: 'stopped',
-    external_url: 'https://www.gitlab.com',
-    environment_type: null,
-    last_deployment: {
-      id: 64,
-      iid: 5,
-      sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-      ref: {
-        name: 'master',
-        ref_url: 'http://localhost:3000/root/ci-folders/tree/master',
-      },
-      tag: false,
-      'last?': true,
-      user: {
-        name: 'Administrator',
-        username: 'root',
-        id: 1,
-        state: 'active',
-        avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
-        web_url: 'http://localhost:3000/root',
-      },
-      commit: {
-        id: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-        short_id: '500aabcb',
-        title: 'Update .gitlab-ci.yml',
-        author_name: 'Administrator',
-        author_email: 'admin@example.com',
-        created_at: '2016-11-07T18:28:13.000+00:00',
-        message: 'Update .gitlab-ci.yml',
-        author: {
-          name: 'Administrator',
-          username: 'root',
-          id: 1,
-          state: 'active',
-          avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
-          web_url: 'http://localhost:3000/root',
-        },
-        commit_path: '/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-      },
-      deployable: {
-        id: 1278,
-        name: 'build',
-        build_path: '/root/ci-folders/builds/1278',
-        retry_path: '/root/ci-folders/builds/1278/retry',
-      },
-      manual_actions: [],
+    name: 'build',
+    size: 5,
+    latest: {
+      id: 12,
+      name: 'build/update-README',
+      state: 'available',
+      external_url: null,
+      environment_type: 'build',
+      last_deployment: null,
+      'stop_action?': false,
+      environment_path: '/root/review-app/environments/12',
+      stop_path: '/root/review-app/environments/12/stop',
+      created_at: '2017-02-01T19:42:18.400Z',
+      updated_at: '2017-02-01T19:42:18.400Z',
     },
-    'stop_action?': false,
-    environment_path: '/root/ci-folders/environments/31',
-    created_at: '2016-11-07T11:11:16.525Z',
-    updated_at: '2016-11-07T11:11:16.525Z',
-  },
-  {
-    id: 33,
-    name: 'test-environment',
-    state: 'available',
-    environment_type: 'review',
-    last_deployment: null,
-    'stop_action?': true,
-    environment_path: '/root/ci-folders/environments/31',
-    created_at: '2016-11-07T11:11:16.525Z',
-    updated_at: '2016-11-07T11:11:16.525Z',
-  },
-  {
-    id: 34,
-    name: 'test-environment-1',
-    state: 'available',
-    environment_type: 'review',
-    last_deployment: null,
-    'stop_action?': true,
-    environment_path: '/root/ci-folders/environments/31',
-    created_at: '2016-11-07T11:11:16.525Z',
-    updated_at: '2016-11-07T11:11:16.525Z',
   },
 ];
 
 window.environmentsList = environmentsList;
 
 const environment = {
-  id: 4,
-  name: 'production',
-  state: 'available',
-  external_url: 'http://production.',
-  environment_type: null,
-  last_deployment: {},
-  'stop_action?': false,
-  environment_path: '/root/review-app/environments/4',
-  stop_path: '/root/review-app/environments/4/stop',
-  created_at: '2016-12-16T11:51:04.690Z',
-  updated_at: '2016-12-16T12:04:51.133Z',
+  name: 'DEV',
+  size: 1,
+  latest: {
+    id: 7,
+    name: 'DEV',
+    state: 'available',
+    external_url: null,
+    environment_type: null,
+    last_deployment: null,
+    'stop_action?': false,
+    environment_path: '/root/review-app/environments/7',
+    stop_path: '/root/review-app/environments/7/stop',
+    created_at: '2017-01-31T10:53:46.894Z',
+    updated_at: '2017-01-31T10:53:46.894Z',
+  },
 };
 
 window.environment = environment;

From 2aeb45bdb55a634a490bf535242a6f8c10aaa938 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 4 Feb 2017 10:38:16 +0100
Subject: [PATCH 03/73] Add support for environment scopes in controller

---
 .../projects/environments_controller.rb       | 19 +++---
 .../projects/environments_controller_spec.rb  | 59 +++++++++++++++----
 2 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 0d1095da6c2..34b081b3e41 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -9,17 +9,22 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   before_action :verify_api_request!, only: :terminal_websocket_authorize
 
   def index
-    @scope = params[:scope]
-    @environments = project.environments.includes(:last_deployment)
+    @environments = project.environments
+      .includes(:last_deployment)
+      .with_state(params[:scope] || :available)
 
     respond_to do |format|
       format.html
       format.json do
-        render json: EnvironmentSerializer
-          .new(project: @project, user: @current_user)
-          .with_pagination(request, response)
-          .within_folders
-          .represent(@environments)
+        render json: {
+          environments: EnvironmentSerializer
+            .new(project: @project, user: @current_user)
+            .with_pagination(request, response)
+            .within_folders
+            .represent(@environments),
+          available_count: project.environments.available.count,
+          stopped_count: project.environments.stopped.count
+        }
       end
     end
   end
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 4ec91738b9b..84d119f1867 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -7,8 +7,7 @@ describe Projects::EnvironmentsController do
   let(:project) { create(:empty_project) }
 
   let(:environment) do
-    create(:environment, name: 'production',
-                         project: project)
+    create(:environment, name: 'production', project: project)
   end
 
   before do
@@ -28,18 +27,56 @@ describe Projects::EnvironmentsController do
 
     context 'when requesting JSON response for folders' do
       before do
-        create(:environment, project: project, name: 'staging/review-1')
-        create(:environment, project: project, name: 'staging/review-2')
+        create(:environment, project: project,
+                             name: 'staging/review-1',
+                             state: :available)
+
+        create(:environment, project: project,
+                             name: 'staging/review-2',
+                             state: :available)
+
+        create(:environment, project: project,
+                             name: 'staging/review-3',
+                             state: :stopped)
       end
 
-      it 'responds with correct JSON' do
-        get :index, environment_params(format: :json)
+      let(:environments) { json_response['environments'] }
 
-        expect(json_response.count).to eq 2
-        expect(json_response.first['name']).to eq 'production'
-        expect(json_response.second['name']).to eq 'staging'
-        expect(json_response.second['size']).to eq 2
-        expect(json_response.second['latest']['name']).to eq 'staging/review-2'
+      context 'when requesting available environments scope' do
+        before do
+          get :index, environment_params(format: :json, scope: :available)
+        end
+
+        it 'responds with a payload describing available environments' do
+          expect(environments.count).to eq 2
+          expect(environments.first['name']).to eq 'production'
+          expect(environments.second['name']).to eq 'staging'
+          expect(environments.second['size']).to eq 2
+          expect(environments.second['latest']['name']).to eq 'staging/review-2'
+        end
+
+        it 'contains values describing environment scopes sizes' do
+          expect(json_response['available_count']).to eq 3
+          expect(json_response['stopped_count']).to eq 1
+        end
+      end
+
+      context 'when requesting stopped environments scope' do
+        before do
+          get :index, environment_params(format: :json, scope: :stopped)
+        end
+
+        it 'responds with a payload describing stopped environments' do
+          expect(environments.count).to eq 1
+          expect(environments.first['name']).to eq 'staging'
+          expect(environments.first['size']).to eq 1
+          expect(environments.first['latest']['name']).to eq 'staging/review-3'
+        end
+
+        it 'contains values describing environment scopes sizes' do
+          expect(json_response['available_count']).to eq 3
+          expect(json_response['stopped_count']).to eq 1
+        end
       end
     end
   end

From 71899e10878455277b7e2ed120d9424489a9d72b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 3 Feb 2017 21:10:50 +0000
Subject: [PATCH 04/73] Adjustments for the new response with counters

a
---
 .../components/environment.js.es6             |  8 +++++--
 .../stores/environments_store.js.es6          | 22 +++++++++++++++++--
 .../environments_store_spec.js.es6            |  2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 93f65ba0ea8..3e899e5895b 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -7,6 +7,7 @@ window.Vue = require('vue');
 window.Vue.use(require('vue-resource'));
 require('../services/environments_service');
 require('./environment_item');
+require('../../vue_pagination/index');
 
 (() => {
   window.gl = window.gl || {};
@@ -79,7 +80,9 @@ require('./environment_item');
       return gl.environmentsService.all()
         .then(resp => resp.json())
         .then((json) => {
-          this.store.storeEnvironments(json);
+          this.store.storeAvailableCount(json.available_count);
+          this.store.storeStoppedCount(json.stopped_count);
+          this.store.storeEnvironments(json.environments);
         })
         .then(() => {
           this.isLoading = false;
@@ -131,7 +134,8 @@ require('./environment_item');
                   {{state.availableCounter}}
                 </span>
               </a>
-            </li><li v-bind:class="{ 'active' : scope === 'stopped' }">
+            </li>
+            <li v-bind:class="{ 'active' : scope === 'stopped' }">
               <a :href="projectStoppedEnvironmentsPath">
                 Stopped
                 <span class="badge js-stopped-environments-count">
diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index a533b8b61d6..c05f353647c 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -42,8 +42,26 @@
       return filteredEnvironments;
     },
 
-    storeCounts() {
-      //TODO
+    /**
+     * Stores the number of available environments.
+     *
+     * @param  {Number} count = 0
+     * @return {Number}
+     */
+    storeAvailableCount(count = 0) {
+      this.state.availableCounter = count;
+      return count;
+    },
+
+    /**
+     * Stores the number of closed environments.
+     *
+     * @param  {Number} count = 0
+     * @return {Number}
+     */
+    storeStoppedCount(count = 0) {
+      this.state.stoppedCounter = count;
+      return count;
     },
 
   };
diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6
index d073e120290..ef4b06dea40 100644
--- a/spec/javascripts/environments/environments_store_spec.js.es6
+++ b/spec/javascripts/environments/environments_store_spec.js.es6
@@ -22,7 +22,7 @@ require('./mock_data');
 
       it('should store environments', () => {
         expect(
-          gl.environmentsList.EnvironmentsStore.state.environments.length
+          gl.environmentsList.EnvironmentsStore.state.environments.length,
         ).toBe(environmentsList.length);
       });
     });

From 3c39cea60cede6399e7fae517b9ab3c5c86143a7 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 6 Feb 2017 15:32:40 +0000
Subject: [PATCH 05/73] Environments folder should be underlined when on hover
 and on focus like a regular link

---
 app/assets/stylesheets/pages/environments.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index 1d4d85ba6de..606cf501b82 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -121,7 +121,6 @@
 
   .folder-name {
     cursor: pointer;
-    text-decoration: none;
     color: $gl-text-color-secondary;
   }
 }

From 72f76c4d4981b14d1cc721b1f379832f74a509f8 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 11:08:44 +0000
Subject: [PATCH 06/73] Remove pagination from this MR

---
 .../javascripts/environments/components/environment.js.es6       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 3e899e5895b..073fbdffe21 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -7,7 +7,6 @@ window.Vue = require('vue');
 window.Vue.use(require('vue-resource'));
 require('../services/environments_service');
 require('./environment_item');
-require('../../vue_pagination/index');
 
 (() => {
   window.gl = window.gl || {};

From acb68ae69e382a7bd949386f14d2d27f6cada086 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 11:16:11 +0000
Subject: [PATCH 07/73] Resolve 500 error

---
 .../javascripts/vue_shared/vue_resource_interceptor.js.es6      | 2 +-
 app/controllers/projects/environments_controller.rb             | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6 b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
index d3229f9f730..a575ae3e441 100644
--- a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
+++ b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
@@ -6,7 +6,7 @@ Vue.http.interceptors.push((request, next) => {
   Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1;
 
   next((response) => {
-    if (typeof response.data === 'string') {
+    if (typeof response.data === 'string' && response.status !== 500) {
       response.data = JSON.parse(response.data);
     }
 
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 34b081b3e41..2252ece68ce 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -10,7 +10,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
 
   def index
     @environments = project.environments
-      .includes(:last_deployment)
       .with_state(params[:scope] || :available)
 
     respond_to do |format|

From 6077dea7b1f6fb857f786d86cd7cf9e5204ec9a9 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 11:18:21 +0000
Subject: [PATCH 08/73] Remove store from global namespace, use CSJ instead

---
 .../components/environment.js.es6             |  12 +-
 .../environments/environments_bundle.js.es6   |   7 -
 .../stores/environments_store.js.es6          | 120 +++++++++---------
 .../vue_resource_interceptor.js.es6           |   2 +-
 4 files changed, 65 insertions(+), 76 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 073fbdffe21..f07b650ca9f 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -7,18 +7,12 @@ window.Vue = require('vue');
 window.Vue.use(require('vue-resource'));
 require('../services/environments_service');
 require('./environment_item');
+const Store = require('../stores/environments_store');
 
 (() => {
   window.gl = window.gl || {};
 
   gl.environmentsList.EnvironmentsComponent = Vue.component('environment-component', {
-    props: {
-      store: {
-        type: Object,
-        required: true,
-        default: () => ({}),
-      },
-    },
 
     components: {
       'environment-item': gl.environmentsList.EnvironmentItem,
@@ -26,9 +20,11 @@ require('./environment_item');
 
     data() {
       const environmentsData = document.querySelector('#environments-list-view').dataset;
+      const store = new Store();
 
       return {
-        state: this.store.state,
+        store,
+        state: store.state,
         visibility: 'available',
         isLoading: false,
         cssContainerClass: environmentsData.cssClass,
diff --git a/app/assets/javascripts/environments/environments_bundle.js.es6 b/app/assets/javascripts/environments/environments_bundle.js.es6
index 05c59d92fd4..912f50aeec1 100644
--- a/app/assets/javascripts/environments/environments_bundle.js.es6
+++ b/app/assets/javascripts/environments/environments_bundle.js.es6
@@ -1,5 +1,4 @@
 window.Vue = require('vue');
-require('./stores/environments_store');
 require('./components/environment');
 require('../vue_shared/vue_resource_interceptor');
 
@@ -9,14 +8,8 @@ $(() => {
   if (gl.EnvironmentsListApp) {
     gl.EnvironmentsListApp.$destroy(true);
   }
-  const Store = gl.environmentsList.EnvironmentsStore;
 
   gl.EnvironmentsListApp = new gl.environmentsList.EnvironmentsComponent({
     el: document.querySelector('#environments-list-view'),
-
-    propsData: {
-      store: Store.create(),
-    },
-
   });
 });
diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index c05f353647c..52bd6b94551 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -1,68 +1,68 @@
-/* eslint-disable no-param-reassign */
-(() => {
-  window.gl = window.gl || {};
-  window.gl.environmentsList = window.gl.environmentsList || {};
+/**
+ * Environments Store.
+ *
+ * Stores received environments, count of stopped environments and count of
+ * available environments.
+ */
+class EnvironmentsStore {
+  constructor() {
+    this.state = {};
+    this.state.environments = [];
+    this.state.stoppedCounter = 0;
+    this.state.availableCounter = 0;
+    this.state.filteredEnvironments = [];
 
-  gl.environmentsList.EnvironmentsStore = {
-    state: {},
+    return this;
+  }
 
-    create() {
-      this.state.environments = [];
-      this.state.stoppedCounter = 0;
-      this.state.availableCounter = 0;
-      this.state.filteredEnvironments = [];
+  /**
+   *
+   * Stores the received environments.
+   *
+   * Each environment has the following schema
+   * { name: String, size: Number, latest: Object }
+   *
+   * If the `size` is bigger than 1, it means it should be rendered as a folder.
+   * In those cases we add `isFolder` key in order to render it properly.
+   *
+   * @param  {Array} environments
+   * @returns {Array}
+   */
+  storeEnvironments(environments = []) {
+    const filteredEnvironments = environments.map((env) => {
+      if (env.size > 1) {
+        return Object.assign({}, env, { isFolder: true });
+      }
 
-      return this;
-    },
+      return env;
+    });
 
-    /**
-     *
-     * Stores the received environments.
-     *
-     * Each environment has the following schema
-     * { name: String, size: Number, latest: Object }
-     *
-     * If the `size` is bigger than 1, it means it should be rendered as a folder.
-     * In those cases we add `isFolder` key in order to render it properly.
-     *
-     * @param  {Array} environments
-     * @returns {Array}
-     */
-    storeEnvironments(environments = []) {
-      const filteredEnvironments = environments.map((env) => {
-        if (env.size > 1) {
-          return Object.assign({}, env, { isFolder: true });
-        }
+    this.state.environments = filteredEnvironments;
 
-        return env;
-      });
+    return filteredEnvironments;
+  }
 
-      this.state.environments = filteredEnvironments;
+  /**
+   * Stores the number of available environments.
+   *
+   * @param  {Number} count = 0
+   * @return {Number}
+   */
+  storeAvailableCount(count = 0) {
+    this.state.availableCounter = count;
+    return count;
+  }
 
-      return filteredEnvironments;
-    },
+  /**
+   * Stores the number of closed environments.
+   *
+   * @param  {Number} count = 0
+   * @return {Number}
+   */
+  storeStoppedCount(count = 0) {
+    this.state.stoppedCounter = count;
+    return count;
+  }
+}
 
-    /**
-     * Stores the number of available environments.
-     *
-     * @param  {Number} count = 0
-     * @return {Number}
-     */
-    storeAvailableCount(count = 0) {
-      this.state.availableCounter = count;
-      return count;
-    },
-
-    /**
-     * Stores the number of closed environments.
-     *
-     * @param  {Number} count = 0
-     * @return {Number}
-     */
-    storeStoppedCount(count = 0) {
-      this.state.stoppedCounter = count;
-      return count;
-    },
-
-  };
-})();
+module.exports = EnvironmentsStore;
diff --git a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6 b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
index a575ae3e441..d3229f9f730 100644
--- a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
+++ b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js.es6
@@ -6,7 +6,7 @@ Vue.http.interceptors.push((request, next) => {
   Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1;
 
   next((response) => {
-    if (typeof response.data === 'string' && response.status !== 500) {
+    if (typeof response.data === 'string') {
       response.data = JSON.parse(response.data);
     }
 

From 26a951b7ab272b80df1281464aaf656570fe214e Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 11:35:53 +0000
Subject: [PATCH 09/73] Use CJS for tests. Updates expected model in tests

---
 .../stores/environments_store.js.es6          |  1 -
 .../environments/environment_item_spec.js.es6 |  8 +++-
 .../environments/environment_spec.js.es6      | 18 +++------
 .../environments_store_spec.js.es6            | 37 ++++++++++---------
 .../javascripts/environments/mock_data.js.es6 |  8 ++--
 5 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index 52bd6b94551..749dd882188 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -10,7 +10,6 @@ class EnvironmentsStore {
     this.state.environments = [];
     this.state.stoppedCounter = 0;
     this.state.availableCounter = 0;
-    this.state.filteredEnvironments = [];
 
     return this;
   }
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6
index 14478f1401d..5dc7ef5ad76 100644
--- a/spec/javascripts/environments/environment_item_spec.js.es6
+++ b/spec/javascripts/environments/environment_item_spec.js.es6
@@ -1,7 +1,7 @@
 window.timeago = require('vendor/timeago');
 require('~/environments/components/environment_item');
 
-describe('Environment item', () => {
+fdescribe('Environment item', () => {
   preloadFixtures('static/environments/table.html.raw');
   beforeEach(() => {
     loadFixtures('static/environments/table.html.raw');
@@ -14,7 +14,11 @@ describe('Environment item', () => {
     beforeEach(() => {
       mockItem = {
         name: 'review',
-        size: 3
+        size: 3,
+        isFolder: true,
+        latest: {
+          environment_path: 'url',
+        },
       };
 
       component = new window.gl.environmentsList.EnvironmentItem({
diff --git a/spec/javascripts/environments/environment_spec.js.es6 b/spec/javascripts/environments/environment_spec.js.es6
index 87eda136122..8b96f4b09db 100644
--- a/spec/javascripts/environments/environment_spec.js.es6
+++ b/spec/javascripts/environments/environment_spec.js.es6
@@ -1,9 +1,8 @@
 /* global Vue, environment */
 
 require('~/flash');
-require('~/environments/stores/environments_store');
 require('~/environments/components/environment');
-require('./mock_data');
+const { environment } = require('./mock_data');
 
 describe('Environment', () => {
   preloadFixtures('static/environments/environments.html.raw');
@@ -35,9 +34,6 @@ describe('Environment', () => {
       it('should render the empty state', (done) => {
         component = new gl.environmentsList.EnvironmentsComponent({
           el: document.querySelector('#environments-list-view'),
-          propsData: {
-            store: gl.environmentsList.EnvironmentsStore.create(),
-          },
         });
 
         setTimeout(() => {
@@ -56,7 +52,11 @@ describe('Environment', () => {
 
     describe('with environments', () => {
       const environmentsResponseInterceptor = (request, next) => {
-        next(request.respondWith(JSON.stringify([environment]), {
+        next(request.respondWith(JSON.stringify({
+          environments: [environment],
+          stopped_count: 1,
+          available_count: 0,
+        }), {
           status: 200,
         }));
       };
@@ -74,9 +74,6 @@ describe('Environment', () => {
       it('should render a table with environments', (done) => {
         component = new gl.environmentsList.EnvironmentsComponent({
           el: document.querySelector('#environments-list-view'),
-          propsData: {
-            store: gl.environmentsList.EnvironmentsStore.create(),
-          },
         });
 
         setTimeout(() => {
@@ -109,9 +106,6 @@ describe('Environment', () => {
     it('should render empty state', (done) => {
       component = new gl.environmentsList.EnvironmentsComponent({
         el: document.querySelector('#environments-list-view'),
-        propsData: {
-          store: gl.environmentsList.EnvironmentsStore.create(),
-        },
       });
 
       setTimeout(() => {
diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6
index ef4b06dea40..861136c621f 100644
--- a/spec/javascripts/environments/environments_store_spec.js.es6
+++ b/spec/javascripts/environments/environments_store_spec.js.es6
@@ -1,30 +1,33 @@
-/* global environmentsList */
-
-require('~/environments/stores/environments_store');
-require('./mock_data');
+const Store = require('~/environments/stores/environments_store');
+const { environmentsList } = require('./mock_data');
 
 (() => {
   describe('Store', () => {
+    let store;
+
     beforeEach(() => {
-      gl.environmentsList.EnvironmentsStore.create();
+      store = new Store();
     });
 
     it('should start with a blank state', () => {
-      expect(gl.environmentsList.EnvironmentsStore.state.environments.length).toBe(0);
-      expect(gl.environmentsList.EnvironmentsStore.state.stoppedCounter).toBe(0);
-      expect(gl.environmentsList.EnvironmentsStore.state.availableCounter).toBe(0);
+      expect(store.state.environments.length).toBe(0);
+      expect(store.state.stoppedCounter).toBe(0);
+      expect(store.state.availableCounter).toBe(0);
     });
 
-    describe('store environments', () => {
-      beforeEach(() => {
-        gl.environmentsList.EnvironmentsStore.storeEnvironments(environmentsList);
-      });
+    it('should store environments', () => {
+      store.storeEnvironments(environmentsList);
+      expect(store.state.environments.length).toBe(environmentsList.length);
+    });
 
-      it('should store environments', () => {
-        expect(
-          gl.environmentsList.EnvironmentsStore.state.environments.length,
-        ).toBe(environmentsList.length);
-      });
+    it('should store available count', () => {
+      store.storeAvailableCount(2);
+      expect(store.state.availableCounter).toBe(2);
+    });
+
+    it('should store stopped count', () => {
+      store.storeStoppedCount(2);
+      expect(store.state.stoppedCounter).toBe(2);
     });
   });
 })();
diff --git a/spec/javascripts/environments/mock_data.js.es6 b/spec/javascripts/environments/mock_data.js.es6
index 91595c049b0..bdecc95d219 100644
--- a/spec/javascripts/environments/mock_data.js.es6
+++ b/spec/javascripts/environments/mock_data.js.es6
@@ -1,4 +1,3 @@
-
 const environmentsList = [
   {
     name: 'DEV',
@@ -36,8 +35,6 @@ const environmentsList = [
   },
 ];
 
-window.environmentsList = environmentsList;
-
 const environment = {
   name: 'DEV',
   size: 1,
@@ -56,4 +53,7 @@ const environment = {
   },
 };
 
-window.environment = environment;
+module.exports = {
+  environmentsList,
+  environment
+};

From 8f3678f1dea1134ebc41f0d519424db673b5f764 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 11:38:59 +0000
Subject: [PATCH 10/73] Use CJS in environments service

---
 .../components/environment.js.es6             |  6 +++---
 .../services/environments_service.js.es6      | 20 ++++---------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index f07b650ca9f..6f84cc625ac 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -5,7 +5,7 @@
 
 window.Vue = require('vue');
 window.Vue.use(require('vue-resource'));
-require('../services/environments_service');
+const EnvironmentsService = require('../services/environments_service');
 require('./environment_item');
 const Store = require('../stores/environments_store');
 
@@ -68,11 +68,11 @@ const Store = require('../stores/environments_store');
       const scope = this.$options.getQueryParameter('scope') || this.visibility;
       const endpoint = `${this.endpoint}?scope=${scope}`;
 
-      gl.environmentsService = new EnvironmentsService(endpoint);
+      const service = new EnvironmentsService(endpoint);
 
       this.isLoading = true;
 
-      return gl.environmentsService.all()
+      return service.all()
         .then(resp => resp.json())
         .then((json) => {
           this.store.storeAvailableCount(json.available_count);
diff --git a/app/assets/javascripts/environments/services/environments_service.js.es6 b/app/assets/javascripts/environments/services/environments_service.js.es6
index fab8d977f58..9b33fd02c53 100644
--- a/app/assets/javascripts/environments/services/environments_service.js.es6
+++ b/app/assets/javascripts/environments/services/environments_service.js.es6
@@ -1,20 +1,8 @@
-/* globals Vue */
-/* eslint-disable no-unused-vars, no-param-reassign */
+const Vue = window.Vue = require('vue');
 
 class EnvironmentsService {
-
-  constructor(root) {
-    Vue.http.options.root = root;
-
-    this.environments = Vue.resource(root);
-
-    Vue.http.interceptors.push((request, next) => {
-      // needed in order to not break the tests.
-      if ($.rails) {
-        request.headers['X-CSRF-Token'] = $.rails.csrfToken();
-      }
-      next();
-    });
+  constructor(endpoint) {
+    this.environments = Vue.resource(endpoint);
   }
 
   all() {
@@ -22,4 +10,4 @@ class EnvironmentsService {
   }
 }
 
-window.EnvironmentsService = EnvironmentsService;
+module.exports = EnvironmentsService;

From d6ae01da55bc8e0903c9ff13211d2e5dd29bff1f Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 11:52:22 +0000
Subject: [PATCH 11/73] Use CJS in all environments components

---
 .../components/environment.js.es6             | 360 ++++---
 .../components/environment_actions.js.es6     |  79 +-
 .../environment_external_url.js.es6           |  36 +-
 .../components/environment_item.js.es6        | 908 +++++++++---------
 .../components/environment_rollback.js.es6    |  57 +-
 .../components/environment_stop.js.es6        |  45 +-
 .../environment_terminal_button.js.es6        |  47 +-
 .../environments/environments_bundle.js.es6   |   5 +-
 .../services/environments_service.js.es6      |   2 +-
 .../vue_shared/components/commit.js.es6       |   1 +
 .../environment_actions_spec.js.es6           |   6 +-
 .../environment_external_url_spec.js.es6      |   4 +-
 .../environments/environment_item_spec.js.es6 |   8 +-
 .../environment_rollback_spec.js.es6          |   8 +-
 .../environments/environment_spec.js.es6      |  11 +-
 .../environments/environment_stop_spec.js.es6 |   4 +-
 16 files changed, 773 insertions(+), 808 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 6f84cc625ac..11a965fcddf 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -1,205 +1,199 @@
 /* eslint-disable no-param-reassign, no-new */
-/* global Vue */
-/* global EnvironmentsService */
 /* global Flash */
 
-window.Vue = require('vue');
-window.Vue.use(require('vue-resource'));
+const Vue = require('vue');
+Vue.use(require('vue-resource'));
 const EnvironmentsService = require('../services/environments_service');
-require('./environment_item');
+const EnvironmentItem = require('./environment_item');
 const Store = require('../stores/environments_store');
 
-(() => {
-  window.gl = window.gl || {};
+module.exports = Vue.component('environment-component', {
 
-  gl.environmentsList.EnvironmentsComponent = Vue.component('environment-component', {
+  components: {
+    'environment-item': EnvironmentItem,
+  },
 
-    components: {
-      'environment-item': gl.environmentsList.EnvironmentItem,
+  data() {
+    const environmentsData = document.querySelector('#environments-list-view').dataset;
+    const store = new Store();
+
+    return {
+      store,
+      state: store.state,
+      visibility: 'available',
+      isLoading: false,
+      cssContainerClass: environmentsData.cssClass,
+      endpoint: environmentsData.environmentsDataEndpoint,
+      canCreateDeployment: environmentsData.canCreateDeployment,
+      canReadEnvironment: environmentsData.canReadEnvironment,
+      canCreateEnvironment: environmentsData.canCreateEnvironment,
+      projectEnvironmentsPath: environmentsData.projectEnvironmentsPath,
+      projectStoppedEnvironmentsPath: environmentsData.projectStoppedEnvironmentsPath,
+      newEnvironmentPath: environmentsData.newEnvironmentPath,
+      helpPagePath: environmentsData.helpPagePath,
+      commitIconSvg: environmentsData.commitIconSvg,
+      playIconSvg: environmentsData.playIconSvg,
+      terminalIconSvg: environmentsData.terminalIconSvg,
+    };
+  },
+
+  computed: {
+    scope() {
+      return this.$options.getQueryParameter('scope');
     },
 
-    data() {
-      const environmentsData = document.querySelector('#environments-list-view').dataset;
-      const store = new Store();
-
-      return {
-        store,
-        state: store.state,
-        visibility: 'available',
-        isLoading: false,
-        cssContainerClass: environmentsData.cssClass,
-        endpoint: environmentsData.environmentsDataEndpoint,
-        canCreateDeployment: environmentsData.canCreateDeployment,
-        canReadEnvironment: environmentsData.canReadEnvironment,
-        canCreateEnvironment: environmentsData.canCreateEnvironment,
-        projectEnvironmentsPath: environmentsData.projectEnvironmentsPath,
-        projectStoppedEnvironmentsPath: environmentsData.projectStoppedEnvironmentsPath,
-        newEnvironmentPath: environmentsData.newEnvironmentPath,
-        helpPagePath: environmentsData.helpPagePath,
-        commitIconSvg: environmentsData.commitIconSvg,
-        playIconSvg: environmentsData.playIconSvg,
-        terminalIconSvg: environmentsData.terminalIconSvg,
-      };
+    canReadEnvironmentParsed() {
+      return this.$options.convertPermissionToBoolean(this.canReadEnvironment);
     },
 
-    computed: {
-      scope() {
-        return this.$options.getQueryParameter('scope');
-      },
-
-      canReadEnvironmentParsed() {
-        return this.$options.convertPermissionToBoolean(this.canReadEnvironment);
-      },
-
-      canCreateDeploymentParsed() {
-        return this.$options.convertPermissionToBoolean(this.canCreateDeployment);
-      },
-
-      canCreateEnvironmentParsed() {
-        return this.$options.convertPermissionToBoolean(this.canCreateEnvironment);
-      },
+    canCreateDeploymentParsed() {
+      return this.$options.convertPermissionToBoolean(this.canCreateDeployment);
     },
 
-    /**
-     * Fetches all the environments and stores them.
-     * Toggles loading property.
-     */
-    created() {
-      const scope = this.$options.getQueryParameter('scope') || this.visibility;
-      const endpoint = `${this.endpoint}?scope=${scope}`;
-
-      const service = new EnvironmentsService(endpoint);
-
-      this.isLoading = true;
-
-      return service.all()
-        .then(resp => resp.json())
-        .then((json) => {
-          this.store.storeAvailableCount(json.available_count);
-          this.store.storeStoppedCount(json.stopped_count);
-          this.store.storeEnvironments(json.environments);
-        })
-        .then(() => {
-          this.isLoading = false;
-        })
-        .catch(() => {
-          this.isLoading = false;
-          new Flash('An error occurred while fetching the environments.', 'alert');
-        });
+    canCreateEnvironmentParsed() {
+      return this.$options.convertPermissionToBoolean(this.canCreateEnvironment);
     },
+  },
 
-    /**
-     * Transforms the url parameter into an object and
-     * returns the one requested.
-     *
-     * @param  {String} param
-     * @returns {String}       The value of the requested parameter.
-     */
-    getQueryParameter(parameter) {
-      return window.location.search.substring(1).split('&').reduce((acc, param) => {
-        const paramSplited = param.split('=');
-        acc[paramSplited[0]] = paramSplited[1];
-        return acc;
-      }, {})[parameter];
+  /**
+   * Fetches all the environments and stores them.
+   * Toggles loading property.
+   */
+  created() {
+    const scope = this.$options.getQueryParameter('scope') || this.visibility;
+    const endpoint = `${this.endpoint}?scope=${scope}`;
+
+    const service = new EnvironmentsService(endpoint);
+
+    this.isLoading = true;
+
+    return service.all()
+      .then(resp => resp.json())
+      .then((json) => {
+        this.store.storeAvailableCount(json.available_count);
+        this.store.storeStoppedCount(json.stopped_count);
+        this.store.storeEnvironments(json.environments);
+      })
+      .then(() => {
+        this.isLoading = false;
+      })
+      .catch(() => {
+        this.isLoading = false;
+        new Flash('An error occurred while fetching the environments.', 'alert');
+      });
+  },
+
+  /**
+   * Transforms the url parameter into an object and
+   * returns the one requested.
+   *
+   * @param  {String} param
+   * @returns {String}       The value of the requested parameter.
+   */
+  getQueryParameter(parameter) {
+    return window.location.search.substring(1).split('&').reduce((acc, param) => {
+      const paramSplited = param.split('=');
+      acc[paramSplited[0]] = paramSplited[1];
+      return acc;
+    }, {})[parameter];
+  },
+
+  /**
+   * Converts permission provided as strings to booleans.
+   * @param  {String} string
+   * @returns {Boolean}
+   */
+  convertPermissionToBoolean(string) {
+    return string === 'true';
+  },
+
+  methods: {
+    toggleRow(model) {
+      return this.store.toggleFolder(model.name);
     },
+  },
 
-    /**
-     * Converts permission provided as strings to booleans.
-     * @param  {String} string
-     * @returns {Boolean}
-     */
-    convertPermissionToBoolean(string) {
-      return string === 'true';
-    },
-
-    methods: {
-      toggleRow(model) {
-        return this.store.toggleFolder(model.name);
-      },
-    },
-
-    template: `
-      <div :class="cssContainerClass">
-        <div class="top-area">
-          <ul v-if="!isLoading" class="nav-links">
-            <li v-bind:class="{ 'active': scope === undefined }">
-              <a :href="projectEnvironmentsPath">
-                Available
-                <span class="badge js-available-environments-count">
-                  {{state.availableCounter}}
-                </span>
-              </a>
-            </li>
-            <li v-bind:class="{ 'active' : scope === 'stopped' }">
-              <a :href="projectStoppedEnvironmentsPath">
-                Stopped
-                <span class="badge js-stopped-environments-count">
-                  {{state.stoppedCounter}}
-                </span>
-              </a>
-            </li>
-          </ul>
-          <div v-if="canCreateEnvironmentParsed && !isLoading" class="nav-controls">
-            <a :href="newEnvironmentPath" class="btn btn-create">
-              New environment
+  template: `
+    <div :class="cssContainerClass">
+      <div class="top-area">
+        <ul v-if="!isLoading" class="nav-links">
+          <li v-bind:class="{ 'active': scope === undefined }">
+            <a :href="projectEnvironmentsPath">
+              Available
+              <span class="badge js-available-environments-count">
+                {{state.availableCounter}}
+              </span>
             </a>
-          </div>
-        </div>
-
-        <div class="environments-container">
-          <div class="environments-list-loading text-center" v-if="isLoading">
-            <i class="fa fa-spinner fa-spin"></i>
-          </div>
-
-          <div class="blank-state blank-state-no-icon"
-            v-if="!isLoading && state.environments.length === 0">
-            <h2 class="blank-state-title js-blank-state-title">
-              You don't have any environments right now.
-            </h2>
-            <p class="blank-state-text">
-              Environments are places where code gets deployed, such as staging or production.
-              <br />
-              <a :href="helpPagePath">
-                Read more about environments
-              </a>
-            </p>
-
-            <a v-if="canCreateEnvironmentParsed"
-              :href="newEnvironmentPath"
-              class="btn btn-create js-new-environment-button">
-              New Environment
+          </li>
+          <li v-bind:class="{ 'active' : scope === 'stopped' }">
+            <a :href="projectStoppedEnvironmentsPath">
+              Stopped
+              <span class="badge js-stopped-environments-count">
+                {{state.stoppedCounter}}
+              </span>
             </a>
-          </div>
-
-          <div class="table-holder"
-            v-if="!isLoading && state.environments.length > 0">
-            <table class="table ci-table environments">
-              <thead>
-                <tr>
-                  <th class="environments-name">Environment</th>
-                  <th class="environments-deploy">Last deployment</th>
-                  <th class="environments-build">Job</th>
-                  <th class="environments-commit">Commit</th>
-                  <th class="environments-date">Updated</th>
-                  <th class="hidden-xs environments-actions"></th>
-                </tr>
-              </thead>
-              <tbody>
-                <template v-for="model in state.environments"
-                  v-bind:model="model">
-                  <tr is="environment-item"
-                    :model="model"
-                    :can-create-deployment="canCreateDeploymentParsed"
-                    :can-read-environment="canReadEnvironmentParsed"
-                    :play-icon-svg="playIconSvg"
-                    :terminal-icon-svg="terminalIconSvg"
-                    :commit-icon-svg="commitIconSvg"></tr>
-                </template>
-              </tbody>
-            </table>
-          </div>
+          </li>
+        </ul>
+        <div v-if="canCreateEnvironmentParsed && !isLoading" class="nav-controls">
+          <a :href="newEnvironmentPath" class="btn btn-create">
+            New environment
+          </a>
         </div>
       </div>
-    `,
-  });
-})();
+
+      <div class="environments-container">
+        <div class="environments-list-loading text-center" v-if="isLoading">
+          <i class="fa fa-spinner fa-spin"></i>
+        </div>
+
+        <div class="blank-state blank-state-no-icon"
+          v-if="!isLoading && state.environments.length === 0">
+          <h2 class="blank-state-title js-blank-state-title">
+            You don't have any environments right now.
+          </h2>
+          <p class="blank-state-text">
+            Environments are places where code gets deployed, such as staging or production.
+            <br />
+            <a :href="helpPagePath">
+              Read more about environments
+            </a>
+          </p>
+
+          <a v-if="canCreateEnvironmentParsed"
+            :href="newEnvironmentPath"
+            class="btn btn-create js-new-environment-button">
+            New Environment
+          </a>
+        </div>
+
+        <div class="table-holder"
+          v-if="!isLoading && state.environments.length > 0">
+          <table class="table ci-table environments">
+            <thead>
+              <tr>
+                <th class="environments-name">Environment</th>
+                <th class="environments-deploy">Last deployment</th>
+                <th class="environments-build">Job</th>
+                <th class="environments-commit">Commit</th>
+                <th class="environments-date">Updated</th>
+                <th class="hidden-xs environments-actions"></th>
+              </tr>
+            </thead>
+            <tbody>
+              <template v-for="model in state.environments"
+                v-bind:model="model">
+                <tr is="environment-item"
+                  :model="model"
+                  :can-create-deployment="canCreateDeploymentParsed"
+                  :can-read-environment="canReadEnvironmentParsed"
+                  :play-icon-svg="playIconSvg"
+                  :terminal-icon-svg="terminalIconSvg"
+                  :commit-icon-svg="commitIconSvg"></tr>
+              </template>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  `,
+});
diff --git a/app/assets/javascripts/environments/components/environment_actions.js.es6 b/app/assets/javascripts/environments/components/environment_actions.js.es6
index ed1c78945db..c5a714d9673 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js.es6
+++ b/app/assets/javascripts/environments/components/environment_actions.js.es6
@@ -1,50 +1,43 @@
-/* global Vue */
+const Vue = require('vue');
 
-window.Vue = require('vue');
-
-(() => {
-  window.gl = window.gl || {};
-  window.gl.environmentsList = window.gl.environmentsList || {};
-
-  gl.environmentsList.ActionsComponent = Vue.component('actions-component', {
-    props: {
-      actions: {
-        type: Array,
-        required: false,
-        default: () => [],
-      },
-
-      playIconSvg: {
-        type: String,
-        required: false,
-      },
+module.exports = Vue.component('actions-component', {
+  props: {
+    actions: {
+      type: Array,
+      required: false,
+      default: () => [],
     },
 
-    template: `
-      <div class="inline">
-        <div class="dropdown">
-          <a class="dropdown-new btn btn-default" data-toggle="dropdown">
-            <span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
-            <i class="fa fa-caret-down"></i>
-          </a>
+    playIconSvg: {
+      type: String,
+      required: false,
+    },
+  },
 
-          <ul class="dropdown-menu dropdown-menu-align-right">
-            <li v-for="action in actions">
-              <a :href="action.play_path"
-                data-method="post"
-                rel="nofollow"
-                class="js-manual-action-link">
+  template: `
+    <div class="inline">
+      <div class="dropdown">
+        <a class="dropdown-new btn btn-default" data-toggle="dropdown">
+          <span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
+          <i class="fa fa-caret-down"></i>
+        </a>
 
-                <span class="js-action-play-icon-container" v-html="playIconSvg"></span>
+        <ul class="dropdown-menu dropdown-menu-align-right">
+          <li v-for="action in actions">
+            <a :href="action.play_path"
+              data-method="post"
+              rel="nofollow"
+              class="js-manual-action-link">
 
-                <span>
-                  {{action.name}}
-                </span>
-              </a>
-            </li>
-          </ul>
-        </div>
+              <span class="js-action-play-icon-container" v-html="playIconSvg"></span>
+
+              <span>
+                {{action.name}}
+              </span>
+            </a>
+          </li>
+        </ul>
       </div>
-    `,
-  });
-})();
+    </div>
+  `,
+});
diff --git a/app/assets/javascripts/environments/components/environment_external_url.js.es6 b/app/assets/javascripts/environments/components/environment_external_url.js.es6
index 28cc0022d17..2599bba3c59 100644
--- a/app/assets/javascripts/environments/components/environment_external_url.js.es6
+++ b/app/assets/javascripts/environments/components/environment_external_url.js.es6
@@ -1,23 +1,19 @@
-/* global Vue */
+/**
+ * Renders the external url link in environments table.
+ */
+const Vue = require('vue');
 
-window.Vue = require('vue');
-
-(() => {
-  window.gl = window.gl || {};
-  window.gl.environmentsList = window.gl.environmentsList || {};
-
-  gl.environmentsList.ExternalUrlComponent = Vue.component('external-url-component', {
-    props: {
-      externalUrl: {
-        type: String,
-        default: '',
-      },
+module.exports = Vue.component('external-url-component', {
+  props: {
+    externalUrl: {
+      type: String,
+      default: '',
     },
+  },
 
-    template: `
-      <a class="btn external_url" :href="externalUrl" target="_blank">
-        <i class="fa fa-external-link"></i>
-      </a>
-    `,
-  });
-})();
+  template: `
+    <a class="btn external_url" :href="externalUrl" target="_blank">
+      <i class="fa fa-external-link"></i>
+    </a>
+  `,
+});
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index ae37bc24396..cf79969471e 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -1,489 +1,481 @@
-/* global Vue */
-/* global timeago */
 
-window.Vue = require('vue');
-window.timeago = require('vendor/timeago');
+const Vue = require('vue');
+const Timeago = require('vendor/timeago');
 require('../../lib/utils/text_utility');
 require('../../vue_shared/components/commit');
-require('./environment_actions');
-require('./environment_external_url');
-require('./environment_stop');
-require('./environment_rollback');
-require('./environment_terminal_button');
+const ActionsComponent = require('./environment_actions');
+const ExternalUrlComponent = require('./environment_external_url');
+const StopComponent = require('./environment_stop');
+const RollbackComponent = require('./environment_rollback');
+const TerminalButtonComponent = require('./environment_terminal_button');
 
-(() => {
-  /**
-   * Envrionment Item Component
-   *
-   * Renders a table row for each environment.
-   */
+/**
+ * Envrionment Item Component
+ *
+ * Renders a table row for each environment.
+ */
 
-  window.gl = window.gl || {};
-  window.gl.environmentsList = window.gl.environmentsList || {};
-  window.gl.environmentsList.timeagoInstance = new timeago(); // eslint-disable-line
+const timeagoInstance = new Timeago();
 
-  gl.environmentsList.EnvironmentItem = Vue.component('environment-item', {
+module.exports = Vue.component('environment-item', {
 
-    components: {
-      'commit-component': gl.CommitComponent,
-      'actions-component': gl.environmentsList.ActionsComponent,
-      'external-url-component': gl.environmentsList.ExternalUrlComponent,
-      'stop-component': gl.environmentsList.StopComponent,
-      'rollback-component': gl.environmentsList.RollbackComponent,
-      'terminal-button-component': gl.environmentsList.TerminalButtonComponent,
+  components: {
+    'commit-component': gl.CommitComponent,
+    'actions-component': ActionsComponent,
+    'external-url-component': ExternalUrlComponent,
+    'stop-component': StopComponent,
+    'rollback-component': RollbackComponent,
+    'terminal-button-component': TerminalButtonComponent,
+  },
+
+  props: {
+    model: {
+      type: Object,
+      required: true,
+      default: () => ({}),
     },
 
-    props: {
-      model: {
-        type: Object,
-        required: true,
-        default: () => ({}),
-      },
-
-      canCreateDeployment: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-
-      canReadEnvironment: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-
-      commitIconSvg: {
-        type: String,
-        required: false,
-      },
-
-      playIconSvg: {
-        type: String,
-        required: false,
-      },
-
-      terminalIconSvg: {
-        type: String,
-        required: false,
-      },
+    canCreateDeployment: {
+      type: Boolean,
+      required: false,
+      default: false,
     },
 
-    computed: {
-      /**
-       * Verifies if `last_deployment` key exists in the current Envrionment.
-       * This key is required to render most of the html - this method works has
-       * an helper.
-       *
-       * @returns {Boolean}
-       */
-      hasLastDeploymentKey() {
-        if (this.model.latest.last_deployment &&
-          !this.$options.isObjectEmpty(this.model.latest.last_deployment)) {
-          return true;
-        }
-        return false;
-      },
+    canReadEnvironment: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
 
-      /**
-       * Verifies is the given environment has manual actions.
-       * Used to verify if we should render them or nor.
-       *
-       * @returns {Boolean|Undefined}
-       */
-      hasManualActions() {
-        return this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.manual_actions &&
-          this.model.latest.last_deployment.manual_actions.length > 0;
-      },
+    commitIconSvg: {
+      type: String,
+      required: false,
+    },
 
-      /**
-       * Returns the value of the `stop_action?` key provided in the response.
-       *
-       * @returns {Boolean}
-       */
-      hasStopAction() {
-        return this.model['stop_action?'];
-      },
+    playIconSvg: {
+      type: String,
+      required: false,
+    },
 
-      /**
-       * Verifies if the `deployable` key is present in `last_deployment` key.
-       * Used to verify whether we should or not render the rollback partial.
-       *
-       * @returns {Boolean|Undefined}
-       */
-      canRetry() {
-        return this.hasLastDeploymentKey &&
-          this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.deployable;
-      },
+    terminalIconSvg: {
+      type: String,
+      required: false,
+    },
+  },
 
-      /**
-       * Verifies if the date to be shown is present.
-       *
-       * @returns {Boolean|Undefined}
-       */
-      canShowDate() {
-        return this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.deployable &&
-          this.model.latest.last_deployment.deployable !== undefined;
-      },
-
-      /**
-       * Human readable date.
-       *
-       * @returns {String}
-       */
-      createdDate() {
-        return gl.environmentsList.timeagoInstance.format(
-          this.model.latest.last_deployment.deployable.created_at,
-        );
-      },
-
-      /**
-       * Returns the manual actions with the name parsed.
-       *
-       * @returns {Array.<Object>|Undefined}
-       */
-      manualActions() {
-        if (this.hasManualActions) {
-          return this.model.latest.last_deployment.manual_actions.map((action) => {
-            const parsedAction = {
-              name: gl.text.humanize(action.name),
-              play_path: action.play_path,
-            };
-            return parsedAction;
-          });
-        }
-        return [];
-      },
-
-      /**
-       * Builds the string used in the user image alt attribute.
-       *
-       * @returns {String}
-       */
-      userImageAltDescription() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.user &&
-          this.model.latest.last_deployment.user.username) {
-          return `${this.model.latest.last_deployment.user.username}'s avatar'`;
-        }
-        return '';
-      },
-
-      /**
-       * If provided, returns the commit tag.
-       *
-       * @returns {String|Undefined}
-       */
-      commitTag() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.tag) {
-          return this.model.latest.last_deployment.tag;
-        }
-        return undefined;
-      },
-
-      /**
-       * If provided, returns the commit ref.
-       *
-       * @returns {Object|Undefined}
-       */
-      commitRef() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.ref) {
-          return this.model.latest.last_deployment.ref;
-        }
-        return undefined;
-      },
-
-      /**
-       * If provided, returns the commit url.
-       *
-       * @returns {String|Undefined}
-       */
-      commitUrl() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.commit &&
-          this.model.latest.last_deployment.commit.commit_path) {
-          return this.model.latest.last_deployment.commit.commit_path;
-        }
-        return undefined;
-      },
-
-      /**
-       * If provided, returns the commit short sha.
-       *
-       * @returns {String|Undefined}
-       */
-      commitShortSha() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.commit &&
-          this.model.latest.last_deployment.commit.short_id) {
-          return this.model.latest.last_deployment.commit.short_id;
-        }
-        return undefined;
-      },
-
-      /**
-       * If provided, returns the commit title.
-       *
-       * @returns {String|Undefined}
-       */
-      commitTitle() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.commit &&
-          this.model.latest.last_deployment.commit.title) {
-          return this.model.latest.last_deployment.commit.title;
-        }
-        return undefined;
-      },
-
-      /**
-       * If provided, returns the commit tag.
-       *
-       * @returns {Object|Undefined}
-       */
-      commitAuthor() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.commit &&
-          this.model.latest.last_deployment.commit.author) {
-          return this.model.latest.last_deployment.commit.author;
-        }
-
-        return undefined;
-      },
-
-      /**
-       * Verifies if the `retry_path` key is present and returns its value.
-       *
-       * @returns {String|Undefined}
-       */
-      retryUrl() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.deployable &&
-          this.model.latest.last_deployment.deployable.retry_path) {
-          return this.model.latest.last_deployment.deployable.retry_path;
-        }
-        return undefined;
-      },
-
-      /**
-       * Verifies if the `last?` key is present and returns its value.
-       *
-       * @returns {Boolean|Undefined}
-       */
-      isLastDeployment() {
-        return this.model.latest.last_deployment &&
-          this.model.latest.last_deployment['last?'];
-      },
-
-      /**
-       * Builds the name of the builds needed to display both the name and the id.
-       *
-       * @returns {String}
-       */
-      buildName() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.deployable) {
-          return `${this.model.latest.last_deployment.deployable.name} #${this.model.latest.last_deployment.deployable.id}`;
-        }
-        return '';
-      },
-
-      /**
-       * Builds the needed string to show the internal id.
-       *
-       * @returns {String}
-       */
-      deploymentInternalId() {
-        if (this.model.latest.last_deployment &&
-          this.model.latest.last_deployment.iid) {
-          return `#${this.model.latest.last_deployment.iid}`;
-        }
-        return '';
-      },
-
-      /**
-       * Verifies if the user object is present under last_deployment object.
-       *
-       * @returns {Boolean}
-       */
-      deploymentHasUser() {
-        return !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
-          !this.$options.isObjectEmpty(this.model.latest.last_deployment.user);
-      },
-
-      /**
-       * Returns the user object nested with the last_deployment object.
-       * Used to render the template.
-       *
-       * @returns {Object}
-       */
-      deploymentUser() {
-        if (!this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
-          !this.$options.isObjectEmpty(this.model.latest.last_deployment.user)) {
-          return this.model.latest.last_deployment.user;
-        }
-        return {};
-      },
-
-      /**
-       * Verifies if the build name column should be rendered by verifing
-       * if all the information needed is present
-       * and if the environment is not a folder.
-       *
-       * @returns {Boolean}
-       */
-      shouldRenderBuildName() {
-        return !this.model.isFolder &&
-          !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
-          !this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
-      },
-
-      /**
-       * Verifies if deplyment internal ID should be rendered by verifing
-       * if all the information needed is present
-       * and if the environment is not a folder.
-       *
-       * @returns {Boolean}
-       */
-      shouldRenderDeploymentID() {
-        return !this.model.isFolder &&
-          !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
-          this.model.latest.last_deployment.iid !== undefined;
-      },
+  computed: {
+    /**
+     * Verifies if `last_deployment` key exists in the current Envrionment.
+     * This key is required to render most of the html - this method works has
+     * an helper.
+     *
+     * @returns {Boolean}
+     */
+    hasLastDeploymentKey() {
+      if (this.model.latest.last_deployment &&
+        !this.$options.isObjectEmpty(this.model.latest.last_deployment)) {
+        return true;
+      }
+      return false;
     },
 
     /**
-     * Helper to verify if certain given object are empty.
-     * Should be replaced by lodash _.isEmpty - https://lodash.com/docs/4.17.2#isEmpty
-     * @param  {Object} object
-     * @returns {Bollean}
+     * Verifies is the given environment has manual actions.
+     * Used to verify if we should render them or nor.
+     *
+     * @returns {Boolean|Undefined}
      */
-    isObjectEmpty(object) {
-      for (const key in object) { // eslint-disable-line
-        if (hasOwnProperty.call(object, key)) {
-          return false;
-        }
-      }
-      return true;
+    hasManualActions() {
+      return this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.manual_actions &&
+        this.model.latest.last_deployment.manual_actions.length > 0;
     },
 
-    template: `
-      <tr>
-        <td>
-          <a v-if="!model.isFolder"
-            class="environment-name"
-            :href="model.latest.environment_path">
+    /**
+     * Returns the value of the `stop_action?` key provided in the response.
+     *
+     * @returns {Boolean}
+     */
+    hasStopAction() {
+      return this.model['stop_action?'];
+    },
+
+    /**
+     * Verifies if the `deployable` key is present in `last_deployment` key.
+     * Used to verify whether we should or not render the rollback partial.
+     *
+     * @returns {Boolean|Undefined}
+     */
+    canRetry() {
+      return this.hasLastDeploymentKey &&
+        this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.deployable;
+    },
+
+    /**
+     * Verifies if the date to be shown is present.
+     *
+     * @returns {Boolean|Undefined}
+     */
+    canShowDate() {
+      return this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.deployable &&
+        this.model.latest.last_deployment.deployable !== undefined;
+    },
+
+    /**
+     * Human readable date.
+     *
+     * @returns {String}
+     */
+    createdDate() {
+      return timeagoInstance.format(this.model.latest.last_deployment.deployable.created_at);
+    },
+
+    /**
+     * Returns the manual actions with the name parsed.
+     *
+     * @returns {Array.<Object>|Undefined}
+     */
+    manualActions() {
+      if (this.hasManualActions) {
+        return this.model.latest.last_deployment.manual_actions.map((action) => {
+          const parsedAction = {
+            name: gl.text.humanize(action.name),
+            play_path: action.play_path,
+          };
+          return parsedAction;
+        });
+      }
+      return [];
+    },
+
+    /**
+     * Builds the string used in the user image alt attribute.
+     *
+     * @returns {String}
+     */
+    userImageAltDescription() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.user &&
+        this.model.latest.last_deployment.user.username) {
+        return `${this.model.latest.last_deployment.user.username}'s avatar'`;
+      }
+      return '';
+    },
+
+    /**
+     * If provided, returns the commit tag.
+     *
+     * @returns {String|Undefined}
+     */
+    commitTag() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.tag) {
+        return this.model.latest.last_deployment.tag;
+      }
+      return undefined;
+    },
+
+    /**
+     * If provided, returns the commit ref.
+     *
+     * @returns {Object|Undefined}
+     */
+    commitRef() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.ref) {
+        return this.model.latest.last_deployment.ref;
+      }
+      return undefined;
+    },
+
+    /**
+     * If provided, returns the commit url.
+     *
+     * @returns {String|Undefined}
+     */
+    commitUrl() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.commit &&
+        this.model.latest.last_deployment.commit.commit_path) {
+        return this.model.latest.last_deployment.commit.commit_path;
+      }
+      return undefined;
+    },
+
+    /**
+     * If provided, returns the commit short sha.
+     *
+     * @returns {String|Undefined}
+     */
+    commitShortSha() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.commit &&
+        this.model.latest.last_deployment.commit.short_id) {
+        return this.model.latest.last_deployment.commit.short_id;
+      }
+      return undefined;
+    },
+
+    /**
+     * If provided, returns the commit title.
+     *
+     * @returns {String|Undefined}
+     */
+    commitTitle() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.commit &&
+        this.model.latest.last_deployment.commit.title) {
+        return this.model.latest.last_deployment.commit.title;
+      }
+      return undefined;
+    },
+
+    /**
+     * If provided, returns the commit tag.
+     *
+     * @returns {Object|Undefined}
+     */
+    commitAuthor() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.commit &&
+        this.model.latest.last_deployment.commit.author) {
+        return this.model.latest.last_deployment.commit.author;
+      }
+
+      return undefined;
+    },
+
+    /**
+     * Verifies if the `retry_path` key is present and returns its value.
+     *
+     * @returns {String|Undefined}
+     */
+    retryUrl() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.deployable &&
+        this.model.latest.last_deployment.deployable.retry_path) {
+        return this.model.latest.last_deployment.deployable.retry_path;
+      }
+      return undefined;
+    },
+
+    /**
+     * Verifies if the `last?` key is present and returns its value.
+     *
+     * @returns {Boolean|Undefined}
+     */
+    isLastDeployment() {
+      return this.model.latest.last_deployment &&
+        this.model.latest.last_deployment['last?'];
+    },
+
+    /**
+     * Builds the name of the builds needed to display both the name and the id.
+     *
+     * @returns {String}
+     */
+    buildName() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.deployable) {
+        return `${this.model.latest.last_deployment.deployable.name} #${this.model.latest.last_deployment.deployable.id}`;
+      }
+      return '';
+    },
+
+    /**
+     * Builds the needed string to show the internal id.
+     *
+     * @returns {String}
+     */
+    deploymentInternalId() {
+      if (this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.iid) {
+        return `#${this.model.latest.last_deployment.iid}`;
+      }
+      return '';
+    },
+
+    /**
+     * Verifies if the user object is present under last_deployment object.
+     *
+     * @returns {Boolean}
+     */
+    deploymentHasUser() {
+      return !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+        !this.$options.isObjectEmpty(this.model.latest.last_deployment.user);
+    },
+
+    /**
+     * Returns the user object nested with the last_deployment object.
+     * Used to render the template.
+     *
+     * @returns {Object}
+     */
+    deploymentUser() {
+      if (!this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+        !this.$options.isObjectEmpty(this.model.latest.last_deployment.user)) {
+        return this.model.latest.last_deployment.user;
+      }
+      return {};
+    },
+
+    /**
+     * Verifies if the build name column should be rendered by verifing
+     * if all the information needed is present
+     * and if the environment is not a folder.
+     *
+     * @returns {Boolean}
+     */
+    shouldRenderBuildName() {
+      return !this.model.isFolder &&
+        !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+        !this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
+    },
+
+    /**
+     * Verifies if deplyment internal ID should be rendered by verifing
+     * if all the information needed is present
+     * and if the environment is not a folder.
+     *
+     * @returns {Boolean}
+     */
+    shouldRenderDeploymentID() {
+      return !this.model.isFolder &&
+        !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+        this.model.latest.last_deployment.iid !== undefined;
+    },
+  },
+
+  /**
+   * Helper to verify if certain given object are empty.
+   * Should be replaced by lodash _.isEmpty - https://lodash.com/docs/4.17.2#isEmpty
+   * @param  {Object} object
+   * @returns {Bollean}
+   */
+  isObjectEmpty(object) {
+    for (const key in object) { // eslint-disable-line
+      if (hasOwnProperty.call(object, key)) {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  template: `
+    <tr>
+      <td>
+        <a v-if="!model.isFolder"
+          class="environment-name"
+          :href="model.latest.environment_path">
+          {{model.name}}
+        </a>
+        <a v-else class="folder-name">
+          <span class="folder-icon">
+            <i class="fa fa-caret-right" aria-hidden="true"></i>
+            <i class="fa fa-folder" aria-hidden="true"></i>
+          </span>
+
+          <span>
             {{model.name}}
-          </a>
-          <a v-else class="folder-name">
-            <span class="folder-icon">
-              <i class="fa fa-caret-right" aria-hidden="true"></i>
-              <i class="fa fa-folder" aria-hidden="true"></i>
-            </span>
-
-            <span>
-              {{model.name}}
-            </span>
-
-            <span class="badge">
-              {{model.size}}
-            </span>
-          </a>
-        </td>
-
-        <td class="deployment-column">
-          <span v-if="shouldRenderDeploymentID">
-            {{deploymentInternalId}}
           </span>
 
-          <span v-if="!model.isFolder && deploymentHasUser">
-            by
-            <a :href="deploymentUser.web_url" class="js-deploy-user-container">
-              <img class="avatar has-tooltip s20"
-                :src="deploymentUser.avatar_url"
-                :alt="userImageAltDescription"
-                :title="deploymentUser.username" />
-            </a>
+          <span class="badge">
+            {{model.size}}
           </span>
-        </td>
+        </a>
+      </td>
 
-        <td class="environments-build-cell">
-          <a v-if="shouldRenderBuildName"
-            class="build-link"
-            :href="model.latest.last_deployment.deployable.build_path">
-            {{buildName}}
+      <td class="deployment-column">
+        <span v-if="shouldRenderDeploymentID">
+          {{deploymentInternalId}}
+        </span>
+
+        <span v-if="!model.isFolder && deploymentHasUser">
+          by
+          <a :href="deploymentUser.web_url" class="js-deploy-user-container">
+            <img class="avatar has-tooltip s20"
+              :src="deploymentUser.avatar_url"
+              :alt="userImageAltDescription"
+              :title="deploymentUser.username" />
           </a>
-        </td>
+        </span>
+      </td>
 
-        <td>
-          <div v-if="!model.isFolder && hasLastDeploymentKey" class="js-commit-component">
-            <commit-component
-              :tag="commitTag"
-              :commit-ref="commitRef"
-              :commit-url="commitUrl"
-              :short-sha="commitShortSha"
-              :title="commitTitle"
-              :author="commitAuthor"
-              :commit-icon-svg="commitIconSvg">
-            </commit-component>
+      <td class="environments-build-cell">
+        <a v-if="shouldRenderBuildName"
+          class="build-link"
+          :href="model.latest.last_deployment.deployable.build_path">
+          {{buildName}}
+        </a>
+      </td>
+
+      <td>
+        <div v-if="!model.isFolder && hasLastDeploymentKey" class="js-commit-component">
+          <commit-component
+            :tag="commitTag"
+            :commit-ref="commitRef"
+            :commit-url="commitUrl"
+            :short-sha="commitShortSha"
+            :title="commitTitle"
+            :author="commitAuthor"
+            :commit-icon-svg="commitIconSvg">
+          </commit-component>
+        </div>
+        <p v-if="!model.isFolder && !hasLastDeploymentKey" class="commit-title">
+          No deployments yet
+        </p>
+      </td>
+
+      <td>
+        <span v-if="!model.isFolder && canShowDate"
+          class="environment-created-date-timeago">
+          {{createdDate}}
+        </span>
+      </td>
+
+      <td class="hidden-xs">
+        <div v-if="!model.isFolder">
+          <div v-if="hasManualActions && canCreateDeployment"
+            class="inline js-manual-actions-container">
+            <actions-component
+              :play-icon-svg="playIconSvg"
+              :actions="manualActions">
+            </actions-component>
           </div>
-          <p v-if="!model.isFolder && !hasLastDeploymentKey" class="commit-title">
-            No deployments yet
-          </p>
-        </td>
 
-        <td>
-          <span v-if="!model.isFolder && canShowDate"
-            class="environment-created-date-timeago">
-            {{createdDate}}
-          </span>
-        </td>
-
-        <td class="hidden-xs">
-          <div v-if="!model.isFolder">
-            <div v-if="hasManualActions && canCreateDeployment"
-              class="inline js-manual-actions-container">
-              <actions-component
-                :play-icon-svg="playIconSvg"
-                :actions="manualActions">
-              </actions-component>
-            </div>
-
-            <div v-if="model.latest.external_url && canReadEnvironment"
-              class="inline js-external-url-container">
-              <external-url-component
-                :external-url="model.latest.external_url">
-              </external-url-component>
-            </div>
-
-            <div v-if="hasStopAction && canCreateDeployment"
-              class="inline js-stop-component-container">
-              <stop-component
-                :stop-url="model.latest.stop_path">
-              </stop-component>
-            </div>
-
-            <div v-if="model.latest.terminal_path"
-              class="inline js-terminal-button-container">
-              <terminal-button-component
-                :terminal-icon-svg="terminalIconSvg"
-                :terminal-path="model.latest.terminal_path">
-              </terminal-button-component>
-            </div>
-
-            <div v-if="canRetry && canCreateDeployment"
-              class="inline js-rollback-component-container">
-              <rollback-component
-                :is-last-deployment="isLastDeployment"
-                :retry-url="retryUrl">
-                </rollback-component>
-            </div>
+          <div v-if="model.latest.external_url && canReadEnvironment"
+            class="inline js-external-url-container">
+            <external-url-component
+              :external-url="model.latest.external_url">
+            </external-url-component>
           </div>
-        </td>
-      </tr>
-    `,
-  });
-})();
+
+          <div v-if="hasStopAction && canCreateDeployment"
+            class="inline js-stop-component-container">
+            <stop-component
+              :stop-url="model.latest.stop_path">
+            </stop-component>
+          </div>
+
+          <div v-if="model.latest.terminal_path"
+            class="inline js-terminal-button-container">
+            <terminal-button-component
+              :terminal-icon-svg="terminalIconSvg"
+              :terminal-path="model.latest.terminal_path">
+            </terminal-button-component>
+          </div>
+
+          <div v-if="canRetry && canCreateDeployment"
+            class="inline js-rollback-component-container">
+            <rollback-component
+              :is-last-deployment="isLastDeployment"
+              :retry-url="retryUrl">
+              </rollback-component>
+          </div>
+        </div>
+      </td>
+    </tr>
+  `,
+});
diff --git a/app/assets/javascripts/environments/components/environment_rollback.js.es6 b/app/assets/javascripts/environments/components/environment_rollback.js.es6
index 5938340a128..daf126eb4e8 100644
--- a/app/assets/javascripts/environments/components/environment_rollback.js.es6
+++ b/app/assets/javascripts/environments/components/environment_rollback.js.es6
@@ -1,33 +1,30 @@
-/* global Vue */
+/**
+ * Renders Rollback or Re deploy button in environments table depending
+ * of the provided property `isLastDeployment`
+ */
+const Vue = require('vue');
 
-window.Vue = require('vue');
-
-(() => {
-  window.gl = window.gl || {};
-  window.gl.environmentsList = window.gl.environmentsList || {};
-
-  gl.environmentsList.RollbackComponent = Vue.component('rollback-component', {
-    props: {
-      retryUrl: {
-        type: String,
-        default: '',
-      },
-
-      isLastDeployment: {
-        type: Boolean,
-        default: true,
-      },
+module.exports = Vue.component('rollback-component', {
+  props: {
+    retryUrl: {
+      type: String,
+      default: '',
     },
 
-    template: `
-      <a class="btn" :href="retryUrl" data-method="post" rel="nofollow">
-        <span v-if="isLastDeployment">
-          Re-deploy
-        </span>
-        <span v-else>
-          Rollback
-        </span>
-      </a>
-    `,
-  });
-})();
+    isLastDeployment: {
+      type: Boolean,
+      default: true,
+    },
+  },
+
+  template: `
+    <a class="btn" :href="retryUrl" data-method="post" rel="nofollow">
+      <span v-if="isLastDeployment">
+        Re-deploy
+      </span>
+      <span v-else>
+        Rollback
+      </span>
+    </a>
+  `,
+});
diff --git a/app/assets/javascripts/environments/components/environment_stop.js.es6 b/app/assets/javascripts/environments/components/environment_stop.js.es6
index be9526989a0..96983a19568 100644
--- a/app/assets/javascripts/environments/components/environment_stop.js.es6
+++ b/app/assets/javascripts/environments/components/environment_stop.js.es6
@@ -1,27 +1,24 @@
-/* global Vue */
+/**
+ * Renders the stop "button" that allows stop an environment.
+ * Used in environments table.
+ */
+const Vue = require('vue');
 
-window.Vue = require('vue');
-
-(() => {
-  window.gl = window.gl || {};
-  window.gl.environmentsList = window.gl.environmentsList || {};
-
-  gl.environmentsList.StopComponent = Vue.component('stop-component', {
-    props: {
-      stopUrl: {
-        type: String,
-        default: '',
-      },
+module.exports = Vue.component('stop-component', {
+  props: {
+    stopUrl: {
+      type: String,
+      default: '',
     },
+  },
 
-    template: `
-      <a class="btn stop-env-link"
-        :href="stopUrl"
-        data-confirm="Are you sure you want to stop this environment?"
-        data-method="post"
-        rel="nofollow">
-        <i class="fa fa-stop stop-env-icon"></i>
-      </a>
-    `,
-  });
-})();
+  template: `
+    <a class="btn stop-env-link"
+      :href="stopUrl"
+      data-confirm="Are you sure you want to stop this environment?"
+      data-method="post"
+      rel="nofollow">
+      <i class="fa fa-stop stop-env-icon" aria-hidden="true"></i>
+    </a>
+  `,
+});
diff --git a/app/assets/javascripts/environments/components/environment_terminal_button.js.es6 b/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
index a3ad063f7cb..481e0d15e7a 100644
--- a/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
+++ b/app/assets/javascripts/environments/components/environment_terminal_button.js.es6
@@ -1,28 +1,25 @@
-/* global Vue */
+/**
+ * Renders a terminal button to open a web terminal.
+ * Used in environments table.
+ */
+const Vue = require('vue');
 
-window.Vue = require('vue');
-
-(() => {
-  window.gl = window.gl || {};
-  window.gl.environmentsList = window.gl.environmentsList || {};
-
-  gl.environmentsList.TerminalButtonComponent = Vue.component('terminal-button-component', {
-    props: {
-      terminalPath: {
-        type: String,
-        default: '',
-      },
-      terminalIconSvg: {
-        type: String,
-        default: '',
-      },
+module.exports = Vue.component('terminal-button-component', {
+  props: {
+    terminalPath: {
+      type: String,
+      default: '',
     },
+    terminalIconSvg: {
+      type: String,
+      default: '',
+    },
+  },
 
-    template: `
-      <a class="btn terminal-button"
-        :href="terminalPath">
-        <span class="js-terminal-icon-container" v-html="terminalIconSvg"></span>
-      </a>
-    `,
-  });
-})();
+  template: `
+    <a class="btn terminal-button"
+      :href="terminalPath">
+      <span class="js-terminal-icon-container" v-html="terminalIconSvg"></span>
+    </a>
+  `,
+});
diff --git a/app/assets/javascripts/environments/environments_bundle.js.es6 b/app/assets/javascripts/environments/environments_bundle.js.es6
index 912f50aeec1..867eba1d384 100644
--- a/app/assets/javascripts/environments/environments_bundle.js.es6
+++ b/app/assets/javascripts/environments/environments_bundle.js.es6
@@ -1,5 +1,4 @@
-window.Vue = require('vue');
-require('./components/environment');
+const EnvironmentsComponent = require('./components/environment');
 require('../vue_shared/vue_resource_interceptor');
 
 $(() => {
@@ -9,7 +8,7 @@ $(() => {
     gl.EnvironmentsListApp.$destroy(true);
   }
 
-  gl.EnvironmentsListApp = new gl.environmentsList.EnvironmentsComponent({
+  gl.EnvironmentsListApp = new EnvironmentsComponent({
     el: document.querySelector('#environments-list-view'),
   });
 });
diff --git a/app/assets/javascripts/environments/services/environments_service.js.es6 b/app/assets/javascripts/environments/services/environments_service.js.es6
index 9b33fd02c53..9cef335868e 100644
--- a/app/assets/javascripts/environments/services/environments_service.js.es6
+++ b/app/assets/javascripts/environments/services/environments_service.js.es6
@@ -1,4 +1,4 @@
-const Vue = window.Vue = require('vue');
+const Vue = require('vue');
 
 class EnvironmentsService {
   constructor(endpoint) {
diff --git a/app/assets/javascripts/vue_shared/components/commit.js.es6 b/app/assets/javascripts/vue_shared/components/commit.js.es6
index 7f7c18ddeb1..ff88e236829 100644
--- a/app/assets/javascripts/vue_shared/components/commit.js.es6
+++ b/app/assets/javascripts/vue_shared/components/commit.js.es6
@@ -1,4 +1,5 @@
 /* global Vue */
+window.Vue = require('vue');
 
 (() => {
   window.gl = window.gl || {};
diff --git a/spec/javascripts/environments/environment_actions_spec.js.es6 b/spec/javascripts/environments/environment_actions_spec.js.es6
index b1838045a06..850586f9f3a 100644
--- a/spec/javascripts/environments/environment_actions_spec.js.es6
+++ b/spec/javascripts/environments/environment_actions_spec.js.es6
@@ -1,4 +1,4 @@
-require('~/environments/components/environment_actions');
+const ActionsComponent = require('~/environments/components/environment_actions');
 
 describe('Actions Component', () => {
   preloadFixtures('static/environments/element.html.raw');
@@ -19,7 +19,7 @@ describe('Actions Component', () => {
       },
     ];
 
-    const component = new window.gl.environmentsList.ActionsComponent({
+    const component = new ActionsComponent({
       el: document.querySelector('.test-dom-element'),
       propsData: {
         actions: actionsMock,
@@ -47,7 +47,7 @@ describe('Actions Component', () => {
       },
     ];
 
-    const component = new window.gl.environmentsList.ActionsComponent({
+    const component = new ActionsComponent({
       el: document.querySelector('.test-dom-element'),
       propsData: {
         actions: actionsMock,
diff --git a/spec/javascripts/environments/environment_external_url_spec.js.es6 b/spec/javascripts/environments/environment_external_url_spec.js.es6
index a6a587e69f5..393dbb5aae0 100644
--- a/spec/javascripts/environments/environment_external_url_spec.js.es6
+++ b/spec/javascripts/environments/environment_external_url_spec.js.es6
@@ -1,4 +1,4 @@
-require('~/environments/components/environment_external_url');
+const ExternalUrlComponent = require('~/environments/components/environment_external_url');
 
 describe('External URL Component', () => {
   preloadFixtures('static/environments/element.html.raw');
@@ -8,7 +8,7 @@ describe('External URL Component', () => {
 
   it('should link to the provided externalUrl prop', () => {
     const externalURL = 'https://gitlab.com';
-    const component = new window.gl.environmentsList.ExternalUrlComponent({
+    const component = new ExternalUrlComponent({
       el: document.querySelector('.test-dom-element'),
       propsData: {
         externalUrl: externalURL,
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6
index 5dc7ef5ad76..dd614e50d7f 100644
--- a/spec/javascripts/environments/environment_item_spec.js.es6
+++ b/spec/javascripts/environments/environment_item_spec.js.es6
@@ -1,7 +1,7 @@
 window.timeago = require('vendor/timeago');
-require('~/environments/components/environment_item');
+const EnvironmentItem = require('~/environments/components/environment_item');
 
-fdescribe('Environment item', () => {
+describe('Environment item', () => {
   preloadFixtures('static/environments/table.html.raw');
   beforeEach(() => {
     loadFixtures('static/environments/table.html.raw');
@@ -21,7 +21,7 @@ fdescribe('Environment item', () => {
         },
       };
 
-      component = new window.gl.environmentsList.EnvironmentItem({
+      component = new EnvironmentItem({
         el: document.querySelector('tr#environment-row'),
         propsData: {
           model: mockItem,
@@ -111,7 +111,7 @@ fdescribe('Environment item', () => {
         },
       };
 
-      component = new window.gl.environmentsList.EnvironmentItem({
+      component = new EnvironmentItem({
         el: document.querySelector('tr#environment-row'),
         propsData: {
           model: environment,
diff --git a/spec/javascripts/environments/environment_rollback_spec.js.es6 b/spec/javascripts/environments/environment_rollback_spec.js.es6
index 043b8708a6e..4a596baad09 100644
--- a/spec/javascripts/environments/environment_rollback_spec.js.es6
+++ b/spec/javascripts/environments/environment_rollback_spec.js.es6
@@ -1,4 +1,4 @@
-require('~/environments/components/environment_rollback');
+const RollbackComponent = require('~/environments/components/environment_rollback');
 
 describe('Rollback Component', () => {
   preloadFixtures('static/environments/element.html.raw');
@@ -10,7 +10,7 @@ describe('Rollback Component', () => {
   });
 
   it('Should link to the provided retryUrl', () => {
-    const component = new window.gl.environmentsList.RollbackComponent({
+    const component = new RollbackComponent({
       el: document.querySelector('.test-dom-element'),
       propsData: {
         retryUrl: retryURL,
@@ -22,7 +22,7 @@ describe('Rollback Component', () => {
   });
 
   it('Should render Re-deploy label when isLastDeployment is true', () => {
-    const component = new window.gl.environmentsList.RollbackComponent({
+    const component = new RollbackComponent({
       el: document.querySelector('.test-dom-element'),
       propsData: {
         retryUrl: retryURL,
@@ -34,7 +34,7 @@ describe('Rollback Component', () => {
   });
 
   it('Should render Rollback label when isLastDeployment is false', () => {
-    const component = new window.gl.environmentsList.RollbackComponent({
+    const component = new RollbackComponent({
       el: document.querySelector('.test-dom-element'),
       propsData: {
         retryUrl: retryURL,
diff --git a/spec/javascripts/environments/environment_spec.js.es6 b/spec/javascripts/environments/environment_spec.js.es6
index 8b96f4b09db..1d1a688a4a5 100644
--- a/spec/javascripts/environments/environment_spec.js.es6
+++ b/spec/javascripts/environments/environment_spec.js.es6
@@ -1,7 +1,6 @@
-/* global Vue, environment */
-
+const Vue = require('vue');
 require('~/flash');
-require('~/environments/components/environment');
+const EnvironmentsComponent = require('~/environments/components/environment');
 const { environment } = require('./mock_data');
 
 describe('Environment', () => {
@@ -32,7 +31,7 @@ describe('Environment', () => {
       });
 
       it('should render the empty state', (done) => {
-        component = new gl.environmentsList.EnvironmentsComponent({
+        component = new EnvironmentsComponent({
           el: document.querySelector('#environments-list-view'),
         });
 
@@ -72,7 +71,7 @@ describe('Environment', () => {
       });
 
       it('should render a table with environments', (done) => {
-        component = new gl.environmentsList.EnvironmentsComponent({
+        component = new EnvironmentsComponent({
           el: document.querySelector('#environments-list-view'),
         });
 
@@ -104,7 +103,7 @@ describe('Environment', () => {
     });
 
     it('should render empty state', (done) => {
-      component = new gl.environmentsList.EnvironmentsComponent({
+      component = new EnvironmentsComponent({
         el: document.querySelector('#environments-list-view'),
       });
 
diff --git a/spec/javascripts/environments/environment_stop_spec.js.es6 b/spec/javascripts/environments/environment_stop_spec.js.es6
index 2dfce5ba824..5ca65b1debc 100644
--- a/spec/javascripts/environments/environment_stop_spec.js.es6
+++ b/spec/javascripts/environments/environment_stop_spec.js.es6
@@ -1,4 +1,4 @@
-require('~/environments/components/environment_stop');
+const StopComponent = require('~/environments/components/environment_stop');
 
 describe('Stop Component', () => {
   preloadFixtures('static/environments/element.html.raw');
@@ -10,7 +10,7 @@ describe('Stop Component', () => {
     loadFixtures('static/environments/element.html.raw');
 
     stopURL = '/stop';
-    component = new window.gl.environmentsList.StopComponent({
+    component = new StopComponent({
       el: document.querySelector('.test-dom-element'),
       propsData: {
         stopUrl: stopURL,

From 19bac884c67acebcc0e6dda2a3df824049b1f726 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 7 Feb 2017 15:06:31 +0100
Subject: [PATCH 12/73] Add route for environment folder and expose an API

---
 .../projects/environments_controller.rb        | 18 ++++++++++++++++++
 config/routes/project.rb                       |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 2252ece68ce..3b7240d8469 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -28,6 +28,24 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     end
   end
 
+  def folder
+    @environments = project.environments
+      .where(environment_type: params[:id])
+      .with_state(params[:scope] || :available)
+
+    respond_to do |format|
+      format.html
+      format.json do
+        render json: {
+          environments: EnvironmentSerializer
+            .new(project: @project, user: @current_user)
+            .with_pagination(request, response)
+            .represent(@environments),
+        }
+      end
+    end
+  end
+
   def show
     @deployments = environment.deployments.order(id: :desc).page(params[:page])
   end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 2ac98cf3842..84f123ff717 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -156,6 +156,10 @@ constraints(ProjectUrlConstrainer.new) do
           get :terminal
           get '/terminal.ws/authorize', to: 'environments#terminal_websocket_authorize', constraints: { format: nil }
         end
+
+        collection do
+          get :folder, path: 'folders/:id'
+        end
       end
 
       resource :cycle_analytics, only: [:show]

From 2bd1a229060c959a177171ddbb32d1f2202b4801 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 9 Feb 2017 15:51:49 +0000
Subject: [PATCH 13/73] Disables add issue button

Previously was disabled until any list was present (except for done) this now takes into account the welcome blank state

Closes #27931
---
 app/assets/javascripts/boards/boards_bundle.js.es6 | 2 +-
 spec/features/boards/boards_spec.rb                | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/boards/boards_bundle.js.es6 b/app/assets/javascripts/boards/boards_bundle.js.es6
index 8f30900198e..878ad1b6031 100644
--- a/app/assets/javascripts/boards/boards_bundle.js.es6
+++ b/app/assets/javascripts/boards/boards_bundle.js.es6
@@ -95,7 +95,7 @@ $(() => {
     },
     computed: {
       disabled() {
-        return Store.shouldAddBlankState();
+        return !this.store.lists.filter(list => list.type !== 'blank' && list.type !== 'done').length;
       },
     },
     template: `
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 7225f38b7e5..1b25b51cfb2 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -28,6 +28,12 @@ describe 'Issue Boards', feature: true, js: true do
       expect(page).to have_content('Welcome to your Issue Board!')
     end
 
+    it 'disables add issues button by default' do
+      button = page.find('.issue-boards-search button', text: 'Add issues')
+
+      expect(button[:disabled]).to eq true
+    end
+
     it 'hides the blank state when clicking nevermind button' do
       page.within(find('.board-blank-state')) do
         click_button("Nevermind, I'll use my own")

From 482e7ff01201dba89a13f5e9979ea17c202c87c7 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 17:32:08 +0000
Subject: [PATCH 14/73] Fix broken test and linter error

---
 .../javascripts/environments/components/environment_item.js.es6 | 2 +-
 spec/javascripts/environments/mock_data.js.es6                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index cf79969471e..d0c5a343d71 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -97,7 +97,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean}
      */
     hasStopAction() {
-      return this.model['stop_action?'];
+      return this.model.latest['stop_action?'];
     },
 
     /**
diff --git a/spec/javascripts/environments/mock_data.js.es6 b/spec/javascripts/environments/mock_data.js.es6
index bdecc95d219..081897f5456 100644
--- a/spec/javascripts/environments/mock_data.js.es6
+++ b/spec/javascripts/environments/mock_data.js.es6
@@ -55,5 +55,5 @@ const environment = {
 
 module.exports = {
   environmentsList,
-  environment
+  environment,
 };

From d0d94e4f104c276ee4095a76d1204daae384c708 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 10 Feb 2017 09:36:52 +0100
Subject: [PATCH 15/73] Fix pagination headers in grouped environments API

---
 app/serializers/environment_serializer.rb     | 23 +++++++++++--------
 .../environment_serializer_spec.rb            | 11 +++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/serializers/environment_serializer.rb b/app/serializers/environment_serializer.rb
index fe16a3784c4..d0a60f134da 100644
--- a/app/serializers/environment_serializer.rb
+++ b/app/serializers/environment_serializer.rb
@@ -20,8 +20,6 @@ class EnvironmentSerializer < BaseSerializer
   end
 
   def represent(resource, opts = {})
-    resource = @paginator.paginate(resource) if paginated?
-
     if itemized?
       itemize(resource).map do |item|
         { name: item.name,
@@ -29,6 +27,8 @@ class EnvironmentSerializer < BaseSerializer
           latest: super(item.latest, opts) }
       end
     else
+      resource = @paginator.paginate(resource) if paginated?
+
       super(resource, opts)
     end
   end
@@ -36,15 +36,20 @@ class EnvironmentSerializer < BaseSerializer
   private
 
   def itemize(resource)
-    items = resource.group(:item_name).order('item_name ASC')
-      .pluck('COALESCE(environment_type, name) AS item_name',
-             'COUNT(*) AS environments_count',
-             'MAX(id) AS last_environment_id')
+    items = resource.order('folder_name ASC')
+      .group('COALESCE(environment_type, name)')
+      .select('COALESCE(environment_type, name) AS folder_name',
+              'COUNT(*) AS size', 'MAX(id) AS last_id')
 
-    environments = resource.where(id: items.map(&:last)).index_by(&:id)
+    # It makes a difference when you call `paginate` method, because
+    # although `page` is effective at the end, it calls counting methods
+    # immediately.
+    items = @paginator.paginate(items) if paginated?
 
-    items.map do |name, size, id|
-      Item.new(name, size, environments[id])
+    environments = resource.where(id: items.map(&:last_id)).index_by(&:id)
+
+    items.map do |item|
+      Item.new(item.folder_name, item.size, environments[item.last_id])
     end
   end
 end
diff --git a/spec/serializers/environment_serializer_spec.rb b/spec/serializers/environment_serializer_spec.rb
index 1b95f1ff198..6a6df377b35 100644
--- a/spec/serializers/environment_serializer_spec.rb
+++ b/spec/serializers/environment_serializer_spec.rb
@@ -181,6 +181,17 @@ describe EnvironmentSerializer do
           expect(subject.first[:name]).to eq 'production'
           expect(subject.second[:name]).to eq 'staging'
         end
+
+        it 'appends correct total page count header' do
+          expect(subject).not_to be_empty
+          expect(response).to have_received(:[]=).with('X-Total', '3')
+        end
+
+        it 'appends correct page count headers' do
+          expect(subject).not_to be_empty
+          expect(response).to have_received(:[]=).with('X-Total-Pages', '2')
+          expect(response).to have_received(:[]=).with('X-Per-Page', '2')
+        end
       end
     end
   end

From f7d8c29e71dc3a5aed4cf7252beaee6fe634de6b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Sun, 12 Feb 2017 12:10:29 +0000
Subject: [PATCH 16/73] Fix broken path

---
 .../components/environment_item.js.es6        | 108 ++++++++++++++----
 1 file changed, 83 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 399473bec65..391539232b1 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -1,5 +1,5 @@
 const Vue = require('vue');
-const Timeago = require('timeago.j');
+const Timeago = require('timeago.js');
 
 require('../../lib/utils/text_utility');
 require('../../vue_shared/components/commit');
@@ -72,7 +72,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean}
      */
     hasLastDeploymentKey() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.lastest && this.model.latest.last_deployment &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment)) {
         return true;
       }
@@ -86,7 +86,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     hasManualActions() {
-      return this.model.latest.last_deployment &&
+      return this.model.lastest && this.model.latest.last_deployment &&
         this.model.latest.last_deployment.manual_actions &&
         this.model.latest.last_deployment.manual_actions.length > 0;
     },
@@ -107,7 +107,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     canRetry() {
-      return this.hasLastDeploymentKey &&
+      return this.model.lastest &&
+        this.hasLastDeploymentKey &&
         this.model.latest.last_deployment &&
         this.model.latest.last_deployment.deployable;
     },
@@ -118,7 +119,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     canShowDate() {
-      return this.model.latest.last_deployment &&
+      return this.model.lastest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.deployable &&
         this.model.latest.last_deployment.deployable !== undefined;
     },
@@ -129,7 +131,13 @@ module.exports = Vue.component('environment-item', {
      * @returns {String}
      */
     createdDate() {
-      return timeagoInstance.format(this.model.latest.last_deployment.deployable.created_at);
+      if (this.model.lastest &&
+        this.model.latest.last_deployment &&
+        this.model.lastest.last_deployment.deployable &&
+        this.model.latest.last_deployment.deployable.created_at) {
+        return timeagoInstance.format(this.model.latest.last_deployment.deployable.created_at);
+      }
+      return '';
     },
 
     /**
@@ -156,7 +164,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {String}
      */
     userImageAltDescription() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.user &&
         this.model.latest.last_deployment.user.username) {
         return `${this.model.latest.last_deployment.user.username}'s avatar'`;
@@ -170,7 +179,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     commitTag() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.tag) {
         return this.model.latest.last_deployment.tag;
       }
@@ -183,7 +193,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {Object|Undefined}
      */
     commitRef() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.ref) {
         return this.model.latest.last_deployment.ref;
       }
@@ -196,7 +207,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     commitUrl() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.commit &&
         this.model.latest.last_deployment.commit.commit_path) {
         return this.model.latest.last_deployment.commit.commit_path;
@@ -210,7 +222,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     commitShortSha() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.commit &&
         this.model.latest.last_deployment.commit.short_id) {
         return this.model.latest.last_deployment.commit.short_id;
@@ -224,7 +237,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     commitTitle() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.commit &&
         this.model.latest.last_deployment.commit.title) {
         return this.model.latest.last_deployment.commit.title;
@@ -238,7 +252,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {Object|Undefined}
      */
     commitAuthor() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.commit &&
         this.model.latest.last_deployment.commit.author) {
         return this.model.latest.last_deployment.commit.author;
@@ -253,7 +268,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     retryUrl() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.deployable &&
         this.model.latest.last_deployment.deployable.retry_path) {
         return this.model.latest.last_deployment.deployable.retry_path;
@@ -267,7 +283,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     isLastDeployment() {
-      return this.model.latest.last_deployment &&
+      return this.model.latest && this.model.latest.last_deployment &&
         this.model.latest.last_deployment['last?'];
     },
 
@@ -277,7 +293,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {String}
      */
     buildName() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.deployable) {
         return `${this.model.latest.last_deployment.deployable.name} #${this.model.latest.last_deployment.deployable.id}`;
       }
@@ -290,7 +307,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {String}
      */
     deploymentInternalId() {
-      if (this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.iid) {
         return `#${this.model.latest.last_deployment.iid}`;
       }
@@ -303,7 +321,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean}
      */
     deploymentHasUser() {
-      return !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+      return this.model.latest &&
+        !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment.user);
     },
 
@@ -314,7 +333,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {Object}
      */
     deploymentUser() {
-      if (!this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
+      if (this.model.latest &&
+        !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment.user)) {
         return this.model.latest.last_deployment.user;
       }
@@ -330,10 +350,39 @@ module.exports = Vue.component('environment-item', {
      */
     shouldRenderBuildName() {
       return !this.model.isFolder &&
+        this.model.lastest &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
     },
 
+    /**
+     * Verifies the presence of all the keys needed to render the buil_path.
+     *
+     * @return {String}
+     */
+    buildPath() {
+      if (this.model.latest &&
+        this.model.lastest.last_deployment &&
+        this.model.latest.last_deployment.deployable &&
+        this.model.lastest.last_deployment.deployable.build_path) {
+        return this.model.lastest.last_deployment.deployable.build_path;
+      }
+
+      return '';
+    },
+    /**
+     * Verifies the presence of all the keys needed to render the external_url.
+     *
+     * @return {String}
+     */
+    externalURL() {
+      if (this.model.latest && this.model.latest.external_url) {
+        return this.model.latest.external_url;
+      }
+
+      return '';
+    },
+
     /**
      * Verifies if deplyment internal ID should be rendered by verifing
      * if all the information needed is present
@@ -343,9 +392,18 @@ module.exports = Vue.component('environment-item', {
      */
     shouldRenderDeploymentID() {
       return !this.model.isFolder &&
+        this.model.lastest &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
         this.model.latest.last_deployment.iid !== undefined;
     },
+
+    environmentPath() {
+      if (this.model && this.model.lastest && this.model.latest.environment_path) {
+        return this.model.latest.environment_path;
+      }
+
+      return '';
+    },
   },
 
   /**
@@ -368,7 +426,7 @@ module.exports = Vue.component('environment-item', {
       <td>
         <a v-if="!model.isFolder"
           class="environment-name"
-          :href="model.latest.environment_path">
+          :href="environmentPath">
           {{model.name}}
         </a>
         <a v-else class="folder-name">
@@ -406,7 +464,7 @@ module.exports = Vue.component('environment-item', {
       <td class="environments-build-cell">
         <a v-if="shouldRenderBuildName"
           class="build-link"
-          :href="model.latest.last_deployment.deployable.build_path">
+          :href="buildPath">
           {{buildName}}
         </a>
       </td>
@@ -445,21 +503,21 @@ module.exports = Vue.component('environment-item', {
             </actions-component>
           </div>
 
-          <div v-if="model.latest.external_url && canReadEnvironment"
+          <div v-if="externalURL && canReadEnvironment"
             class="inline js-external-url-container">
             <external-url-component
-              :external-url="model.latest.external_url">
+              :external-url="externalURL">
             </external-url-component>
           </div>
 
-          <div v-if="hasStopAction && canCreateDeployment"
+          <div v-if="hasStopAction && canCreateDeployment && model.latest"
             class="inline js-stop-component-container">
             <stop-component
               :stop-url="model.latest.stop_path">
             </stop-component>
           </div>
 
-          <div v-if="model.latest.terminal_path"
+          <div v-if="model.latest && model.latest.terminal_path"
             class="inline js-terminal-button-container">
             <terminal-button-component
               :terminal-icon-svg="terminalIconSvg"

From b8dbebce1d7e0ad4edf2ab09135457ade69c240c Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Sun, 12 Feb 2017 13:43:46 +0000
Subject: [PATCH 17/73] Fix typo

---
 .../components/environment_item.js.es6        | 24 +++++++++----------
 spec/features/projects/builds_spec.rb         |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 391539232b1..7805152b173 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -72,7 +72,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean}
      */
     hasLastDeploymentKey() {
-      if (this.model.lastest && this.model.latest.last_deployment &&
+      if (this.model.latest && this.model.latest.last_deployment &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment)) {
         return true;
       }
@@ -86,7 +86,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     hasManualActions() {
-      return this.model.lastest && this.model.latest.last_deployment &&
+      return this.model.latest && this.model.latest.last_deployment &&
         this.model.latest.last_deployment.manual_actions &&
         this.model.latest.last_deployment.manual_actions.length > 0;
     },
@@ -107,7 +107,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     canRetry() {
-      return this.model.lastest &&
+      return this.model.latest &&
         this.hasLastDeploymentKey &&
         this.model.latest.last_deployment &&
         this.model.latest.last_deployment.deployable;
@@ -119,7 +119,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     canShowDate() {
-      return this.model.lastest &&
+      return this.model.latest &&
         this.model.latest.last_deployment &&
         this.model.latest.last_deployment.deployable &&
         this.model.latest.last_deployment.deployable !== undefined;
@@ -131,9 +131,9 @@ module.exports = Vue.component('environment-item', {
      * @returns {String}
      */
     createdDate() {
-      if (this.model.lastest &&
+      if (this.model.latest &&
         this.model.latest.last_deployment &&
-        this.model.lastest.last_deployment.deployable &&
+        this.model.latest.last_deployment.deployable &&
         this.model.latest.last_deployment.deployable.created_at) {
         return timeagoInstance.format(this.model.latest.last_deployment.deployable.created_at);
       }
@@ -350,7 +350,7 @@ module.exports = Vue.component('environment-item', {
      */
     shouldRenderBuildName() {
       return !this.model.isFolder &&
-        this.model.lastest &&
+        this.model.latest &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
     },
@@ -362,10 +362,10 @@ module.exports = Vue.component('environment-item', {
      */
     buildPath() {
       if (this.model.latest &&
-        this.model.lastest.last_deployment &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.deployable &&
-        this.model.lastest.last_deployment.deployable.build_path) {
-        return this.model.lastest.last_deployment.deployable.build_path;
+        this.model.latest.last_deployment.deployable.build_path) {
+        return this.model.latest.last_deployment.deployable.build_path;
       }
 
       return '';
@@ -392,13 +392,13 @@ module.exports = Vue.component('environment-item', {
      */
     shouldRenderDeploymentID() {
       return !this.model.isFolder &&
-        this.model.lastest &&
+        this.model.latest &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
         this.model.latest.last_deployment.iid !== undefined;
     },
 
     environmentPath() {
-      if (this.model && this.model.lastest && this.model.latest.environment_path) {
+      if (this.model && this.model.latest && this.model.latest.environment_path) {
         return this.model.latest.environment_path;
       }
 
diff --git a/spec/features/projects/builds_spec.rb b/spec/features/projects/builds_spec.rb
index f7e0115643e..80ba5ff1a63 100644
--- a/spec/features/projects/builds_spec.rb
+++ b/spec/features/projects/builds_spec.rb
@@ -271,7 +271,7 @@ feature 'Builds', :feature do
         let!(:deployment) { create(:deployment, environment: environment, sha: project.commit.id) }
         let(:build) { create(:ci_build, :success, environment: environment.name, pipeline: pipeline) }
 
-        it 'shows a link to lastest deployment' do
+        it 'shows a link to latest deployment' do
           visit namespace_project_build_path(project.namespace, project, build)
 
           expect(page).to have_link('latest deployment')

From 991a7ae86055df2d0eb619e1d29a1e24e322c741 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 12:18:47 +0000
Subject: [PATCH 18/73] Adds pagination component

---
 .../components/environment.js.es6             | 25 +++++++++++++++++--
 .../stores/environments_store.js.es6          | 13 ++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 11a965fcddf..f89dbdbda1d 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -6,11 +6,13 @@ Vue.use(require('vue-resource'));
 const EnvironmentsService = require('../services/environments_service');
 const EnvironmentItem = require('./environment_item');
 const Store = require('../stores/environments_store');
+require('../../vue_shared/components/table_pagination');
 
 module.exports = Vue.component('environment-component', {
 
   components: {
     'environment-item': EnvironmentItem,
+    'table-pagination': gl.VueGlPagination,
   },
 
   data() {
@@ -34,6 +36,10 @@ module.exports = Vue.component('environment-component', {
       commitIconSvg: environmentsData.commitIconSvg,
       playIconSvg: environmentsData.playIconSvg,
       terminalIconSvg: environmentsData.terminalIconSvg,
+
+      // Pagination Properties,
+      paginationInformation: {},
+      pageNumber: 1,
     };
   },
 
@@ -61,14 +67,18 @@ module.exports = Vue.component('environment-component', {
    */
   created() {
     const scope = this.$options.getQueryParameter('scope') || this.visibility;
-    const endpoint = `${this.endpoint}?scope=${scope}`;
+    const pageNumber = this.$options.getQueryParameter('page') || this.pageNumber;
+    const endpoint = `${this.endpoint}?scope=${scope}&page=${pageNumber}`;
 
     const service = new EnvironmentsService(endpoint);
 
     this.isLoading = true;
 
     return service.all()
-      .then(resp => resp.json())
+      .then((resp) => {
+        debugger;
+        return resp.json();
+      })
       .then((json) => {
         this.store.storeAvailableCount(json.available_count);
         this.store.storeStoppedCount(json.stopped_count);
@@ -111,6 +121,10 @@ module.exports = Vue.component('environment-component', {
     toggleRow(model) {
       return this.store.toggleFolder(model.name);
     },
+
+    changePage(pageNumber, scope) {
+      gl.utils.visitUrl(`?scope=${scope}&p=${pageNumber}`);
+    },
   },
 
   template: `
@@ -192,6 +206,13 @@ module.exports = Vue.component('environment-component', {
               </template>
             </tbody>
           </table>
+
+          <table-pagination v-if="!isLoading && state.environments.length"
+            :pagenum="1"
+            :count="2"
+            :change="changePage"
+            :pageInfo="paginationInformation">
+          </table-pagination>
         </div>
       </div>
     </div>
diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index 749dd882188..e55b8624ac8 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -1,3 +1,4 @@
+require('~/lib/utils/common_utils');
 /**
  * Environments Store.
  *
@@ -10,6 +11,7 @@ class EnvironmentsStore {
     this.state.environments = [];
     this.state.stoppedCounter = 0;
     this.state.availableCounter = 0;
+    this.state.paginationInformation = {};
 
     return this;
   }
@@ -41,6 +43,17 @@ class EnvironmentsStore {
     return filteredEnvironments;
   }
 
+  storePagination(pagination = {}) {
+    const normalizedHeaders = gl.utils.normalizedHeaders(pagination);
+
+    const paginationInformation = {
+
+    };
+
+    this.paginationInformation = paginationInformation;
+    return paginationInformation;
+  }
+
   /**
    * Stores the number of available environments.
    *

From fb35980893f918f7dbad0f433447c6df13a1c757 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 14:49:13 +0000
Subject: [PATCH 19/73] Verify `latest` key is present when needed

---
 .../environments/components/environment_item.js.es6  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 7805152b173..d3ca4cb8dde 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -355,6 +355,18 @@ module.exports = Vue.component('environment-item', {
         !this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
     },
 
+    buildPath(){
+      return this.model.latest &&
+        this.model.latest.last_deployment &&
+        this.model.latest.last_deployment.deployable &&
+        this.model.latest.last_deployment.deployable.build_path ||
+        '';
+    },
+
+    externalURL() {
+      return this.model.latest && this.model.latest.external_url || '';
+    },
+
     /**
      * Verifies the presence of all the keys needed to render the buil_path.
      *

From 595afed2e3de93d1685b2f77dd8e72df2781a57b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 9 Feb 2017 15:10:16 +0000
Subject: [PATCH 20/73] Integrates pagination component with API

Adds pagination tests

Remove misplaced comment

Fix broken store test
---
 .../components/environment.js.es6             | 37 +++++++++++--------
 .../components/environment_item.js.es6        | 16 +++++++-
 .../stores/environments_store.js.es6          | 12 ++++--
 .../vue_pipelines_index/pipelines.js.es6      |  1 +
 .../components/table_pagination.js.es6        |  4 +-
 .../environments/environment_spec.js.es6      | 28 +++++++++++---
 .../environments_store_spec.js.es6            | 36 +++++++++++++++---
 7 files changed, 100 insertions(+), 34 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index f89dbdbda1d..d5bb9f91e7f 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -59,6 +59,7 @@ module.exports = Vue.component('environment-component', {
     canCreateEnvironmentParsed() {
       return this.$options.convertPermissionToBoolean(this.canCreateEnvironment);
     },
+
   },
 
   /**
@@ -68,6 +69,7 @@ module.exports = Vue.component('environment-component', {
   created() {
     const scope = this.$options.getQueryParameter('scope') || this.visibility;
     const pageNumber = this.$options.getQueryParameter('page') || this.pageNumber;
+
     const endpoint = `${this.endpoint}?scope=${scope}&page=${pageNumber}`;
 
     const service = new EnvironmentsService(endpoint);
@@ -75,14 +77,15 @@ module.exports = Vue.component('environment-component', {
     this.isLoading = true;
 
     return service.all()
-      .then((resp) => {
-        debugger;
-        return resp.json();
-      })
-      .then((json) => {
-        this.store.storeAvailableCount(json.available_count);
-        this.store.storeStoppedCount(json.stopped_count);
-        this.store.storeEnvironments(json.environments);
+      .then(resp => ({
+        headers: resp.headers,
+        body: resp.json(),
+      }))
+      .then((response) => {
+        this.store.storeAvailableCount(response.body.available_count);
+        this.store.storeStoppedCount(response.body.stopped_count);
+        this.store.storeEnvironments(response.body.environments);
+        this.store.storePagination(response.headers);
       })
       .then(() => {
         this.isLoading = false;
@@ -122,8 +125,14 @@ module.exports = Vue.component('environment-component', {
       return this.store.toggleFolder(model.name);
     },
 
-    changePage(pageNumber, scope) {
-      gl.utils.visitUrl(`?scope=${scope}&p=${pageNumber}`);
+    /**
+     * Will change the page number and update the URL.
+     *
+     * @param  {Number} pageNumber desired page to go to.
+     */
+    changePage(pageNumber) {
+      const param = window.location.search.replace(/page=\d/g, `page=${pageNumber}`);
+      gl.utils.visitUrl(param);
     },
   },
 
@@ -131,7 +140,7 @@ module.exports = Vue.component('environment-component', {
     <div :class="cssContainerClass">
       <div class="top-area">
         <ul v-if="!isLoading" class="nav-links">
-          <li v-bind:class="{ 'active': scope === undefined }">
+          <li v-bind:class="{ 'active': scope === undefined || scope === 'available' }">
             <a :href="projectEnvironmentsPath">
               Available
               <span class="badge js-available-environments-count">
@@ -207,11 +216,9 @@ module.exports = Vue.component('environment-component', {
             </tbody>
           </table>
 
-          <table-pagination v-if="!isLoading && state.environments.length"
-            :pagenum="1"
-            :count="2"
+          <table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
             :change="changePage"
-            :pageInfo="paginationInformation">
+            :pageInfo="state.paginationInformation">
           </table-pagination>
         </div>
       </div>
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index d3ca4cb8dde..1648f06a991 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -355,6 +355,11 @@ module.exports = Vue.component('environment-item', {
         !this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
     },
 
+    /**
+     * Verifies the presence of all the keys needed to render the buil_path.
+     *
+     * @return {String}
+     */
     buildPath(){
       return this.model.latest &&
         this.model.latest.last_deployment &&
@@ -363,8 +368,17 @@ module.exports = Vue.component('environment-item', {
         '';
     },
 
+    /**
+     * Verifies the presence of all the keys needed to render the external_url.
+     *
+     * @return {String}
+     */
     externalURL() {
-      return this.model.latest && this.model.latest.external_url || '';
+      if (this.model.latest && this.model.latest.external_url) {
+        return this.model.latest.external_url;
+      }
+
+      return '';
     },
 
     /**
diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index e55b8624ac8..252e349962e 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -44,13 +44,17 @@ class EnvironmentsStore {
   }
 
   storePagination(pagination = {}) {
-    const normalizedHeaders = gl.utils.normalizedHeaders(pagination);
-
+    const normalizedHeaders = gl.utils.normalizeHeaders(pagination);
     const paginationInformation = {
-
+      perPage: parseInt(normalizedHeaders['X-PER-PAGE'], 10),
+      page: parseInt(normalizedHeaders['X-PAGE'], 10),
+      total: parseInt(normalizedHeaders['X-TOTAL'], 10),
+      totalPages: parseInt(normalizedHeaders['X-TOTAL-PAGES'], 10),
+      nextPage: parseInt(normalizedHeaders['X-NEXT-PAGE'], 10),
+      previousPage: parseInt(normalizedHeaders['X-PREV-PAGE'], 10),
     };
 
-    this.paginationInformation = paginationInformation;
+    this.state.paginationInformation = paginationInformation;
     return paginationInformation;
   }
 
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index e47dc6935d6..9e816a285e4 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -36,6 +36,7 @@ require('../vue_shared/components/pipelines_table');
     },
     methods: {
       change(pagenum, apiScope) {
+        if (!apiScope) apiScope = 'all';
         gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
       },
     },
diff --git a/app/assets/javascripts/vue_shared/components/table_pagination.js.es6 b/app/assets/javascripts/vue_shared/components/table_pagination.js.es6
index 67c6cb73761..d8042a9b7fc 100644
--- a/app/assets/javascripts/vue_shared/components/table_pagination.js.es6
+++ b/app/assets/javascripts/vue_shared/components/table_pagination.js.es6
@@ -57,9 +57,7 @@ window.Vue = require('vue');
     },
     methods: {
       changePage(e) {
-        let apiScope = gl.utils.getParameterByName('scope');
-
-        if (!apiScope) apiScope = 'all';
+        const apiScope = gl.utils.getParameterByName('scope');
 
         const text = e.target.innerText;
         const { totalPages, nextPage, previousPage } = this.pageInfo;
diff --git a/spec/javascripts/environments/environment_spec.js.es6 b/spec/javascripts/environments/environment_spec.js.es6
index 1d1a688a4a5..f557dcee91f 100644
--- a/spec/javascripts/environments/environment_spec.js.es6
+++ b/spec/javascripts/environments/environment_spec.js.es6
@@ -49,7 +49,7 @@ describe('Environment', () => {
       });
     });
 
-    describe('with environments', () => {
+    describe('with paginated environments', () => {
       const environmentsResponseInterceptor = (request, next) => {
         next(request.respondWith(JSON.stringify({
           environments: [environment],
@@ -57,11 +57,22 @@ describe('Environment', () => {
           available_count: 0,
         }), {
           status: 200,
+          headers: {
+            'X-Next-Page': '2',
+            'X-Page': '1',
+            'X-Per-Page': '1',
+            'X-Prev-Page': '',
+            'X-Total': '37',
+            'X-Total-Pages': '2',
+          },
         }));
       };
 
       beforeEach(() => {
         Vue.http.interceptors.push(environmentsResponseInterceptor);
+        component = new EnvironmentsComponent({
+          el: document.querySelector('#environments-list-view'),
+        });
       });
 
       afterEach(() => {
@@ -71,10 +82,6 @@ describe('Environment', () => {
       });
 
       it('should render a table with environments', (done) => {
-        component = new EnvironmentsComponent({
-          el: document.querySelector('#environments-list-view'),
-        });
-
         setTimeout(() => {
           expect(
             component.$el.querySelectorAll('table tbody tr').length,
@@ -82,6 +89,17 @@ describe('Environment', () => {
           done();
         }, 0);
       });
+
+      describe('pagination', () => {
+        it('should render pagination', (done) => {
+          setTimeout(() => {
+            expect(
+              component.$el.querySelectorAll('.gl-pagination li').length,
+            ).toEqual(5);
+            done();
+          }, 0);
+        });
+      });
     });
   });
 
diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6
index 861136c621f..8fd660c3edb 100644
--- a/spec/javascripts/environments/environments_store_spec.js.es6
+++ b/spec/javascripts/environments/environments_store_spec.js.es6
@@ -10,24 +10,48 @@ const { environmentsList } = require('./mock_data');
     });
 
     it('should start with a blank state', () => {
-      expect(store.state.environments.length).toBe(0);
-      expect(store.state.stoppedCounter).toBe(0);
-      expect(store.state.availableCounter).toBe(0);
+      expect(store.state.environments.length).toEqual(0);
+      expect(store.state.stoppedCounter).toEqual(0);
+      expect(store.state.availableCounter).toEqual(0);
+      expect(store.state.paginationInformation).toEqual({});
     });
 
     it('should store environments', () => {
       store.storeEnvironments(environmentsList);
-      expect(store.state.environments.length).toBe(environmentsList.length);
+      expect(store.state.environments.length).toEqual(environmentsList.length);
     });
 
     it('should store available count', () => {
       store.storeAvailableCount(2);
-      expect(store.state.availableCounter).toBe(2);
+      expect(store.state.availableCounter).toEqual(2);
     });
 
     it('should store stopped count', () => {
       store.storeStoppedCount(2);
-      expect(store.state.stoppedCounter).toBe(2);
+      expect(store.state.stoppedCounter).toEqual(2);
+    });
+
+    it('should store pagination information', () => {
+      const pagination = {
+        'X-nExt-pAge': '2',
+        'X-page': '1',
+        'X-Per-Page': '1',
+        'X-Prev-Page': '2',
+        'X-TOTAL': '37',
+        'X-Total-Pages': '2',
+      };
+
+      const expectedResult = {
+        perPage: 1,
+        page: 1,
+        total: 37,
+        totalPages: 2,
+        nextPage: 2,
+        previousPage: 2,
+      };
+
+      store.storePagination(pagination);
+      expect(store.state.paginationInformation).toEqual(expectedResult);
     });
   });
 })();

From 27d7ec70b1efcaac73095e6ea3894b0eb9ba8473 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 10 Feb 2017 17:26:48 +0000
Subject: [PATCH 21/73] Remove spec checking for scope 'all' since it's no
 longer part of component

Changes after review

Fix typo
---
 .../environments/components/environment_item.js.es6  |  6 ++++--
 .../javascripts/environments/environment_spec.js.es6 |  6 +++---
 .../components/table_pagination_spec.js.es6          | 12 ++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 1648f06a991..871a09977a4 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -72,7 +72,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean}
      */
     hasLastDeploymentKey() {
-      if (this.model.latest && this.model.latest.last_deployment &&
+      if (this.model.latest &&
+        this.model.latest.last_deployment &&
         !this.$options.isObjectEmpty(this.model.latest.last_deployment)) {
         return true;
       }
@@ -86,7 +87,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     hasManualActions() {
-      return this.model.latest && this.model.latest.last_deployment &&
+      return this.model.latest &&
+        this.model.latest.last_deployment &&
         this.model.latest.last_deployment.manual_actions &&
         this.model.latest.last_deployment.manual_actions.length > 0;
     },
diff --git a/spec/javascripts/environments/environment_spec.js.es6 b/spec/javascripts/environments/environment_spec.js.es6
index f557dcee91f..657d8d2ab02 100644
--- a/spec/javascripts/environments/environment_spec.js.es6
+++ b/spec/javascripts/environments/environment_spec.js.es6
@@ -58,11 +58,11 @@ describe('Environment', () => {
         }), {
           status: 200,
           headers: {
-            'X-Next-Page': '2',
-            'X-Page': '1',
+            'X-nExt-pAge': '2',
+            'x-page': '1',
             'X-Per-Page': '1',
             'X-Prev-Page': '',
-            'X-Total': '37',
+            'X-TOTAL': '37',
             'X-Total-Pages': '2',
           },
         }));
diff --git a/spec/javascripts/vue_shared/components/table_pagination_spec.js.es6 b/spec/javascripts/vue_shared/components/table_pagination_spec.js.es6
index e84f0dcfe67..dd495cb43bc 100644
--- a/spec/javascripts/vue_shared/components/table_pagination_spec.js.es6
+++ b/spec/javascripts/vue_shared/components/table_pagination_spec.js.es6
@@ -34,7 +34,7 @@ describe('Pagination component', () => {
     component.changePage({ target: { innerText: '1' } });
 
     expect(changeChanges.one).toEqual(1);
-    expect(changeChanges.two).toEqual('all');
+    expect(changeChanges.two).toEqual(null);
   });
 
   it('should go to the previous page', () => {
@@ -55,7 +55,7 @@ describe('Pagination component', () => {
     component.changePage({ target: { innerText: 'Prev' } });
 
     expect(changeChanges.one).toEqual(1);
-    expect(changeChanges.two).toEqual('all');
+    expect(changeChanges.two).toEqual(null);
   });
 
   it('should go to the next page', () => {
@@ -76,7 +76,7 @@ describe('Pagination component', () => {
     component.changePage({ target: { innerText: 'Next' } });
 
     expect(changeChanges.one).toEqual(5);
-    expect(changeChanges.two).toEqual('all');
+    expect(changeChanges.two).toEqual(null);
   });
 
   it('should go to the last page', () => {
@@ -97,7 +97,7 @@ describe('Pagination component', () => {
     component.changePage({ target: { innerText: 'Last >>' } });
 
     expect(changeChanges.one).toEqual(10);
-    expect(changeChanges.two).toEqual('all');
+    expect(changeChanges.two).toEqual(null);
   });
 
   it('should go to the first page', () => {
@@ -118,7 +118,7 @@ describe('Pagination component', () => {
     component.changePage({ target: { innerText: '<< First' } });
 
     expect(changeChanges.one).toEqual(1);
-    expect(changeChanges.two).toEqual('all');
+    expect(changeChanges.two).toEqual(null);
   });
 
   it('should do nothing', () => {
@@ -139,7 +139,7 @@ describe('Pagination component', () => {
     component.changePage({ target: { innerText: '...' } });
 
     expect(changeChanges.one).toEqual(1);
-    expect(changeChanges.two).toEqual('all');
+    expect(changeChanges.two).toEqual(null);
   });
 });
 

From c2fe699ac801fd2440cc4b57083a60a334cffa06 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Sun, 12 Feb 2017 13:04:00 +0000
Subject: [PATCH 22/73] Add pagination tests for environments table

Remove fdescribe statement

Fix conflict
---
 .../components/environment.js.es6             | 20 ++++++++-
 .../components/environment_item.js.es6        | 27 +-----------
 .../environments/environment_spec.js.es6      | 42 +++++++++++++++++++
 3 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index d5bb9f91e7f..6d9599e7645 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -128,11 +128,29 @@ module.exports = Vue.component('environment-component', {
     /**
      * Will change the page number and update the URL.
      *
+     * If no search params are present, we'll add param for page
+     * If param for page is already present, we'll update it
+     * If there are params but none for page, we'll add it at the end.
+     *
      * @param  {Number} pageNumber desired page to go to.
      */
     changePage(pageNumber) {
-      const param = window.location.search.replace(/page=\d/g, `page=${pageNumber}`);
+      let param;
+      if (window.location.search.length === 0) {
+        param = `?page=${pageNumber}`;
+      }
+
+      if (window.location.search.indexOf('page') !== -1) {
+        param = window.location.search.replace(/page=\d/g, `page=${pageNumber}`);
+      }
+
+      if (window.location.search.length &&
+        window.location.search.indexOf('page') === -1) {
+        param = `${window.location.search}&page=${pageNumber}`;
+      }
+
       gl.utils.visitUrl(param);
+      return param;
     },
   },
 
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 871a09977a4..fc45c3c5f53 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -357,32 +357,6 @@ module.exports = Vue.component('environment-item', {
         !this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
     },
 
-    /**
-     * Verifies the presence of all the keys needed to render the buil_path.
-     *
-     * @return {String}
-     */
-    buildPath(){
-      return this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.deployable &&
-        this.model.latest.last_deployment.deployable.build_path ||
-        '';
-    },
-
-    /**
-     * Verifies the presence of all the keys needed to render the external_url.
-     *
-     * @return {String}
-     */
-    externalURL() {
-      if (this.model.latest && this.model.latest.external_url) {
-        return this.model.latest.external_url;
-      }
-
-      return '';
-    },
-
     /**
      * Verifies the presence of all the keys needed to render the buil_path.
      *
@@ -398,6 +372,7 @@ module.exports = Vue.component('environment-item', {
 
       return '';
     },
+
     /**
      * Verifies the presence of all the keys needed to render the external_url.
      *
diff --git a/spec/javascripts/environments/environment_spec.js.es6 b/spec/javascripts/environments/environment_spec.js.es6
index 657d8d2ab02..edd0cad32d0 100644
--- a/spec/javascripts/environments/environment_spec.js.es6
+++ b/spec/javascripts/environments/environment_spec.js.es6
@@ -99,6 +99,48 @@ describe('Environment', () => {
             done();
           }, 0);
         });
+
+        it('should update url when no search params are present', (done) => {
+          spyOn(gl.utils, 'visitUrl');
+          setTimeout(() => {
+            component.$el.querySelector('.gl-pagination li:nth-child(5) a').click();
+            expect(gl.utils.visitUrl).toHaveBeenCalledWith('?page=2');
+            done();
+          }, 0);
+        });
+
+        it('should update url when page is already present', (done) => {
+          spyOn(gl.utils, 'visitUrl');
+          window.history.pushState({}, null, '?page=1');
+
+          setTimeout(() => {
+            component.$el.querySelector('.gl-pagination li:nth-child(5) a').click();
+            expect(gl.utils.visitUrl).toHaveBeenCalledWith('?page=2');
+            done();
+          }, 0);
+        });
+
+        it('should update url when page and scope are already present', (done) => {
+          spyOn(gl.utils, 'visitUrl');
+          window.history.pushState({}, null, '?scope=all&page=1');
+
+          setTimeout(() => {
+            component.$el.querySelector('.gl-pagination li:nth-child(5) a').click();
+            expect(gl.utils.visitUrl).toHaveBeenCalledWith('?scope=all&page=2');
+            done();
+          }, 0);
+        });
+
+        it('should update url when page and scope are already present and page is first param', (done) => {
+          spyOn(gl.utils, 'visitUrl');
+          window.history.pushState({}, null, '?page=1&scope=all');
+
+          setTimeout(() => {
+            component.$el.querySelector('.gl-pagination li:nth-child(5) a').click();
+            expect(gl.utils.visitUrl).toHaveBeenCalledWith('?page=2&scope=all');
+            done();
+          }, 0);
+        });
       });
     });
   });

From 142432ce5ae78cc873b9748f41e54257adc56dcc Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Tue, 14 Feb 2017 17:27:29 +1100
Subject: [PATCH 23/73] update issue count when closing/reopening an issue

---
 app/assets/javascripts/issue.js | 3 +++
 spec/javascripts/issue_spec.js  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js
index 6c08b1b8e61..1776b3d61f6 100644
--- a/app/assets/javascripts/issue.js
+++ b/app/assets/javascripts/issue.js
@@ -54,16 +54,19 @@ require('vendor/task_list');
           success: function(data, textStatus, jqXHR) {
             if ('id' in data) {
               $(document).trigger('issuable:change');
+              const currentTotal = Number($('.issue_counter').text());
               if (isClose) {
                 $('a.btn-close').addClass('hidden');
                 $('a.btn-reopen').removeClass('hidden');
                 $('div.status-box-closed').removeClass('hidden');
                 $('div.status-box-open').addClass('hidden');
+                $('.issue_counter').text(currentTotal - 1);
               } else {
                 $('a.btn-reopen').addClass('hidden');
                 $('a.btn-close').removeClass('hidden');
                 $('div.status-box-closed').addClass('hidden');
                 $('div.status-box-open').removeClass('hidden');
+                $('.issue_counter').text(currentTotal + 1);
               }
             } else {
               new Flash(issueFailMessage, 'alert');
diff --git a/spec/javascripts/issue_spec.js b/spec/javascripts/issue_spec.js
index 5b0b7aa7903..beb544468ef 100644
--- a/spec/javascripts/issue_spec.js
+++ b/spec/javascripts/issue_spec.js
@@ -105,6 +105,7 @@ require('~/issue');
 
       expectIssueState(false);
       expect($btnClose).toHaveProp('disabled', false);
+      expect($('.issue_counter')).toHaveText(0);
     });
 
     it('fails to close an issue with success:false', function() {
@@ -121,6 +122,7 @@ require('~/issue');
       expectIssueState(true);
       expect($btnClose).toHaveProp('disabled', false);
       expectErrorMessage();
+      expect($('.issue_counter')).toHaveText(1);
     });
 
     it('fails to closes an issue with HTTP error', function() {
@@ -135,6 +137,7 @@ require('~/issue');
       expectIssueState(true);
       expect($btnClose).toHaveProp('disabled', true);
       expectErrorMessage();
+      expect($('.issue_counter')).toHaveText(1);
     });
   });
 
@@ -159,6 +162,7 @@ require('~/issue');
 
       expectIssueState(true);
       expect($btnReopen).toHaveProp('disabled', false);
+      expect($('.issue_counter')).toHaveText(1);
     });
   });
 }).call(this);

From 0dfccd995aa9bf560e59299f3a4f1705d6981115 Mon Sep 17 00:00:00 2001
From: Semyon Pupkov <mail@semyonpupkov.com>
Date: Sun, 12 Feb 2017 13:02:26 +0500
Subject: [PATCH 24/73] Add active_when helper

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24036
---
 app/helpers/application_helper.rb             |  9 +++++++
 app/views/admin/logs/show.html.haml           |  5 ++--
 app/views/admin/projects/index.html.haml      |  6 ++---
 app/views/admin/users/index.html.haml         | 14 +++++-----
 app/views/dashboard/_activity_head.html.haml  |  4 +--
 app/views/dashboard/todos/index.html.haml     |  6 ++---
 app/views/devise/shared/_signin_box.html.haml |  2 +-
 app/views/devise/shared/_tabs_ldap.html.haml  |  2 +-
 app/views/explore/projects/_filter.html.haml  |  4 +--
 app/views/kaminari/gitlab/_page.html.haml     |  2 +-
 app/views/projects/pipelines/index.html.haml  |  8 +++---
 .../wikis/_sidebar_wiki_page.html.haml        |  2 +-
 app/views/search/_category.html.haml          | 26 +++++++++----------
 app/views/shared/builds/_tabs.html.haml       |  8 +++---
 app/views/shared/issuable/_nav.html.haml      | 10 +++----
 .../snippets/_snippets_scope_menu.html.haml   |  8 +++---
 spec/helpers/application_helper_spec.rb       |  5 ++++
 17 files changed, 66 insertions(+), 55 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bee323993a0..6db813d4a02 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -296,4 +296,13 @@ module ApplicationHelper
   def page_class
     "issue-boards-page" if current_controller?(:boards)
   end
+
+  # Returns active css class when condition returns true
+  # otherwise returns nil.
+  #
+  # Example:
+  #   %li{ class: active_when(params[:filter] == '1') }
+  def active_when(condition)
+    'active' if condition
+  end
 end
diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml
index 13d00dd1fcb..5e585ce789b 100644
--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
@@ -8,15 +8,14 @@
 %div{ class: container_class }
   %ul.nav-links.log-tabs
     - loggers.each do |klass|
-      %li{ class: (klass == Gitlab::GitLogger ? 'active' : '') }>
+      %li{ class: active_when(klass == Gitlab::GitLogger) }>
         = link_to klass::file_name, "##{klass::file_name_noext}",
             'data-toggle' => 'tab'
   .row-content-block
     To prevent performance issues admin logs output the last 2000 lines
   .tab-content
     - loggers.each do |klass|
-      .tab-pane{ class: (klass == Gitlab::GitLogger ? 'active' : ''),
-          id: klass::file_name_noext }
+      .tab-pane{ class: active_when(klass == Gitlab::GitLogger), id: klass::file_name_noext }
         .file-holder#README
           .js-file-title.file-title
             %i.fa.fa-file
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index cf8d438670b..756782c7d4e 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -48,13 +48,13 @@
         = link_to admin_projects_path do
           All
 
-      = nav_link(html_options: { class: params[:visibility_level] == Gitlab::VisibilityLevel::PRIVATE.to_s ? 'active' : '' }) do
+      = nav_link(html_options: { class: active_when(params[:visibility_level] == Gitlab::VisibilityLevel::PRIVATE.to_s) }) do
         = link_to admin_projects_path(visibility_level: Gitlab::VisibilityLevel::PRIVATE) do
           Private
-      = nav_link(html_options: { class: params[:visibility_level] == Gitlab::VisibilityLevel::INTERNAL.to_s ? 'active' : '' }) do
+      = nav_link(html_options: { class: active_when(params[:visibility_level] == Gitlab::VisibilityLevel::INTERNAL.to_s) }) do
         = link_to admin_projects_path(visibility_level: Gitlab::VisibilityLevel::INTERNAL) do
           Internal
-      = nav_link(html_options: { class: params[:visibility_level] == Gitlab::VisibilityLevel::PUBLIC.to_s ? 'active' : '' }) do
+      = nav_link(html_options: { class: active_when(params[:visibility_level] == Gitlab::VisibilityLevel::PUBLIC.to_s) }) do
         = link_to admin_projects_path(visibility_level: Gitlab::VisibilityLevel::PUBLIC) do
           Public
 
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 4dc44225d49..298cf0fa950 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -38,31 +38,31 @@
     .nav-block
       %ul.nav-links.wide.scrolling-tabs.white.scrolling-tabs
         .fade-left
-        = nav_link(html_options: { class: ('active' unless params[:filter]) }) do
+        = nav_link(html_options: { class: active_when(params[:filter].nil?) }) do
           = link_to admin_users_path do
             Active
             %small.badge= number_with_delimiter(User.active.count)
-        = nav_link(html_options: { class: ('active' if params[:filter] == 'admins') }) do
+        = nav_link(html_options: { class: active_when(params[:filter] == 'admins') }) do
           = link_to admin_users_path(filter: "admins") do
             Admins
             %small.badge= number_with_delimiter(User.admins.count)
-        = nav_link(html_options: { class: "#{'active' if params[:filter] == 'two_factor_enabled'} filter-two-factor-enabled" }) do
+        = nav_link(html_options: { class: "#{active_when(params[:filter] == 'two_factor_enabled')} filter-two-factor-enabled" }) do
           = link_to admin_users_path(filter: 'two_factor_enabled') do
             2FA Enabled
             %small.badge= number_with_delimiter(User.with_two_factor.count)
-        = nav_link(html_options: { class: "#{'active' if params[:filter] == 'two_factor_disabled'} filter-two-factor-disabled" }) do
+        = nav_link(html_options: { class: "#{active_when(params[:filter] == 'two_factor_disabled')} filter-two-factor-disabled" }) do
           = link_to admin_users_path(filter: 'two_factor_disabled') do
             2FA Disabled
             %small.badge= number_with_delimiter(User.without_two_factor.count)
-        = nav_link(html_options: { class: ('active' if params[:filter] == 'external') }) do
+        = nav_link(html_options: { class: active_when(params[:filter] == 'external') }) do
           = link_to admin_users_path(filter: 'external') do
             External
             %small.badge= number_with_delimiter(User.external.count)
-        = nav_link(html_options: { class: ('active' if params[:filter] == 'blocked') }) do
+        = nav_link(html_options: { class: active_when(params[:filter] == 'blocked') }) do
           = link_to admin_users_path(filter: "blocked") do
             Blocked
             %small.badge= number_with_delimiter(User.blocked.count)
-        = nav_link(html_options: { class: ('active' if params[:filter] == 'wop') }) do
+        = nav_link(html_options: { class: active_when(params[:filter] == 'wop') }) do
           = link_to admin_users_path(filter: "wop") do
             Without projects
             %small.badge= number_with_delimiter(User.without_projects.count)
diff --git a/app/views/dashboard/_activity_head.html.haml b/app/views/dashboard/_activity_head.html.haml
index 68a46f61eb7..ecdf76ef5c5 100644
--- a/app/views/dashboard/_activity_head.html.haml
+++ b/app/views/dashboard/_activity_head.html.haml
@@ -1,8 +1,8 @@
 .top-area
   %ul.nav-links
-    %li{ class: ("active" unless params[:filter]) }>
+    %li{ class: active_when(params[:filter].nil?) }>
       = link_to activity_dashboard_path, class: 'shortcuts-activity', data: {placement: 'right'} do
         Your Projects
-    %li{ class: ("active" if params[:filter] == 'starred') }>
+    %li{ class: active_when(params[:filter] == 'starred') }>
       = link_to activity_dashboard_path(filter: 'starred'), data: {placement: 'right'} do
         Starred Projects
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index c4bf2c90cc2..16a5713948a 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -4,15 +4,13 @@
 - if current_user.todos.any?
   .top-area
     %ul.nav-links
-      - todo_pending_active = ('active' if params[:state].blank? || params[:state] == 'pending')
-      %li{ class: "todos-pending #{todo_pending_active}" }>
+      %li.todos-pending{ class: active_when(params[:state].blank? || params[:state] == 'pending') }>
         = link_to todos_filter_path(state: 'pending') do
           %span
             To do
           %span.badge
             = number_with_delimiter(todos_pending_count)
-      - todo_done_active = ('active' if params[:state] == 'done')
-      %li{ class: "todos-done #{todo_done_active}" }>
+      %li.todos-done{ class: active_when(params[:state] == 'done') }>
         = link_to todos_filter_path(state: 'done') do
           %span
             Done
diff --git a/app/views/devise/shared/_signin_box.html.haml b/app/views/devise/shared/_signin_box.html.haml
index eddfce363a7..da4769e214e 100644
--- a/app/views/devise/shared/_signin_box.html.haml
+++ b/app/views/devise/shared/_signin_box.html.haml
@@ -4,7 +4,7 @@
       .login-body
         = render 'devise/sessions/new_crowd'
   - @ldap_servers.each_with_index do |server, i|
-    .login-box.tab-pane{ id: "#{server['provider_name']}", role: 'tabpanel', class: (:active if i.zero? && !crowd_enabled?) }
+    .login-box.tab-pane{ id: "#{server['provider_name']}", role: 'tabpanel', class: active_when(i.zero? && !crowd_enabled?) }
       .login-body
         = render 'devise/sessions/new_ldap', server: server
   - if signin_enabled?
diff --git a/app/views/devise/shared/_tabs_ldap.html.haml b/app/views/devise/shared/_tabs_ldap.html.haml
index 8c4ad30c832..dd34600490e 100644
--- a/app/views/devise/shared/_tabs_ldap.html.haml
+++ b/app/views/devise/shared/_tabs_ldap.html.haml
@@ -3,7 +3,7 @@
     %li.active
       = link_to "Crowd", "#crowd", 'data-toggle' => 'tab'
   - @ldap_servers.each_with_index do |server, i|
-    %li{ class: (:active if i.zero? && !crowd_enabled?) }
+    %li{ class: active_when(i.zero? && !crowd_enabled?) }
       = link_to server['label'], "##{server['provider_name']}",  'data-toggle' => 'tab'
   - if signin_enabled?
     %li
diff --git a/app/views/explore/projects/_filter.html.haml b/app/views/explore/projects/_filter.html.haml
index e3088848492..56f463572bb 100644
--- a/app/views/explore/projects/_filter.html.haml
+++ b/app/views/explore/projects/_filter.html.haml
@@ -13,7 +13,7 @@
         = link_to filter_projects_path(visibility_level: nil) do
           Any
       - Gitlab::VisibilityLevel.values.each do |level|
-        %li{ class: (level.to_s == params[:visibility_level]) ? 'active' : 'light' }
+        %li{ class: active_when(level.to_s == params[:visibility_level]) || 'light' }
           = link_to filter_projects_path(visibility_level: level) do
             = visibility_level_icon(level)
             = visibility_level_label(level)
@@ -34,7 +34,7 @@
           Any
 
       - @tags.each do |tag|
-        %li{ class: (tag.name == params[:tag]) ? 'active' : 'light' }
+        %li{ class: active_when(tag.name == params[:tag]) || 'light' }
           = link_to filter_projects_path(tag: tag.name) do
             = icon('tag')
             = tag.name
diff --git a/app/views/kaminari/gitlab/_page.html.haml b/app/views/kaminari/gitlab/_page.html.haml
index cefe0066a8f..5c5be03a7cd 100644
--- a/app/views/kaminari/gitlab/_page.html.haml
+++ b/app/views/kaminari/gitlab/_page.html.haml
@@ -6,5 +6,5 @@
 -#    total_pages:   total number of pages
 -#    per_page:      number of items to fetch per page
 -#    remote:        data-remote
-%li{ class: "page#{' active' if page.current?}#{' sibling' if page.next? || page.prev?}" }
+%li.page{ class: [active_when(page.current?), ('sibling' if page.next? || page.prev?)] }
   = link_to page, url, { remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil }
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 81e393d7626..6e0428e2a31 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -5,23 +5,23 @@
 %div{ class: container_class }
   .top-area
     %ul.nav-links
-      %li{ class: ('active' if @scope.nil?) }>
+      %li{ class: active_when(@scope.nil?) }>
         = link_to project_pipelines_path(@project) do
           All
           %span.badge.js-totalbuilds-count
             = number_with_delimiter(@pipelines_count)
 
-      %li{ class: ('active' if @scope == 'running') }>
+      %li{ class: active_when(@scope == 'running') }>
         = link_to project_pipelines_path(@project, scope: :running) do
           Running
           %span.badge.js-running-count
             = number_with_delimiter(@running_or_pending_count)
 
-      %li{ class: ('active' if @scope == 'branches') }>
+      %li{ class: active_when(@scope == 'branches') }>
         = link_to project_pipelines_path(@project, scope: :branches) do
           Branches
 
-      %li{ class: ('active' if @scope == 'tags') }>
+      %li{ class: active_when(@scope == 'tags') }>
         = link_to project_pipelines_path(@project, scope: :tags) do
           Tags
 
diff --git a/app/views/projects/wikis/_sidebar_wiki_page.html.haml b/app/views/projects/wikis/_sidebar_wiki_page.html.haml
index eb9bd14920d..0a61d90177b 100644
--- a/app/views/projects/wikis/_sidebar_wiki_page.html.haml
+++ b/app/views/projects/wikis/_sidebar_wiki_page.html.haml
@@ -1,3 +1,3 @@
-%li{ class: params[:id] == wiki_page.slug ? 'active' : '' }
+%li{ class: active_when(params[:id] == wiki_page.slug) }
   = link_to namespace_project_wiki_path(@project.namespace, @project, wiki_page) do
     = wiki_page.title.capitalize
diff --git a/app/views/search/_category.html.haml b/app/views/search/_category.html.haml
index 8cbecb725b5..5afb95ac430 100644
--- a/app/views/search/_category.html.haml
+++ b/app/views/search/_category.html.haml
@@ -1,70 +1,70 @@
 %ul.nav-links.search-filter
   - if @project
-    %li{ class: ("active" if @scope == 'blobs') }
+    %li{ class: active_when(@scope == 'blobs') }
       = link_to search_filter_path(scope: 'blobs') do
         Code
         %span.badge
           = @search_results.blobs_count
-    %li{ class: ("active" if @scope == 'issues') }
+    %li{ class: active_when(@scope == 'issues') }
       = link_to search_filter_path(scope: 'issues') do
         Issues
         %span.badge
           = @search_results.issues_count
-    %li{ class: ("active" if @scope == 'merge_requests') }
+    %li{ class: active_when(@scope == 'merge_requests') }
       = link_to search_filter_path(scope: 'merge_requests') do
         Merge requests
         %span.badge
           = @search_results.merge_requests_count
-    %li{ class: ("active" if @scope == 'milestones') }
+    %li{ class: active_when(@scope == 'milestones') }
       = link_to search_filter_path(scope: 'milestones') do
         Milestones
         %span.badge
           = @search_results.milestones_count
-    %li{ class: ("active" if @scope == 'notes') }
+    %li{ class: active_when(@scope == 'notes') }
       = link_to search_filter_path(scope: 'notes') do
         Comments
         %span.badge
           = @search_results.notes_count
-    %li{ class: ("active" if @scope == 'wiki_blobs') }
+    %li{ class: active_when(@scope == 'wiki_blobs') }
       = link_to search_filter_path(scope: 'wiki_blobs') do
         Wiki
         %span.badge
           = @search_results.wiki_blobs_count
-    %li{ class: ("active" if @scope == 'commits') }
+    %li{ class: active_when(@scope == 'commits') }
       = link_to search_filter_path(scope: 'commits') do
         Commits
         %span.badge
           = @search_results.commits_count
 
   - elsif @show_snippets
-    %li{ class: ("active" if @scope == 'snippet_blobs') }
+    %li{ class: active_when(@scope == 'snippet_blobs') }
       = link_to search_filter_path(scope: 'snippet_blobs', snippets: true, group_id: nil, project_id: nil) do
         Snippet Contents
         %span.badge
           = @search_results.snippet_blobs_count
-    %li{ class: ("active" if @scope == 'snippet_titles') }
+    %li{ class: active_when(@scope == 'snippet_titles') }
       = link_to search_filter_path(scope: 'snippet_titles', snippets: true, group_id: nil, project_id: nil) do
         Titles and Filenames
         %span.badge
           = @search_results.snippet_titles_count
 
   - else
-    %li{ class: ("active" if @scope == 'projects') }
+    %li{ class: active_when(@scope == 'projects') }
       = link_to search_filter_path(scope: 'projects') do
         Projects
         %span.badge
           = @search_results.projects_count
-    %li{ class: ("active" if @scope == 'issues') }
+    %li{ class: active_when(@scope == 'issues') }
       = link_to search_filter_path(scope: 'issues') do
         Issues
         %span.badge
           = @search_results.issues_count
-    %li{ class: ("active" if @scope == 'merge_requests') }
+    %li{ class: active_when(@scope == 'merge_requests') }
       = link_to search_filter_path(scope: 'merge_requests') do
         Merge requests
         %span.badge
           = @search_results.merge_requests_count
-    %li{ class: ("active" if @scope == 'milestones') }
+    %li{ class: active_when(@scope == 'milestones') }
       = link_to search_filter_path(scope: 'milestones') do
         Milestones
         %span.badge
diff --git a/app/views/shared/builds/_tabs.html.haml b/app/views/shared/builds/_tabs.html.haml
index b6047ece592..3baa956b910 100644
--- a/app/views/shared/builds/_tabs.html.haml
+++ b/app/views/shared/builds/_tabs.html.haml
@@ -1,23 +1,23 @@
 %ul.nav-links
-  %li{ class: ('active' if scope.nil?) }>
+  %li{ class: active_when(scope.nil?) }>
     = link_to build_path_proc.call(nil) do
       All
       %span.badge.js-totalbuilds-count
         = number_with_delimiter(all_builds.count(:id))
 
-  %li{ class: ('active' if scope == 'pending') }>
+  %li{ class: active_when(scope == 'pending') }>
     = link_to build_path_proc.call('pending') do
       Pending
       %span.badge
         = number_with_delimiter(all_builds.pending.count(:id))
 
-  %li{ class: ('active' if scope == 'running') }>
+  %li{ class: active_when(scope == 'running') }>
     = link_to build_path_proc.call('running') do
       Running
       %span.badge
         = number_with_delimiter(all_builds.running.count(:id))
 
-  %li{ class: ('active' if scope == 'finished') }>
+  %li{ class: active_when(scope == 'finished') }>
     = link_to build_path_proc.call('finished') do
       Finished
       %span.badge
diff --git a/app/views/shared/issuable/_nav.html.haml b/app/views/shared/issuable/_nav.html.haml
index 1154316c03f..ad995cbe962 100644
--- a/app/views/shared/issuable/_nav.html.haml
+++ b/app/views/shared/issuable/_nav.html.haml
@@ -3,23 +3,23 @@
 - issuables = @issues || @merge_requests
 
 %ul.nav-links.issues-state-filters
-  %li{ class: ("active" if params[:state] == 'opened') }>
+  %li{ class: active_when(params[:state] == 'opened') }>
     = link_to page_filter_path(state: 'opened', label: true), id: 'state-opened', title: "Filter by #{page_context_word} that are currently opened." do
       #{issuables_state_counter_text(type, :opened)}
 
   - if type == :merge_requests
-    %li{ class: ("active" if params[:state] == 'merged') }>
+    %li{ class: active_when(params[:state] == 'merged') }>
       = link_to page_filter_path(state: 'merged', label: true), id: 'state-merged', title: 'Filter by merge requests that are currently merged.' do
         #{issuables_state_counter_text(type, :merged)}
 
-    %li{ class: ("active" if params[:state] == 'closed') }>
+    %li{ class: active_when(params[:state] == 'closed') }>
       = link_to page_filter_path(state: 'closed', label: true), id: 'state-closed', title: 'Filter by merge requests that are currently closed and unmerged.' do
         #{issuables_state_counter_text(type, :closed)}
   - else
-    %li{ class: ("active" if params[:state] == 'closed') }>
+    %li{ class: active_when(params[:state] == 'closed') }>
       = link_to page_filter_path(state: 'closed', label: true), id: 'state-all', title: 'Filter by issues that are currently closed.' do
         #{issuables_state_counter_text(type, :closed)}
 
-  %li{ class: ("active" if params[:state] == 'all') }>
+  %li{ class: active_when(params[:state] == 'all') }>
     = link_to page_filter_path(state: 'all', label: true), id: 'state-all', title: "Show all #{page_context_word}." do
       #{issuables_state_counter_text(type, :all)}
diff --git a/app/views/snippets/_snippets_scope_menu.html.haml b/app/views/snippets/_snippets_scope_menu.html.haml
index 2dda5fed647..8b6a98a054a 100644
--- a/app/views/snippets/_snippets_scope_menu.html.haml
+++ b/app/views/snippets/_snippets_scope_menu.html.haml
@@ -2,7 +2,7 @@
 - include_private = local_assigns.fetch(:include_private, false)
 
 .nav-links.snippet-scope-menu
-  %li{ class: ("active" unless params[:scope]) }
+  %li{ class: active_when(params[:scope].nil?) }
     = link_to subject_snippets_path(subject) do
       All
       %span.badge
@@ -12,19 +12,19 @@
           = subject.snippets.public_and_internal.count
 
   - if include_private
-    %li{ class: ("active" if params[:scope] == "are_private") }
+    %li{ class: active_when(params[:scope] == "are_private") }
       = link_to subject_snippets_path(subject, scope: 'are_private') do
         Private
         %span.badge
           = subject.snippets.are_private.count
 
-  %li{ class: ("active" if params[:scope] == "are_internal") }
+  %li{ class: active_when(params[:scope] == "are_internal") }
     = link_to subject_snippets_path(subject, scope: 'are_internal') do
       Internal
       %span.badge
         = subject.snippets.are_internal.count
 
-  %li{ class: ("active" if params[:scope] == "are_public") }
+  %li{ class: active_when(params[:scope] == "are_public") }
     = link_to subject_snippets_path(subject, scope: 'are_public') do
       Public
       %span.badge
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 8b201f348f1..fd40fe99941 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -265,4 +265,9 @@ describe ApplicationHelper do
       expect(helper.render_markup('foo.adoc', content)).to eq('NOEL')
     end
   end
+
+  describe '#active_when' do
+    it { expect(helper.active_when(true)).to eq('active') }
+    it { expect(helper.active_when(false)).to eq(nil) }
+  end
 end

From 7a8d0aab61fa5d59a4bde5330948f1adcfbb542c Mon Sep 17 00:00:00 2001
From: Mark Fletcher <mark@gitlab.com>
Date: Wed, 15 Feb 2017 18:54:18 +0530
Subject: [PATCH 25/73] Ensure only commit comments relevant to target project
 are returned

---
 ...-commit-comments-are-shared-across-projects.yml |  4 ++++
 lib/api/commits.rb                                 |  2 +-
 spec/requests/api/commits_spec.rb                  | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects.yml

diff --git a/changelogs/unreleased/27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects.yml b/changelogs/unreleased/27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects.yml
new file mode 100644
index 00000000000..89e2bdc69bc
--- /dev/null
+++ b/changelogs/unreleased/27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects.yml
@@ -0,0 +1,4 @@
+---
+title: Only return target project's comments for a commit
+merge_request:
+author:
diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index 2fefe760d24..173083d0ade 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -114,7 +114,7 @@ module API
         commit = user_project.commit(params[:sha])
 
         not_found! 'Commit' unless commit
-        notes = Note.where(commit_id: commit.id).order(:created_at)
+        notes = user_project.notes.where(commit_id: commit.id).order(:created_at)
 
         present paginate(notes), with: Entities::CommitNote
       end
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index af9028a8978..cb11cf98bf4 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -464,6 +464,20 @@ describe API::Commits, api: true  do
         expect(response).to have_http_status(401)
       end
     end
+
+    context 'when the commit is present on two projects' do
+      let(:forked_project) { create(:project, :repository, creator: user2, namespace: user2.namespace) }
+      let!(:forked_project_note) { create(:note_on_commit, author: user2, project: forked_project, commit_id: forked_project.repository.commit.id, note: 'a comment on a commit for fork') }
+
+      it 'returns the comments for the target project' do
+        get api("/projects/#{forked_project.id}/repository/commits/#{forked_project.repository.commit.id}/comments", user2)
+
+        expect(response).to have_http_status(200)
+        expect(json_response.length).to eq(1)
+        expect(json_response.first['note']).to eq('a comment on a commit for fork')
+        expect(json_response.first['author']['id']).to eq(user2.id)
+      end
+    end
   end
 
   describe 'POST :id/repository/commits/:sha/cherry_pick' do

From e15032eded3b35097409817ddb1844164173ce1a Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Thu, 16 Feb 2017 01:07:29 +1100
Subject: [PATCH 26/73] override favicon for development to find tabs more
 easily

---
 app/assets/images/favicon-purple.ico    | Bin 0 -> 5430 bytes
 app/helpers/page_layout_helper.rb       |   4 ++++
 app/views/layouts/_head.html.haml       |   2 +-
 spec/helpers/page_layout_helper_spec.rb |  12 ++++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/images/favicon-purple.ico

diff --git a/app/assets/images/favicon-purple.ico b/app/assets/images/favicon-purple.ico
new file mode 100644
index 0000000000000000000000000000000000000000..71acdf670ab48827376ef071657da6d7fa9e306f
GIT binary patch
literal 5430
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
OiaL_NMKKZNFv&ls2@&uB

literal 0
HcmV?d00001

diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 7d4d049101a..aee8099aeb2 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -34,6 +34,10 @@ module PageLayoutHelper
     end
   end
 
+  def favicon
+    Rails.env.development? ? 'favicon-purple.ico' : 'favicon.ico'
+  end
+
   def page_image
     default = image_url('gitlab_logo.png')
 
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index f2d355587bd..302c1794628 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -23,7 +23,7 @@
   %title= page_title(site_name)
   %meta{ name: "description", content: page_description }
 
-  = favicon_link_tag 'favicon.ico'
+  = favicon_link_tag favicon
 
   = stylesheet_link_tag "application", media: "all"
   = stylesheet_link_tag "print",       media: "print"
diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb
index dc07657e101..872679a6ce3 100644
--- a/spec/helpers/page_layout_helper_spec.rb
+++ b/spec/helpers/page_layout_helper_spec.rb
@@ -40,6 +40,18 @@ describe PageLayoutHelper do
     end
   end
 
+  describe 'favicon' do
+    it 'defaults to favicon.ico' do
+      allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('production'))
+      expect(helper.favicon).to eq 'favicon.ico'
+    end
+
+    it 'has purple favicon for development' do
+      allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development'))
+      expect(helper.favicon).to eq 'favicon-purple.ico'
+    end
+  end
+
   describe 'page_image' do
     it 'defaults to the GitLab logo' do
       expect(helper.page_image).to end_with 'assets/gitlab_logo.png'

From 19cb1fcdf364a31077a70d8cf2af09d674f32eaa Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Sat, 11 Feb 2017 22:22:22 +0100
Subject: [PATCH 27/73] Make Karma output look nicer for CI (!9165)

---
 .../unreleased/beautiful-karma-output.yml     |   4 +
 config/karma.config.js                        |   3 +-
 package.json                                  |   1 +
 yarn.lock                                     | 195 +++++++++---------
 4 files changed, 108 insertions(+), 95 deletions(-)
 create mode 100644 changelogs/unreleased/beautiful-karma-output.yml

diff --git a/changelogs/unreleased/beautiful-karma-output.yml b/changelogs/unreleased/beautiful-karma-output.yml
new file mode 100644
index 00000000000..6ccddebab68
--- /dev/null
+++ b/changelogs/unreleased/beautiful-karma-output.yml
@@ -0,0 +1,4 @@
+---
+title: Make Karma output look nicer for CI
+merge_request: 9165
+author: winniehell
diff --git a/config/karma.config.js b/config/karma.config.js
index a1fbeab1f46..5b472780aed 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -4,6 +4,7 @@ var ROOT_PATH = path.resolve(__dirname, '..');
 
 // Karma configuration
 module.exports = function(config) {
+  var progressReporter = process.env.CI ? 'mocha' : 'progress';
   config.set({
     basePath: ROOT_PATH,
     browsers: ['PhantomJS'],
@@ -15,7 +16,7 @@ module.exports = function(config) {
     preprocessors: {
       'spec/javascripts/**/*.js?(.es6)': ['webpack', 'sourcemap'],
     },
-    reporters: ['progress', 'coverage-istanbul'],
+    reporters: [progressReporter, 'coverage-istanbul'],
     coverageIstanbulReporter: {
       reports: ['html', 'text-summary'],
       dir: 'coverage-javascript/',
diff --git a/package.json b/package.json
index 0500ba9670e..08bde1bc313 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "jquery-ui": "github:jquery/jquery-ui#1.11.4",
     "jquery-ujs": "1.2.1",
     "js-cookie": "^2.1.3",
+    "karma-mocha-reporter": "^2.2.2",
     "mousetrap": "1.4.6",
     "pikaday": "^1.5.1",
     "select2": "3.5.2-browserify",
diff --git a/yarn.lock b/yarn.lock
index 42cdc8b3fcd..99db6f61bcd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,10 +1,12 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
+
+
 abbrev@1, abbrev@1.0.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
-accepts@~1.3.3, accepts@1.3.3:
+accepts@1.3.3, accepts@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
   dependencies:
@@ -23,14 +25,14 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
+acorn@4.0.4, acorn@^4.0.3, acorn@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
+
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.3, acorn@^4.0.4, acorn@4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
-
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
@@ -178,7 +180,11 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@^1.4.0, async@^1.4.2, async@^1.5.2, async@1.x:
+async@0.2.x, async@~0.2.6:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+
+async@1.x, async@^1.4.0, async@^1.4.2, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
@@ -188,10 +194,6 @@ async@^2.1.2, async@^2.1.4:
   dependencies:
     lodash "^4.14.0"
 
-async@~0.2.6, async@0.2.x:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-
 async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
@@ -995,7 +997,7 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
+chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   dependencies:
@@ -1140,14 +1142,6 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.4.6:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
 concat-stream@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611"
@@ -1156,6 +1150,14 @@ concat-stream@1.5.0:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
+concat-stream@^1.4.6:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 connect-history-api-fallback@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz#e51d17f8f0ef0db90a64fdb47de3051556e9f169"
@@ -1263,16 +1265,16 @@ custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
 
+d3@3.5.11:
+  version "3.5.11"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.11.tgz#d130750eed0554db70e8432102f920a12407b69c"
+
 d@^0.1.1, d@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
   dependencies:
     es5-ext "~0.10.2"
 
-d3@3.5.11:
-  version "3.5.11"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.11.tgz#d130750eed0554db70e8432102f920a12407b69c"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -1283,28 +1285,28 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-debug@^2.1.1, debug@^2.2.0, debug@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
-  dependencies:
-    ms "0.7.2"
+debug@0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
 
-debug@~2.2.0, debug@2.2.0:
+debug@2.2.0, debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
     ms "0.7.1"
 
-debug@0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
-
 debug@2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
   dependencies:
     ms "0.7.2"
 
+debug@2.6.0, debug@^2.1.1, debug@^2.2.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
+  dependencies:
+    ms "0.7.2"
+
 decamelize@^1.0.0, decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -1382,7 +1384,7 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-doctrine@^1.2.2, doctrine@1.5.0:
+doctrine@1.5.0, doctrine@^1.2.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
   dependencies:
@@ -1545,7 +1547,7 @@ es6-set@~0.1.3:
     es6-symbol "3"
     event-emitter "~0.3.4"
 
-es6-symbol@~3.1, es6-symbol@~3.1.0, es6-symbol@3:
+es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa"
   dependencies:
@@ -1697,7 +1699,7 @@ espree@^3.4.0:
     acorn "4.0.4"
     acorn-jsx "^3.0.0"
 
-esprima@^2.7.1, esprima@2.7.x:
+esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
@@ -2293,7 +2295,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -2499,14 +2501,14 @@ is-windows@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
-isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isbinaryfile@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
@@ -2632,7 +2634,7 @@ jquery-ujs@1.2.1:
   dependencies:
     jquery ">=1.8.0"
 
-jquery@>=1.8.0, jquery@2.2.1:
+jquery@2.2.1, jquery@>=1.8.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f"
 
@@ -2644,7 +2646,7 @@ js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
-js-yaml@^3.5.1, js-yaml@^3.7.0, js-yaml@3.x:
+js-yaml@3.x, js-yaml@^3.5.1, js-yaml@^3.7.0:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628"
   dependencies:
@@ -2681,7 +2683,7 @@ json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-json3@^3.3.2, json3@3.3.2:
+json3@3.3.2, json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
 
@@ -2721,6 +2723,12 @@ karma-jasmine@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf"
 
+karma-mocha-reporter@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.2.tgz#876de9a287244e54a608591732a98e66611f6abe"
+  dependencies:
+    chalk "1.1.3"
+
 karma-phantomjs-launcher@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.2.tgz#19e1041498fd75563ed86730a22c1fe579fa8fb1"
@@ -2823,7 +2831,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@0.2.x:
+loader-utils@0.2.x, loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.5:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
   dependencies:
@@ -2985,7 +2993,7 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.26.0"
 
-mime@^1.3.4, mime@1.3.4:
+mime@1.3.4, mime@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
@@ -2993,32 +3001,32 @@ minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, "minimatch@2 || 3":
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
     brace-expansion "^1.0.0"
 
+minimist@0.0.8, minimist@~0.0.1:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
 minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@~0.0.1, minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1, mkdirp@0.5.x:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
 mkdirp@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
   dependencies:
     minimist "0.0.8"
 
+mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
 moment@2.x:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
@@ -3130,7 +3138,7 @@ node-zopfli@^2.0.0:
     nan "^2.0.0"
     node-pre-gyp "^0.6.4"
 
-nopt@~3.0.6, nopt@3.x:
+nopt@3.x, nopt@~3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
@@ -3166,14 +3174,14 @@ oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
 object-assign@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
 
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
@@ -3199,7 +3207,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@^1.3.0, once@^1.4.0, once@1.x:
+once@1.x, once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -3480,22 +3488,18 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-punycode@^1.2.4, punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
 qjobs@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
 
-qs@~6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
-
 qs@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
@@ -3504,6 +3508,10 @@ qs@6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.1.tgz#ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"
 
+qs@~6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
+
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -3743,11 +3751,11 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
-resolve@^1.1.6, resolve@1.1.x:
+resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.2.0:
+resolve@^1.1.6, resolve@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
 
@@ -3764,7 +3772,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
@@ -3796,7 +3804,7 @@ select2@3.5.2-browserify:
   version "3.5.2-browserify"
   resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d"
 
-semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5":
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -3963,7 +3971,7 @@ source-map-support@^0.4.2:
   dependencies:
     source-map "^0.5.3"
 
-source-map@^0.1.41, source-map@0.1.x:
+source-map@0.1.x, source-map@^0.1.41:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
   dependencies:
@@ -4063,10 +4071,6 @@ stream-http@^2.3.1:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -4082,6 +4086,10 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -4292,17 +4300,10 @@ underscore@1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
 
-unpipe@~1.0.0, unpipe@1.0.0:
+unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
-url-parse@^1.1.1:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a"
-  dependencies:
-    querystringify "0.0.x"
-    requires-port "1.0.x"
-
 url-parse@1.0.x:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
@@ -4310,6 +4311,13 @@ url-parse@1.0.x:
     querystringify "0.0.x"
     requires-port "1.0.x"
 
+url-parse@^1.1.1:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a"
+  dependencies:
+    querystringify "0.0.x"
+    requires-port "1.0.x"
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -4334,7 +4342,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@^0.10.3, util@0.10.3:
+util@0.10.3, util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -4494,6 +4502,10 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -4502,10 +4514,6 @@ wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -4588,4 +4596,3 @@ yauzl@2.4.1:
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-

From cec1e3ebc8fe03955c3c1c27f10a7d924f2917ed Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 15 Feb 2017 16:45:41 +0100
Subject: [PATCH 28/73] create lighter version of JSON and reuse initial
 restore in spec to speed up run

---
 .../gitlab/import_export/project.light.json   |  48 +++++
 .../project_tree_restorer_spec.rb             | 168 ++++++++----------
 2 files changed, 123 insertions(+), 93 deletions(-)
 create mode 100644 spec/lib/gitlab/import_export/project.light.json

diff --git a/spec/lib/gitlab/import_export/project.light.json b/spec/lib/gitlab/import_export/project.light.json
new file mode 100644
index 00000000000..a78836c3c34
--- /dev/null
+++ b/spec/lib/gitlab/import_export/project.light.json
@@ -0,0 +1,48 @@
+{
+  "description": "Nisi et repellendus ut enim quo accusamus vel magnam.",
+  "visibility_level": 10,
+  "archived": false,
+  "labels": [
+    {
+      "id": 2,
+      "title": "test2",
+      "color": "#428bca",
+      "project_id": 8,
+      "created_at": "2016-07-22T08:55:44.161Z",
+      "updated_at": "2016-07-22T08:55:44.161Z",
+      "template": false,
+      "description": "",
+      "type": "ProjectLabel",
+      "priorities": [
+      ]
+    },
+    {
+      "id": 3,
+      "title": "test3",
+      "color": "#428bca",
+      "group_id": 8,
+      "created_at": "2016-07-22T08:55:44.161Z",
+      "updated_at": "2016-07-22T08:55:44.161Z",
+      "template": false,
+      "description": "",
+      "project_id": null,
+      "type": "GroupLabel",
+      "priorities": [
+        {
+          "id": 1,
+          "project_id": 5,
+          "label_id": 1,
+          "priority": 1,
+          "created_at": "2016-10-18T09:35:43.338Z",
+          "updated_at": "2016-10-18T09:35:43.338Z"
+        }
+      ]
+    }
+  ],
+  "snippets": [
+
+  ],
+  "hooks": [
+
+  ]
+}
\ No newline at end of file
diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
index 0af13ba8e47..0eefb450f37 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -3,24 +3,27 @@ include ImportExport::CommonUtil
 
 describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
   describe 'restore project tree' do
-    let(:user) { create(:user) }
-    let(:namespace) { create(:namespace, owner: user) }
-    let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: "", project_path: 'path') }
-    let!(:project) { create(:empty_project, :builds_disabled, :issues_disabled, name: 'project', path: 'project') }
-    let(:project_tree_restorer) { described_class.new(user: user, shared: shared, project: project) }
-    let(:restored_project_json) { project_tree_restorer.restore }
+    before(:all) do
+      user = create(:user)
+
+      RSpec::Mocks.with_temporary_scope do
+        @shared = Gitlab::ImportExport::Shared.new(relative_path: "", project_path: 'path')
+        allow(@shared).to receive(:export_path).and_return('spec/lib/gitlab/import_export/')
+        project = create(:empty_project, :builds_disabled, :issues_disabled, name: 'project', path: 'project')
+        project_tree_restorer = described_class.new(user: user, shared: @shared, project: project)
+        @restored_project_json = project_tree_restorer.restore
+      end
+    end
 
     before do
-      allow(shared).to receive(:export_path).and_return('spec/lib/gitlab/import_export/')
     end
 
     context 'JSON' do
       it 'restores models based on JSON' do
-        expect(restored_project_json).to be true
+        expect(@restored_project_json).to be true
       end
 
       it 'restore correct project features' do
-        restored_project_json
         project = Project.find_by_path('project')
 
         expect(project.project_feature.issues_access_level).to eq(ProjectFeature::DISABLED)
@@ -31,62 +34,42 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
       end
 
       it 'has the same label associated to two issues' do
-        restored_project_json
-
         expect(ProjectLabel.find_by_title('test2').issues.count).to eq(2)
       end
 
       it 'has milestones associated to two separate issues' do
-        restored_project_json
-
         expect(Milestone.find_by_description('test milestone').issues.count).to eq(2)
       end
 
       it 'creates a valid pipeline note' do
-        restored_project_json
-
         expect(Ci::Pipeline.first.notes).not_to be_empty
       end
 
       it 'restores pipelines with missing ref' do
-        restored_project_json
-
         expect(Ci::Pipeline.where(ref: nil)).not_to be_empty
       end
 
       it 'restores the correct event with symbolised data' do
-        restored_project_json
-
         expect(Event.where.not(data: nil).first.data[:ref]).not_to be_empty
       end
 
       it 'preserves updated_at on issues' do
-        restored_project_json
-
         issue = Issue.where(description: 'Aliquam enim illo et possimus.').first
 
         expect(issue.reload.updated_at.to_s).to eq('2016-06-14 15:02:47 UTC')
       end
 
       it 'contains the merge access levels on a protected branch' do
-        restored_project_json
-
         expect(ProtectedBranch.first.merge_access_levels).not_to be_empty
       end
 
       it 'contains the push access levels on a protected branch' do
-        restored_project_json
-
         expect(ProtectedBranch.first.push_access_levels).not_to be_empty
       end
 
       context 'event at forth level of the tree' do
         let(:event) { Event.where(title: 'test levels').first }
 
-        before do
-          restored_project_json
-        end
-
         it 'restores the event' do
           expect(event).not_to be_nil
         end
@@ -99,77 +82,44 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
       it 'has the correct data for merge request st_diffs' do
         # makes sure we are renaming the custom method +utf8_st_diffs+ into +st_diffs+
 
-        expect { restored_project_json }.to change(MergeRequestDiff.where.not(st_diffs: nil), :count).by(9)
+        expect(MergeRequestDiff.where.not(st_diffs: nil).count).to eq(9)
       end
 
       it 'has labels associated to label links, associated to issues' do
-        restored_project_json
-
         expect(Label.first.label_links.first.target).not_to be_nil
       end
 
       it 'has project labels' do
-        restored_project_json
-
         expect(ProjectLabel.count).to eq(2)
       end
 
       it 'has no group labels' do
-        restored_project_json
-
         expect(GroupLabel.count).to eq(0)
       end
 
-      context 'with group' do
-        let!(:project) do
-          create(:empty_project,
-                 :builds_disabled,
-                 :issues_disabled,
-                 name: 'project',
-                 path: 'project',
-                 group: create(:group))
-        end
-
-        it 'has group labels' do
-          restored_project_json
-
-          expect(GroupLabel.count).to eq(1)
-        end
-
-        it 'has label priorities' do
-          restored_project_json
-
-          expect(GroupLabel.first.priorities).not_to be_empty
-        end
-      end
-
       it 'has a project feature' do
-        restored_project_json
-
-        expect(project.project_feature).not_to be_nil
+        expect(Project.first.project_feature).not_to be_nil
       end
 
       it 'restores the correct service' do
-        restored_project_json
-
         expect(CustomIssueTrackerService.first).not_to be_nil
       end
 
       context 'Merge requests' do
         before do
-          restored_project_json
+          @restored_project_json
         end
 
         it 'always has the new project as a target' do
-          expect(MergeRequest.find_by_title('MR1').target_project).to eq(project)
+          expect(MergeRequest.find_by_title('MR1').target_project).to eq(Project.first)
         end
 
         it 'has the same source project as originally if source/target are the same' do
-          expect(MergeRequest.find_by_title('MR1').source_project).to eq(project)
+          expect(MergeRequest.find_by_title('MR1').source_project).to eq(Project.first)
         end
 
         it 'has the new project as target if source/target differ' do
-          expect(MergeRequest.find_by_title('MR2').target_project).to eq(project)
+          expect(MergeRequest.find_by_title('MR2').target_project).to eq(Project.first)
         end
 
         it 'has no source if source/target differ' do
@@ -177,32 +127,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
         end
       end
 
-      context 'project.json file access check' do
-        it 'does not read a symlink' do
-          Dir.mktmpdir do |tmpdir|
-            setup_symlink(tmpdir, 'project.json')
-            allow(shared).to receive(:export_path).and_call_original
-
-            restored_project_json
-
-            expect(shared.errors.first).not_to include('test')
-          end
-        end
-      end
-
-      context 'when there is an existing build with build token' do
-        it 'restores project json correctly' do
-          create(:ci_build, token: 'abcd')
-
-          expect(restored_project_json).to be true
-        end
-      end
-
       context 'tokens are regenerated' do
-        before do
-          restored_project_json
-        end
-
         it 'has a new CI trigger token' do
           expect(Ci::Trigger.where(token: 'cdbfasdf44a5958c83654733449e585')).to be_empty
         end
@@ -213,4 +138,61 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
       end
     end
   end
+
+  context 'Light JSON' do
+    let(:user) { create(:user) }
+    let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: "", project_path: 'path') }
+    let!(:project) { create(:empty_project, :builds_disabled, :issues_disabled, name: 'project', path: 'project') }
+    let(:project_tree_restorer) { described_class.new(user: user, shared: shared, project: project) }
+    let(:restored_project_json) { project_tree_restorer.restore }
+
+    before do
+      allow(ImportExport).to receive(:project_filename).and_return('project.light.json')
+      allow(shared).to receive(:export_path).and_return('spec/lib/gitlab/import_export/')
+    end
+
+    context 'project.json file access check' do
+      it 'does not read a symlink' do
+        Dir.mktmpdir do |tmpdir|
+          setup_symlink(tmpdir, 'project.json')
+          allow(shared).to receive(:export_path).and_call_original
+
+          restored_project_json
+
+          expect(shared.errors.first).not_to include('test')
+        end
+      end
+    end
+
+    context 'when there is an existing build with build token' do
+      it 'restores project json correctly' do
+        create(:ci_build, token: 'abcd')
+
+        expect(restored_project_json).to be true
+      end
+    end
+
+    context 'with group' do
+      let!(:project) do
+        create(:empty_project,
+               :builds_disabled,
+               :issues_disabled,
+               name: 'project',
+               path: 'project',
+               group: create(:group))
+      end
+
+      before do
+        restored_project_json
+      end
+
+      it 'has group labels' do
+        expect(GroupLabel.count).to eq(1)
+      end
+
+      it 'has label priorities' do
+        expect(GroupLabel.first.priorities).not_to be_empty
+      end
+    end
+  end
 end

From a89e9736266cbf9ccde3a49eccd8ab04f72bf38f Mon Sep 17 00:00:00 2001
From: Semyon Pupkov <mail@semyonpupkov.com>
Date: Sat, 11 Feb 2017 22:30:15 +0500
Subject: [PATCH 29/73] Set `Auto-Submitted: auto-generated` header to emails

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305
---
 changelogs/unreleased/add-auto-submited-header.yml   |  4 ++++
 .../initializers/additional_headers_interceptor.rb   |  1 +
 lib/additional_email_headers_interceptor.rb          |  8 ++++++++
 .../lib/additional_email_headers_interceptor_spec.rb | 12 ++++++++++++
 4 files changed, 25 insertions(+)
 create mode 100644 changelogs/unreleased/add-auto-submited-header.yml
 create mode 100644 config/initializers/additional_headers_interceptor.rb
 create mode 100644 lib/additional_email_headers_interceptor.rb
 create mode 100644 spec/lib/additional_email_headers_interceptor_spec.rb

diff --git a/changelogs/unreleased/add-auto-submited-header.yml b/changelogs/unreleased/add-auto-submited-header.yml
new file mode 100644
index 00000000000..93481613b39
--- /dev/null
+++ b/changelogs/unreleased/add-auto-submited-header.yml
@@ -0,0 +1,4 @@
+---
+title: Set Auto-Submitted header to mails
+merge_request:
+author: Semyon Pupkov
diff --git a/config/initializers/additional_headers_interceptor.rb b/config/initializers/additional_headers_interceptor.rb
new file mode 100644
index 00000000000..b9159e7c06c
--- /dev/null
+++ b/config/initializers/additional_headers_interceptor.rb
@@ -0,0 +1 @@
+ActionMailer::Base.register_interceptor(AdditionalEmailHeadersInterceptor)
diff --git a/lib/additional_email_headers_interceptor.rb b/lib/additional_email_headers_interceptor.rb
new file mode 100644
index 00000000000..2358fa6bbfd
--- /dev/null
+++ b/lib/additional_email_headers_interceptor.rb
@@ -0,0 +1,8 @@
+class AdditionalEmailHeadersInterceptor
+  def self.delivering_email(message)
+    message.headers(
+      'Auto-Submitted' => 'auto-generated',
+      'X-Auto-Response-Suppress' => 'All'
+    )
+  end
+end
diff --git a/spec/lib/additional_email_headers_interceptor_spec.rb b/spec/lib/additional_email_headers_interceptor_spec.rb
new file mode 100644
index 00000000000..580450eef1e
--- /dev/null
+++ b/spec/lib/additional_email_headers_interceptor_spec.rb
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe AdditionalEmailHeadersInterceptor do
+  it 'adds Auto-Submitted header' do
+    mail = ActionMailer::Base.mail(to: 'test@mail.com', from: 'info@mail.com', body: 'hello').deliver
+
+    expect(mail.header['To'].value).to eq('test@mail.com')
+    expect(mail.header['From'].value).to eq('info@mail.com')
+    expect(mail.header['Auto-Submitted'].value).to eq('auto-generated')
+    expect(mail.header['X-Auto-Response-Suppress'].value).to eq('All')
+  end
+end

From a254dcf0edfb6aa4ea93fd0bfdb992565d6e8422 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Wed, 15 Feb 2017 19:59:30 +0100
Subject: [PATCH 30/73] Add count keys to response JSON

---
 app/controllers/projects/environments_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index 3b7240d8469..fed75396d6e 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -29,9 +29,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   end
 
   def folder
-    @environments = project.environments
-      .where(environment_type: params[:id])
-      .with_state(params[:scope] || :available)
+    folder_environments = project.environments.where(environment_type: params[:id])
+    @environments = folder_environments.with_state(params[:scope] || :available)
 
     respond_to do |format|
       format.html
@@ -41,6 +40,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
             .new(project: @project, user: @current_user)
             .with_pagination(request, response)
             .represent(@environments),
+          available_count: folder_environments.available.count,
+          stopped_count: folder_environments.stopped.count
         }
       end
     end

From 679ce9dbb35021bec3bc048948e471ba3989e518 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Thu, 16 Feb 2017 06:55:52 +1100
Subject: [PATCH 31/73] dev favicon is blue, not purple

---
 .../images/{favicon-purple.ico => favicon-blue.ico} | Bin
 app/helpers/page_layout_helper.rb                   |   2 +-
 spec/helpers/page_layout_helper_spec.rb             |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename app/assets/images/{favicon-purple.ico => favicon-blue.ico} (100%)

diff --git a/app/assets/images/favicon-purple.ico b/app/assets/images/favicon-blue.ico
similarity index 100%
rename from app/assets/images/favicon-purple.ico
rename to app/assets/images/favicon-blue.ico
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index aee8099aeb2..3286a92a8a7 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -35,7 +35,7 @@ module PageLayoutHelper
   end
 
   def favicon
-    Rails.env.development? ? 'favicon-purple.ico' : 'favicon.ico'
+    Rails.env.development? ? 'favicon-blue.ico' : 'favicon.ico'
   end
 
   def page_image
diff --git a/spec/helpers/page_layout_helper_spec.rb b/spec/helpers/page_layout_helper_spec.rb
index 872679a6ce3..2cc0b40b2d0 100644
--- a/spec/helpers/page_layout_helper_spec.rb
+++ b/spec/helpers/page_layout_helper_spec.rb
@@ -46,9 +46,9 @@ describe PageLayoutHelper do
       expect(helper.favicon).to eq 'favicon.ico'
     end
 
-    it 'has purple favicon for development' do
+    it 'has blue favicon for development' do
       allow(Rails).to receive(:env).and_return(ActiveSupport::StringInquirer.new('development'))
-      expect(helper.favicon).to eq 'favicon-purple.ico'
+      expect(helper.favicon).to eq 'favicon-blue.ico'
     end
   end
 

From 7af6982e5fcf2b76906f33d5046dd9b2298ac32c Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Sun, 12 Feb 2017 14:40:11 +0000
Subject: [PATCH 32/73] Extracts table into a reusable component

---
 .../components/environment.js.es6             | 37 +++-------
 .../components/environments_table.js.es6      | 74 +++++++++++++++++++
 .../folder/environments_folder_bundle.js.es6  |  0
 .../folder/environments_folder_view.js.es6    |  0
 .../projects/environments/folder.html.haml    |  0
 5 files changed, 85 insertions(+), 26 deletions(-)
 create mode 100644 app/assets/javascripts/environments/components/environments_table.js.es6
 create mode 100644 app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
 create mode 100644 app/assets/javascripts/environments/folder/environments_folder_view.js.es6
 create mode 100644 app/views/projects/environments/folder.html.haml

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 6d9599e7645..42f74e114c9 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -4,14 +4,14 @@
 const Vue = require('vue');
 Vue.use(require('vue-resource'));
 const EnvironmentsService = require('../services/environments_service');
-const EnvironmentItem = require('./environment_item');
+const EnvironmentTable = require('./environments_table');
 const Store = require('../stores/environments_store');
 require('../../vue_shared/components/table_pagination');
 
 module.exports = Vue.component('environment-component', {
 
   components: {
-    'environment-item': EnvironmentItem,
+    'environment-table': EnvironmentTable,
     'table-pagination': gl.VueGlPagination,
   },
 
@@ -209,30 +209,15 @@ module.exports = Vue.component('environment-component', {
 
         <div class="table-holder"
           v-if="!isLoading && state.environments.length > 0">
-          <table class="table ci-table environments">
-            <thead>
-              <tr>
-                <th class="environments-name">Environment</th>
-                <th class="environments-deploy">Last deployment</th>
-                <th class="environments-build">Job</th>
-                <th class="environments-commit">Commit</th>
-                <th class="environments-date">Updated</th>
-                <th class="hidden-xs environments-actions"></th>
-              </tr>
-            </thead>
-            <tbody>
-              <template v-for="model in state.environments"
-                v-bind:model="model">
-                <tr is="environment-item"
-                  :model="model"
-                  :can-create-deployment="canCreateDeploymentParsed"
-                  :can-read-environment="canReadEnvironmentParsed"
-                  :play-icon-svg="playIconSvg"
-                  :terminal-icon-svg="terminalIconSvg"
-                  :commit-icon-svg="commitIconSvg"></tr>
-              </template>
-            </tbody>
-          </table>
+
+          <environment-table
+            :environments="state.environments"
+            :can-create-deployment="canCreateDeploymentParsed"
+            :can-read-environment="canReadEnvironmentParsed"
+            :play-icon-svg="playIconSvg"
+            :terminal-icon-svg="terminalIconSvg"
+            :commit-icon-svg="commitIconSvg">
+          </environment-table>
 
           <table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
             :change="changePage"
diff --git a/app/assets/javascripts/environments/components/environments_table.js.es6 b/app/assets/javascripts/environments/components/environments_table.js.es6
new file mode 100644
index 00000000000..fd35d77fd3d
--- /dev/null
+++ b/app/assets/javascripts/environments/components/environments_table.js.es6
@@ -0,0 +1,74 @@
+/**
+ * Render environments table.
+ */
+const Vue = require('vue');
+const EnvironmentItem = require('./environment_item');
+
+module.exports = Vue.component('environment-table-component', {
+
+  components: {
+    'environment-item': EnvironmentItem,
+  },
+
+  props: {
+    environments: {
+      type: Array,
+      required: true,
+      default: () => ([]),
+    },
+
+    canReadEnvironment: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+
+    canCreateDeployment: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+
+    commitIconSvg: {
+      type: String,
+      required: false,
+    },
+
+    playIconSvg: {
+      type: String,
+      required: false,
+    },
+
+    terminalIconSvg: {
+      type: String,
+      required: false,
+    },
+  },
+
+  template: `
+    <table class="table ci-table environments">
+      <thead>
+        <tr>
+          <th class="environments-name">Environment</th>
+          <th class="environments-deploy">Last deployment</th>
+          <th class="environments-build">Job</th>
+          <th class="environments-commit">Commit</th>
+          <th class="environments-date">Updated</th>
+          <th class="hidden-xs environments-actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <template v-for="model in environments"
+          v-bind:model="model">
+          <tr is="environment-item"
+            :model="model"
+            :can-create-deployment="canCreateDeployment"
+            :can-read-environment="canReadEnvironment"
+            :play-icon-svg="playIconSvg"
+            :terminal-icon-svg="terminalIconSvg"
+            :commit-icon-svg="commitIconSvg"></tr>
+        </template>
+      </tbody>
+    </table>
+  `,
+});
diff --git a/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/app/views/projects/environments/folder.html.haml b/app/views/projects/environments/folder.html.haml
new file mode 100644
index 00000000000..e69de29bb2d

From 26d18387dea786ded85df3a429542c5d1e4f1ac1 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Sun, 12 Feb 2017 14:55:18 +0000
Subject: [PATCH 33/73] First iteration

---
 .../folder/environments_folder_bundle.js.es6  |  14 ++
 .../folder/environments_folder_view.js.es6    | 196 ++++++++++++++++++
 .../stores/environments_folder_store.js.es6   |  49 +++++
 .../projects/environments/folder.html.haml    |   8 +
 config/webpack.config.js                      |   1 +
 5 files changed, 268 insertions(+)
 create mode 100644 app/assets/javascripts/environments/stores/environments_folder_store.js.es6

diff --git a/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
index e69de29bb2d..9cc1c2f4f18 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
+++ b/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
@@ -0,0 +1,14 @@
+const EnvironmentsFolderComponent = require('./environments_folder_view');
+require('../vue_shared/vue_resource_interceptor');
+
+$(() => {
+  window.gl = window.gl || {};
+
+  if (gl.EnvironmentsListFolderApp) {
+    gl.EnvironmentsListFolderApp.$destroy(true);
+  }
+
+  gl.EnvironmentsListFolderApp = new EnvironmentsFolderComponent({
+    el: document.querySelector('#environments-folder-list-view'),
+  });
+});
diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
index e69de29bb2d..070bc84bbe3 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
@@ -0,0 +1,196 @@
+/* eslint-disable no-param-reassign, no-new */
+/* global Flash */
+
+const Vue = require('vue');
+Vue.use(require('vue-resource'));
+const EnvironmentsService = require('../services/environments_service');
+const EnvironmentTable = require('./environments_table');
+const Store = require('../stores/environments_folder_store');
+require('../../vue_shared/components/table_pagination');
+
+module.exports = Vue.component('environment-folder-view', {
+
+  components: {
+    'environment-table': EnvironmentTable,
+    'table-pagination': gl.VueGlPagination,
+  },
+
+  props: {
+    endpoint: {
+      type: String,
+      required: true,
+      default: '',
+    },
+
+    folderName: {
+      type: String,
+      required: true,
+      default: '',
+    },
+  },
+
+  data() {
+    const store = new Store();
+
+    return {
+      store,
+      state: store.state,
+      isLoading: false,
+
+      // Pagination Properties,
+      paginationInformation: {},
+      pageNumber: 1,
+    };
+  },
+
+  /**
+   * Fetches all the environments and stores them.
+   * Toggles loading property.
+   */
+  created() {
+    const scope = this.$options.getQueryParameter('scope') || this.visibility;
+    const pageNumber = this.$options.getQueryParameter('page') || this.pageNumber;
+
+    const endpoint = `${this.endpoint}?scope=${scope}&page=${pageNumber}`;
+
+    const service = new EnvironmentsService(endpoint);
+
+    this.isLoading = true;
+
+    return service.all()
+      .then(resp => ({
+        headers: resp.headers,
+        body: resp.json(),
+      }))
+      .then((response) => {
+        this.store.storeEnvironments(response.body.environments);
+        this.store.storePagination(response.headers);
+      })
+      .then(() => {
+        this.isLoading = false;
+      })
+      .catch(() => {
+        this.isLoading = false;
+        new Flash('An error occurred while fetching the environments.', 'alert');
+      });
+  },
+
+  /**
+   * Transforms the url parameter into an object and
+   * returns the one requested.
+   *
+   * @param  {String} param
+   * @returns {String}       The value of the requested parameter.
+   */
+  getQueryParameter(parameter) {
+    return window.location.search.substring(1).split('&').reduce((acc, param) => {
+      const paramSplited = param.split('=');
+      acc[paramSplited[0]] = paramSplited[1];
+      return acc;
+    }, {})[parameter];
+  },
+
+  methods: {
+    /**
+     * Will change the page number and update the URL.
+     *
+     * If no search params are present, we'll add param for page
+     * If param for page is already present, we'll update it
+     * If there are params but none for page, we'll add it at the end.
+     *
+     * @param  {Number} pageNumber desired page to go to.
+     */
+    changePage(pageNumber) {
+      let param;
+      if (window.location.search.length === 0) {
+        param = `?page=${pageNumber}`;
+      }
+
+      if (window.location.search.indexOf('page') !== -1) {
+        param = window.location.search.replace(/page=\d/g, `page=${pageNumber}`);
+      }
+
+      if (window.location.search.length &&
+        window.location.search.indexOf('page') === -1) {
+        param = `${window.location.search}&page=${pageNumber}`;
+      }
+
+      gl.utils.visitUrl(param);
+      return param;
+    },
+  },
+
+  template: `
+    <div :class="cssContainerClass">
+      <div class="top-area">
+        <ul v-if="!isLoading" class="nav-links">
+          <li v-bind:class="{ 'active': scope === undefined || scope === 'available' }">
+            <a :href="projectEnvironmentsPath">
+              Available
+              <span class="badge js-available-environments-count">
+                {{state.availableCounter}}
+              </span>
+            </a>
+          </li>
+          <li v-bind:class="{ 'active' : scope === 'stopped' }">
+            <a :href="projectStoppedEnvironmentsPath">
+              Stopped
+              <span class="badge js-stopped-environments-count">
+                {{state.stoppedCounter}}
+              </span>
+            </a>
+          </li>
+        </ul>
+        <div v-if="canCreateEnvironmentParsed && !isLoading" class="nav-controls">
+          <a :href="newEnvironmentPath" class="btn btn-create">
+            New environment
+          </a>
+        </div>
+      </div>
+
+      <div class="environments-container">
+        <div class="environments-list-loading text-center" v-if="isLoading">
+          <i class="fa fa-spinner fa-spin"></i>
+        </div>
+
+        <div class="blank-state blank-state-no-icon"
+          v-if="!isLoading && state.environments.length === 0">
+          <h2 class="blank-state-title js-blank-state-title">
+            You don't have any environments right now.
+          </h2>
+          <p class="blank-state-text">
+            Environments are places where code gets deployed, such as staging or production.
+            <br />
+            <a :href="helpPagePath">
+              Read more about environments
+            </a>
+          </p>
+
+          <a v-if="canCreateEnvironmentParsed"
+            :href="newEnvironmentPath"
+            class="btn btn-create js-new-environment-button">
+            New Environment
+          </a>
+        </div>
+
+        <div class="table-holder"
+          v-if="!isLoading && state.environments.length > 0">
+
+          <environment-table
+            :environments="state.environments"
+            :can-create-deployment="canCreateDeploymentParsed"
+            :can-read-environment="canReadEnvironmentParsed"
+            :play-icon-svg="playIconSvg"
+            :terminal-icon-svg="terminalIconSvg"
+            :commit-icon-svg="commitIconSvg">
+          </environment-table>
+
+          <table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
+            :change="changePage"
+            :pageInfo="state.paginationInformation">
+          </table-pagination>
+        </div>
+      </div>
+    </div>
+  `,
+});
diff --git a/app/assets/javascripts/environments/stores/environments_folder_store.js.es6 b/app/assets/javascripts/environments/stores/environments_folder_store.js.es6
new file mode 100644
index 00000000000..005ed52d9a1
--- /dev/null
+++ b/app/assets/javascripts/environments/stores/environments_folder_store.js.es6
@@ -0,0 +1,49 @@
+require('~/lib/utils/common_utils');
+/**
+ * Environments Folder Store.
+ *
+ * Stores received environments that belong to a parent store.
+ */
+class EnvironmentsFolderStore {
+  constructor() {
+    this.state = {};
+    this.state.environments = [];
+    this.state.paginationInformation = {};
+
+    return this;
+  }
+
+  /**
+   *
+   * Stores the received environments.
+   *
+   * Each environment has the following schema
+   * { name: String, size: Number, latest: Object }
+   *
+   *
+   * @param  {Array} environments
+   * @returns {Array}
+   */
+  storeEnvironments(environments = []) {
+    this.state.environments = environments;
+
+    return environments;
+  }
+
+  storePagination(pagination = {}) {
+    const normalizedHeaders = gl.utils.normalizeHeaders(pagination);
+    const paginationInformation = {
+      perPage: parseInt(normalizedHeaders['X-PER-PAGE'], 10),
+      page: parseInt(normalizedHeaders['X-PAGE'], 10),
+      total: parseInt(normalizedHeaders['X-TOTAL'], 10),
+      totalPages: parseInt(normalizedHeaders['X-TOTAL-PAGES'], 10),
+      nextPage: parseInt(normalizedHeaders['X-NEXT-PAGE'], 10),
+      previousPage: parseInt(normalizedHeaders['X-PREV-PAGE'], 10),
+    };
+
+    this.state.paginationInformation = paginationInformation;
+    return paginationInformation;
+  }
+}
+
+module.exports = EnvironmentsFolderStore;
diff --git a/app/views/projects/environments/folder.html.haml b/app/views/projects/environments/folder.html.haml
index e69de29bb2d..452d32fc8b6 100644
--- a/app/views/projects/environments/folder.html.haml
+++ b/app/views/projects/environments/folder.html.haml
@@ -0,0 +1,8 @@
+- @no_container = true
+- page_title "Environments"
+= render "projects/pipelines/head"
+
+- content_for :page_specific_javascripts do
+  = page_specific_javascript_bundle_tag("environments_folder")
+
+#environments-folder-list-view
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 00f448c1fbb..7fda5405ea2 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -22,6 +22,7 @@ var config = {
     commit_pipelines:     './commit/pipelines/pipelines_bundle.js',
     diff_notes:           './diff_notes/diff_notes_bundle.js',
     environments:         './environments/environments_bundle.js',
+    environments_folder:  './environments/folder/environments_folder_bundle.js',
     filtered_search:      './filtered_search/filtered_search_bundle.js',
     graphs:               './graphs/graphs_bundle.js',
     issuable:             './issuable/issuable_bundle.js',

From 082348491360d51ffaa737e3f266c4d1d6bdd946 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Sun, 12 Feb 2017 16:58:53 +0000
Subject: [PATCH 34/73] Adds url for folder; Creates new subview to show
 envirnoments that belong to a folder

---
 .../components/environment_item.js.es6        | 12 ++-
 .../folder/environments_folder_bundle.js.es6  |  1 -
 .../folder/environments_folder_view.js.es6    | 86 +++++++++----------
 .../stores/environments_folder_store.js.es6   | 49 -----------
 .../projects/environments/folder.html.haml    |  7 +-
 5 files changed, 59 insertions(+), 96 deletions(-)
 delete mode 100644 app/assets/javascripts/environments/stores/environments_folder_store.js.es6

diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index fc45c3c5f53..e40c97130ad 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -407,6 +407,16 @@ module.exports = Vue.component('environment-item', {
 
       return '';
     },
+
+    /**
+     * Constructs folder URL based on the current location and the folder id.
+     *
+     * @return {String}
+     */
+    folderUrl() {
+      return `${window.location.pathname}/folders/${this.model.latest.id}`;
+    },
+
   },
 
   /**
@@ -432,7 +442,7 @@ module.exports = Vue.component('environment-item', {
           :href="environmentPath">
           {{model.name}}
         </a>
-        <a v-else class="folder-name">
+        <a v-else class="folder-name" :href="folderUrl">
           <span class="folder-icon">
             <i class="fa fa-caret-right" aria-hidden="true"></i>
             <i class="fa fa-folder" aria-hidden="true"></i>
diff --git a/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
index 9cc1c2f4f18..d2ca465351a 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
+++ b/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
@@ -1,5 +1,4 @@
 const EnvironmentsFolderComponent = require('./environments_folder_view');
-require('../vue_shared/vue_resource_interceptor');
 
 $(() => {
   window.gl = window.gl || {};
diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
index 070bc84bbe3..83643161056 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
@@ -4,9 +4,8 @@
 const Vue = require('vue');
 Vue.use(require('vue-resource'));
 const EnvironmentsService = require('../services/environments_service');
-const EnvironmentTable = require('./environments_table');
-const Store = require('../stores/environments_folder_store');
-require('../../vue_shared/components/table_pagination');
+const EnvironmentTable = require('../components/environments_table');
+const Store = require('../stores/environments_store');
 
 module.exports = Vue.component('environment-folder-view', {
 
@@ -15,27 +14,25 @@ module.exports = Vue.component('environment-folder-view', {
     'table-pagination': gl.VueGlPagination,
   },
 
-  props: {
-    endpoint: {
-      type: String,
-      required: true,
-      default: '',
-    },
-
-    folderName: {
-      type: String,
-      required: true,
-      default: '',
-    },
-  },
-
   data() {
+    const environmentsData = document.querySelector('#environments-folder-list-view').dataset;
     const store = new Store();
+    const endpoint = `${window.location.pathname}.json`;
 
     return {
       store,
+      endpoint,
       state: store.state,
+      visibility: 'available',
       isLoading: false,
+      cssContainerClass: environmentsData.cssClass,
+      canCreateDeployment: environmentsData.canCreateDeployment,
+      canReadEnvironment: environmentsData.canReadEnvironment,
+
+      // svgs
+      commitIconSvg: environmentsData.commitIconSvg,
+      playIconSvg: environmentsData.playIconSvg,
+      terminalIconSvg: environmentsData.terminalIconSvg,
 
       // Pagination Properties,
       paginationInformation: {},
@@ -43,6 +40,29 @@ module.exports = Vue.component('environment-folder-view', {
     };
   },
 
+  computed: {
+    scope() {
+      return this.$options.getQueryParameter('scope');
+    },
+
+    canReadEnvironmentParsed() {
+      return this.$options.convertPermissionToBoolean(this.canReadEnvironment);
+    },
+
+    canCreateDeploymentParsed() {
+      return this.$options.convertPermissionToBoolean(this.canCreateDeployment);
+    },
+
+    stoppedPath() {
+      return `${window.location.pathname}?scope=stopped`;
+    },
+
+    availablePath() {
+      return window.location.pathname;
+    },
+
+  },
+
   /**
    * Fetches all the environments and stores them.
    * Toggles loading property.
@@ -123,9 +143,12 @@ module.exports = Vue.component('environment-folder-view', {
   template: `
     <div :class="cssContainerClass">
       <div class="top-area">
+
+        <h3>FOLDER NAME</h3>
+
         <ul v-if="!isLoading" class="nav-links">
           <li v-bind:class="{ 'active': scope === undefined || scope === 'available' }">
-            <a :href="projectEnvironmentsPath">
+            <a :href="availablePath">
               Available
               <span class="badge js-available-environments-count">
                 {{state.availableCounter}}
@@ -133,7 +156,7 @@ module.exports = Vue.component('environment-folder-view', {
             </a>
           </li>
           <li v-bind:class="{ 'active' : scope === 'stopped' }">
-            <a :href="projectStoppedEnvironmentsPath">
+            <a :href="stoppedPath">
               Stopped
               <span class="badge js-stopped-environments-count">
                 {{state.stoppedCounter}}
@@ -141,11 +164,6 @@ module.exports = Vue.component('environment-folder-view', {
             </a>
           </li>
         </ul>
-        <div v-if="canCreateEnvironmentParsed && !isLoading" class="nav-controls">
-          <a :href="newEnvironmentPath" class="btn btn-create">
-            New environment
-          </a>
-        </div>
       </div>
 
       <div class="environments-container">
@@ -153,26 +171,6 @@ module.exports = Vue.component('environment-folder-view', {
           <i class="fa fa-spinner fa-spin"></i>
         </div>
 
-        <div class="blank-state blank-state-no-icon"
-          v-if="!isLoading && state.environments.length === 0">
-          <h2 class="blank-state-title js-blank-state-title">
-            You don't have any environments right now.
-          </h2>
-          <p class="blank-state-text">
-            Environments are places where code gets deployed, such as staging or production.
-            <br />
-            <a :href="helpPagePath">
-              Read more about environments
-            </a>
-          </p>
-
-          <a v-if="canCreateEnvironmentParsed"
-            :href="newEnvironmentPath"
-            class="btn btn-create js-new-environment-button">
-            New Environment
-          </a>
-        </div>
-
         <div class="table-holder"
           v-if="!isLoading && state.environments.length > 0">
 
diff --git a/app/assets/javascripts/environments/stores/environments_folder_store.js.es6 b/app/assets/javascripts/environments/stores/environments_folder_store.js.es6
deleted file mode 100644
index 005ed52d9a1..00000000000
--- a/app/assets/javascripts/environments/stores/environments_folder_store.js.es6
+++ /dev/null
@@ -1,49 +0,0 @@
-require('~/lib/utils/common_utils');
-/**
- * Environments Folder Store.
- *
- * Stores received environments that belong to a parent store.
- */
-class EnvironmentsFolderStore {
-  constructor() {
-    this.state = {};
-    this.state.environments = [];
-    this.state.paginationInformation = {};
-
-    return this;
-  }
-
-  /**
-   *
-   * Stores the received environments.
-   *
-   * Each environment has the following schema
-   * { name: String, size: Number, latest: Object }
-   *
-   *
-   * @param  {Array} environments
-   * @returns {Array}
-   */
-  storeEnvironments(environments = []) {
-    this.state.environments = environments;
-
-    return environments;
-  }
-
-  storePagination(pagination = {}) {
-    const normalizedHeaders = gl.utils.normalizeHeaders(pagination);
-    const paginationInformation = {
-      perPage: parseInt(normalizedHeaders['X-PER-PAGE'], 10),
-      page: parseInt(normalizedHeaders['X-PAGE'], 10),
-      total: parseInt(normalizedHeaders['X-TOTAL'], 10),
-      totalPages: parseInt(normalizedHeaders['X-TOTAL-PAGES'], 10),
-      nextPage: parseInt(normalizedHeaders['X-NEXT-PAGE'], 10),
-      previousPage: parseInt(normalizedHeaders['X-PREV-PAGE'], 10),
-    };
-
-    this.state.paginationInformation = paginationInformation;
-    return paginationInformation;
-  }
-}
-
-module.exports = EnvironmentsFolderStore;
diff --git a/app/views/projects/environments/folder.html.haml b/app/views/projects/environments/folder.html.haml
index 452d32fc8b6..d9cb7bc0331 100644
--- a/app/views/projects/environments/folder.html.haml
+++ b/app/views/projects/environments/folder.html.haml
@@ -5,4 +5,9 @@
 - content_for :page_specific_javascripts do
   = page_specific_javascript_bundle_tag("environments_folder")
 
-#environments-folder-list-view
+#environments-folder-list-view{ data: { "can-create-deployment" => can?(current_user, :create_deployment, @project).to_s,
+  "can-read-environment" => can?(current_user, :read_environment, @project).to_s,
+  "css-class" => container_class,
+  "commit-icon-svg" => custom_icon("icon_commit"),
+  "terminal-icon-svg" => custom_icon("icon_terminal"),
+  "play-icon-svg" => custom_icon("icon_play") } }

From 17897c37f806e593359239ba09667081b88cb24b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 13 Feb 2017 14:41:50 +0000
Subject: [PATCH 35/73] Fix underline style

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

diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index 606cf501b82..2f4a3c80aeb 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -122,6 +122,7 @@
   .folder-name {
     cursor: pointer;
     color: $gl-text-color-secondary;
+    display: inline-block;
   }
 }
 

From 73accafe430f56cd3065774c6118de3db0a45734 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 13 Feb 2017 14:49:19 +0000
Subject: [PATCH 36/73] Use common util to get parameter name

---
 .../components/environment.js.es6             | 24 ++++---------------
 .../folder/environments_folder_view.js.es6    |  7 +++---
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 42f74e114c9..2cbfbcad023 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -7,6 +7,7 @@ const EnvironmentsService = require('../services/environments_service');
 const EnvironmentTable = require('./environments_table');
 const Store = require('../stores/environments_store');
 require('../../vue_shared/components/table_pagination');
+require('../../lib/utils/common_utils');
 
 module.exports = Vue.component('environment-component', {
 
@@ -45,7 +46,7 @@ module.exports = Vue.component('environment-component', {
 
   computed: {
     scope() {
-      return this.$options.getQueryParameter('scope');
+      return gl.utils.getParameterByName('scope');
     },
 
     canReadEnvironmentParsed() {
@@ -67,8 +68,8 @@ module.exports = Vue.component('environment-component', {
    * Toggles loading property.
    */
   created() {
-    const scope = this.$options.getQueryParameter('scope') || this.visibility;
-    const pageNumber = this.$options.getQueryParameter('page') || this.pageNumber;
+    const scope = gl.utils.getParameterByName('scope') || this.visibility;
+    const pageNumber = gl.utils.getParameterByName('page') || this.pageNumber;
 
     const endpoint = `${this.endpoint}?scope=${scope}&page=${pageNumber}`;
 
@@ -96,21 +97,6 @@ module.exports = Vue.component('environment-component', {
       });
   },
 
-  /**
-   * Transforms the url parameter into an object and
-   * returns the one requested.
-   *
-   * @param  {String} param
-   * @returns {String}       The value of the requested parameter.
-   */
-  getQueryParameter(parameter) {
-    return window.location.search.substring(1).split('&').reduce((acc, param) => {
-      const paramSplited = param.split('=');
-      acc[paramSplited[0]] = paramSplited[1];
-      return acc;
-    }, {})[parameter];
-  },
-
   /**
    * Converts permission provided as strings to booleans.
    * @param  {String} string
@@ -158,7 +144,7 @@ module.exports = Vue.component('environment-component', {
     <div :class="cssContainerClass">
       <div class="top-area">
         <ul v-if="!isLoading" class="nav-links">
-          <li v-bind:class="{ 'active': scope === undefined || scope === 'available' }">
+          <li v-bind:class="{ 'active': scope === null || scope === 'available' }">
             <a :href="projectEnvironmentsPath">
               Available
               <span class="badge js-available-environments-count">
diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
index 83643161056..c5d1e2d4d9f 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
@@ -6,6 +6,7 @@ Vue.use(require('vue-resource'));
 const EnvironmentsService = require('../services/environments_service');
 const EnvironmentTable = require('../components/environments_table');
 const Store = require('../stores/environments_store');
+require('../../lib/utils/common_utils');
 
 module.exports = Vue.component('environment-folder-view', {
 
@@ -42,7 +43,7 @@ module.exports = Vue.component('environment-folder-view', {
 
   computed: {
     scope() {
-      return this.$options.getQueryParameter('scope');
+      return gl.utils.getParameterByName('scope');
     },
 
     canReadEnvironmentParsed() {
@@ -68,8 +69,8 @@ module.exports = Vue.component('environment-folder-view', {
    * Toggles loading property.
    */
   created() {
-    const scope = this.$options.getQueryParameter('scope') || this.visibility;
-    const pageNumber = this.$options.getQueryParameter('page') || this.pageNumber;
+    const scope = gl.utils.getParameterByName('scope') || this.visibility;
+    const pageNumber = gl.utils.getParameterByName('page') || this.pageNumber;
 
     const endpoint = `${this.endpoint}?scope=${scope}&page=${pageNumber}`;
 

From 1285d629064abce3aee8faafaa57492da6f8f163 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 13 Feb 2017 16:11:11 +0000
Subject: [PATCH 37/73] Move change page param to utility function

Add tests

Adds folder name in the top of the table
---
 .../components/environment.js.es6             |  34 +--
 .../components/environment_item.js.es6        |   4 +-
 .../folder/environments_folder_bundle.js.es6  |   1 +
 .../folder/environments_folder_view.js.es6    |  67 +++---
 .../javascripts/lib/utils/common_utils.js.es6 |  40 ++++
 .../stylesheets/pages/environments.scss       |   5 +
 .../environment_table_spec.js.es6             |  30 +++
 .../environments_folder_view_spec.js.es6      | 212 ++++++++++++++++++
 .../environments_folder_view.html.haml        |   7 +
 9 files changed, 328 insertions(+), 72 deletions(-)
 create mode 100644 spec/javascripts/environments/environment_table_spec.js.es6
 create mode 100644 spec/javascripts/environments/folder/environments_folder_view_spec.js.es6
 create mode 100644 spec/javascripts/fixtures/environments/environments_folder_view.html.haml

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 2cbfbcad023..e9ea6d91adb 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -50,15 +50,15 @@ module.exports = Vue.component('environment-component', {
     },
 
     canReadEnvironmentParsed() {
-      return this.$options.convertPermissionToBoolean(this.canReadEnvironment);
+      return gl.utils.convertPermissionToBoolean(this.canReadEnvironment);
     },
 
     canCreateDeploymentParsed() {
-      return this.$options.convertPermissionToBoolean(this.canCreateDeployment);
+      return gl.utils.convertPermissionToBoolean(this.canCreateDeployment);
     },
 
     canCreateEnvironmentParsed() {
-      return this.$options.convertPermissionToBoolean(this.canCreateEnvironment);
+      return gl.utils.convertPermissionToBoolean(this.canCreateEnvironment);
     },
 
   },
@@ -97,15 +97,6 @@ module.exports = Vue.component('environment-component', {
       });
   },
 
-  /**
-   * Converts permission provided as strings to booleans.
-   * @param  {String} string
-   * @returns {Boolean}
-   */
-  convertPermissionToBoolean(string) {
-    return string === 'true';
-  },
-
   methods: {
     toggleRow(model) {
       return this.store.toggleFolder(model.name);
@@ -114,26 +105,11 @@ module.exports = Vue.component('environment-component', {
     /**
      * Will change the page number and update the URL.
      *
-     * If no search params are present, we'll add param for page
-     * If param for page is already present, we'll update it
-     * If there are params but none for page, we'll add it at the end.
-     *
      * @param  {Number} pageNumber desired page to go to.
+     * @return {String}
      */
     changePage(pageNumber) {
-      let param;
-      if (window.location.search.length === 0) {
-        param = `?page=${pageNumber}`;
-      }
-
-      if (window.location.search.indexOf('page') !== -1) {
-        param = window.location.search.replace(/page=\d/g, `page=${pageNumber}`);
-      }
-
-      if (window.location.search.length &&
-        window.location.search.indexOf('page') === -1) {
-        param = `${window.location.search}&page=${pageNumber}`;
-      }
+      const param = gl.utils.setParamInURL('page', pageNumber);
 
       gl.utils.visitUrl(param);
       return param;
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index e40c97130ad..8401459977b 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -99,7 +99,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean}
      */
     hasStopAction() {
-      return this.model.latest['stop_action?'];
+      return this.model.latest && this.model.latest['stop_action?'];
     },
 
     /**
@@ -414,7 +414,7 @@ module.exports = Vue.component('environment-item', {
      * @return {String}
      */
     folderUrl() {
-      return `${window.location.pathname}/folders/${this.model.latest.id}`;
+      return `${window.location.pathname}/folders/${this.model.name}`;
     },
 
   },
diff --git a/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
index d2ca465351a..29f704c1a37 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
+++ b/app/assets/javascripts/environments/folder/environments_folder_bundle.js.es6
@@ -1,4 +1,5 @@
 const EnvironmentsFolderComponent = require('./environments_folder_view');
+require('../../vue_shared/vue_resource_interceptor');
 
 $(() => {
   window.gl = window.gl || {};
diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
index c5d1e2d4d9f..f67e5eab64a 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
@@ -6,6 +6,7 @@ Vue.use(require('vue-resource'));
 const EnvironmentsService = require('../services/environments_service');
 const EnvironmentTable = require('../components/environments_table');
 const Store = require('../stores/environments_store');
+require('../../vue_shared/components/table_pagination');
 require('../../lib/utils/common_utils');
 
 module.exports = Vue.component('environment-folder-view', {
@@ -19,9 +20,11 @@ module.exports = Vue.component('environment-folder-view', {
     const environmentsData = document.querySelector('#environments-folder-list-view').dataset;
     const store = new Store();
     const endpoint = `${window.location.pathname}.json`;
+    const folderName = window.location.pathname.substr(window.location.pathname.lastIndexOf('/') + 1);
 
     return {
       store,
+      folderName,
       endpoint,
       state: store.state,
       visibility: 'available',
@@ -47,21 +50,30 @@ module.exports = Vue.component('environment-folder-view', {
     },
 
     canReadEnvironmentParsed() {
-      return this.$options.convertPermissionToBoolean(this.canReadEnvironment);
+      return gl.utils.convertPermissionToBoolean(this.canReadEnvironment);
     },
 
     canCreateDeploymentParsed() {
-      return this.$options.convertPermissionToBoolean(this.canCreateDeployment);
+      return gl.utils.convertPermissionToBoolean(this.canCreateDeployment);
     },
 
+    /**
+     * URL to link in the stopped tab.
+     *
+     * @return {String}
+     */
     stoppedPath() {
       return `${window.location.pathname}?scope=stopped`;
     },
 
+    /**
+     * URL to link in the available tab.
+     *
+     * @return {String}
+     */
     availablePath() {
       return window.location.pathname;
     },
-
   },
 
   /**
@@ -84,6 +96,8 @@ module.exports = Vue.component('environment-folder-view', {
         body: resp.json(),
       }))
       .then((response) => {
+        this.store.storeAvailableCount(response.body.available_count);
+        this.store.storeStoppedCount(response.body.stopped_count);
         this.store.storeEnvironments(response.body.environments);
         this.store.storePagination(response.headers);
       })
@@ -96,45 +110,14 @@ module.exports = Vue.component('environment-folder-view', {
       });
   },
 
-  /**
-   * Transforms the url parameter into an object and
-   * returns the one requested.
-   *
-   * @param  {String} param
-   * @returns {String}       The value of the requested parameter.
-   */
-  getQueryParameter(parameter) {
-    return window.location.search.substring(1).split('&').reduce((acc, param) => {
-      const paramSplited = param.split('=');
-      acc[paramSplited[0]] = paramSplited[1];
-      return acc;
-    }, {})[parameter];
-  },
-
   methods: {
     /**
      * Will change the page number and update the URL.
      *
-     * If no search params are present, we'll add param for page
-     * If param for page is already present, we'll update it
-     * If there are params but none for page, we'll add it at the end.
-     *
      * @param  {Number} pageNumber desired page to go to.
      */
     changePage(pageNumber) {
-      let param;
-      if (window.location.search.length === 0) {
-        param = `?page=${pageNumber}`;
-      }
-
-      if (window.location.search.indexOf('page') !== -1) {
-        param = window.location.search.replace(/page=\d/g, `page=${pageNumber}`);
-      }
-
-      if (window.location.search.length &&
-        window.location.search.indexOf('page') === -1) {
-        param = `${window.location.search}&page=${pageNumber}`;
-      }
+      const param = gl.utils.setParamInURL('page', pageNumber);
 
       gl.utils.visitUrl(param);
       return param;
@@ -143,13 +126,15 @@ module.exports = Vue.component('environment-folder-view', {
 
   template: `
     <div :class="cssContainerClass">
-      <div class="top-area">
+      <div class="top-area" v-if="!isLoading">
 
-        <h3>FOLDER NAME</h3>
+        <h4 class="js-folder-name environments-folder-name">
+          Environments / <b>{{folderName}}</b>
+        </h4>
 
-        <ul v-if="!isLoading" class="nav-links">
-          <li v-bind:class="{ 'active': scope === undefined || scope === 'available' }">
-            <a :href="availablePath">
+        <ul class="nav-links">
+          <li v-bind:class="{ 'active': scope === null || scope === 'available' }">
+            <a :href="availablePath" class="js-available-environments-folder-tab">
               Available
               <span class="badge js-available-environments-count">
                 {{state.availableCounter}}
@@ -157,7 +142,7 @@ module.exports = Vue.component('environment-folder-view', {
             </a>
           </li>
           <li v-bind:class="{ 'active' : scope === 'stopped' }">
-            <a :href="stoppedPath">
+            <a :href="stoppedPath" class="js-stopped-environments-folder-tab">
               Stopped
               <span class="badge js-stopped-environments-count">
                 {{state.stoppedCounter}}
diff --git a/app/assets/javascripts/lib/utils/common_utils.js.es6 b/app/assets/javascripts/lib/utils/common_utils.js.es6
index bcb3a706b51..276ff01ab89 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js.es6
+++ b/app/assets/javascripts/lib/utils/common_utils.js.es6
@@ -241,5 +241,45 @@
       acc[element] = DOMStringMapObject[element];
       return acc;
     }, {});
+
+    /**
+     * Updates the search parameter of a URL given the parameter and values provided.
+     *
+     * If no search params are present we'll add it.
+     * If param for page is already present, we'll update it
+     * If there are params but not for the given one, we'll add it at the end.
+     * Returns the new search parameters.
+     *
+     * @param {String} param
+     * @param {Number|String|Undefined|Null} value
+     * @return {String}
+     */
+    w.gl.utils.setParamInURL = (param, value) => {
+      let search;
+
+      if (window.location.search.length === 0) {
+        search = `?${param}=${value}`;
+      }
+
+      if (window.location.search.indexOf(param) !== -1) {
+        const regex = new RegExp(param + '=\\d');
+        search = window.location.search.replace(regex, `${param}=${value}`);
+      }
+
+      if (window.location.search.length &&
+        window.location.search.indexOf(param) === -1) {
+        search = `${window.location.search}&${param}=${value}`;
+      }
+
+      return search;
+    };
+
+    /**
+     * Converts permission provided as strings to booleans.
+     *
+     * @param  {String} string
+     * @returns {Boolean}
+     */
+    w.gl.utils.convertPermissionToBoolean = permission => permission === 'true';
   })(window);
 }).call(this);
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index 2f4a3c80aeb..fed63158f41 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -10,6 +10,11 @@
   font-size: 34px;
 }
 
+.environments-folder-name {
+  font-weight: normal;
+  padding-top: 20px;
+}
+
 @media (max-width: $screen-xs-max) {
   .environments-container {
     width: 100%;
diff --git a/spec/javascripts/environments/environment_table_spec.js.es6 b/spec/javascripts/environments/environment_table_spec.js.es6
new file mode 100644
index 00000000000..be4330b5012
--- /dev/null
+++ b/spec/javascripts/environments/environment_table_spec.js.es6
@@ -0,0 +1,30 @@
+const EnvironmentTable = require('~/environments/components/environments_table');
+
+describe('Environment item', () => {
+  preloadFixtures('static/environments/element.html.raw');
+  beforeEach(() => {
+    loadFixtures('static/environments/element.html.raw');
+  });
+
+  it('Should render a table', () => {
+    const mockItem = {
+      name: 'review',
+      size: 3,
+      isFolder: true,
+      latest: {
+        environment_path: 'url',
+      },
+    };
+
+    const component = new EnvironmentTable({
+      el: document.querySelector('.test-dom-element'),
+      propsData: {
+        environments: [{ mockItem }],
+        canCreateDeployment: false,
+        canReadEnvironment: true,
+      },
+    });
+
+    expect(component.$el.tagName).toEqual('TABLE');
+  });
+});
diff --git a/spec/javascripts/environments/folder/environments_folder_view_spec.js.es6 b/spec/javascripts/environments/folder/environments_folder_view_spec.js.es6
new file mode 100644
index 00000000000..6a95fabcea5
--- /dev/null
+++ b/spec/javascripts/environments/folder/environments_folder_view_spec.js.es6
@@ -0,0 +1,212 @@
+const Vue = require('vue');
+require('~/flash');
+const EnvironmentsFolderViewComponent = require('~/environments/folder/environments_folder_view');
+const { environmentsList } = require('../mock_data');
+
+describe('Environments Folder View', () => {
+  preloadFixtures('static/environments/environments_folder_view.html.raw');
+
+  beforeEach(() => {
+    loadFixtures('static/environments/environments_folder_view.html.raw');
+    window.history.pushState({}, null, 'environments/folders/51');
+  });
+
+  let component;
+
+  describe('successfull request', () => {
+    const environmentsResponseInterceptor = (request, next) => {
+      next(request.respondWith(JSON.stringify({
+        environments: environmentsList,
+        stopped_count: 1,
+        available_count: 0,
+      }), {
+        status: 200,
+        headers: {
+          'X-nExt-pAge': '2',
+          'x-page': '1',
+          'X-Per-Page': '1',
+          'X-Prev-Page': '',
+          'X-TOTAL': '37',
+          'X-Total-Pages': '2',
+        },
+      }));
+    };
+
+    beforeEach(() => {
+      Vue.http.interceptors.push(environmentsResponseInterceptor);
+      component = new EnvironmentsFolderViewComponent({
+        el: document.querySelector('#environments-folder-list-view'),
+      });
+    });
+
+    afterEach(() => {
+      Vue.http.interceptors = _.without(
+        Vue.http.interceptors, environmentsResponseInterceptor,
+      );
+    });
+
+    it('should render a table with environments', (done) => {
+      setTimeout(() => {
+        expect(
+          component.$el.querySelectorAll('table tbody tr').length,
+        ).toEqual(2);
+        done();
+      }, 0);
+    });
+
+    it('should render available tab with count', (done) => {
+      setTimeout(() => {
+        expect(
+          component.$el.querySelector('.js-available-environments-folder-tab').textContent,
+        ).toContain('Available');
+
+        expect(
+          component.$el.querySelector('.js-available-environments-folder-tab .js-available-environments-count').textContent,
+        ).toContain('0');
+        done();
+      }, 0);
+    });
+
+    it('should render stopped tab with count', (done) => {
+      setTimeout(() => {
+        expect(
+          component.$el.querySelector('.js-stopped-environments-folder-tab').textContent,
+        ).toContain('Stopped');
+
+        expect(
+          component.$el.querySelector('.js-stopped-environments-folder-tab .js-stopped-environments-count').textContent,
+        ).toContain('1');
+        done();
+      }, 0);
+    });
+
+    // FIX ME:
+    it('should render parent folder name', (done) => {
+      setTimeout(() => {
+        expect(
+          component.$el.querySelector('.js-folder-name'),
+        ).toBe(null);
+        done();
+      }, 0);
+    });
+
+    describe('pagination', () => {
+      it('should render pagination', (done) => {
+        setTimeout(() => {
+          expect(
+            component.$el.querySelectorAll('.gl-pagination li').length,
+          ).toEqual(5);
+          done();
+        }, 0);
+      });
+
+      it('should update url when no search params are present', (done) => {
+        spyOn(gl.utils, 'visitUrl');
+        setTimeout(() => {
+          component.$el.querySelector('.gl-pagination li:nth-child(5) a').click();
+          expect(gl.utils.visitUrl).toHaveBeenCalledWith('?page=2');
+          done();
+        }, 0);
+      });
+
+      it('should update url when page is already present', (done) => {
+        spyOn(gl.utils, 'visitUrl');
+        window.history.pushState({}, null, '?page=1');
+
+        setTimeout(() => {
+          component.$el.querySelector('.gl-pagination li:nth-child(5) a').click();
+          expect(gl.utils.visitUrl).toHaveBeenCalledWith('?page=2');
+          done();
+        }, 0);
+      });
+
+      it('should update url when page and scope are already present', (done) => {
+        spyOn(gl.utils, 'visitUrl');
+        window.history.pushState({}, null, '?scope=all&page=1');
+
+        setTimeout(() => {
+          component.$el.querySelector('.gl-pagination li:nth-child(5) a').click();
+          expect(gl.utils.visitUrl).toHaveBeenCalledWith('?scope=all&page=2');
+          done();
+        }, 0);
+      });
+
+      it('should update url when page and scope are already present and page is first param', (done) => {
+        spyOn(gl.utils, 'visitUrl');
+        window.history.pushState({}, null, '?page=1&scope=all');
+
+        setTimeout(() => {
+          component.$el.querySelector('.gl-pagination li:nth-child(5) a').click();
+          expect(gl.utils.visitUrl).toHaveBeenCalledWith('?page=2&scope=all');
+          done();
+        }, 0);
+      });
+    });
+  });
+
+  describe('unsuccessfull request', () => {
+    const environmentsErrorResponseInterceptor = (request, next) => {
+      next(request.respondWith(JSON.stringify([]), {
+        status: 500,
+      }));
+    };
+
+    beforeEach(() => {
+      Vue.http.interceptors.push(environmentsErrorResponseInterceptor);
+    });
+
+    afterEach(() => {
+      Vue.http.interceptors = _.without(
+        Vue.http.interceptors, environmentsErrorResponseInterceptor,
+      );
+    });
+
+    it('should not render a table', (done) => {
+      component = new EnvironmentsFolderViewComponent({
+        el: document.querySelector('#environments-folder-list-view'),
+      });
+
+      setTimeout(() => {
+        expect(
+          component.$el.querySelector('table'),
+        ).toBe(null);
+        done();
+      }, 0);
+    });
+
+    it('should render available tab with count 0', (done) => {
+      setTimeout(() => {
+        expect(
+          component.$el.querySelector('.js-available-environments-folder-tab').textContent,
+        ).toContain('Available');
+
+        expect(
+          component.$el.querySelector('.js-available-environments-folder-tab .js-available-environments-count').textContent,
+        ).toContain('0');
+        done();
+      }, 0);
+    });
+
+    it('should render stopped tab with count 0', (done) => {
+      setTimeout(() => {
+        expect(
+          component.$el.querySelector('.js-stopped-environments-folder-tab').textContent,
+        ).toContain('Stopped');
+
+        expect(
+          component.$el.querySelector('.js-stopped-environments-folder-tab .js-stopped-environments-count').textContent,
+        ).toContain('0');
+        done();
+      }, 0);
+    });
+
+    it('should not render parent folder name', (done) => {
+      setTimeout(() => {
+        expect(
+          component.$el.querySelector('.js-folder-name'),
+        ).toBe(null);
+        done();
+      }, 0);
+    });
+  });
+});
diff --git a/spec/javascripts/fixtures/environments/environments_folder_view.html.haml b/spec/javascripts/fixtures/environments/environments_folder_view.html.haml
new file mode 100644
index 00000000000..aceec139730
--- /dev/null
+++ b/spec/javascripts/fixtures/environments/environments_folder_view.html.haml
@@ -0,0 +1,7 @@
+%div
+  #environments-folder-list-view{ data: { "can-create-deployment" => "true",
+    "can-read-environment" => "true",
+    "css-class" => "",
+    "commit-icon-svg" => custom_icon("icon_commit"),
+    "terminal-icon-svg" => custom_icon("icon_terminal"),
+    "play-icon-svg" => custom_icon("icon_play") } }

From 9414fc5c93d83a560da96b52ac062f8574726827 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 15 Feb 2017 19:45:19 +0000
Subject: [PATCH 38/73] Moves check for latest key to store instead of poluting
 the view making it reusable between endpoints.

---
 .../components/environment_item.js.es6        | 192 +++++++++---------
 .../stores/environments_store.js.es6          |  19 +-
 .../stylesheets/pages/environments.scss       |   1 +
 3 files changed, 112 insertions(+), 100 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 8401459977b..2187969c2ae 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -72,9 +72,9 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean}
      */
     hasLastDeploymentKey() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        !this.$options.isObjectEmpty(this.model.latest.last_deployment)) {
+      if (this.model &&
+        this.model.last_deployment &&
+        !this.$options.isObjectEmpty(this.model.last_deployment)) {
         return true;
       }
       return false;
@@ -87,10 +87,10 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     hasManualActions() {
-      return this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.manual_actions &&
-        this.model.latest.last_deployment.manual_actions.length > 0;
+      return this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.manual_actions &&
+        this.model.last_deployment.manual_actions.length > 0;
     },
 
     /**
@@ -99,7 +99,7 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean}
      */
     hasStopAction() {
-      return this.model.latest && this.model.latest['stop_action?'];
+      return this.model && this.model['stop_action?'];
     },
 
     /**
@@ -109,10 +109,10 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     canRetry() {
-      return this.model.latest &&
+      return this.model &&
         this.hasLastDeploymentKey &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.deployable;
+        this.model.last_deployment &&
+        this.model.last_deployment.deployable;
     },
 
     /**
@@ -121,10 +121,10 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     canShowDate() {
-      return this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.deployable &&
-        this.model.latest.last_deployment.deployable !== undefined;
+      return this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.deployable &&
+        this.model.last_deployment.deployable !== undefined;
     },
 
     /**
@@ -133,11 +133,11 @@ module.exports = Vue.component('environment-item', {
      * @returns {String}
      */
     createdDate() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.deployable &&
-        this.model.latest.last_deployment.deployable.created_at) {
-        return timeagoInstance.format(this.model.latest.last_deployment.deployable.created_at);
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.deployable &&
+        this.model.last_deployment.deployable.created_at) {
+        return timeagoInstance.format(this.model.last_deployment.deployable.created_at);
       }
       return '';
     },
@@ -149,7 +149,7 @@ module.exports = Vue.component('environment-item', {
      */
     manualActions() {
       if (this.hasManualActions) {
-        return this.model.latest.last_deployment.manual_actions.map((action) => {
+        return this.model.last_deployment.manual_actions.map((action) => {
           const parsedAction = {
             name: gl.text.humanize(action.name),
             play_path: action.play_path,
@@ -166,11 +166,11 @@ module.exports = Vue.component('environment-item', {
      * @returns {String}
      */
     userImageAltDescription() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.user &&
-        this.model.latest.last_deployment.user.username) {
-        return `${this.model.latest.last_deployment.user.username}'s avatar'`;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.user &&
+        this.model.last_deployment.user.username) {
+        return `${this.model.last_deployment.user.username}'s avatar'`;
       }
       return '';
     },
@@ -181,10 +181,10 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     commitTag() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.tag) {
-        return this.model.latest.last_deployment.tag;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.tag) {
+        return this.model.last_deployment.tag;
       }
       return undefined;
     },
@@ -195,10 +195,10 @@ module.exports = Vue.component('environment-item', {
      * @returns {Object|Undefined}
      */
     commitRef() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.ref) {
-        return this.model.latest.last_deployment.ref;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.ref) {
+        return this.model.last_deployment.ref;
       }
       return undefined;
     },
@@ -209,11 +209,11 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     commitUrl() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.commit &&
-        this.model.latest.last_deployment.commit.commit_path) {
-        return this.model.latest.last_deployment.commit.commit_path;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.commit &&
+        this.model.last_deployment.commit.commit_path) {
+        return this.model.last_deployment.commit.commit_path;
       }
       return undefined;
     },
@@ -224,11 +224,11 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     commitShortSha() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.commit &&
-        this.model.latest.last_deployment.commit.short_id) {
-        return this.model.latest.last_deployment.commit.short_id;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.commit &&
+        this.model.last_deployment.commit.short_id) {
+        return this.model.last_deployment.commit.short_id;
       }
       return undefined;
     },
@@ -239,11 +239,11 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     commitTitle() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.commit &&
-        this.model.latest.last_deployment.commit.title) {
-        return this.model.latest.last_deployment.commit.title;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.commit &&
+        this.model.last_deployment.commit.title) {
+        return this.model.last_deployment.commit.title;
       }
       return undefined;
     },
@@ -254,11 +254,11 @@ module.exports = Vue.component('environment-item', {
      * @returns {Object|Undefined}
      */
     commitAuthor() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.commit &&
-        this.model.latest.last_deployment.commit.author) {
-        return this.model.latest.last_deployment.commit.author;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.commit &&
+        this.model.last_deployment.commit.author) {
+        return this.model.last_deployment.commit.author;
       }
 
       return undefined;
@@ -270,11 +270,11 @@ module.exports = Vue.component('environment-item', {
      * @returns {String|Undefined}
      */
     retryUrl() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.deployable &&
-        this.model.latest.last_deployment.deployable.retry_path) {
-        return this.model.latest.last_deployment.deployable.retry_path;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.deployable &&
+        this.model.last_deployment.deployable.retry_path) {
+        return this.model.last_deployment.deployable.retry_path;
       }
       return undefined;
     },
@@ -285,8 +285,8 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean|Undefined}
      */
     isLastDeployment() {
-      return this.model.latest && this.model.latest.last_deployment &&
-        this.model.latest.last_deployment['last?'];
+      return this.model && this.model.last_deployment &&
+        this.model.last_deployment['last?'];
     },
 
     /**
@@ -295,10 +295,10 @@ module.exports = Vue.component('environment-item', {
      * @returns {String}
      */
     buildName() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.deployable) {
-        return `${this.model.latest.last_deployment.deployable.name} #${this.model.latest.last_deployment.deployable.id}`;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.deployable) {
+        return `${this.model.last_deployment.deployable.name} #${this.model.last_deployment.deployable.id}`;
       }
       return '';
     },
@@ -309,10 +309,10 @@ module.exports = Vue.component('environment-item', {
      * @returns {String}
      */
     deploymentInternalId() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.iid) {
-        return `#${this.model.latest.last_deployment.iid}`;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.iid) {
+        return `#${this.model.last_deployment.iid}`;
       }
       return '';
     },
@@ -323,9 +323,9 @@ module.exports = Vue.component('environment-item', {
      * @returns {Boolean}
      */
     deploymentHasUser() {
-      return this.model.latest &&
-        !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
-        !this.$options.isObjectEmpty(this.model.latest.last_deployment.user);
+      return this.model &&
+        !this.$options.isObjectEmpty(this.model.last_deployment) &&
+        !this.$options.isObjectEmpty(this.model.last_deployment.user);
     },
 
     /**
@@ -335,10 +335,10 @@ module.exports = Vue.component('environment-item', {
      * @returns {Object}
      */
     deploymentUser() {
-      if (this.model.latest &&
-        !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
-        !this.$options.isObjectEmpty(this.model.latest.last_deployment.user)) {
-        return this.model.latest.last_deployment.user;
+      if (this.model &&
+        !this.$options.isObjectEmpty(this.model.last_deployment) &&
+        !this.$options.isObjectEmpty(this.model.last_deployment.user)) {
+        return this.model.last_deployment.user;
       }
       return {};
     },
@@ -352,9 +352,8 @@ module.exports = Vue.component('environment-item', {
      */
     shouldRenderBuildName() {
       return !this.model.isFolder &&
-        this.model.latest &&
-        !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
-        !this.$options.isObjectEmpty(this.model.latest.last_deployment.deployable);
+        !this.$options.isObjectEmpty(this.model.last_deployment) &&
+        !this.$options.isObjectEmpty(this.model.last_deployment.deployable);
     },
 
     /**
@@ -363,11 +362,11 @@ module.exports = Vue.component('environment-item', {
      * @return {String}
      */
     buildPath() {
-      if (this.model.latest &&
-        this.model.latest.last_deployment &&
-        this.model.latest.last_deployment.deployable &&
-        this.model.latest.last_deployment.deployable.build_path) {
-        return this.model.latest.last_deployment.deployable.build_path;
+      if (this.model &&
+        this.model.last_deployment &&
+        this.model.last_deployment.deployable &&
+        this.model.last_deployment.deployable.build_path) {
+        return this.model.last_deployment.deployable.build_path;
       }
 
       return '';
@@ -379,8 +378,8 @@ module.exports = Vue.component('environment-item', {
      * @return {String}
      */
     externalURL() {
-      if (this.model.latest && this.model.latest.external_url) {
-        return this.model.latest.external_url;
+      if (this.model && this.model.external_url) {
+        return this.model.external_url;
       }
 
       return '';
@@ -395,14 +394,13 @@ module.exports = Vue.component('environment-item', {
      */
     shouldRenderDeploymentID() {
       return !this.model.isFolder &&
-        this.model.latest &&
-        !this.$options.isObjectEmpty(this.model.latest.last_deployment) &&
-        this.model.latest.last_deployment.iid !== undefined;
+        !this.$options.isObjectEmpty(this.model.last_deployment) &&
+        this.model.last_deployment.iid !== undefined;
     },
 
     environmentPath() {
-      if (this.model && this.model.latest && this.model.latest.environment_path) {
-        return this.model.latest.environment_path;
+      if (this.model && this.model.environment_path) {
+        return this.model.environment_path;
       }
 
       return '';
@@ -414,7 +412,7 @@ module.exports = Vue.component('environment-item', {
      * @return {String}
      */
     folderUrl() {
-      return `${window.location.pathname}/folders/${this.model.name}`;
+      return `${window.location.pathname}/folders/${this.model.folderName}`;
     },
 
   },
@@ -449,7 +447,7 @@ module.exports = Vue.component('environment-item', {
           </span>
 
           <span>
-            {{model.name}}
+            {{model.folderName}}
           </span>
 
           <span class="badge">
@@ -523,18 +521,18 @@ module.exports = Vue.component('environment-item', {
             </external-url-component>
           </div>
 
-          <div v-if="hasStopAction && canCreateDeployment && model.latest"
+          <div v-if="hasStopAction && canCreateDeployment"
             class="inline js-stop-component-container">
             <stop-component
-              :stop-url="model.latest.stop_path">
+              :stop-url="model.stop_path">
             </stop-component>
           </div>
 
-          <div v-if="model.latest && model.latest.terminal_path"
+          <div v-if="model && model.terminal_path"
             class="inline js-terminal-button-container">
             <terminal-button-component
               :terminal-icon-svg="terminalIconSvg"
-              :terminal-path="model.latest.terminal_path">
+              :terminal-path="model.terminal_path">
             </terminal-button-component>
           </div>
 
diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index 252e349962e..560d2702c6b 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -20,8 +20,12 @@ class EnvironmentsStore {
    *
    * Stores the received environments.
    *
-   * Each environment has the following schema
+   * In the main environments endpoint, each environment has the following schema
    * { name: String, size: Number, latest: Object }
+   * In the endpoint to retrieve environments from each folder, the environment does
+   * not have the `latest` key and the data is all in the root level.
+   * To avoid doing this check in the view, we store both cases the same by extracting
+   * what is inside the `latest` key.
    *
    * If the `size` is bigger than 1, it means it should be rendered as a folder.
    * In those cases we add `isFolder` key in order to render it properly.
@@ -31,11 +35,20 @@ class EnvironmentsStore {
    */
   storeEnvironments(environments = []) {
     const filteredEnvironments = environments.map((env) => {
+      let filtered = {};
+
       if (env.size > 1) {
-        return Object.assign({}, env, { isFolder: true });
+        filtered = Object.assign({}, env, { isFolder: true });
       }
 
-      return env;
+      if (env.latest) {
+        filtered = Object.assign(filtered, env, env.latest, { folderName: env.name });
+        delete filtered.latest;
+      } else {
+        filtered = Object.assign(filtered, env);
+      }
+
+      return filtered;
     });
 
     this.state.environments = filteredEnvironments;
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index fed63158f41..181dcb7721f 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -118,6 +118,7 @@
   .folder-icon {
     margin-right: 3px;
     color: $gl-text-color-secondary;
+    display: inline-block;
 
     .fa:nth-child(1) {
       margin-right: 3px;

From 9ac8bf2c2227036394882d64a5822dcf0dd726d7 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 15 Feb 2017 20:02:52 +0000
Subject: [PATCH 39/73] Adds Changelog entry

---
 .../unreleased/fe-paginated-environments-api-add-subview.yml  | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/fe-paginated-environments-api-add-subview.yml

diff --git a/changelogs/unreleased/fe-paginated-environments-api-add-subview.yml b/changelogs/unreleased/fe-paginated-environments-api-add-subview.yml
new file mode 100644
index 00000000000..7e626982de6
--- /dev/null
+++ b/changelogs/unreleased/fe-paginated-environments-api-add-subview.yml
@@ -0,0 +1,4 @@
+---
+title: Adds paginationd and folders view to environments table
+merge_request:
+author:

From 179ae4ab5b5584f62234b7321aa5c7a1d7ae484d Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Tue, 14 Feb 2017 11:11:31 -0600
Subject: [PATCH 40/73] Seed abuse reports

```
rake db:seed_fu FILTER=abuse_reports
```

Thanks to @stanhu,
https://gitlab.com/gitlab-org/gitlab-ce/issues/28059#note_23325328
---
 changelogs/unreleased/seed-abuse-reports.yml | 4 ++++
 db/fixtures/development/18_abuse_reports.rb  | 5 +++++
 2 files changed, 9 insertions(+)
 create mode 100644 changelogs/unreleased/seed-abuse-reports.yml
 create mode 100644 db/fixtures/development/18_abuse_reports.rb

diff --git a/changelogs/unreleased/seed-abuse-reports.yml b/changelogs/unreleased/seed-abuse-reports.yml
new file mode 100644
index 00000000000..6fbcb81ae3f
--- /dev/null
+++ b/changelogs/unreleased/seed-abuse-reports.yml
@@ -0,0 +1,4 @@
+---
+title: Seed abuse reports for development
+merge_request:
+author:
diff --git a/db/fixtures/development/18_abuse_reports.rb b/db/fixtures/development/18_abuse_reports.rb
new file mode 100644
index 00000000000..8618d10387a
--- /dev/null
+++ b/db/fixtures/development/18_abuse_reports.rb
@@ -0,0 +1,5 @@
+require 'factory_girl_rails'
+
+(AbuseReport.default_per_page + 3).times do
+  FactoryGirl.create(:abuse_report)
+end

From b5cbca552adba05475210729e401290b189da0de Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Thu, 16 Feb 2017 09:55:49 +1100
Subject: [PATCH 41/73] add changelog

---
 changelogs/unreleased/27452-update-issue-count.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/27452-update-issue-count.yml

diff --git a/changelogs/unreleased/27452-update-issue-count.yml b/changelogs/unreleased/27452-update-issue-count.yml
new file mode 100644
index 00000000000..a7417eba63c
--- /dev/null
+++ b/changelogs/unreleased/27452-update-issue-count.yml
@@ -0,0 +1,4 @@
+---
+title: update issue count when closing/reopening an issue
+merge_request:
+author:

From 1a299121f30c3b9ff48bf97052ecc25cf518452f Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Thu, 16 Feb 2017 11:47:26 +1100
Subject: [PATCH 42/73] don't trigger tanuki loader when downloading files

---
 .../vue_pipelines_index/pipeline_actions.js.es6        |  1 +
 app/views/projects/buttons/_download.html.haml         | 10 +++++-----
 app/views/projects/ci/pipelines/_pipeline.html.haml    |  2 +-
 changelogs/unreleased/26957-tanuki-anim-hang.yml       |  4 ++++
 spec/features/projects/main/download_buttons_spec.rb   |  7 +++++++
 spec/features/projects/pipelines/pipelines_spec.rb     |  8 ++++++++
 6 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/26957-tanuki-anim-hang.yml

diff --git a/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
index 8106934e864..54e8f977a47 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipeline_actions.js.es6
@@ -62,6 +62,7 @@
                 <li v-for='artifact in pipeline.details.artifacts'>
                   <a
                     rel="nofollow"
+                    download
                     :href='artifact.path'
                   >
                     <i class="fa fa-download" aria-hidden="true"></i>
diff --git a/app/views/projects/buttons/_download.html.haml b/app/views/projects/buttons/_download.html.haml
index 762ff34a9ec..b560ed21f1d 100644
--- a/app/views/projects/buttons/_download.html.haml
+++ b/app/views/projects/buttons/_download.html.haml
@@ -8,19 +8,19 @@
     %ul.dropdown-menu.dropdown-menu-align-right{ role: 'menu' }
       %li.dropdown-header Source code
       %li
-        = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'zip'), rel: 'nofollow' do
+        = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'zip'), rel: 'nofollow', download: '' do
           %i.fa.fa-download
           %span Download zip
       %li
-        = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do
+        = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.gz'), rel: 'nofollow', download: '' do
           %i.fa.fa-download
           %span Download tar.gz
       %li
-        = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do
+        = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar.bz2'), rel: 'nofollow', download: '' do
           %i.fa.fa-download
           %span Download tar.bz2
       %li
-        = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar'), rel: 'nofollow' do
+        = link_to archive_namespace_project_repository_path(project.namespace, project, ref: ref, format: 'tar'), rel: 'nofollow', download: '' do
           %i.fa.fa-download
           %span Download tar
 
@@ -36,6 +36,6 @@
             %li.dropdown-header Previous Artifacts
           - artifacts.each do |job|
             %li
-              = link_to latest_succeeded_namespace_project_artifacts_path(project.namespace, project, "#{ref}/download", job: job.name), rel: 'nofollow' do
+              = link_to latest_succeeded_namespace_project_artifacts_path(project.namespace, project, "#{ref}/download", job: job.name), rel: 'nofollow', download: '' do
                 %i.fa.fa-download
                 %span Download '#{job.name}'
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index f852f2e3fd7..3475fa5f960 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -78,7 +78,7 @@
               %ul.dropdown-menu.dropdown-menu-align-right
                 - artifacts.each do |build|
                   %li
-                    = link_to download_namespace_project_build_artifacts_path(pipeline.project.namespace, pipeline.project, build), rel: 'nofollow' do
+                    = link_to download_namespace_project_build_artifacts_path(pipeline.project.namespace, pipeline.project, build), rel: 'nofollow', download: '' do
                       = icon("download")
                       %span Download '#{build.name}' artifacts
 
diff --git a/changelogs/unreleased/26957-tanuki-anim-hang.yml b/changelogs/unreleased/26957-tanuki-anim-hang.yml
new file mode 100644
index 00000000000..c7b4b9ebdfd
--- /dev/null
+++ b/changelogs/unreleased/26957-tanuki-anim-hang.yml
@@ -0,0 +1,4 @@
+---
+title: don't animate logo when downloading files
+merge_request:
+author:
diff --git a/spec/features/projects/main/download_buttons_spec.rb b/spec/features/projects/main/download_buttons_spec.rb
index 227ccf9459c..02198ff3e41 100644
--- a/spec/features/projects/main/download_buttons_spec.rb
+++ b/spec/features/projects/main/download_buttons_spec.rb
@@ -39,6 +39,13 @@ feature 'Download buttons in project main page', feature: true do
 
         expect(page).to have_link "Download '#{build.name}'", href: href
       end
+
+      scenario 'download links have download attribute' do
+        expect(page).to have_selector('a', text: 'Download')
+        page.all('a', text: 'Download').each do |link|
+          expect(link[:download]).to eq ''
+        end
+      end
     end
   end
 end
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 6555b2fc6c1..b56be499264 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -218,6 +218,14 @@ describe 'Pipelines', :feature, :js do
 
             expect(page).to have_link(with_artifacts.name)
           end
+
+          it 'has download attribute on download links' do
+            find('.js-pipeline-dropdown-download').click
+            expect(page).to have_selector('a', text: 'Download')
+            page.all('.build-artifacts a', text: 'Download').each do |link|
+              expect(link[:download]).to eq ''
+            end
+          end
         end
 
         context 'with artifacts expired' do

From 6606a45030ecd4035b095d33d32f1372c3562b02 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 15 Feb 2017 23:50:05 -0800
Subject: [PATCH 43/73] Fix a number of race conditions that can occur during
 namespace deletion

There are two problems in the current implementation:

1. If a project is marked for deletion via the `pending_delete` flag
and then the namespace was quickly deleted, it's possible that the
namespace skips over that project and leaves that project in
an orphaned state.

2. Before namespace deletion, the namespace attempts to clean up
all the relevant storage paths. However, if all projects have been
removed synchronously, then the namespace will not be able to clean anything.
To prevent this, we should load the paths to be deleted before
actually destroying projects.

The specs were missing this second case due to a permission issue
that caused project removal never to happen.
---
 app/models/namespace.rb                      | 12 ++++++++++--
 app/models/project.rb                        |  2 ++
 app/services/groups/destroy_service.rb       |  4 +++-
 spec/services/groups/destroy_service_spec.rb | 19 ++++++++++++++++---
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 6de4d08fc28..bd0336c984a 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -42,7 +42,7 @@ class Namespace < ActiveRecord::Base
   after_commit :refresh_access_of_projects_invited_groups, on: :update, if: -> { previous_changes.key?('share_with_group_lock') }
 
   # Save the storage paths before the projects are destroyed to use them on after destroy
-  before_destroy(prepend: true) { @old_repository_storage_paths = repository_storage_paths }
+  before_destroy(prepend: true) { prepare_for_destroy }
   after_destroy :rm_dir
 
   scope :root, -> { where('type IS NULL') }
@@ -211,6 +211,14 @@ class Namespace < ActiveRecord::Base
     parent_id_changed?
   end
 
+  def prepare_for_destroy
+    old_repository_storage_paths
+  end
+
+  def old_repository_storage_paths
+    @old_repository_storage_paths ||= repository_storage_paths
+  end
+
   private
 
   def repository_storage_paths
@@ -224,7 +232,7 @@ class Namespace < ActiveRecord::Base
 
   def rm_dir
     # Remove the namespace directory in all storages paths used by member projects
-    @old_repository_storage_paths.each do |repository_storage_path|
+    old_repository_storage_paths.each do |repository_storage_path|
       # Move namespace directory into trash.
       # We will remove it later async
       new_path = "#{path}+#{id}+deleted"
diff --git a/app/models/project.rb b/app/models/project.rb
index ed43fc2e575..fc5b1a66910 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -214,6 +214,8 @@ class Project < ActiveRecord::Base
   # Scopes
   default_scope { where(pending_delete: false) }
 
+  scope :with_deleted, -> { unscope(where: :pending_delete) }
+
   scope :sorted_by_activity, -> { reorder(last_activity_at: :desc) }
   scope :sorted_by_stars, -> { reorder('projects.star_count DESC') }
 
diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb
index 7f2d28086f5..2e2d7f884ac 100644
--- a/app/services/groups/destroy_service.rb
+++ b/app/services/groups/destroy_service.rb
@@ -8,7 +8,9 @@ module Groups
     end
 
     def execute
-      group.projects.each do |project|
+      group.prepare_for_destroy
+
+      group.projects.with_deleted.each do |project|
         # Execute the destruction of the models immediately to ensure atomic cleanup.
         # Skip repository removal because we remove directory with namespace
         # that contain all these repositories
diff --git a/spec/services/groups/destroy_service_spec.rb b/spec/services/groups/destroy_service_spec.rb
index f86189b68e9..32c2ed8cae7 100644
--- a/spec/services/groups/destroy_service_spec.rb
+++ b/spec/services/groups/destroy_service_spec.rb
@@ -9,14 +9,18 @@ describe Groups::DestroyService, services: true do
   let!(:gitlab_shell) { Gitlab::Shell.new }
   let!(:remove_path)  { group.path + "+#{group.id}+deleted" }
 
+  before do
+    group.add_user(user, Gitlab::Access::OWNER)
+  end
+
   shared_examples 'group destruction' do |async|
     context 'database records' do
       before do
         destroy_group(group, user, async)
       end
 
-      it { expect(Group.all).not_to include(group) }
-      it { expect(Project.all).not_to include(project) }
+      it { expect(Group.unscoped.all).not_to include(group) }
+      it { expect(Project.unscoped.all).not_to include(project) }
     end
 
     context 'file system' do
@@ -32,7 +36,7 @@ describe Groups::DestroyService, services: true do
 
       context 'Sidekiq fake' do
         before do
-          # Dont run sidekiq to check if renamed repository exists
+          # Don't run sidekiq to check if renamed repository exists
           Sidekiq::Testing.fake! { destroy_group(group, user, async) }
         end
 
@@ -95,4 +99,13 @@ describe Groups::DestroyService, services: true do
   describe 'synchronous delete' do
     it_behaves_like 'group destruction', false
   end
+
+  context 'projects in pending_delete' do
+    before do
+      project.pending_delete = true
+      project.save
+    end
+
+    it_behaves_like 'group destruction', false
+  end
 end

From 65427442b9866dd98b7356d7a8f94b486fef662a Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 16 Feb 2017 09:14:47 +0100
Subject: [PATCH 44/73] refactored a couple of things

---
 .../project_tree_restorer_spec.rb             | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
index 0eefb450f37..94a3b0fbba9 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -4,18 +4,19 @@ include ImportExport::CommonUtil
 describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
   describe 'restore project tree' do
     before(:all) do
-      user = create(:user)
+      @user = create(:user)
 
       RSpec::Mocks.with_temporary_scope do
         @shared = Gitlab::ImportExport::Shared.new(relative_path: "", project_path: 'path')
         allow(@shared).to receive(:export_path).and_return('spec/lib/gitlab/import_export/')
-        project = create(:empty_project, :builds_disabled, :issues_disabled, name: 'project', path: 'project')
-        project_tree_restorer = described_class.new(user: user, shared: @shared, project: project)
+        @project = create(:empty_project, :builds_disabled, :issues_disabled, name: 'project', path: 'project')
+        project_tree_restorer = described_class.new(user: @user, shared: @shared, project: @project)
         @restored_project_json = project_tree_restorer.restore
       end
     end
 
-    before do
+    after(:all) do
+      @user.destroy!
     end
 
     context 'JSON' do
@@ -98,7 +99,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
       end
 
       it 'has a project feature' do
-        expect(Project.first.project_feature).not_to be_nil
+        expect(@project.project_feature).not_to be_nil
       end
 
       it 'restores the correct service' do
@@ -106,20 +107,16 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
       end
 
       context 'Merge requests' do
-        before do
-          @restored_project_json
-        end
-
         it 'always has the new project as a target' do
-          expect(MergeRequest.find_by_title('MR1').target_project).to eq(Project.first)
+          expect(MergeRequest.find_by_title('MR1').target_project).to eq(@project)
         end
 
         it 'has the same source project as originally if source/target are the same' do
-          expect(MergeRequest.find_by_title('MR1').source_project).to eq(Project.first)
+          expect(MergeRequest.find_by_title('MR1').source_project).to eq(@project)
         end
 
         it 'has the new project as target if source/target differ' do
-          expect(MergeRequest.find_by_title('MR2').target_project).to eq(Project.first)
+          expect(MergeRequest.find_by_title('MR2').target_project).to eq(@project)
         end
 
         it 'has no source if source/target differ' do

From 496b52722649b5f927cf9f88589a8ebb6526b83d Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Thu, 16 Feb 2017 09:38:52 +0100
Subject: [PATCH 45/73] Fix broken link in university docs

[ci skip]
---
 doc/university/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/university/README.md b/doc/university/README.md
index e9f14703789..8d4e7eff115 100644
--- a/doc/university/README.md
+++ b/doc/university/README.md
@@ -5,7 +5,7 @@ GitLab University is the best place to learn about **Version Control with Git an
 It doesn't replace, but accompanies our great [Documentation](https://docs.gitlab.com)
 and [Blog Articles](https://about.gitlab.com/blog/).
 
-Would you like to contribute to GitLab University? Then please take a look at our contribution [process](process) for more information.
+Would you like to contribute to GitLab University? Then please take a look at our contribution [process](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/PROCESS.md) for more information.
 
 ## Gitlab University Curriculum
 

From 2a60f4dea86c9aa052d88de9c772e91750885a9a Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 15 Feb 2017 10:42:54 +0000
Subject: [PATCH 46/73] Reduce query count for snippet search

Recudes the number of queries within the snippet search from approx. 50
to approx. 14 by preloading the authors

Part of #27392
---
 app/views/search/results/_snippet_blob.html.haml      | 2 +-
 app/views/search/results/_snippet_title.html.haml     | 2 +-
 changelogs/unreleased/snippets-search-performance.yml | 4 ++++
 lib/gitlab/snippet_search_results.rb                  | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 changelogs/unreleased/snippets-search-performance.yml

diff --git a/app/views/search/results/_snippet_blob.html.haml b/app/views/search/results/_snippet_blob.html.haml
index f7808ea6aff..e977c1f1698 100644
--- a/app/views/search/results/_snippet_blob.html.haml
+++ b/app/views/search/results/_snippet_blob.html.haml
@@ -7,7 +7,7 @@
     = snippet.title
     by
     = link_to user_snippets_path(snippet.author) do
-      = image_tag avatar_icon(snippet.author_email), class: "avatar avatar-inline s16", alt: ''
+      = image_tag avatar_icon(snippet.author), class: "avatar avatar-inline s16", alt: ''
       = snippet.author_name
     %span.light= time_ago_with_tooltip(snippet.created_at)
   %h4.snippet-title
diff --git a/app/views/search/results/_snippet_title.html.haml b/app/views/search/results/_snippet_title.html.haml
index 704d1d01a81..026f404ce07 100644
--- a/app/views/search/results/_snippet_title.html.haml
+++ b/app/views/search/results/_snippet_title.html.haml
@@ -18,6 +18,6 @@
     %span
       by
       = link_to user_snippets_path(snippet_title.author) do
-        = image_tag avatar_icon(snippet_title.author_email), class: "avatar avatar-inline s16", alt: ''
+        = image_tag avatar_icon(snippet_title.author), class: "avatar avatar-inline s16", alt: ''
         = snippet_title.author_name
       %span.light= time_ago_with_tooltip(snippet_title.created_at)
diff --git a/changelogs/unreleased/snippets-search-performance.yml b/changelogs/unreleased/snippets-search-performance.yml
new file mode 100644
index 00000000000..2895478abfd
--- /dev/null
+++ b/changelogs/unreleased/snippets-search-performance.yml
@@ -0,0 +1,4 @@
+---
+title: Reduced query count for snippet search
+merge_request:
+author:
diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index 9e01f02029c..b85f70e450e 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -31,11 +31,11 @@ module Gitlab
     private
 
     def snippet_titles
-      limit_snippets.search(query).order('updated_at DESC')
+      limit_snippets.search(query).order('updated_at DESC').includes(:author)
     end
 
     def snippet_blobs
-      limit_snippets.search_code(query).order('updated_at DESC')
+      limit_snippets.search_code(query).order('updated_at DESC').includes(:author)
     end
 
     def default_scope

From b3fb5b4f26b609ad41ccb0837e599fa50c22b55f Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 13 Feb 2017 16:43:17 +0100
Subject: [PATCH 47/73] Use gitlab shell import instead of manually creating
 the webhooks

Also update repo restorer to use project wiki method.
---
 app/models/project_wiki.rb                    |  4 ++
 lib/gitlab/import_export/command_line_util.rb | 12 ------
 lib/gitlab/import_export/repo_restorer.rb     | 21 +---------
 lib/gitlab/shell.rb                           |  4 +-
 .../import_export/repo_restorer_spec.rb       | 40 +++++++++++++++++++
 5 files changed, 49 insertions(+), 32 deletions(-)
 create mode 100644 spec/lib/gitlab/import_export/repo_restorer_spec.rb

diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 9db96347322..d0b991db112 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -160,6 +160,10 @@ class ProjectWiki
     }
   end
 
+  def repository_storage_path
+    project.repository_storage_path
+  end
+
   private
 
   def init_repo(path_with_namespace)
diff --git a/lib/gitlab/import_export/command_line_util.rb b/lib/gitlab/import_export/command_line_util.rb
index f00c7460e82..90942774a2e 100644
--- a/lib/gitlab/import_export/command_line_util.rb
+++ b/lib/gitlab/import_export/command_line_util.rb
@@ -15,14 +15,6 @@ module Gitlab
         execute(%W(#{git_bin_path} --git-dir=#{repo_path} bundle create #{bundle_path} --all))
       end
 
-      def git_unbundle(repo_path:, bundle_path:)
-        execute(%W(#{git_bin_path} clone --bare #{bundle_path} #{repo_path}))
-      end
-
-      def git_restore_hooks
-        execute(%W(#{Gitlab.config.gitlab_shell.path}/bin/create-hooks) + repository_storage_paths_args)
-      end
-
       def mkdir_p(path)
         FileUtils.mkdir_p(path, mode: DEFAULT_MODE)
         FileUtils.chmod(DEFAULT_MODE, path)
@@ -56,10 +48,6 @@ module Gitlab
         FileUtils.copy_entry(source, destination)
         true
       end
-
-      def repository_storage_paths_args
-        Gitlab.config.repositories.storages.values
-      end
     end
   end
 end
diff --git a/lib/gitlab/import_export/repo_restorer.rb b/lib/gitlab/import_export/repo_restorer.rb
index 48a9a6fa5e2..c824d3ea9fc 100644
--- a/lib/gitlab/import_export/repo_restorer.rb
+++ b/lib/gitlab/import_export/repo_restorer.rb
@@ -2,6 +2,7 @@ module Gitlab
   module ImportExport
     class RepoRestorer
       include Gitlab::ImportExport::CommandLineUtil
+      include Gitlab::ShellAdapter
 
       def initialize(project:, shared:, path_to_bundle:)
         @project = project
@@ -12,29 +13,11 @@ module Gitlab
       def restore
         return true unless File.exist?(@path_to_bundle)
 
-        mkdir_p(path_to_repo)
-
-        git_unbundle(repo_path: path_to_repo, bundle_path: @path_to_bundle) && repo_restore_hooks
+        gitlab_shell.import_repository(@project.repository_storage_path, @project.path_with_namespace, @path_to_bundle)
       rescue => e
         @shared.error(e)
         false
       end
-
-      private
-
-      def path_to_repo
-        @project.repository.path_to_repo
-      end
-
-      def repo_restore_hooks
-        return true if wiki?
-
-        git_restore_hooks
-      end
-
-      def wiki?
-        @project.class.name == 'ProjectWiki'
-      end
     end
   end
 end
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb
index 82e194c1af1..ea7e6a8c93d 100644
--- a/lib/gitlab/shell.rb
+++ b/lib/gitlab/shell.rb
@@ -80,8 +80,10 @@ module Gitlab
     #   import_repository("/path/to/storage", "gitlab/gitlab-ci", "https://github.com/randx/six.git")
     #
     def import_repository(storage, name, url)
+      # Timeout should be less than 900 ideally, to prevent the memory killer
+      # to silently kill the process without knowing we are timing out here.
       output, status = Popen::popen([gitlab_shell_projects_path, 'import-project',
-                                     storage, "#{name}.git", url, '900'])
+                                     storage, "#{name}.git", url, '800'])
       raise Error, output unless status.zero?
       true
     end
diff --git a/spec/lib/gitlab/import_export/repo_restorer_spec.rb b/spec/lib/gitlab/import_export/repo_restorer_spec.rb
new file mode 100644
index 00000000000..a9feb8dd19d
--- /dev/null
+++ b/spec/lib/gitlab/import_export/repo_restorer_spec.rb
@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Gitlab::ImportExport::RepoRestorer, services: true do
+  describe 'bundle a project Git repo' do
+    let(:user) { create(:user) }
+    let!(:project_with_repo) { create(:project, :test_repo, name: 'test-repo-restorer', path: 'test-repo-restorer') }
+    let!(:project) { create(:empty_project) }
+    let(:export_path) { "#{Dir::tmpdir}/project_tree_saver_spec" }
+    let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.path_with_namespace) }
+    let(:bundler) { Gitlab::ImportExport::RepoSaver.new(project: project_with_repo, shared: shared) }
+    let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename) }
+    let(:restorer) do
+      described_class.new(path_to_bundle: bundle_path,
+                          shared: shared,
+                          project: project)
+    end
+
+    before do
+      allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+
+      bundler.save
+    end
+
+    after do
+      FileUtils.rm_rf(export_path)
+      FileUtils.rm_rf(project_with_repo.repository.path_to_repo)
+      FileUtils.rm_rf(project.repository.path_to_repo)
+    end
+
+    it 'restores the repo successfully' do
+      expect(restorer.restore).to be true
+    end
+
+    it 'has the webhooks' do
+      restorer.restore
+
+      expect(Gitlab::Git::Hook.new('post-receive', project.repository.path_to_repo)).to exist
+    end
+  end
+end

From f4bb5dd0ad8fb5d6f766b8462aa6f58bb36d75b0 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Thu, 16 Feb 2017 10:04:55 +0100
Subject: [PATCH 48/73] Clarify that stage is needed to stop environments

[ci skip]
---
 doc/ci/environments.md | 5 ++++-
 doc/ci/yaml/README.md  | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/ci/environments.md b/doc/ci/environments.md
index 3bba94f8b83..3c31ba45d3d 100644
--- a/doc/ci/environments.md
+++ b/doc/ci/environments.md
@@ -535,6 +535,7 @@ deploy_review:
     - master
 
 stop_review:
+  stage: deploy
   variables:
     GIT_STRATEGY: none
   script:
@@ -555,7 +556,9 @@ when their associated branch is deleted.
 
 When you have an environment that has a stop action defined (typically when
 the environment describes a review app), GitLab will automatically trigger a
-stop action when the associated branch is deleted.
+stop action when the associated branch is deleted. The `stop_review` job must
+be in the same `stage` as the `deploy_review` one in order for the environment
+to automatically stop.
 
 You can read more in the [`.gitlab-ci.yml` reference][onstop].
 
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 63be61d1bca..a73598df812 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -690,6 +690,8 @@ The `stop_review_app` job is **required** to have the following keywords defined
 - `when` - [reference](#when)
 - `environment:name`
 - `environment:action`
+- `stage` should be the same as the `review_app` in order for the environment
+  to stop automatically when the branch is deleted
 
 #### dynamic environments
 

From 038ed9ad46ac52a7ab5f2d86f6e48b392f0fb4d9 Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Wed, 15 Feb 2017 23:39:45 +0100
Subject: [PATCH 49/73] Move babel config for instanbul to karma config (!9286)

---
 changelogs/unreleased/instrument-in-karma.yml |  4 ++++
 config/karma.config.js                        | 11 +++++++++++
 config/webpack.config.js                      |  1 -
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/instrument-in-karma.yml

diff --git a/changelogs/unreleased/instrument-in-karma.yml b/changelogs/unreleased/instrument-in-karma.yml
new file mode 100644
index 00000000000..cfabf2569fe
--- /dev/null
+++ b/changelogs/unreleased/instrument-in-karma.yml
@@ -0,0 +1,4 @@
+---
+title: Move babel config for instanbul to karma config
+merge_request: 9286
+author: winniehell
diff --git a/config/karma.config.js b/config/karma.config.js
index a1fbeab1f46..a16e2d2077f 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -2,6 +2,17 @@ var path = require('path');
 var webpackConfig = require('./webpack.config.js');
 var ROOT_PATH = path.resolve(__dirname, '..');
 
+// add coverage instrumentation to babel config
+if (webpackConfig && webpackConfig.module && webpackConfig.module.rules) {
+  var babelConfig = webpackConfig.module.rules.find(function (rule) {
+    return rule.loader === 'babel-loader';
+  });
+
+  babelConfig.options = babelConfig.options || {};
+  babelConfig.options.plugins = babelConfig.options.plugins || [];
+  babelConfig.options.plugins.push('istanbul');
+}
+
 // Karma configuration
 module.exports = function(config) {
   config.set({
diff --git a/config/webpack.config.js b/config/webpack.config.js
index e63775e43ce..ac117522005 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -54,7 +54,6 @@ var config = {
         exclude: /(node_modules|vendor\/assets)/,
         loader: 'babel-loader',
         options: {
-          plugins: IS_PRODUCTION ? [] : ['istanbul'],
           presets: [
             ["es2015", {"modules": false}],
             'stage-2'

From 7a9d3a3c9043d391fc890befc6ed8117aa94c8ad Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Tue, 14 Feb 2017 14:13:35 +0000
Subject: [PATCH 50/73] Show merge errors in merge request widget

There were two problems here:

1. On the JS side, the reference to $widgetBody didn't refer to the
   right DOM element any more. This might be because it was replaced by
   the `getMergeStatus` method. Even if it wasn't, ensuring we have the
   right element means that the content gets updated.

2. On the Ruby side, the `log_merge_error` method didn't update the
   `merge_error` column of the merge request. Change that to update if
   requested, and update in the most common cases by default.

   Additionally, this would sometimes return an error hash, but it
   doesn't look like this was ever used (the return value of
   `MergeService#execute` appears to be unused everywhere).
---
 .../javascripts/merge_request_widget.js.es6   |  2 +-
 app/services/merge_requests/merge_service.rb  | 18 +++++++-----
 .../28124-mrs-don-t-show-all-merge-errors.yml |  4 +++
 spec/features/merge_requests/widget_spec.rb   | 15 ++++++++++
 .../merge_requests/merge_service_spec.rb      | 29 +++++++++++++------
 5 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 changelogs/unreleased/28124-mrs-don-t-show-all-merge-errors.yml

diff --git a/app/assets/javascripts/merge_request_widget.js.es6 b/app/assets/javascripts/merge_request_widget.js.es6
index 69aed77c83d..4ab33420e59 100644
--- a/app/assets/javascripts/merge_request_widget.js.es6
+++ b/app/assets/javascripts/merge_request_widget.js.es6
@@ -110,7 +110,7 @@ require('./smart_interval');
               urlSuffix = deleteSourceBranch ? '?deleted_source_branch=true' : '';
               return window.location.href = window.location.pathname + urlSuffix;
             } else if (data.merge_error) {
-              return _this.$widgetBody.html("<h4>" + data.merge_error + "</h4>");
+              return $('.mr-widget-body').html("<h4>" + data.merge_error + "</h4>");
             } else {
               callback = function() {
                 return merge_request_widget.mergeInProgress(deleteSourceBranch);
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index 5ca6fec962d..177b714b734 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -11,18 +11,20 @@ module MergeRequests
     def execute(merge_request)
       @merge_request = merge_request
 
-      return log_merge_error('Merge request is not mergeable', true) unless @merge_request.mergeable?
+      unless @merge_request.mergeable?
+        return log_merge_error('Merge request is not mergeable', save_message_on_model: true)
+      end
 
       @source = find_merge_source
 
-      return log_merge_error('No source for merge', true) unless @source
+      unless @source
+        log_merge_error('No source for merge', save_message_on_model: true)
+      end
 
       merge_request.in_locked_state do
         if commit
           after_merge
           success
-        else
-          log_merge_error('Can not merge changes', true)
         end
       end
     end
@@ -43,11 +45,11 @@ module MergeRequests
       if commit_id
         merge_request.update(merge_commit_sha: commit_id)
       else
-        merge_request.update(merge_error: 'Conflicts detected during merge')
+        log_merge_error('Conflicts detected during merge', save_message_on_model: true)
         false
       end
     rescue GitHooksService::PreReceiveError => e
-      merge_request.update(merge_error: e.message)
+      log_merge_error(e.message, save_message_on_model: true)
       false
     rescue StandardError => e
       merge_request.update(merge_error: "Something went wrong during merge: #{e.message}")
@@ -70,10 +72,10 @@ module MergeRequests
       @merge_request.force_remove_source_branch? ? @merge_request.author : current_user
     end
 
-    def log_merge_error(message, http_error = false)
+    def log_merge_error(message, save_message_on_model: false)
       Rails.logger.error("MergeService ERROR: #{merge_request_info} - #{message}")
 
-      error(message) if http_error
+      @merge_request.update(merge_error: message) if save_message_on_model
     end
 
     def merge_request_info
diff --git a/changelogs/unreleased/28124-mrs-don-t-show-all-merge-errors.yml b/changelogs/unreleased/28124-mrs-don-t-show-all-merge-errors.yml
new file mode 100644
index 00000000000..cd61c38e1bc
--- /dev/null
+++ b/changelogs/unreleased/28124-mrs-don-t-show-all-merge-errors.yml
@@ -0,0 +1,4 @@
+---
+title: Show merge errors in merge request widget
+merge_request: 9229
+author:
diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb
index 957e913bf95..4ad944366c8 100644
--- a/spec/features/merge_requests/widget_spec.rb
+++ b/spec/features/merge_requests/widget_spec.rb
@@ -52,4 +52,19 @@ describe 'Merge request', :feature, :js do
       end
     end
   end
+
+  context 'merge error' do
+    before do
+      allow_any_instance_of(Repository).to receive(:merge).and_return(false)
+      visit namespace_project_merge_request_path(project.namespace, project, merge_request)
+      click_button 'Accept Merge Request'
+      wait_for_ajax
+    end
+
+    it 'updates the MR widget' do
+      page.within('.mr-widget-body') do
+        expect(page).to have_content('Conflicts detected during merge')
+      end
+    end
+  end
 end
diff --git a/spec/services/merge_requests/merge_service_spec.rb b/spec/services/merge_requests/merge_service_spec.rb
index 5a89acc96a4..d96f819e66a 100644
--- a/spec/services/merge_requests/merge_service_spec.rb
+++ b/spec/services/merge_requests/merge_service_spec.rb
@@ -149,35 +149,46 @@ describe MergeRequests::MergeService, services: true do
     context "error handling" do
       let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
 
-      it 'saves error if there is an exception' do
+      before do
+        allow(Rails.logger).to receive(:error)
+      end
+
+      it 'logs and saves error if there is an exception' do
+        error_message = 'error message'
+
         allow(service).to receive(:repository).and_raise("error message")
-
         allow(service).to receive(:execute_hooks)
 
         service.execute(merge_request)
 
-        expect(merge_request.merge_error).to eq("Something went wrong during merge: error message")
+        expect(merge_request.merge_error).to include(error_message)
+        expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
       end
 
-      it 'saves error if there is an PreReceiveError exception' do
-        allow(service).to receive(:repository).and_raise(GitHooksService::PreReceiveError, "error")
+      it 'logs and saves error if there is an PreReceiveError exception' do
+        error_message = 'error message'
 
+        allow(service).to receive(:repository).and_raise(GitHooksService::PreReceiveError, error_message)
         allow(service).to receive(:execute_hooks)
 
         service.execute(merge_request)
 
-        expect(merge_request.merge_error).to eq("error")
+        expect(merge_request.merge_error).to include(error_message)
+        expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
       end
 
-      it 'aborts if there is a merge conflict' do
+      it 'logs and saves error if there is a merge conflict' do
+        error_message = 'Conflicts detected during merge'
+
         allow_any_instance_of(Repository).to receive(:merge).and_return(false)
         allow(service).to receive(:execute_hooks)
 
         service.execute(merge_request)
 
-        expect(merge_request.open?).to be_truthy
+        expect(merge_request).to be_open
         expect(merge_request.merge_commit_sha).to be_nil
-        expect(merge_request.merge_error).to eq("Conflicts detected during merge")
+        expect(merge_request.merge_error).to include(error_message)
+        expect(Rails.logger).to have_received(:error).with(a_string_matching(error_message))
       end
     end
   end

From 605195c26add353805bdb5b3e927ebc286f91fec Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 16 Feb 2017 10:23:59 +0000
Subject: [PATCH 51/73] Fix broken tests

---
 .../stores/environments_store.js.es6          |   4 +-
 .../environments/environment_item_spec.js.es6 | 115 +++++++++---------
 .../environments_store_spec.js.es6            |   7 +-
 .../environments_folder_view_spec.js.es6      |  16 +--
 .../javascripts/environments/mock_data.js.es6 |  33 +++++
 5 files changed, 98 insertions(+), 77 deletions(-)

diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index 560d2702c6b..e8b44aeb0bb 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -38,11 +38,11 @@ class EnvironmentsStore {
       let filtered = {};
 
       if (env.size > 1) {
-        filtered = Object.assign({}, env, { isFolder: true });
+        filtered = Object.assign({}, env, { isFolder: true, folderName: env.name });
       }
 
       if (env.latest) {
-        filtered = Object.assign(filtered, env, env.latest, { folderName: env.name });
+        filtered = Object.assign(filtered, env, env.latest);
         delete filtered.latest;
       } else {
         filtered = Object.assign(filtered, env);
diff --git a/spec/javascripts/environments/environment_item_spec.js.es6 b/spec/javascripts/environments/environment_item_spec.js.es6
index 88413d9ae2b..7fea80ed799 100644
--- a/spec/javascripts/environments/environment_item_spec.js.es6
+++ b/spec/javascripts/environments/environment_item_spec.js.es6
@@ -14,11 +14,10 @@ describe('Environment item', () => {
     beforeEach(() => {
       mockItem = {
         name: 'review',
+        folderName: 'review',
         size: 3,
         isFolder: true,
-        latest: {
-          environment_path: 'url',
-        },
+        environment_path: 'url',
       };
 
       component = new EnvironmentItem({
@@ -49,21 +48,36 @@ describe('Environment item', () => {
       environment = {
         name: 'production',
         size: 1,
-        latest: {
-          state: 'stopped',
-          external_url: 'http://external.com',
-          environment_type: null,
-          last_deployment: {
-            id: 66,
-            iid: 6,
-            sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-            ref: {
-              name: 'master',
-              ref_path: 'root/ci-folders/tree/master',
-            },
-            tag: true,
-            'last?': true,
-            user: {
+        state: 'stopped',
+        external_url: 'http://external.com',
+        environment_type: null,
+        last_deployment: {
+          id: 66,
+          iid: 6,
+          sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
+          ref: {
+            name: 'master',
+            ref_path: 'root/ci-folders/tree/master',
+          },
+          tag: true,
+          'last?': true,
+          user: {
+            name: 'Administrator',
+            username: 'root',
+            id: 1,
+            state: 'active',
+            avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
+            web_url: 'http://localhost:3000/root',
+          },
+          commit: {
+            id: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
+            short_id: '500aabcb',
+            title: 'Update .gitlab-ci.yml',
+            author_name: 'Administrator',
+            author_email: 'admin@example.com',
+            created_at: '2016-11-07T18:28:13.000+00:00',
+            message: 'Update .gitlab-ci.yml',
+            author: {
               name: 'Administrator',
               username: 'root',
               id: 1,
@@ -71,44 +85,27 @@ describe('Environment item', () => {
               avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
               web_url: 'http://localhost:3000/root',
             },
-            commit: {
-              id: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-              short_id: '500aabcb',
-              title: 'Update .gitlab-ci.yml',
-              author_name: 'Administrator',
-              author_email: 'admin@example.com',
-              created_at: '2016-11-07T18:28:13.000+00:00',
-              message: 'Update .gitlab-ci.yml',
-              author: {
-                name: 'Administrator',
-                username: 'root',
-                id: 1,
-                state: 'active',
-                avatar_url: 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80\u0026d=identicon',
-                web_url: 'http://localhost:3000/root',
-              },
-              commit_path: '/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
-            },
-            deployable: {
-              id: 1279,
-              name: 'deploy',
-              build_path: '/root/ci-folders/builds/1279',
-              retry_path: '/root/ci-folders/builds/1279/retry',
-              created_at: '2016-11-29T18:11:58.430Z',
-              updated_at: '2016-11-29T18:11:58.430Z',
-            },
-            manual_actions: [
-              {
-                name: 'action',
-                play_path: '/play',
-              },
-            ],
+            commit_path: '/root/ci-folders/tree/500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
           },
-          'stop_action?': true,
-          environment_path: 'root/ci-folders/environments/31',
-          created_at: '2016-11-07T11:11:16.525Z',
-          updated_at: '2016-11-10T15:55:58.778Z',
+          deployable: {
+            id: 1279,
+            name: 'deploy',
+            build_path: '/root/ci-folders/builds/1279',
+            retry_path: '/root/ci-folders/builds/1279/retry',
+            created_at: '2016-11-29T18:11:58.430Z',
+            updated_at: '2016-11-29T18:11:58.430Z',
+          },
+          manual_actions: [
+            {
+              name: 'action',
+              play_path: '/play',
+            },
+          ],
         },
+        'stop_action?': true,
+        environment_path: 'root/ci-folders/environments/31',
+        created_at: '2016-11-07T11:11:16.525Z',
+        updated_at: '2016-11-10T15:55:58.778Z',
       };
 
       component = new EnvironmentItem({
@@ -129,7 +126,7 @@ describe('Environment item', () => {
       it('should render deployment internal id', () => {
         expect(
           component.$el.querySelector('.deployment-column span').textContent,
-        ).toContain(environment.latest.last_deployment.iid);
+        ).toContain(environment.last_deployment.iid);
 
         expect(
           component.$el.querySelector('.deployment-column span').textContent,
@@ -139,7 +136,7 @@ describe('Environment item', () => {
       it('should render last deployment date', () => {
         const timeagoInstance = new timeago(); // eslint-disable-line
         const formatedDate = timeagoInstance.format(
-          environment.latest.last_deployment.deployable.created_at,
+          environment.last_deployment.deployable.created_at,
         );
 
         expect(
@@ -151,7 +148,7 @@ describe('Environment item', () => {
         it('should render user avatar with link to profile', () => {
           expect(
             component.$el.querySelector('.js-deploy-user-container').getAttribute('href'),
-          ).toEqual(environment.latest.last_deployment.user.web_url);
+          ).toEqual(environment.last_deployment.user.web_url);
         });
       });
 
@@ -159,13 +156,13 @@ describe('Environment item', () => {
         it('Should link to build url provided', () => {
           expect(
             component.$el.querySelector('.build-link').getAttribute('href'),
-          ).toEqual(environment.latest.last_deployment.deployable.build_path);
+          ).toEqual(environment.last_deployment.deployable.build_path);
         });
 
         it('Should render deployable name and id', () => {
           expect(
             component.$el.querySelector('.build-link').getAttribute('href'),
-          ).toEqual(environment.latest.last_deployment.deployable.build_path);
+          ).toEqual(environment.last_deployment.deployable.build_path);
         });
       });
 
diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6
index 8fd660c3edb..49c7dc4b25c 100644
--- a/spec/javascripts/environments/environments_store_spec.js.es6
+++ b/spec/javascripts/environments/environments_store_spec.js.es6
@@ -1,5 +1,5 @@
 const Store = require('~/environments/stores/environments_store');
-const { environmentsList } = require('./mock_data');
+const { environmentsList, serverData } = require('./mock_data');
 
 (() => {
   describe('Store', () => {
@@ -17,8 +17,9 @@ const { environmentsList } = require('./mock_data');
     });
 
     it('should store environments', () => {
-      store.storeEnvironments(environmentsList);
-      expect(store.state.environments.length).toEqual(environmentsList.length);
+      store.storeEnvironments(serverData);
+      expect(store.state.environments.length).toEqual(serverData.length);
+      expect(store.state.environments[0]).toEqual(environmentsList[0]);
     });
 
     it('should store available count', () => {
diff --git a/spec/javascripts/environments/folder/environments_folder_view_spec.js.es6 b/spec/javascripts/environments/folder/environments_folder_view_spec.js.es6
index 6a95fabcea5..d1335b5b304 100644
--- a/spec/javascripts/environments/folder/environments_folder_view_spec.js.es6
+++ b/spec/javascripts/environments/folder/environments_folder_view_spec.js.es6
@@ -8,7 +8,7 @@ describe('Environments Folder View', () => {
 
   beforeEach(() => {
     loadFixtures('static/environments/environments_folder_view.html.raw');
-    window.history.pushState({}, null, 'environments/folders/51');
+    window.history.pushState({}, null, 'environments/folders/build');
   });
 
   let component;
@@ -80,12 +80,11 @@ describe('Environments Folder View', () => {
       }, 0);
     });
 
-    // FIX ME:
     it('should render parent folder name', (done) => {
       setTimeout(() => {
         expect(
-          component.$el.querySelector('.js-folder-name'),
-        ).toBe(null);
+          component.$el.querySelector('.js-folder-name').textContent,
+        ).toContain('Environments / build');
         done();
       }, 0);
     });
@@ -199,14 +198,5 @@ describe('Environments Folder View', () => {
         done();
       }, 0);
     });
-
-    it('should not render parent folder name', (done) => {
-      setTimeout(() => {
-        expect(
-          component.$el.querySelector('.js-folder-name'),
-        ).toBe(null);
-        done();
-      }, 0);
-    });
   });
 });
diff --git a/spec/javascripts/environments/mock_data.js.es6 b/spec/javascripts/environments/mock_data.js.es6
index 081897f5456..5c395c6b2d8 100644
--- a/spec/javascripts/environments/mock_data.js.es6
+++ b/spec/javascripts/environments/mock_data.js.es6
@@ -1,4 +1,36 @@
 const environmentsList = [
+  {
+    name: 'DEV',
+    size: 1,
+    id: 7,
+    state: 'available',
+    external_url: null,
+    environment_type: null,
+    last_deployment: null,
+    'stop_action?': false,
+    environment_path: '/root/review-app/environments/7',
+    stop_path: '/root/review-app/environments/7/stop',
+    created_at: '2017-01-31T10:53:46.894Z',
+    updated_at: '2017-01-31T10:53:46.894Z',
+  },
+  {
+    folderName: 'build',
+    size: 5,
+    id: 12,
+    name: 'build/update-README',
+    state: 'available',
+    external_url: null,
+    environment_type: 'build',
+    last_deployment: null,
+    'stop_action?': false,
+    environment_path: '/root/review-app/environments/12',
+    stop_path: '/root/review-app/environments/12/stop',
+    created_at: '2017-02-01T19:42:18.400Z',
+    updated_at: '2017-02-01T19:42:18.400Z',
+  },
+];
+
+const serverData = [
   {
     name: 'DEV',
     size: 1,
@@ -56,4 +88,5 @@ const environment = {
 module.exports = {
   environmentsList,
   environment,
+  serverData,
 };

From 21aafcfc899d34f296ddd1e3380970dbe01397f6 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 16 Feb 2017 11:34:08 +0100
Subject: [PATCH 52/73] fix tmpdir

---
 spec/lib/gitlab/import_export/repo_restorer_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/lib/gitlab/import_export/repo_restorer_spec.rb b/spec/lib/gitlab/import_export/repo_restorer_spec.rb
index a9feb8dd19d..168a59e5139 100644
--- a/spec/lib/gitlab/import_export/repo_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/repo_restorer_spec.rb
@@ -5,7 +5,7 @@ describe Gitlab::ImportExport::RepoRestorer, services: true do
     let(:user) { create(:user) }
     let!(:project_with_repo) { create(:project, :test_repo, name: 'test-repo-restorer', path: 'test-repo-restorer') }
     let!(:project) { create(:empty_project) }
-    let(:export_path) { "#{Dir::tmpdir}/project_tree_saver_spec" }
+    let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
     let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.path_with_namespace) }
     let(:bundler) { Gitlab::ImportExport::RepoSaver.new(project: project_with_repo, shared: shared) }
     let(:bundle_path) { File.join(shared.export_path, Gitlab::ImportExport.project_bundle_filename) }

From ace33c559e4790fe0027ba4e1047f58ec55339c8 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 15 Feb 2017 16:00:58 +0000
Subject: [PATCH 53/73] Only run timeago loops after rendering timeago
 components

---
 .../commit/pipelines/pipelines_store.js.es6   |  2 +-
 .../commit/pipelines/pipelines_table.js.es6   |  7 ++-
 .../vue_pipelines_index/pipelines.js.es6      | 10 ++++
 .../vue_pipelines_index/store.js.es6          | 54 +++++--------------
 changelogs/unreleased/28247-timeloops-bug.yml |  4 ++
 5 files changed, 34 insertions(+), 43 deletions(-)
 create mode 100644 changelogs/unreleased/28247-timeloops-bug.yml

diff --git a/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
index f1b41911b73..c45808e5e0f 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
+++ b/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
@@ -24,7 +24,7 @@ class PipelinesStore {
    * update the time to show how long as passed.
    *
    */
-  startTimeAgoLoops() {
+  static startTimeAgoLoops() {
     const startTimeLoops = () => {
       this.timeLoopInterval = setInterval(() => {
         this.$children[0].$children.reduce((acc, component) => {
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
index 5c1a7eb1052..1bb1f5429e5 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
+++ b/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
@@ -71,7 +71,6 @@ require('./pipelines_store');
         .then(response => response.json())
         .then((json) => {
           this.store.storePipelines(json);
-          this.store.startTimeAgoLoops.call(this, Vue);
           this.isLoading = false;
         })
         .catch(() => {
@@ -80,6 +79,12 @@ require('./pipelines_store');
         });
     },
 
+    beforeUpdate() {
+      if (this.state.pipelines.length && this.$children) {
+        this.store.startTimeAgoLoops.call(this, Vue);
+      }
+    },
+
     template: `
       <div class="pipelines">
         <div class="realtime-loading" v-if="isLoading">
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index e47dc6935d6..2def07a96f4 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -5,6 +5,7 @@ window.Vue = require('vue');
 require('../vue_shared/components/table_pagination');
 require('./store');
 require('../vue_shared/components/pipelines_table');
+const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_store');
 
 ((gl) => {
   gl.VuePipelines = Vue.extend({
@@ -32,8 +33,17 @@ require('../vue_shared/components/pipelines_table');
       const scope = gl.utils.getParameterByName('scope');
       if (pagenum) this.pagenum = pagenum;
       if (scope) this.apiScope = scope;
+
       this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope, this.apiScope);
     },
+
+    beforeUpdate() {
+      if (this.pipelines.length && this.$children) {
+        debugger;
+        CommitPipelinesStoreWithTimeAgo.startTimeAgoLoops.call(this, Vue);
+      }
+    },
+
     methods: {
       change(pagenum, apiScope) {
         gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
diff --git a/app/assets/javascripts/vue_pipelines_index/store.js.es6 b/app/assets/javascripts/vue_pipelines_index/store.js.es6
index 0ee21f00fdc..e45decc73c1 100644
--- a/app/assets/javascripts/vue_pipelines_index/store.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/store.js.es6
@@ -1,6 +1,5 @@
 /* global gl, Flash */
-/* eslint-disable no-param-reassign, no-underscore-dangle */
-require('../vue_realtime_listener');
+/* eslint-disable no-param-reassign */
 
 ((gl) => {
   const pageValues = (headers) => {
@@ -21,48 +20,21 @@ require('../vue_realtime_listener');
   gl.PipelineStore = class {
     fetchDataLoop(Vue, pageNum, url, apiScope) {
       this.pageRequest = true;
-      const updatePipelineNums = (count) => {
-        const { all } = count;
-        const running = count.running_or_pending;
-        document.querySelector('.js-totalbuilds-count').innerHTML = all;
-        document.querySelector('.js-running-count').innerHTML = running;
-      };
 
-      const goFetch = () =>
-        this.$http.get(`${url}?scope=${apiScope}&page=${pageNum}`)
-          .then((response) => {
-            const pageInfo = pageValues(response.headers);
-            this.pageInfo = Object.assign({}, this.pageInfo, pageInfo);
+      return this.$http.get(`${url}?scope=${apiScope}&page=${pageNum}`)
+      .then((response) => {
+        const pageInfo = pageValues(response.headers);
+        this.pageInfo = Object.assign({}, this.pageInfo, pageInfo);
 
-            const res = JSON.parse(response.body);
-            this.count = Object.assign({}, this.count, res.count);
-            this.pipelines = Object.assign([], this.pipelines, res.pipelines);
+        const res = JSON.parse(response.body);
+        this.count = Object.assign({}, this.count, res.count);
+        this.pipelines = Object.assign([], this.pipelines, res.pipelines);
 
-            updatePipelineNums(this.count);
-            this.pageRequest = false;
-          }, () => {
-            this.pageRequest = false;
-            return new Flash('An error occurred while fetching the pipelines, please reload the page again.');
-          });
-
-      goFetch();
-
-      const startTimeLoops = () => {
-        this.timeLoopInterval = setInterval(() => {
-          this.$children[0].$children.reduce((acc, component) => {
-            const timeAgoComponent = component.$children.filter(el => el.$options._componentTag === 'time-ago')[0];
-            acc.push(timeAgoComponent);
-            return acc;
-          }, []).forEach(e => e.changeTime());
-        }, 10000);
-      };
-
-      startTimeLoops();
-
-      const removeIntervals = () => clearInterval(this.timeLoopInterval);
-      const startIntervals = () => startTimeLoops();
-
-      gl.VueRealtimeListener(removeIntervals, startIntervals);
+        this.pageRequest = false;
+      }, () => {
+        this.pageRequest = false;
+        return new Flash('An error occurred while fetching the pipelines, please reload the page again.');
+      });
     }
   };
 })(window.gl || (window.gl = {}));
diff --git a/changelogs/unreleased/28247-timeloops-bug.yml b/changelogs/unreleased/28247-timeloops-bug.yml
new file mode 100644
index 00000000000..12ab523b7c7
--- /dev/null
+++ b/changelogs/unreleased/28247-timeloops-bug.yml
@@ -0,0 +1,4 @@
+---
+title: Only run timeago loops after rendering timeago components
+merge_request:
+author:

From d1004b79764f60798701de1dd55dfc47f1864bb8 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 15 Feb 2017 20:53:19 +0000
Subject: [PATCH 54/73] Transforms startTimeAgoLoops into a static method so we
 can reuse it instead of have 2

Fix broken test
---
 .../javascripts/commit/pipelines/pipelines_store.js.es6    | 6 ++----
 .../javascripts/commit/pipelines/pipelines_table.js.es6    | 7 +++----
 .../javascripts/vue_pipelines_index/pipelines.js.es6       | 1 -
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
index c45808e5e0f..f1b80e45444 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
+++ b/app/assets/javascripts/commit/pipelines/pipelines_store.js.es6
@@ -4,6 +4,7 @@
  *
  * Used to store the Pipelines rendered in the commit view in the pipelines table.
  */
+require('../../vue_realtime_listener');
 
 class PipelinesStore {
   constructor() {
@@ -44,7 +45,4 @@ class PipelinesStore {
   }
 }
 
-window.gl = window.gl || {};
-gl.commits = gl.commits || {};
-gl.commits.pipelines = gl.commits.pipelines || {};
-gl.commits.pipelines.PipelinesStore = PipelinesStore;
+module.exports = PipelinesStore;
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6 b/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
index 1bb1f5429e5..e7c6c063413 100644
--- a/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
+++ b/app/assets/javascripts/commit/pipelines/pipelines_table.js.es6
@@ -6,9 +6,8 @@ window.Vue.use(require('vue-resource'));
 require('../../lib/utils/common_utils');
 require('../../vue_shared/vue_resource_interceptor');
 require('../../vue_shared/components/pipelines_table');
-require('../../vue_realtime_listener/index');
 require('./pipelines_service');
-require('./pipelines_store');
+const PipelineStore = require('./pipelines_store');
 
 /**
  *
@@ -41,7 +40,7 @@ require('./pipelines_store');
     data() {
       const pipelinesTableData = document.querySelector('#commit-pipeline-table-view').dataset;
       const svgsData = document.querySelector('.pipeline-svgs').dataset;
-      const store = new gl.commits.pipelines.PipelinesStore();
+      const store = new PipelineStore();
 
       // Transform svgs DOMStringMap to a plain Object.
       const svgsObject = gl.utils.DOMStringMapToObject(svgsData);
@@ -81,7 +80,7 @@ require('./pipelines_store');
 
     beforeUpdate() {
       if (this.state.pipelines.length && this.$children) {
-        this.store.startTimeAgoLoops.call(this, Vue);
+        PipelineStore.startTimeAgoLoops.call(this, Vue);
       }
     },
 
diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index 2def07a96f4..a2441735374 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -39,7 +39,6 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s
 
     beforeUpdate() {
       if (this.pipelines.length && this.$children) {
-        debugger;
         CommitPipelinesStoreWithTimeAgo.startTimeAgoLoops.call(this, Vue);
       }
     },

From ac7101364293666aaf81dfaa19ab46b148d0718c Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 16 Feb 2017 11:15:08 +0000
Subject: [PATCH 55/73] Rename storePagination to setPagination

---
 .../javascripts/environments/components/environment.js.es6      | 2 +-
 .../javascripts/environments/stores/environments_store.js.es6   | 2 +-
 spec/javascripts/environments/environments_store_spec.js.es6    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index 6d9599e7645..d3d4efb8289 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -85,7 +85,7 @@ module.exports = Vue.component('environment-component', {
         this.store.storeAvailableCount(response.body.available_count);
         this.store.storeStoppedCount(response.body.stopped_count);
         this.store.storeEnvironments(response.body.environments);
-        this.store.storePagination(response.headers);
+        this.store.setPagination(response.headers);
       })
       .then(() => {
         this.isLoading = false;
diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index 252e349962e..2dc6bbe4761 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -43,7 +43,7 @@ class EnvironmentsStore {
     return filteredEnvironments;
   }
 
-  storePagination(pagination = {}) {
+  setPagination(pagination = {}) {
     const normalizedHeaders = gl.utils.normalizeHeaders(pagination);
     const paginationInformation = {
       perPage: parseInt(normalizedHeaders['X-PER-PAGE'], 10),
diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6
index 8fd660c3edb..71c1abd0c91 100644
--- a/spec/javascripts/environments/environments_store_spec.js.es6
+++ b/spec/javascripts/environments/environments_store_spec.js.es6
@@ -50,7 +50,7 @@ const { environmentsList } = require('./mock_data');
         previousPage: 2,
       };
 
-      store.storePagination(pagination);
+      store.setPagination(pagination);
       expect(store.state.paginationInformation).toEqual(expectedResult);
     });
   });

From 19791b65b20a21f1d12315b5b75f52a01531693b Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 16 Feb 2017 11:22:58 +0000
Subject: [PATCH 56/73] Changes after review

---
 .../javascripts/vue_pipelines_index/pipelines.js.es6 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index 9e816a285e4..39935b08dc0 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -35,8 +35,16 @@ require('../vue_shared/components/pipelines_table');
       this.store.fetchDataLoop.call(this, Vue, this.pagenum, this.scope, this.apiScope);
     },
     methods: {
-      change(pagenum, apiScope) {
-        if (!apiScope) apiScope = 'all';
+
+      /**
+       * Changes the URL according to the pagination component.
+       *
+       * If no scope is provided, 'all' is assumed.
+       *
+       * @param  {Number} pagenum
+       * @param  {String} apiScope = 'all'
+       */
+      change(pagenum, apiScope = 'all') {
         gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
       },
     },

From ba53ee78fa5ff5be573ca9f9e2dda75e8089aa85 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 16 Feb 2017 11:29:45 +0000
Subject: [PATCH 57/73] Changes after review

---
 .../environments/components/environment.js.es6       |  4 ++--
 .../folder/environments_folder_view.js.es6           | 11 ++++++-----
 app/assets/javascripts/lib/utils/common_utils.js.es6 | 12 ++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6
index d096f837285..0cbf952ea5c 100644
--- a/app/assets/javascripts/environments/components/environment.js.es6
+++ b/app/assets/javascripts/environments/components/environment.js.es6
@@ -5,7 +5,7 @@ const Vue = require('vue');
 Vue.use(require('vue-resource'));
 const EnvironmentsService = require('../services/environments_service');
 const EnvironmentTable = require('./environments_table');
-const Store = require('../stores/environments_store');
+const EnvironmentsStore = require('../stores/environments_store');
 require('../../vue_shared/components/table_pagination');
 require('../../lib/utils/common_utils');
 
@@ -18,7 +18,7 @@ module.exports = Vue.component('environment-component', {
 
   data() {
     const environmentsData = document.querySelector('#environments-list-view').dataset;
-    const store = new Store();
+    const store = new EnvironmentsStore();
 
     return {
       store,
diff --git a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6 b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
index f67e5eab64a..0b1204559da 100644
--- a/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
+++ b/app/assets/javascripts/environments/folder/environments_folder_view.js.es6
@@ -5,7 +5,7 @@ const Vue = require('vue');
 Vue.use(require('vue-resource'));
 const EnvironmentsService = require('../services/environments_service');
 const EnvironmentTable = require('../components/environments_table');
-const Store = require('../stores/environments_store');
+const EnvironmentsStore = require('../stores/environments_store');
 require('../../vue_shared/components/table_pagination');
 require('../../lib/utils/common_utils');
 
@@ -18,9 +18,10 @@ module.exports = Vue.component('environment-folder-view', {
 
   data() {
     const environmentsData = document.querySelector('#environments-folder-list-view').dataset;
-    const store = new Store();
-    const endpoint = `${window.location.pathname}.json`;
-    const folderName = window.location.pathname.substr(window.location.pathname.lastIndexOf('/') + 1);
+    const store = new EnvironmentsStore();
+    const pathname = window.location.pathname;
+    const endpoint = `${pathname}.json`;
+    const folderName = pathname.substr(pathname.lastIndexOf('/') + 1);
 
     return {
       store,
@@ -99,7 +100,7 @@ module.exports = Vue.component('environment-folder-view', {
         this.store.storeAvailableCount(response.body.available_count);
         this.store.storeStoppedCount(response.body.stopped_count);
         this.store.storeEnvironments(response.body.environments);
-        this.store.storePagination(response.headers);
+        this.store.setPagination(response.headers);
       })
       .then(() => {
         this.isLoading = false;
diff --git a/app/assets/javascripts/lib/utils/common_utils.js.es6 b/app/assets/javascripts/lib/utils/common_utils.js.es6
index 276ff01ab89..9c010e49284 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js.es6
+++ b/app/assets/javascripts/lib/utils/common_utils.js.es6
@@ -256,19 +256,19 @@
      */
     w.gl.utils.setParamInURL = (param, value) => {
       let search;
+      const locationSearch = window.location.search;
 
-      if (window.location.search.length === 0) {
+      if (locationSearch.length === 0) {
         search = `?${param}=${value}`;
       }
 
-      if (window.location.search.indexOf(param) !== -1) {
+      if (locationSearch.indexOf(param) !== -1) {
         const regex = new RegExp(param + '=\\d');
-        search = window.location.search.replace(regex, `${param}=${value}`);
+        search = locationSearch.replace(regex, `${param}=${value}`);
       }
 
-      if (window.location.search.length &&
-        window.location.search.indexOf(param) === -1) {
-        search = `${window.location.search}&${param}=${value}`;
+      if (locationSearch.length && locationSearch.indexOf(param) === -1) {
+        search = `${locationSearch}&${param}=${value}`;
       }
 
       return search;

From baa59b33efecfa326360633f67c16d6f89f48b20 Mon Sep 17 00:00:00 2001
From: Sam Rose <samrose3@gmail.com>
Date: Thu, 16 Feb 2017 06:39:28 -0500
Subject: [PATCH 58/73] Wrap long Project and Group titles

---
 app/assets/stylesheets/pages/projects.scss                    | 1 +
 ...28262-horizontal-scrolling-issue-on-long-project-names.yml | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/28262-horizontal-scrolling-issue-on-long-project-names.yml

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 9a72148f408..6b05e5bb4aa 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -102,6 +102,7 @@
     font-size: 24px;
     font-weight: 400;
     line-height: 1;
+    word-wrap: break-word;
 
     .fa {
       margin-left: 2px;
diff --git a/changelogs/unreleased/28262-horizontal-scrolling-issue-on-long-project-names.yml b/changelogs/unreleased/28262-horizontal-scrolling-issue-on-long-project-names.yml
new file mode 100644
index 00000000000..fa1674453de
--- /dev/null
+++ b/changelogs/unreleased/28262-horizontal-scrolling-issue-on-long-project-names.yml
@@ -0,0 +1,4 @@
+---
+title: Wrap long Project and Group titles
+merge_request: 9301
+author:

From 51f037809e207b5a28d6c3f7945801a7a13739fe Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 16 Feb 2017 12:02:55 +0000
Subject: [PATCH 59/73] Create util to handle pagination transformation

---
 .../stores/environments_store.js.es6          |  9 +------
 .../javascripts/lib/utils/common_utils.js.es6 | 15 ++++++++++++
 .../vue_pipelines_index/store.js.es6          | 11 +--------
 .../lib/utils/common_utils_spec.js.es6        | 24 +++++++++++++++++++
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/environments/stores/environments_store.js.es6 b/app/assets/javascripts/environments/stores/environments_store.js.es6
index 87822730be2..15cd9bde08e 100644
--- a/app/assets/javascripts/environments/stores/environments_store.js.es6
+++ b/app/assets/javascripts/environments/stores/environments_store.js.es6
@@ -58,14 +58,7 @@ class EnvironmentsStore {
 
   setPagination(pagination = {}) {
     const normalizedHeaders = gl.utils.normalizeHeaders(pagination);
-    const paginationInformation = {
-      perPage: parseInt(normalizedHeaders['X-PER-PAGE'], 10),
-      page: parseInt(normalizedHeaders['X-PAGE'], 10),
-      total: parseInt(normalizedHeaders['X-TOTAL'], 10),
-      totalPages: parseInt(normalizedHeaders['X-TOTAL-PAGES'], 10),
-      nextPage: parseInt(normalizedHeaders['X-NEXT-PAGE'], 10),
-      previousPage: parseInt(normalizedHeaders['X-PREV-PAGE'], 10),
-    };
+    const paginationInformation = gl.utils.parseIntPagination(normalizedHeaders);
 
     this.state.paginationInformation = paginationInformation;
     return paginationInformation;
diff --git a/app/assets/javascripts/lib/utils/common_utils.js.es6 b/app/assets/javascripts/lib/utils/common_utils.js.es6
index 9c010e49284..764aff51fee 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js.es6
+++ b/app/assets/javascripts/lib/utils/common_utils.js.es6
@@ -231,6 +231,21 @@
       return upperCaseHeaders;
     };
 
+    /**
+     * Parses pagination object string values into numbers.
+     *
+     * @param {Object} paginationInformation
+     * @returns {Object}
+     */
+    w.gl.utils.parseIntPagination = paginationInformation => ({
+      perPage: parseInt(paginationInformation['X-PER-PAGE'], 10),
+      page: parseInt(paginationInformation['X-PAGE'], 10),
+      total: parseInt(paginationInformation['X-TOTAL'], 10),
+      totalPages: parseInt(paginationInformation['X-TOTAL-PAGES'], 10),
+      nextPage: parseInt(paginationInformation['X-NEXT-PAGE'], 10),
+      previousPage: parseInt(paginationInformation['X-PREV-PAGE'], 10),
+    });
+
     /**
      * Transforms a DOMStringMap into a plain object.
      *
diff --git a/app/assets/javascripts/vue_pipelines_index/store.js.es6 b/app/assets/javascripts/vue_pipelines_index/store.js.es6
index 0ee21f00fdc..572f0493c9f 100644
--- a/app/assets/javascripts/vue_pipelines_index/store.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/store.js.es6
@@ -5,16 +5,7 @@ require('../vue_realtime_listener');
 ((gl) => {
   const pageValues = (headers) => {
     const normalized = gl.utils.normalizeHeaders(headers);
-
-    const paginationInfo = {
-      perPage: +normalized['X-PER-PAGE'],
-      page: +normalized['X-PAGE'],
-      total: +normalized['X-TOTAL'],
-      totalPages: +normalized['X-TOTAL-PAGES'],
-      nextPage: +normalized['X-NEXT-PAGE'],
-      previousPage: +normalized['X-PREV-PAGE'],
-    };
-
+    const paginationInfo = gl.utils.normalizeHeaders(normalized);
     return paginationInfo;
   };
 
diff --git a/spec/javascripts/lib/utils/common_utils_spec.js.es6 b/spec/javascripts/lib/utils/common_utils_spec.js.es6
index 006ede21093..f4d3e77e515 100644
--- a/spec/javascripts/lib/utils/common_utils_spec.js.es6
+++ b/spec/javascripts/lib/utils/common_utils_spec.js.es6
@@ -108,6 +108,30 @@ require('~/lib/utils/common_utils');
       });
     });
 
+    describe('gl.utils.parseIntPagination', () => {
+      it('should parse to integers all string values and return pagination object', () => {
+        const pagination = {
+          'X-PER-PAGE': 10,
+          'X-PAGE': 2,
+          'X-TOTAL': 30,
+          'X-TOTAL-PAGES': 3,
+          'X-NEXT-PAGE': 3,
+          'X-PREV-PAGE': 1,
+        };
+
+        const expectedPagination = {
+          perPage: 10,
+          page: 2,
+          total: 30,
+          totalPages: 3,
+          nextPage: 3,
+          previousPage: 1,
+        };
+
+        expect(gl.utils.parseIntPagination(pagination)).toEqual(expectedPagination);
+      });
+    });
+
     describe('gl.utils.isMetaClick', () => {
       it('should identify meta click on Windows/Linux', () => {
         const e = {

From ab3c546ff50d24e12c0883f1d7a0f749e46b5199 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 16 Feb 2017 12:26:04 +0000
Subject: [PATCH 60/73] Remove arrow icon from folders

---
 .../javascripts/environments/components/environment_item.js.es6  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6
index 2187969c2ae..24fd58a301a 100644
--- a/app/assets/javascripts/environments/components/environment_item.js.es6
+++ b/app/assets/javascripts/environments/components/environment_item.js.es6
@@ -442,7 +442,6 @@ module.exports = Vue.component('environment-item', {
         </a>
         <a v-else class="folder-name" :href="folderUrl">
           <span class="folder-icon">
-            <i class="fa fa-caret-right" aria-hidden="true"></i>
             <i class="fa fa-folder" aria-hidden="true"></i>
           </span>
 

From d89f4d73b9422aac15ee708ca72405f399c7dfa6 Mon Sep 17 00:00:00 2001
From: Jarka Kadlecova <jarka@gitlab.com>
Date: Wed, 15 Feb 2017 14:51:40 +0100
Subject: [PATCH 61/73] Fix error in MR widget after /merge slash command

---
 app/controllers/projects/merge_requests_controller.rb    | 9 ++++++---
 changelogs/unreleased/28176_merge_widget_fix.yml         | 4 ++++
 .../projects/merge_requests_controller_spec.rb           | 6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/28176_merge_widget_fix.yml

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index c3e1760f168..63b5bcbb586 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -369,10 +369,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def merge_widget_refresh
-    if merge_request.in_progress_merge_commit_sha || merge_request.state == 'merged'
-      @status = :success
-    elsif merge_request.merge_when_build_succeeds
+    if merge_request.merge_when_build_succeeds
       @status = :merge_when_build_succeeds
+    else
+      # Only MRs that can be merged end in this action
+      # MR can be already picked up for merge / merged already or can be waiting for worker to be picked up
+      # in last case it does not have any special status. Possible error is handled inside widget js function
+      @status = :success
     end
 
     render 'merge'
diff --git a/changelogs/unreleased/28176_merge_widget_fix.yml b/changelogs/unreleased/28176_merge_widget_fix.yml
new file mode 100644
index 00000000000..8e4e75fc237
--- /dev/null
+++ b/changelogs/unreleased/28176_merge_widget_fix.yml
@@ -0,0 +1,4 @@
+---
+title: Fix error in MR widget after /merge slash command
+merge_request: 9259
+author:
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index bfd134e406e..f84f922ba5e 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -1143,15 +1143,15 @@ describe Projects::MergeRequestsController do
       end
     end
 
-    context 'when no special status for MR' do
+    context 'when MR does not have special state' do
       let(:merge_request) { create(:merge_request, source_project: project) }
 
       it 'returns an OK response' do
         expect(response).to have_http_status(:ok)
       end
 
-      it 'sets status to nil' do
-        expect(assigns(:status)).to be_nil
+      it 'sets status to success' do
+        expect(assigns(:status)).to eq(:success)
         expect(response).to render_template('merge')
       end
     end

From 58cf7db157676d637f9baa3488b2893f2f49a3c5 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Thu, 16 Feb 2017 13:30:17 +0100
Subject: [PATCH 62/73] Simplify Pages admin Omnibus docs

[ci skip]
---
 doc/administration/pages/index.md | 155 +++++++++++++++++-------------
 1 file changed, 89 insertions(+), 66 deletions(-)

diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index 19316458d49..8de0cc5af5c 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -1,4 +1,4 @@
-# GitLab Pages Administration
+# GitLab Pages administration
 
 > **Notes:**
 - [Introduced][ee-80] in GitLab EE 8.3.
@@ -6,6 +6,7 @@
 - GitLab Pages [were ported][ce-14605] to Community Edition in GitLab 8.17.
 - This guide is for Omnibus GitLab installations. If you have installed
   GitLab from source, follow the [Pages source installation document](source.md).
+- To learn how to use GitLab Pages, read the [user documentation][pages-userguide].
 
 ---
 
@@ -14,9 +15,6 @@ sure to read the [changelog](#changelog) if you are upgrading to a new GitLab
 version as it may include new features and changes needed to be made in your
 configuration.
 
-If you are looking for ways to upload your static content in GitLab Pages, you
-probably want to read the [user documentation][pages-userguide].
-
 ## Overview
 
 GitLab Pages makes use of the [GitLab Pages daemon], a simple HTTP server
@@ -32,7 +30,7 @@ In the case of custom domains, the Pages daemon needs to listen on ports `80`
 and/or `443`. For that reason, there is some flexibility in the way which you
 can set it up:
 
-1. Run the pages daemon in the same server as GitLab, listening on a secondary IP
+1. Run the pages daemon in the same server as GitLab, listening on a secondary IP.
 1. Run the pages daemon in a separate server. In that case, the
    [Pages path](#change-storage-path) must also be present in the server that
    the pages daemon is installed, so you will have to share it via network.
@@ -64,11 +62,11 @@ you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the
 host that GitLab runs. For example, an entry would look like this:
 
 ```
-*.example.io. 1800 IN A 1.2.3.4
+*.example.io. 1800 IN A 1.1.1.1
 ```
 
 where `example.io` is the domain under which GitLab Pages will be served
-and `1.2.3.4` is the IP address of your GitLab instance.
+and `1.1.1.1` is the IP address of your GitLab instance.
 
 > **Note:**
 You should not use the GitLab domain to serve user pages. For more information
@@ -78,69 +76,44 @@ see the [security section](#security).
 
 ## Configuration
 
-Depending on your needs, you can install GitLab Pages in four different ways.
+Depending on your needs, you can set up GitLab Pages in 4 different ways.
+The following options are listed from the easiest setup to the most
+advanced one. The absolute minimum requirement is to set up the wildcard DNS
+since that is needed in all configurations.
 
-### Option 1. Custom domains with HTTPS support
+### Wildcard domains
 
-| URL scheme | Wildcard certificate | Custom domain with HTTP support | Custom domain with HTTPS support | Secondary IP |
-| --- |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| `https://page.example.io` and `https://page.com` | yes |  redirects to HTTPS | yes | yes |
+>**Requirements:**
+- [Wildcard DNS setup](#dns-configuration)
+>
+>---
+>
+URL scheme: `http://page.example.io`
 
-Pages enabled, daemon is enabled AND pages has external IP support enabled.
-In that case, the pages daemon is running, NGINX still proxies requests to
-the daemon but the daemon is also able to receive requests from the outside
-world. Custom domains and TLS are supported.
+This is the minimum setup that you can use Pages with. It is the base for all
+other setups as described below. Nginx will proxy all requests to the daemon.
+The Pages daemon doesn't listen to the outside world.
 
-1. Edit `/etc/gitlab/gitlab.rb`:
+1. Set the external URL for GitLab Pages in `/etc/gitlab/gitlab.rb`:
 
     ```ruby
-    pages_external_url "https://example.io"
-    nginx['listen_addresses'] = ['1.1.1.1']
-    pages_nginx['enable'] = false
-    gitlab_pages['cert'] = "/etc/gitlab/ssl/example.io.crt"
-    gitlab_pages['cert_key'] = "/etc/gitlab/ssl/example.io.key"
-    gitlab_pages['external_http'] = '1.1.1.2:80'
-    gitlab_pages['external_https'] = '1.1.1.2:443'
+    pages_external_url 'http://example.io'
     ```
 
-    where `1.1.1.1` is the primary IP address that GitLab is listening to and
-    `1.1.1.2` the secondary IP where the GitLab Pages daemon listens to.
-
 1. [Reconfigure GitLab][reconfigure]
 
-### Option 2. Custom domains without HTTPS support
+### Wildcard domains with TLS support
 
-| URL scheme |  Wildcard certificate | Custom domain with HTTP support | Custom domain with HTTPS support | Secondary IP |
-| --- |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| `http://page.example.io` and `http://page.com` | no  |  yes    | no  | yes |
+>**Requirements:**
+- [Wildcard DNS setup](#dns-configuration)
+- Wildcard TLS certificate
+>
+>---
+>
+URL scheme: `https://page.example.io`
 
-Pages enabled, daemon is enabled AND pages has external IP support enabled.
-In that case, the pages daemon is running, NGINX still proxies requests to
-the daemon but the daemon is also able to receive requests from the outside
-world. Custom domains and TLS are supported.
-
-1. Edit `/etc/gitlab/gitlab.rb`:
-
-    ```ruby
-    pages_external_url "http://example.io"
-    nginx['listen_addresses'] = ['1.1.1.1']
-    pages_nginx['enable'] = false
-    gitlab_pages['external_http'] = '1.1.1.2:80'
-    ```
-
-    where `1.1.1.1` is the primary IP address that GitLab is listening to and
-    `1.1.1.2` the secondary IP where the GitLab Pages daemon listens to.
-
-1. [Reconfigure GitLab][reconfigure]
-
-### Option 3. Wildcard HTTPS domain without custom domains
-
-| URL scheme | Wildcard certificate | Custom domain with HTTP support | Custom domain with HTTPS support | Secondary IP |
-| --- |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| `https://page.example.io` | yes |  no | no | no |
-
-Pages enabled, daemon is enabled and NGINX will proxy all requests to the
-daemon. Pages daemon doesn't listen to the outside world.
+Nginx will proxy all requests to the daemon. Pages daemon doesn't listen to the
+outside world.
 
 1. Place the certificate and key inside `/etc/gitlab/ssl`
 1. In `/etc/gitlab/gitlab.rb` specify the following configuration:
@@ -158,21 +131,71 @@ daemon. Pages daemon doesn't listen to the outside world.
 
 1. [Reconfigure GitLab][reconfigure]
 
-### Option 4. Wildcard HTTP domain without custom domains
+## Advanced configuration
 
-| URL scheme | Wildcard certificate | Custom domain with HTTP support | Custom domain with HTTPS support | Secondary IP |
-| --- |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| `http://page.example.io`  | no  |  no | no | no |
+In addition to the wildcard domains, you can also have the option to configure
+GitLab Pages to work with custom domains. Again, there are two options here:
+support custom domains with and without TLS certificates. The easiest setup is
+that without TLS certificates.
 
-Pages enabled, daemon is enabled and NGINX will proxy all requests to the
-daemon. Pages daemon doesn't listen to the outside world.
+### Custom domains
 
-1. Set the external URL for GitLab Pages in `/etc/gitlab/gitlab.rb`:
+>**Requirements:**
+- [Wildcard DNS setup](#dns-configuration)
+- Secondary IP
+>
+---
+>
+URL scheme: `http://page.example.io` and `http://domain.com`
+
+In that case, the pages daemon is running, Nginx still proxies requests to
+the daemon but the daemon is also able to receive requests from the outside
+world. Custom domains are supported, but no TLS.
+
+1. Edit `/etc/gitlab/gitlab.rb`:
 
     ```ruby
-    pages_external_url 'http://example.io'
+    pages_external_url "http://example.io"
+    nginx['listen_addresses'] = ['1.1.1.1']
+    pages_nginx['enable'] = false
+    gitlab_pages['external_http'] = '1.1.1.2:80'
     ```
 
+    where `1.1.1.1` is the primary IP address that GitLab is listening to and
+    `1.1.1.2` the secondary IP where the GitLab Pages daemon listens to.
+
+1. [Reconfigure GitLab][reconfigure]
+
+### Custom domains with TLS support
+
+>**Requirements:**
+- [Wildcard DNS setup](#dns-configuration)
+- Wildcard TLS certificate
+- Secondary IP
+>
+---
+>
+URL scheme: `https://page.example.io` and `https://domain.com`
+
+In that case, the pages daemon is running, Nginx still proxies requests to
+the daemon but the daemon is also able to receive requests from the outside
+world. Custom domains and TLS are supported.
+
+1. Edit `/etc/gitlab/gitlab.rb`:
+
+    ```ruby
+    pages_external_url "https://example.io"
+    nginx['listen_addresses'] = ['1.1.1.1']
+    pages_nginx['enable'] = false
+    gitlab_pages['cert'] = "/etc/gitlab/ssl/example.io.crt"
+    gitlab_pages['cert_key'] = "/etc/gitlab/ssl/example.io.key"
+    gitlab_pages['external_http'] = '1.1.1.2:80'
+    gitlab_pages['external_https'] = '1.1.1.2:443'
+    ```
+
+    where `1.1.1.1` is the primary IP address that GitLab is listening to and
+    `1.1.1.2` the secondary IP where the GitLab Pages daemon listens to.
+
 1. [Reconfigure GitLab][reconfigure]
 
 ## Change storage path

From 97ece6ace27543ce408ca85740a2734c4902122d Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Thu, 16 Feb 2017 13:39:42 +0100
Subject: [PATCH 63/73] Simplify Pages admin source docs

[ci skip]
---
 doc/administration/pages/source.md | 393 +++++++++++++++++------------
 1 file changed, 231 insertions(+), 162 deletions(-)

diff --git a/doc/administration/pages/source.md b/doc/administration/pages/source.md
index 0718c05a6f4..463715e48ca 100644
--- a/doc/administration/pages/source.md
+++ b/doc/administration/pages/source.md
@@ -17,20 +17,234 @@ Pages to the latest supported version.
 
 ## Prerequisites
 
-[Read the Omnibus prerequisites section.](index.md#prerequisites)
+Before proceeding with the Pages configuration, you will need to:
+
+1. Have a separate domain under which the GitLab Pages will be served. In this
+   document we assume that to be `example.io`.
+1. Configure a **wildcard DNS record**.
+1. (Optional) Have a **wildcard certificate** for that domain if you decide to
+   serve Pages under HTTPS.
+1. (Optional but recommended) Enable [Shared runners](../../ci/runners/README.md)
+   so that your users don't have to bring their own.
+
+### DNS configuration
+
+GitLab Pages expect to run on their own virtual host. In your DNS server/provider
+you need to add a [wildcard DNS A record][wiki-wildcard-dns] pointing to the
+host that GitLab runs. For example, an entry would look like this:
+
+```
+*.example.io. 1800 IN A 1.1.1.1
+```
+
+where `example.io` is the domain under which GitLab Pages will be served
+and `1.1.1.1` is the IP address of your GitLab instance.
+
+> **Note:**
+You should not use the GitLab domain to serve user pages. For more information
+see the [security section](#security).
+
+[wiki-wildcard-dns]: https://en.wikipedia.org/wiki/Wildcard_DNS_record
 
 ## Configuration
 
-Depending on your needs, you can install GitLab Pages in four different ways.
+Depending on your needs, you can set up GitLab Pages in 4 different ways.
+The following options are listed from the easiest setup to the most
+advanced one. The absolute minimum requirement is to set up the wildcard DNS
+since that is needed in all configurations.
 
-### Option 1. Custom domains with HTTPS support
+### Wildcard domains
 
-| URL scheme | Wildcard certificate | Custom domain with HTTP support | Custom domain with HTTPS support | Secondary IP |
-| --- |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| `https://page.example.io` and `https://page.com` | yes |  redirects to HTTPS | yes | yes |
+>**Requirements:**
+- [Wildcard DNS setup](#dns-configuration)
+>
+>---
+>
+URL scheme: `http://page.example.io`
 
-Pages enabled, daemon is enabled AND pages has external IP support enabled.
-In that case, the pages daemon is running, NGINX still proxies requests to
+This is the minimum setup that you can use Pages with. It is the base for all
+other setups as described below. Nginx will proxy all requests to the daemon.
+The Pages daemon doesn't listen to the outside world.
+
+1. Install the Pages daemon:
+
+    ```
+    cd /home/git
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
+    cd gitlab-pages
+    sudo -u git -H git checkout v0.2.4
+    sudo -u git -H make
+    ```
+
+1. Go to the GitLab installation directory:
+
+     ```bash
+     cd /home/git/gitlab
+     ```
+
+1. Edit `gitlab.yml` and under the `pages` setting, set `enabled` to `true` and
+   the `host` to the FQDN under which GitLab Pages will be served:
+
+     ```yaml
+     ## GitLab Pages
+     pages:
+       enabled: true
+       # The location where pages are stored (default: shared/pages).
+       # path: shared/pages
+
+       host: example.io
+       port: 80
+       https: false
+     ```
+
+1. Copy the `gitlab-pages-ssl` Nginx configuration file:
+
+    ```bash
+    sudo cp lib/support/nginx/gitlab-pages-ssl /etc/nginx/sites-available/gitlab-pages-ssl.conf
+    sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf
+    ```
+
+      Replace `gitlab-pages-ssl` with `gitlab-pages` if you are not using SSL.
+
+1. Restart NGINX
+1. [Restart GitLab][restart]
+
+### Wildcard domains with TLS support
+
+>**Requirements:**
+- [Wildcard DNS setup](#dns-configuration)
+- Wildcard TLS certificate
+>
+>---
+>
+URL scheme: `https://page.example.io`
+
+Nginx will proxy all requests to the daemon. Pages daemon doesn't listen to the
+outside world.
+
+1. Install the Pages daemon:
+
+    ```
+    cd /home/git
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
+    cd gitlab-pages
+    sudo -u git -H git checkout v0.2.4
+    sudo -u git -H make
+    ```
+
+1. In `gitlab.yml`, set the port to `443` and https to `true`:
+
+     ```bash
+     ## GitLab Pages
+     pages:
+       enabled: true
+       # The location where pages are stored (default: shared/pages).
+       # path: shared/pages
+
+       host: example.io
+       port: 443
+       https: true
+     ```
+
+1. Copy the `gitlab-pages-ssl` Nginx configuration file:
+
+    ```bash
+    sudo cp lib/support/nginx/gitlab-pages-ssl /etc/nginx/sites-available/gitlab-pages-ssl.conf
+    sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf
+    ```
+
+      Replace `gitlab-pages-ssl` with `gitlab-pages` if you are not using SSL.
+
+1. Restart NGINX
+1. [Restart GitLab][restart]
+
+
+## Advanced configuration
+
+In addition to the wildcard domains, you can also have the option to configure
+GitLab Pages to work with custom domains. Again, there are two options here:
+support custom domains with and without TLS certificates. The easiest setup is
+that without TLS certificates.
+
+### Custom domains
+
+>**Requirements:**
+- [Wildcard DNS setup](#dns-configuration)
+- Secondary IP
+>
+---
+>
+URL scheme: `http://page.example.io` and `http://domain.com`
+
+In that case, the pages daemon is running, Nginx still proxies requests to
+the daemon but the daemon is also able to receive requests from the outside
+world. Custom domains are supported, but no TLS.
+
+1. Install the Pages daemon:
+
+    ```
+    cd /home/git
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
+    cd gitlab-pages
+    sudo -u git -H git checkout v0.2.4
+    sudo -u git -H make
+    ```
+
+1. Edit `gitlab.yml` to look like the example below. You need to change the
+   `host` to the FQDN under which GitLab Pages will be served. Set
+   `external_http` to the secondary IP on which the pages daemon will listen
+   for connections:
+
+     ```yaml
+     pages:
+       enabled: true
+       # The location where pages are stored (default: shared/pages).
+       # path: shared/pages
+
+       host: example.io
+       port: 80
+       https: false
+
+       external_http: 1.1.1.2:80
+     ```
+
+1. Edit `/etc/default/gitlab` and set `gitlab_pages_enabled` to `true` in
+   order to enable the pages daemon. In `gitlab_pages_options` the
+   `-pages-domain` and `-listen-http` must match the `host` and `external_http`
+   settings that you set above respectively:
+
+    ```
+    gitlab_pages_enabled=true
+    gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 1.1.1.2:80"
+    ```
+
+1. Copy the `gitlab-pages-ssl` Nginx configuration file:
+
+    ```bash
+    sudo cp lib/support/nginx/gitlab-pages-ssl /etc/nginx/sites-available/gitlab-pages-ssl.conf
+    sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf
+    ```
+
+      Replace `gitlab-pages-ssl` with `gitlab-pages` if you are not using SSL.
+
+1. Edit all GitLab related configs in `/etc/nginx/site-available/` and replace
+   `0.0.0.0` with `1.1.1.1`, where `1.1.1.1` the primary IP where GitLab
+   listens to.
+1. Restart NGINX
+1. [Restart GitLab][restart]
+
+### Custom domains with TLS support
+
+>**Requirements:**
+- [Wildcard DNS setup](#dns-configuration)
+- Wildcard TLS certificate
+- Secondary IP
+>
+---
+>
+URL scheme: `https://page.example.io` and `https://domain.com`
+
+In that case, the pages daemon is running, Nginx still proxies requests to
 the daemon but the daemon is also able to receive requests from the outside
 world. Custom domains and TLS are supported.
 
@@ -91,165 +305,20 @@ world. Custom domains and TLS are supported.
 1. Restart NGINX
 1. [Restart GitLab][restart]
 
-### Option 2. Custom domains without HTTPS support
+## Change storage path
 
-| URL scheme |  Wildcard certificate | Custom domain with HTTP support | Custom domain with HTTPS support | Secondary IP |
-| --- |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| `http://page.example.io` and `http://page.com` | no  |  yes    | no  | yes |
+Follow the steps below to change the default path where GitLab Pages' contents
+are stored.
 
-Pages enabled, daemon is enabled AND pages has external IP support enabled.
-In that case, the pages daemon is running, NGINX still proxies requests to
-the daemon but the daemon is also able to receive requests from the outside
-world. Custom domains and TLS are supported.
+1. Pages are stored by default in `/var/opt/gitlab/gitlab-rails/shared/pages`.
+   If you wish to store them in another location you must set it up in
+   `/etc/gitlab/gitlab.rb`:
 
-1. Install the Pages daemon:
-
-    ```
-    cd /home/git
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
-    cd gitlab-pages
-    sudo -u git -H git checkout v0.2.4
-    sudo -u git -H make
-    ```
-
-1. Edit `gitlab.yml` to look like the example below. You need to change the
-   `host` to the FQDN under which GitLab Pages will be served. Set
-   `external_http` to the secondary IP on which the pages daemon will listen
-   for connections:
-
-     ```yaml
-     pages:
-       enabled: true
-       # The location where pages are stored (default: shared/pages).
-       # path: shared/pages
-
-       host: example.io
-       port: 80
-       https: false
-
-       external_http: 1.1.1.2:80
+     ```ruby
+     gitlab_rails['pages_path'] = "/mnt/storage/pages"
      ```
 
-1. Edit `/etc/default/gitlab` and set `gitlab_pages_enabled` to `true` in
-   order to enable the pages daemon. In `gitlab_pages_options` the
-   `-pages-domain` and `-listen-http` must match the `host` and `external_http`
-   settings that you set above respectively:
-
-    ```
-    gitlab_pages_enabled=true
-    gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 1.1.1.2:80"
-    ```
-
-1. Copy the `gitlab-pages-ssl` Nginx configuration file:
-
-    ```bash
-    sudo cp lib/support/nginx/gitlab-pages-ssl /etc/nginx/sites-available/gitlab-pages-ssl.conf
-    sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf
-    ```
-
-      Replace `gitlab-pages-ssl` with `gitlab-pages` if you are not using SSL.
-
-1. Edit all GitLab related configs in `/etc/nginx/site-available/` and replace
-   `0.0.0.0` with `1.1.1.1`, where `1.1.1.1` the primary IP where GitLab
-   listens to.
-1. Restart NGINX
-1. [Restart GitLab][restart]
-
-### Option 3. Wildcard HTTPS domain without custom domains
-
-| URL scheme | Wildcard certificate | Custom domain with HTTP support | Custom domain with HTTPS support | Secondary IP |
-| --- |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| `https://page.example.io` | yes |  no | no | no |
-
-Pages enabled, daemon is enabled and NGINX will proxy all requests to the
-daemon. Pages daemon doesn't listen to the outside world.
-
-1. Install the Pages daemon:
-
-    ```
-    cd /home/git
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
-    cd gitlab-pages
-    sudo -u git -H git checkout v0.2.4
-    sudo -u git -H make
-    ```
-1. In `gitlab.yml`, set the port to `443` and https to `true`:
-
-     ```bash
-     ## GitLab Pages
-     pages:
-       enabled: true
-       # The location where pages are stored (default: shared/pages).
-       # path: shared/pages
-
-       host: example.io
-       port: 443
-       https: true
-     ```
-
-1. Copy the `gitlab-pages-ssl` Nginx configuration file:
-
-    ```bash
-    sudo cp lib/support/nginx/gitlab-pages-ssl /etc/nginx/sites-available/gitlab-pages-ssl.conf
-    sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf
-    ```
-
-      Replace `gitlab-pages-ssl` with `gitlab-pages` if you are not using SSL.
-
-1. Restart NGINX
-1. [Restart GitLab][restart]
-
-### Option 4. Wildcard HTTP domain without custom domains
-
-| URL scheme | Wildcard certificate | Custom domain with HTTP support | Custom domain with HTTPS support | Secondary IP |
-| --- |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| `http://page.example.io`  | no  |  no | no | no |
-
-Pages enabled, daemon is enabled and NGINX will proxy all requests to the
-daemon. Pages daemon doesn't listen to the outside world.
-
-1. Install the Pages daemon:
-
-    ```
-    cd /home/git
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-pages.git
-    cd gitlab-pages
-    sudo -u git -H git checkout v0.2.4
-    sudo -u git -H make
-    ```
-
-1. Go to the GitLab installation directory:
-
-     ```bash
-     cd /home/git/gitlab
-     ```
-
-1. Edit `gitlab.yml` and under the `pages` setting, set `enabled` to `true` and
-   the `host` to the FQDN under which GitLab Pages will be served:
-
-     ```yaml
-     ## GitLab Pages
-     pages:
-       enabled: true
-       # The location where pages are stored (default: shared/pages).
-       # path: shared/pages
-
-       host: example.io
-       port: 80
-       https: false
-     ```
-
-1. Copy the `gitlab-pages-ssl` Nginx configuration file:
-
-    ```bash
-    sudo cp lib/support/nginx/gitlab-pages-ssl /etc/nginx/sites-available/gitlab-pages-ssl.conf
-    sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf
-    ```
-
-      Replace `gitlab-pages-ssl` with `gitlab-pages` if you are not using SSL.
-
-1. Restart NGINX
-1. [Restart GitLab][restart]
+1. [Reconfigure GitLab][reconfigure]
 
 ## NGINX caveats
 

From 19fd4ebb5f51f65eacead761368e1680dee36411 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Thu, 16 Feb 2017 14:05:51 +0100
Subject: [PATCH 64/73] Update services templates docs

[ci skip]
---
 .../services_templates_redmine_example.png    | Bin 8776 -> 8608 bytes
 .../integrations/services_templates.md        |  19 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/doc/user/project/integrations/img/services_templates_redmine_example.png b/doc/user/project/integrations/img/services_templates_redmine_example.png
index 50d20510dafd0dbfcfd89f16abc21002d87a79d4..379cef9888d91c2b27d0f285a0171ef3bc15a13e 100644
GIT binary patch
literal 8608
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
OdvISvvFxt-tN#J_<rLHa

delta 8127
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
Cbtl~b

diff --git a/doc/user/project/integrations/services_templates.md b/doc/user/project/integrations/services_templates.md
index be6d13b6d2b..5b04d7d88b8 100644
--- a/doc/user/project/integrations/services_templates.md
+++ b/doc/user/project/integrations/services_templates.md
@@ -1,25 +1,26 @@
-# Services Templates
+# Services templates
 
 A GitLab administrator can add a service template that sets a default for each
-project. This makes it much easier to configure individual projects.
+project. After a service template is enabled, it will be applied to new
+projects only and its details will be pre-filled on the project's Service page.
 
-After the template is created, the template details will be pre-filled on a
-project's Service page.
-
-## Enable a Service template
+## Enable a service template
 
 In GitLab's Admin area, navigate to **Service Templates** and choose the
 service template you wish to create.
 
-For example, in the image below you can see Redmine.
+## Services for external issue trackers
+
+In the image below you can see how a service template for Redmine would look
+like.
 
 ![Redmine service template](img/services_templates_redmine_example.png)
 
 ---
 
-**NOTE:** For each project, you will still need to configure the issue tracking
+For each project, you will still need to configure the issue tracking
 URLs by replacing `:issues_tracker_id` in the above screenshot with the ID used
 by your external issue tracker. Prior to GitLab v7.8, this ID was configured in
 the project settings, and GitLab would automatically update the URL configured
 in `gitlab.yml`. This behavior is now deprecated and all issue tracker URLs
-must be configured directly within the project's **Services** settings.
+must be configured directly within the project's **Integrations** settings.

From 78082831c1b3fa724badc6bab4fd54d9fbd0366c Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 16 Feb 2017 13:28:59 +0000
Subject: [PATCH 65/73] Fix broken test

---
 spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6 b/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6
index 789f5dc9f49..94973419979 100644
--- a/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6
+++ b/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6
@@ -1,10 +1,10 @@
-require('~/commit/pipelines/pipelines_store');
+const PipelinesStore = require('~/commit/pipelines/pipelines_store');
 
 describe('Store', () => {
   let store;
 
   beforeEach(() => {
-    store = new gl.commits.pipelines.PipelinesStore();
+    store = new PipelinesStore();
   });
 
   // unregister intervals and event handlers

From d603cf2f3956057fa3e1416367b59ae146d0c1a3 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Thu, 16 Feb 2017 14:42:40 +0100
Subject: [PATCH 66/73] Do not use single quote in headings as it breaks
 docs.gitlab.com

[ci skip]
---
 doc/development/gotchas.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/development/gotchas.md b/doc/development/gotchas.md
index 0f78e8238af..565d4b33457 100644
--- a/doc/development/gotchas.md
+++ b/doc/development/gotchas.md
@@ -3,7 +3,7 @@
 The purpose of this guide is to document potential "gotchas" that contributors
 might encounter or should avoid during development of GitLab CE and EE.
 
-## Don't `describe` symbols
+## Do not `describe` symbols
 
 Consider the following model spec:
 
@@ -32,7 +32,7 @@ spec/models/user_spec.rb|6 error|  Failure/Error: u = described_class.new NoMeth
 Except for the top-level `describe` block, always provide a String argument to
 `describe`.
 
-## Don't assert against the absolute value of a sequence-generated attribute
+## Do not assert against the absolute value of a sequence-generated attribute
 
 Consider the following factory:
 
@@ -121,7 +121,7 @@ describe API::Labels do
 end
 ```
 
-## Don't `rescue Exception`
+## Do not `rescue Exception`
 
 See ["Why is it bad style to `rescue Exception => e` in Ruby?"][Exception].
 
@@ -130,7 +130,7 @@ Rubocop](https://gitlab.com/gitlab-org/gitlab-ce/blob/8-4-stable/.rubocop.yml#L9
 
 [Exception]: http://stackoverflow.com/q/10048173/223897
 
-## Don't use inline JavaScript in views
+## Do not use inline JavaScript in views
 
 Using the inline `:javascript` Haml filters comes with a
 performance overhead. Using inline JavaScript is not a good way to structure your code and should be avoided.

From 221b772179c738daf33b2a5b08c03f0368d734a3 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Fri, 17 Feb 2017 00:34:45 +1100
Subject: [PATCH 67/73] add space between ci text and commit sha in Merge
 Request widget

flex parent was pushing elements together
---
 app/views/projects/merge_requests/widget/_heading.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index e3062f47788..c676953f729 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -28,7 +28,7 @@
         %span
           CI job
           = ci_label_for_status(status)
-        for
+          for
         - commit = @merge_request.diff_head_commit
         = succeed "." do
           = link_to commit.short_id, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, commit), class: "monospace"

From 092e4212d44a3757134d73bb820a02504d2fe1bb Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 15 Feb 2017 13:20:22 -0500
Subject: [PATCH 68/73] Fix positioning of top scroll button

---
 app/assets/stylesheets/pages/builds.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index fd101d43b5b..a24292a7c8c 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -91,7 +91,7 @@
     }
 
     &.scroll-top {
-      top: 110px;
+      top: 10px;
     }
 
     &.scroll-bottom {

From 3f76d7451ae43ca30a4a615d35d2dbc65ec234ec Mon Sep 17 00:00:00 2001
From: Alfredo Sumaran <alfredo@gitlab.com>
Date: Wed, 15 Feb 2017 13:29:02 -0500
Subject: [PATCH 69/73] Add CHANGELOG file

---
 .../unreleased/28253-fix-buid-scroll-button-position.yml      | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/28253-fix-buid-scroll-button-position.yml

diff --git a/changelogs/unreleased/28253-fix-buid-scroll-button-position.yml b/changelogs/unreleased/28253-fix-buid-scroll-button-position.yml
new file mode 100644
index 00000000000..b13d115dab9
--- /dev/null
+++ b/changelogs/unreleased/28253-fix-buid-scroll-button-position.yml
@@ -0,0 +1,4 @@
+---
+title: Fix positioning of `Scroll to top` button
+merge_request:
+author:

From af41d689dfd76870635f6a66bff8b1f987aca026 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Tue, 14 Feb 2017 13:39:29 -0600
Subject: [PATCH 70/73] update migration docs for 8.17 to include minimum node
 version

---
 doc/install/installation.md | 29 ++++++++++++++++++++++-------
 doc/update/8.16-to-8.17.md  | 31 +++++++++++++++++++++++--------
 lib/gitlab/upgrader.rb      |  1 +
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 0f07085942a..1a4e45a65aa 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -39,6 +39,7 @@ The GitLab installation consists of setting up the following components:
 1. Packages / Dependencies
 1. Ruby
 1. Go
+1. Node
 1. System Users
 1. Database
 1. Redis
@@ -63,7 +64,7 @@ up-to-date and install it.
 
 Install the required packages (needed to compile Ruby and native extensions to Ruby gems):
 
-    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils pkg-config cmake nodejs
+    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils pkg-config cmake
 
 If you want to use Kerberos for user authentication, then install libkrb5-dev:
 
@@ -151,13 +152,26 @@ page](https://golang.org/dl).
     sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/
     rm go1.5.3.linux-amd64.tar.gz
 
-## 4. System Users
+## 4. Node
+
+Since GitLab 8.17, GitLab requires the use of node >= v4.3.0 to compile
+javascript assets. In many distros the version provided by the official package
+repositories is out of date, so we'll need to install through the following
+commands:
+
+    # install node v7.x
+    curl --location https://deb.nodesource.com/setup_7.x | bash -
+    sudo apt-get install -y nodejs
+
+Visit the official website for [node](https://nodejs.org/en/download/package-manager/) if you have any trouble with this step.
+
+## 5. System Users
 
 Create a `git` user for GitLab:
 
     sudo adduser --disabled-login --gecos 'GitLab' git
 
-## 5. Database
+## 6. Database
 
 We recommend using a PostgreSQL database. For MySQL check the
 [MySQL setup guide](database_mysql.md).
@@ -218,7 +232,7 @@ We recommend using a PostgreSQL database. For MySQL check the
     gitlabhq_production> \q
     ```
 
-## 6. Redis
+## 7. Redis
 
 GitLab requires at least Redis 2.8.
 
@@ -263,7 +277,7 @@ sudo service redis-server restart
 sudo usermod -aG redis git
 ```
 
-## 7. GitLab
+## 8. GitLab
 
     # We'll install GitLab into home directory of the user "git"
     cd /home/git
@@ -451,7 +465,8 @@ Check if GitLab and its environment are configured correctly:
 
 ### Compile Assets
 
-    sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production
+    sudo -u git -H npm install --production
+    sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
 
 ### Start Your GitLab Instance
 
@@ -459,7 +474,7 @@ Check if GitLab and its environment are configured correctly:
     # or
     sudo /etc/init.d/gitlab restart
 
-## 8. Nginx
+## 9. Nginx
 
 **Note:** Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the [GitLab recipes](https://gitlab.com/gitlab-org/gitlab-recipes/).
 
diff --git a/doc/update/8.16-to-8.17.md b/doc/update/8.16-to-8.17.md
index 53c2bc560e8..ded5df26950 100644
--- a/doc/update/8.16-to-8.17.md
+++ b/doc/update/8.16-to-8.17.md
@@ -49,7 +49,19 @@ Install Bundler:
 sudo gem install bundler --no-ri --no-rdoc
 ```
 
-### 4. Get latest code
+### 4. Update Node
+
+GitLab now runs [webpack](http://webpack.js.org) to compile frontend assets and
+it has a minimum requirement of node v4.3.0.
+
+You can check which version you are running with `node -v`. If you are running
+a version older than `v4.3.0` you will should update to a newer version.  You
+can find instructions to install from community maintained packages or compile
+from source at the nodejs.org website.
+
+<https://nodejs.org/en/download/>
+
+### 5. Get latest code
 
 ```bash
 cd /home/git/gitlab
@@ -76,7 +88,7 @@ cd /home/git/gitlab
 sudo -u git -H git checkout 8-17-stable-ee
 ```
 
-### 5. Install libs, migrations, etc.
+### 6. Install libs, migrations, etc.
 
 ```bash
 cd /home/git/gitlab
@@ -93,13 +105,16 @@ sudo -u git -H bundle clean
 # Run database migrations
 sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
 
+# Install/update frontend asset dependencies
+sudo -u git -H npm install --production
+
 # Clean up assets and cache
-sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
+sudo -u git -H bundle exec rake gitlab:assets:clean gitlab:assets:compile cache:clear RAILS_ENV=production
 ```
 
 **MySQL installations**: Run through the `MySQL strings limits` and `Tables and data conversion to utf8mb4` [tasks](../install/database_mysql.md).
 
-### 6. Update gitlab-workhorse
+### 7. Update gitlab-workhorse
 
 Install and compile gitlab-workhorse. This requires
 [Go 1.5](https://golang.org/dl) which should already be on your system from
@@ -111,7 +126,7 @@ cd /home/git/gitlab
 sudo -u git -H bundle exec rake "gitlab:workhorse:install[/home/git/gitlab-workhorse]" RAILS_ENV=production
 ```
 
-### 7. Update gitlab-shell
+### 8. Update gitlab-shell
 
 ```bash
 cd /home/git/gitlab-shell
@@ -120,7 +135,7 @@ sudo -u git -H git fetch --all --tags
 sudo -u git -H git checkout v4.1.1
 ```
 
-### 8. Update configuration files
+### 9. Update configuration files
 
 #### New configuration options for `gitlab.yml`
 
@@ -194,14 +209,14 @@ For Ubuntu 16.04.1 LTS:
 sudo systemctl daemon-reload
 ```
 
-### 9. Start application
+### 10. Start application
 
 ```bash
 sudo service gitlab start
 sudo service nginx restart
 ```
 
-### 10. Check application status
+### 11. Check application status
 
 Check if GitLab and its environment are configured correctly:
 
diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb
index e78d0c34a02..23a5a868d79 100644
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
@@ -61,6 +61,7 @@ module Gitlab
         "Switch to new version" => %W(#{Gitlab.config.git.bin_path} checkout v#{latest_version}),
         "Install gems" => %W(bundle),
         "Migrate DB" => %W(bundle exec rake db:migrate),
+        "Install node modules" => %W(npm install --production),
         "Recompile assets" => %W(bundle exec rake gitlab:assets:clean gitlab:assets:compile),
         "Clear cache" => %W(bundle exec rake cache:clear)
       }

From 6970f42e2892c665657532dc105bd7c17c701c60 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 16 Feb 2017 18:10:23 +0000
Subject: [PATCH 71/73] Renders pagination again for pipelines table

---
 app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 | 5 ++++-
 app/assets/javascripts/vue_pipelines_index/store.js.es6     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6 b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
index 02ad029119d..dac364977d5 100644
--- a/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/pipelines.js.es6
@@ -50,10 +50,13 @@ const CommitPipelinesStoreWithTimeAgo = require('../commit/pipelines/pipelines_s
        *
        * If no scope is provided, 'all' is assumed.
        *
+       * Pagination component sends "null" when no scope is provided.
+       *
        * @param  {Number} pagenum
        * @param  {String} apiScope = 'all'
        */
-      change(pagenum, apiScope = 'all') {
+      change(pagenum, apiScope) {
+        if (!apiScope) apiScope = 'all';
         gl.utils.visitUrl(`?scope=${apiScope}&p=${pagenum}`);
       },
     },
diff --git a/app/assets/javascripts/vue_pipelines_index/store.js.es6 b/app/assets/javascripts/vue_pipelines_index/store.js.es6
index ffed5f53097..909007267b9 100644
--- a/app/assets/javascripts/vue_pipelines_index/store.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/store.js.es6
@@ -4,7 +4,7 @@
 ((gl) => {
   const pageValues = (headers) => {
     const normalized = gl.utils.normalizeHeaders(headers);
-    const paginationInfo = gl.utils.normalizeHeaders(normalized);
+    const paginationInfo = gl.utils.parseIntPagination(normalized);
     return paginationInfo;
   };
 

From 812e7e482eb48876a2decdf02cee37f24374f65b Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 16 Feb 2017 13:18:43 -0600
Subject: [PATCH 72/73] move "Install node modules" step before "Migrate DB"
 within update process

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

diff --git a/lib/gitlab/upgrader.rb b/lib/gitlab/upgrader.rb
index 23a5a868d79..7fd4935191c 100644
--- a/lib/gitlab/upgrader.rb
+++ b/lib/gitlab/upgrader.rb
@@ -60,8 +60,8 @@ module Gitlab
         "Get latest code" => %W(#{Gitlab.config.git.bin_path} fetch),
         "Switch to new version" => %W(#{Gitlab.config.git.bin_path} checkout v#{latest_version}),
         "Install gems" => %W(bundle),
-        "Migrate DB" => %W(bundle exec rake db:migrate),
         "Install node modules" => %W(npm install --production),
+        "Migrate DB" => %W(bundle exec rake db:migrate),
         "Recompile assets" => %W(bundle exec rake gitlab:assets:clean gitlab:assets:compile),
         "Clear cache" => %W(bundle exec rake cache:clear)
       }

From e25f1a0a85e703acf417d92048bf9628c6b39ee9 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Thu, 16 Feb 2017 14:26:39 -0600
Subject: [PATCH 73/73] fix typo in node section

---
 doc/update/8.16-to-8.17.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/update/8.16-to-8.17.md b/doc/update/8.16-to-8.17.md
index ded5df26950..954109ba18f 100644
--- a/doc/update/8.16-to-8.17.md
+++ b/doc/update/8.16-to-8.17.md
@@ -55,7 +55,7 @@ GitLab now runs [webpack](http://webpack.js.org) to compile frontend assets and
 it has a minimum requirement of node v4.3.0.
 
 You can check which version you are running with `node -v`. If you are running
-a version older than `v4.3.0` you will should update to a newer version.  You
+a version older than `v4.3.0` you will need to update to a newer version.  You
 can find instructions to install from community maintained packages or compile
 from source at the nodejs.org website.