From 3cd511733b5b646becfdf72e36062b863dfbcf20 Mon Sep 17 00:00:00 2001
From: Ronald van Zon <rvzon84@gmail.com>
Date: Thu, 30 Aug 2018 14:17:36 +0000
Subject: Fixing count on Milestones

By adding groups to milestones we can now include them
in the count of Open and Closed.
---
 app/controllers/dashboard/application_controller.rb |  4 ++++
 app/controllers/dashboard/milestones_controller.rb  |  3 ++-
 app/models/global_milestone.rb                      | 20 ++++++++++++++++++--
 changelogs/unreleased/rz_fix_milestone_count.yml    |  5 +++++
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/rz_fix_milestone_count.yml

diff --git a/app/controllers/dashboard/application_controller.rb b/app/controllers/dashboard/application_controller.rb
index cee0753a021..1c9a5917da5 100644
--- a/app/controllers/dashboard/application_controller.rb
+++ b/app/controllers/dashboard/application_controller.rb
@@ -12,4 +12,8 @@ class Dashboard::ApplicationController < ApplicationController
   def projects
     @projects ||= current_user.authorized_projects.sorted_by_activity.non_archived
   end
+
+  def groups
+    @groups ||= GroupsFinder.new(current_user, state_all: true).execute
+  end
 end
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb
index 6e17bc212e4..ddc1a66d11d 100644
--- a/app/controllers/dashboard/milestones_controller.rb
+++ b/app/controllers/dashboard/milestones_controller.rb
@@ -4,12 +4,13 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
   include MilestoneActions
 
   before_action :projects
+  before_action :groups
   before_action :milestone, only: [:show, :merge_requests, :participants, :labels]
 
   def index
     respond_to do |format|
       format.html do
-        @milestone_states = GlobalMilestone.states_count(@projects)
+        @milestone_states = GlobalMilestone.states_count(@projects, @groups)
         @milestones = Kaminari.paginate_array(milestones).page(params[:page])
       end
       format.json do
diff --git a/app/models/global_milestone.rb b/app/models/global_milestone.rb
index a6cebabe089..d07ef43c97e 100644
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
@@ -34,15 +34,31 @@ class GlobalMilestone
     new(title, child_milestones)
   end
 
-  def self.states_count(projects, group = nil)
+  def self.states_count(projects, groups = nil)
     legacy_group_milestones_count = legacy_group_milestone_states_count(projects)
-    group_milestones_count = group_milestones_states_count(group)
+    group_milestones_count = groups_milestone_state_count(groups)
 
     legacy_group_milestones_count.merge(group_milestones_count) do |k, legacy_group_milestones_count, group_milestones_count|
       legacy_group_milestones_count + group_milestones_count
     end
   end
 
+  def self.groups_milestone_state_count(groups)
+    return STATE_COUNT_HASH unless groups
+    return self.group_milestones_states_count(groups) unless groups.respond_to?(:each)
+
+    milestone_states = STATE_COUNT_HASH
+
+    groups.each do |group|
+      group_milestones_count = self.group_milestones_states_count(group)
+      milestone_states = milestone_states.merge(group_milestones_count) do |k, milestone_state, group_milestones_count|
+        milestone_state + group_milestones_count
+      end
+    end
+
+    milestone_states
+  end
+
   def self.group_milestones_states_count(group)
     return STATE_COUNT_HASH unless group
 
diff --git a/changelogs/unreleased/rz_fix_milestone_count.yml b/changelogs/unreleased/rz_fix_milestone_count.yml
new file mode 100644
index 00000000000..f85cfe48b2d
--- /dev/null
+++ b/changelogs/unreleased/rz_fix_milestone_count.yml
@@ -0,0 +1,5 @@
+---
+title: Fixing count on Milestones
+merge_request: 21446
+author: eagllus
+type: fixed
-- 
cgit v1.2.3


From 43f32c6bf966a85d6d5e1d8933a1cea67ec89ba4 Mon Sep 17 00:00:00 2001
From: Eagllus <rvanzon@gitlab.com>
Date: Wed, 3 Oct 2018 15:19:13 +0200
Subject: Add test for the milestone count

---
 spec/controllers/dashboard/milestones_controller_spec.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/controllers/dashboard/milestones_controller_spec.rb b/spec/controllers/dashboard/milestones_controller_spec.rb
index 56047c0c8d2..278b980b6d8 100644
--- a/spec/controllers/dashboard/milestones_controller_spec.rb
+++ b/spec/controllers/dashboard/milestones_controller_spec.rb
@@ -45,6 +45,8 @@ describe Dashboard::MilestonesController do
   end
 
   describe "#index" do
+    render_views
+
     it 'returns group and project milestones to which the user belongs' do
       get :index, format: :json
 
@@ -53,5 +55,12 @@ describe Dashboard::MilestonesController do
       expect(json_response.map { |i| i["first_milestone"]["id"] }).to match_array([group_milestone.id, project_milestone.id])
       expect(json_response.map { |i| i["group_name"] }.compact).to match_array(group.name)
     end
+
+    it 'should contain group and project milestones to which the user belongs to' do
+      get :index
+
+      expect(response.body).to include("Open\n<span class=\"badge badge-pill\">3</span>")
+      expect(response.body).to include("Closed\n<span class=\"badge badge-pill\">0</span>")
+    end
   end
 end
-- 
cgit v1.2.3


From 074fafe9e09935cd53cf286ad00b9d53240a9413 Mon Sep 17 00:00:00 2001
From: Eagllus <rvanzon@gitlab.com>
Date: Tue, 16 Oct 2018 14:52:08 +0200
Subject: Update code according comment recommendations

---
 app/controllers/dashboard/application_controller.rb | 4 ----
 app/controllers/dashboard/milestones_controller.rb  | 8 ++++++--
 app/controllers/groups/milestones_controller.rb     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/dashboard/application_controller.rb b/app/controllers/dashboard/application_controller.rb
index 1c9a5917da5..cee0753a021 100644
--- a/app/controllers/dashboard/application_controller.rb
+++ b/app/controllers/dashboard/application_controller.rb
@@ -12,8 +12,4 @@ class Dashboard::ApplicationController < ApplicationController
   def projects
     @projects ||= current_user.authorized_projects.sorted_by_activity.non_archived
   end
-
-  def groups
-    @groups ||= GroupsFinder.new(current_user, state_all: true).execute
-  end
 end
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb
index ddc1a66d11d..8252a0f2511 100644
--- a/app/controllers/dashboard/milestones_controller.rb
+++ b/app/controllers/dashboard/milestones_controller.rb
@@ -4,13 +4,13 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
   include MilestoneActions
 
   before_action :projects
-  before_action :groups
+  before_action :groups, only: :index
   before_action :milestone, only: [:show, :merge_requests, :participants, :labels]
 
   def index
     respond_to do |format|
       format.html do
-        @milestone_states = GlobalMilestone.states_count(@projects, @groups)
+        @milestone_states = Milestone.states_count(@projects, @groups)
         @milestones = Kaminari.paginate_array(milestones).page(params[:page])
       end
       format.json do
@@ -43,4 +43,8 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
     @milestone = DashboardMilestone.build(@projects, params[:title])
     render_404 unless @milestone
   end
+
+  def groups
+    @groups ||= GroupsFinder.new(current_user, state_all: true).execute
+  end
 end
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index a7cee426cf1..b42116b0f36 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -10,7 +10,7 @@ class Groups::MilestonesController < Groups::ApplicationController
   def index
     respond_to do |format|
       format.html do
-        @milestone_states = GlobalMilestone.states_count(group_projects, group)
+        @milestone_states = Milestone.states_count(group_projects, [group])
         @milestones = Kaminari.paginate_array(milestones).page(params[:page])
       end
       format.json do
-- 
cgit v1.2.3


From d2ee2eabc2a6b9037e98f3feb9d1534ebda79e19 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 10 Oct 2018 01:41:22 -0500
Subject: Prettify app/assets/javascripts/pages

---
 .../pages/admin/abuse_reports/abuse_reports.js     |   2 +-
 app/assets/javascripts/pages/admin/admin.js        |  15 +-
 .../application_settings/account_and_limits.js     |   8 +-
 .../admin/broadcast_messages/broadcast_message.js  |  36 ++--
 .../jobs/index/components/stop_jobs_modal.vue      |  65 +++---
 .../javascripts/pages/admin/projects/index.js      |   3 +-
 .../index/components/delete_project_modal.vue      | 139 ++++++-------
 .../pages/admin/projects/index/index.js            |   2 +-
 .../admin/users/components/delete_user_modal.vue   | 187 ++++++++---------
 app/assets/javascripts/pages/admin/users/index.js  |   6 +-
 .../javascripts/pages/admin/users/new/index.js     |   6 +-
 .../pages/dashboard/todos/index/todos.js           |  15 +-
 .../shared/components/delete_milestone_modal.vue   | 169 +++++++++-------
 .../shared/delete_milestone_modal_init.js          |  16 +-
 .../shared/promote_milestone_modal_init.js         |  16 +-
 app/assets/javascripts/pages/profiles/index.js     |   7 +-
 .../pages/profiles/two_factor_auths/index.js       |   4 +-
 .../pages/projects/branches/new/index.js           |  11 +-
 .../pages/projects/graphs/charts/index.js          |  22 +-
 .../pages/projects/graphs/show/index.js            |   3 +-
 .../graphs/show/stat_graph_contributors.js         |  91 +++++----
 .../graphs/show/stat_graph_contributors_graph.js   | 221 ++++++++++++++-------
 .../graphs/show/stat_graph_contributors_util.js    |  64 +++---
 app/assets/javascripts/pages/projects/init_blob.js |   3 +-
 app/assets/javascripts/pages/projects/init_form.js |   2 +-
 .../javascripts/pages/projects/issues/show.js      |   2 +-
 .../labels/components/promote_label_modal.vue      | 124 +++++++-----
 .../pages/projects/labels/index/index.js           |  16 +-
 .../javascripts/pages/projects/network/network.js  |  10 +-
 .../projects/pipeline_schedules/index/index.js     |  22 +-
 .../shared/components/interval_pattern_input.vue   | 102 +++++-----
 .../components/pipeline_schedules_callout.vue      |  46 ++---
 .../shared/components/target_branch_dropdown.js    |   3 +-
 .../pipeline_schedules/shared/init_form.js         |   4 +-
 .../pages/projects/pipelines/charts/index.js       |  59 +++---
 .../pages/projects/pipelines/index/index.js        |  66 +++---
 .../pages/projects/pipelines/init_pipelines.js     |   7 +-
 .../components/project_feature_setting.vue         | 114 ++++++-----
 .../permissions/components/project_setting_row.vue |  36 ++--
 .../pages/projects/shared/permissions/constants.js |   6 +-
 .../pages/projects/shared/project_avatar.js        |   5 +-
 .../javascripts/pages/projects/wikis/index.js      |   3 +-
 app/assets/javascripts/pages/search/show/search.js |  25 ++-
 .../pages/sessions/new/signin_tabs_memoizer.js     |   2 +-
 .../pages/sessions/new/username_validator.js       |  10 +-
 app/assets/javascripts/pages/users/index.js        |   6 +-
 46 files changed, 1001 insertions(+), 780 deletions(-)

diff --git a/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js b/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js
index 15e737fff05..d9cf62db3f7 100644
--- a/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js
+++ b/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js
@@ -31,7 +31,7 @@ export default class AbuseReports {
       $messageCellElement.text(originalMessage);
     } else {
       $messageCellElement.data('messageTruncated', 'true');
-      $messageCellElement.text(`${originalMessage.substr(0, (MAX_MESSAGE_LENGTH - 3))}...`);
+      $messageCellElement.text(`${originalMessage.substr(0, MAX_MESSAGE_LENGTH - 3)}...`);
     }
   }
 }
diff --git a/app/assets/javascripts/pages/admin/admin.js b/app/assets/javascripts/pages/admin/admin.js
index ff4d6ab15f9..4616a075729 100644
--- a/app/assets/javascripts/pages/admin/admin.js
+++ b/app/assets/javascripts/pages/admin/admin.js
@@ -23,7 +23,7 @@ export default function adminInit() {
     }
   });
 
-  $('body').on('click', '.js-toggle-colors-link', (e) => {
+  $('body').on('click', '.js-toggle-colors-link', e => {
     e.preventDefault();
     $('.js-toggle-colors-container').toggleClass('hide');
   });
@@ -33,12 +33,15 @@ export default function adminInit() {
     $(this).tab('show');
   });
 
-  $('.log-bottom').on('click', (e) => {
+  $('.log-bottom').on('click', e => {
     e.preventDefault();
     const $visibleLog = $('.file-content:visible');
-    $visibleLog.animate({
-      scrollTop: $visibleLog.find('ol').height(),
-    }, 'fast');
+    $visibleLog.animate(
+      {
+        scrollTop: $visibleLog.find('ol').height(),
+      },
+      'fast',
+    );
   });
 
   $('.change-owner-link').on('click', function changeOwnerLinkClick(e) {
@@ -47,7 +50,7 @@ export default function adminInit() {
     modal.show();
   });
 
-  $('.change-owner-cancel-link').on('click', (e) => {
+  $('.change-owner-cancel-link').on('click', e => {
     e.preventDefault();
     modal.hide();
     $('.change-owner-link').show();
diff --git a/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js b/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js
index 7281f907ec7..455c637a6b3 100644
--- a/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js
+++ b/app/assets/javascripts/pages/admin/application_settings/account_and_limits.js
@@ -1,10 +1,14 @@
 import { __ } from '~/locale';
 
 export const PLACEHOLDER_USER_EXTERNAL_DEFAULT_TRUE = __('Regex pattern');
-export const PLACEHOLDER_USER_EXTERNAL_DEFAULT_FALSE = __('To define internal users, first enable new users set to external');
+export const PLACEHOLDER_USER_EXTERNAL_DEFAULT_FALSE = __(
+  'To define internal users, first enable new users set to external',
+);
 
 function setUserInternalRegexPlaceholder(checkbox) {
-  const userInternalRegex = document.getElementById('application_setting_user_default_internal_regex');
+  const userInternalRegex = document.getElementById(
+    'application_setting_user_default_internal_regex',
+  );
   if (checkbox && userInternalRegex) {
     if (checkbox.checked) {
       userInternalRegex.readOnly = false;
diff --git a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
index e7ceccb6f47..d5ded3f9a79 100644
--- a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
+++ b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js
@@ -17,20 +17,24 @@ export default () => {
 
   const previewPath = $('textarea#broadcast_message_message').data('previewPath');
 
-  $('textarea#broadcast_message_message').on('input', _.debounce(function onMessageInput() {
-    const message = $(this).val();
-    if (message === '') {
-      $('.js-broadcast-message-preview').text('Your message here');
-    } else {
-      axios.post(previewPath, {
-        broadcast_message: {
-          message,
-        },
-      })
-      .then(({ data }) => {
-        $('.js-broadcast-message-preview').html(data.message);
-      })
-      .catch(() => flash(__('An error occurred while rendering preview broadcast message')));
-    }
-  }, 250));
+  $('textarea#broadcast_message_message').on(
+    'input',
+    _.debounce(function onMessageInput() {
+      const message = $(this).val();
+      if (message === '') {
+        $('.js-broadcast-message-preview').text('Your message here');
+      } else {
+        axios
+          .post(previewPath, {
+            broadcast_message: {
+              message,
+            },
+          })
+          .then(({ data }) => {
+            $('.js-broadcast-message-preview').html(data.message);
+          })
+          .catch(() => flash(__('An error occurred while rendering preview broadcast message')));
+      }
+    }, 250),
+  );
 };
diff --git a/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue b/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue
index bc84666779e..e2fec3c7172 100644
--- a/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue
+++ b/app/assets/javascripts/pages/admin/jobs/index/components/stop_jobs_modal.vue
@@ -1,39 +1,42 @@
 <script>
-  import axios from '~/lib/utils/axios_utils';
-  import createFlash from '~/flash';
-  import GlModal from '~/vue_shared/components/gl_modal.vue';
-  import { redirectTo } from '~/lib/utils/url_utility';
-  import { s__ } from '~/locale';
+import axios from '~/lib/utils/axios_utils';
+import createFlash from '~/flash';
+import GlModal from '~/vue_shared/components/gl_modal.vue';
+import { redirectTo } from '~/lib/utils/url_utility';
+import { s__ } from '~/locale';
 
-  export default {
-    components: {
-      GlModal,
+export default {
+  components: {
+    GlModal,
+  },
+  props: {
+    url: {
+      type: String,
+      required: true,
     },
-    props: {
-      url: {
-        type: String,
-        required: true,
-      },
+  },
+  computed: {
+    text() {
+      return s__(
+        'AdminArea|You’re about to stop all jobs.This will halt all current jobs that are running.',
+      );
     },
-    computed: {
-      text() {
-        return s__('AdminArea|You’re about to stop all jobs.This will halt all current jobs that are running.');
-      },
+  },
+  methods: {
+    onSubmit() {
+      return axios
+        .post(this.url)
+        .then(response => {
+          // follow the rediect to refresh the page
+          redirectTo(response.request.responseURL);
+        })
+        .catch(error => {
+          createFlash(s__('AdminArea|Stopping jobs failed'));
+          throw error;
+        });
     },
-    methods: {
-      onSubmit() {
-        return axios.post(this.url)
-          .then((response) => {
-            // follow the rediect to refresh the page
-            redirectTo(response.request.responseURL);
-          })
-          .catch((error) => {
-            createFlash(s__('AdminArea|Stopping jobs failed'));
-            throw error;
-          });
-      },
-    },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/pages/admin/projects/index.js b/app/assets/javascripts/pages/admin/projects/index.js
index 31c96eb87af..d6b1e747aec 100644
--- a/app/assets/javascripts/pages/admin/projects/index.js
+++ b/app/assets/javascripts/pages/admin/projects/index.js
@@ -4,6 +4,7 @@ import NamespaceSelect from '../../../namespace_select';
 document.addEventListener('DOMContentLoaded', () => {
   new ProjectsList(); // eslint-disable-line no-new
 
-  document.querySelectorAll('.js-namespace-select')
+  document
+    .querySelectorAll('.js-namespace-select')
     .forEach(dropdown => new NamespaceSelect({ dropdown }));
 });
diff --git a/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue b/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue
index ff66d3a8ac4..3c383735f4a 100644
--- a/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue
+++ b/app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue
@@ -1,81 +1,84 @@
 <script>
-  import _ from 'underscore';
-  import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
-  import { s__, sprintf } from '~/locale';
+import _ from 'underscore';
+import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
+import { s__, sprintf } from '~/locale';
 
-  export default {
-    components: {
-      DeprecatedModal,
+export default {
+  components: {
+    DeprecatedModal,
+  },
+  props: {
+    deleteProjectUrl: {
+      type: String,
+      required: false,
+      default: '',
     },
-    props: {
-      deleteProjectUrl: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      projectName: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      csrfToken: {
-        type: String,
-        required: false,
-        default: '',
-      },
+    projectName: {
+      type: String,
+      required: false,
+      default: '',
     },
-    data() {
-      return {
-        enteredProjectName: '',
-      };
+    csrfToken: {
+      type: String,
+      required: false,
+      default: '',
     },
-    computed: {
-      title() {
-        return sprintf(s__('AdminProjects|Delete Project %{projectName}?'),
-          {
-            projectName: `'${_.escape(this.projectName)}'`,
-          },
-          false,
-        );
-      },
-      text() {
-        return sprintf(s__(`AdminProjects|
+  },
+  data() {
+    return {
+      enteredProjectName: '',
+    };
+  },
+  computed: {
+    title() {
+      return sprintf(
+        s__('AdminProjects|Delete Project %{projectName}?'),
+        {
+          projectName: `'${_.escape(this.projectName)}'`,
+        },
+        false,
+      );
+    },
+    text() {
+      return sprintf(
+        s__(`AdminProjects|
           You’re about to permanently delete the project %{projectName}, its repository,
           and all related resources including issues, merge requests, etc..  Once you confirm and press
           %{strong_start}Delete project%{strong_end}, it cannot be undone or recovered.`),
-          {
-            projectName: `<strong>${_.escape(this.projectName)}</strong>`,
-            strong_start: '<strong>',
-            strong_end: '</strong>',
-          },
-          false,
-        );
-      },
-      confirmationTextLabel() {
-        return sprintf(s__('AdminUsers|To confirm, type %{projectName}'),
-          {
-            projectName: `<code>${_.escape(this.projectName)}</code>`,
-          },
-          false,
-        );
-      },
-      primaryButtonLabel() {
-        return s__('AdminProjects|Delete project');
-      },
-      canSubmit() {
-        return this.enteredProjectName === this.projectName;
-      },
+        {
+          projectName: `<strong>${_.escape(this.projectName)}</strong>`,
+          strong_start: '<strong>',
+          strong_end: '</strong>',
+        },
+        false,
+      );
+    },
+    confirmationTextLabel() {
+      return sprintf(
+        s__('AdminUsers|To confirm, type %{projectName}'),
+        {
+          projectName: `<code>${_.escape(this.projectName)}</code>`,
+        },
+        false,
+      );
+    },
+    primaryButtonLabel() {
+      return s__('AdminProjects|Delete project');
+    },
+    canSubmit() {
+      return this.enteredProjectName === this.projectName;
+    },
+  },
+  methods: {
+    onCancel() {
+      this.enteredProjectName = '';
     },
-    methods: {
-      onCancel() {
-        this.enteredProjectName = '';
-      },
-      onSubmit() {
-        this.$refs.form.submit();
-        this.enteredProjectName = '';
-      },
+    onSubmit() {
+      this.$refs.form.submit();
+      this.enteredProjectName = '';
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/pages/admin/projects/index/index.js b/app/assets/javascripts/pages/admin/projects/index/index.js
index ddbefec87b6..6fa8760545d 100644
--- a/app/assets/javascripts/pages/admin/projects/index/index.js
+++ b/app/assets/javascripts/pages/admin/projects/index/index.js
@@ -28,7 +28,7 @@ document.addEventListener('DOMContentLoaded', () => {
     },
   });
 
-  $(document).on('shown.bs.modal', (event) => {
+  $(document).on('shown.bs.modal', event => {
     if (event.relatedTarget.classList.contains('delete-project-button')) {
       const buttonProps = event.relatedTarget.dataset;
       deleteModal.deleteProjectUrl = buttonProps.deleteProjectUrl;
diff --git a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
index 8d5efcdcd96..4b33fcc759a 100644
--- a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
+++ b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
@@ -1,114 +1,119 @@
 <script>
-  import _ from 'underscore';
-  import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
-  import { s__, sprintf } from '~/locale';
+import _ from 'underscore';
+import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
+import { s__, sprintf } from '~/locale';
 
-  export default {
-    components: {
-      DeprecatedModal,
+export default {
+  components: {
+    DeprecatedModal,
+  },
+  props: {
+    deleteUserUrl: {
+      type: String,
+      required: false,
+      default: '',
     },
-    props: {
-      deleteUserUrl: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      blockUserUrl: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      deleteContributions: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-      username: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      csrfToken: {
-        type: String,
-        required: false,
-        default: '',
-      },
+    blockUserUrl: {
+      type: String,
+      required: false,
+      default: '',
     },
-    data() {
-      return {
-        enteredUsername: '',
-      };
+    deleteContributions: {
+      type: Boolean,
+      required: false,
+      default: false,
     },
-    computed: {
-      title() {
-        const keepContributionsTitle = s__('AdminUsers|Delete User %{username}?');
-        const deleteContributionsTitle = s__('AdminUsers|Delete User %{username} and contributions?');
+    username: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    csrfToken: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      enteredUsername: '',
+    };
+  },
+  computed: {
+    title() {
+      const keepContributionsTitle = s__('AdminUsers|Delete User %{username}?');
+      const deleteContributionsTitle = s__('AdminUsers|Delete User %{username} and contributions?');
 
-        return sprintf(
-          this.deleteContributions ? deleteContributionsTitle : keepContributionsTitle, {
-            username: `'${_.escape(this.username)}'`,
-          }, false);
-      },
-      text() {
-        const keepContributionsText = s__(`AdminArea|
+      return sprintf(
+        this.deleteContributions ? deleteContributionsTitle : keepContributionsTitle,
+        {
+          username: `'${_.escape(this.username)}'`,
+        },
+        false,
+      );
+    },
+    text() {
+      const keepContributionsText = s__(`AdminArea|
           You are about to permanently delete the user %{username}.
           Issues, merge requests, and groups linked to them will be transferred to a system-wide "Ghost-user".
           To avoid data loss, consider using the %{strong_start}block user%{strong_end} feature instead.
           Once you %{strong_start}Delete user%{strong_end}, it cannot be undone or recovered.`);
 
-        const deleteContributionsText = s__(`AdminArea|
+      const deleteContributionsText = s__(`AdminArea|
           You are about to permanently delete the user %{username}.
           This will delete all of the issues, merge requests, and groups linked to them.
           To avoid data loss, consider using the %{strong_start}block user%{strong_end} feature instead.
           Once you %{strong_start}Delete user%{strong_end}, it cannot be undone or recovered.`);
-        return sprintf(this.deleteContributions ? deleteContributionsText : keepContributionsText,
-          {
-            username: `<strong>${_.escape(this.username)}</strong>`,
-            strong_start: '<strong>',
-            strong_end: '</strong>',
-          },
-          false,
-        );
-      },
-      confirmationTextLabel() {
-        return sprintf(s__('AdminUsers|To confirm, type %{username}'),
-          {
-            username: `<code>${_.escape(this.username)}</code>`,
-          },
-          false,
-        );
-      },
-      primaryButtonLabel() {
-        const keepContributionsLabel = s__('AdminUsers|Delete user');
-        const deleteContributionsLabel = s__('AdminUsers|Delete user and contributions');
+      return sprintf(
+        this.deleteContributions ? deleteContributionsText : keepContributionsText,
+        {
+          username: `<strong>${_.escape(this.username)}</strong>`,
+          strong_start: '<strong>',
+          strong_end: '</strong>',
+        },
+        false,
+      );
+    },
+    confirmationTextLabel() {
+      return sprintf(
+        s__('AdminUsers|To confirm, type %{username}'),
+        {
+          username: `<code>${_.escape(this.username)}</code>`,
+        },
+        false,
+      );
+    },
+    primaryButtonLabel() {
+      const keepContributionsLabel = s__('AdminUsers|Delete user');
+      const deleteContributionsLabel = s__('AdminUsers|Delete user and contributions');
 
-        return this.deleteContributions ? deleteContributionsLabel : keepContributionsLabel;
-      },
-      secondaryButtonLabel() {
-        return s__('AdminUsers|Block user');
-      },
-      canSubmit() {
-        return this.enteredUsername === this.username;
-      },
+      return this.deleteContributions ? deleteContributionsLabel : keepContributionsLabel;
     },
-    methods: {
-      onCancel() {
-        this.enteredUsername = '';
-      },
-      onSecondaryAction() {
-        const { form } = this.$refs;
+    secondaryButtonLabel() {
+      return s__('AdminUsers|Block user');
+    },
+    canSubmit() {
+      return this.enteredUsername === this.username;
+    },
+  },
+  methods: {
+    onCancel() {
+      this.enteredUsername = '';
+    },
+    onSecondaryAction() {
+      const { form } = this.$refs;
 
-        form.action = this.blockUserUrl;
-        this.$refs.method.value = 'put';
+      form.action = this.blockUserUrl;
+      this.$refs.method.value = 'put';
 
-        form.submit();
-      },
-      onSubmit() {
-        this.$refs.form.submit();
-        this.enteredUsername = '';
-      },
+      form.submit();
+    },
+    onSubmit() {
+      this.$refs.form.submit();
+      this.enteredUsername = '';
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/pages/admin/users/index.js b/app/assets/javascripts/pages/admin/users/index.js
index 06599c3fd5f..45046688b57 100644
--- a/app/assets/javascripts/pages/admin/users/index.js
+++ b/app/assets/javascripts/pages/admin/users/index.js
@@ -32,12 +32,14 @@ document.addEventListener('DOMContentLoaded', () => {
     },
   });
 
-  $(document).on('shown.bs.modal', (event) => {
+  $(document).on('shown.bs.modal', event => {
     if (event.relatedTarget.classList.contains('delete-user-button')) {
       const buttonProps = event.relatedTarget.dataset;
       deleteModal.deleteUserUrl = buttonProps.deleteUserUrl;
       deleteModal.blockUserUrl = buttonProps.blockUserUrl;
-      deleteModal.deleteContributions = event.relatedTarget.hasAttribute('data-delete-contributions');
+      deleteModal.deleteContributions = event.relatedTarget.hasAttribute(
+        'data-delete-contributions',
+      );
       deleteModal.username = buttonProps.username;
     }
   });
diff --git a/app/assets/javascripts/pages/admin/users/new/index.js b/app/assets/javascripts/pages/admin/users/new/index.js
index 58bfa8d64e7..3e6a090cb0e 100644
--- a/app/assets/javascripts/pages/admin/users/new/index.js
+++ b/app/assets/javascripts/pages/admin/users/new/index.js
@@ -4,7 +4,9 @@ export default class UserInternalRegexHandler {
   constructor() {
     this.regexPattern = $('[data-user-internal-regex-pattern]').data('user-internal-regex-pattern');
     if (this.regexPattern && this.regexPattern !== '') {
-      this.regexOptions = $('[data-user-internal-regex-options]').data('user-internal-regex-options');
+      this.regexOptions = $('[data-user-internal-regex-options]').data(
+        'user-internal-regex-options',
+      );
       this.external = $('#user_external');
       this.warningMessage = $('#warning_external_automatically_set');
       this.addListenerToEmailField();
@@ -13,7 +15,7 @@ export default class UserInternalRegexHandler {
   }
 
   addListenerToEmailField() {
-    $('#user_email').on('input', (event) => {
+    $('#user_email').on('input', event => {
       this.setExternalCheckbox(event.currentTarget.value);
     });
   }
diff --git a/app/assets/javascripts/pages/dashboard/todos/index/todos.js b/app/assets/javascripts/pages/dashboard/todos/index/todos.js
index 72f3f70b98f..1b56b97f751 100644
--- a/app/assets/javascripts/pages/dashboard/todos/index/todos.js
+++ b/app/assets/javascripts/pages/dashboard/todos/index/todos.js
@@ -79,7 +79,8 @@ export default class Todos {
       .then(({ data }) => {
         this.updateRowState(target);
         this.updateBadges(data);
-      }).catch(() => {
+      })
+      .catch(() => {
         this.updateRowState(target, true);
         return flash(__('Error updating todo status.'));
       });
@@ -118,10 +119,12 @@ export default class Todos {
 
     axios[target.dataset.method](target.dataset.href, {
       ids: this.todo_ids,
-    }).then(({ data }) => {
-      this.updateAllState(target, data);
-      this.updateBadges(data);
-    }).catch(() => flash(__('Error updating status for all todos.')));
+    })
+      .then(({ data }) => {
+        this.updateAllState(target, data);
+        this.updateBadges(data);
+      })
+      .catch(() => flash(__('Error updating status for all todos.')));
   }
 
   updateAllState(target, data) {
@@ -133,7 +136,7 @@ export default class Todos {
     target.removeAttribute('disabled');
     target.classList.remove('disabled');
 
-    this.todo_ids = (target === markAllDoneBtn) ? data.updated_ids : [];
+    this.todo_ids = target === markAllDoneBtn ? data.updated_ids : [];
     undoAllBtn.classList.toggle('hidden');
     markAllDoneBtn.classList.toggle('hidden');
     todoListContainer.classList.toggle('hidden');
diff --git a/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue b/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue
index 48668562f09..a4778077bc4 100644
--- a/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue
+++ b/app/assets/javascripts/pages/milestones/shared/components/delete_milestone_modal.vue
@@ -1,94 +1,117 @@
 <script>
-  import axios from '~/lib/utils/axios_utils';
+import axios from '~/lib/utils/axios_utils';
 
-  import Flash from '~/flash';
-  import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
-  import { n__, s__, sprintf } from '~/locale';
-  import { redirectTo } from '~/lib/utils/url_utility';
-  import eventHub from '../event_hub';
+import Flash from '~/flash';
+import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
+import { n__, s__, sprintf } from '~/locale';
+import { redirectTo } from '~/lib/utils/url_utility';
+import eventHub from '../event_hub';
 
-  export default {
-    components: {
-      DeprecatedModal,
+export default {
+  components: {
+    DeprecatedModal,
+  },
+  props: {
+    issueCount: {
+      type: Number,
+      required: true,
     },
-    props: {
-      issueCount: {
-        type: Number,
-        required: true,
-      },
-      mergeRequestCount: {
-        type: Number,
-        required: true,
-      },
-      milestoneId: {
-        type: Number,
-        required: true,
-      },
-      milestoneTitle: {
-        type: String,
-        required: true,
-      },
-      milestoneUrl: {
-        type: String,
-        required: true,
-      },
+    mergeRequestCount: {
+      type: Number,
+      required: true,
     },
-    computed: {
-      text() {
-        const milestoneTitle = sprintf('<strong>%{milestoneTitle}</strong>', { milestoneTitle: this.milestoneTitle });
-
-        if (this.issueCount === 0 && this.mergeRequestCount === 0) {
-          return sprintf(
-            s__(`Milestones|
-You’re about to permanently delete the milestone %{milestoneTitle}.
-This milestone is not currently used in any issues or merge requests.`),
-            {
-              milestoneTitle,
-            },
-            false,
-          );
-        }
+    milestoneId: {
+      type: Number,
+      required: true,
+    },
+    milestoneTitle: {
+      type: String,
+      required: true,
+    },
+    milestoneUrl: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    text() {
+      const milestoneTitle = sprintf('<strong>%{milestoneTitle}</strong>', {
+        milestoneTitle: this.milestoneTitle,
+      });
 
+      if (this.issueCount === 0 && this.mergeRequestCount === 0) {
         return sprintf(
           s__(`Milestones|
-You’re about to permanently delete the milestone %{milestoneTitle} and remove it from %{issuesWithCount} and %{mergeRequestsWithCount}.
-Once deleted, it cannot be undone or recovered.`),
+You’re about to permanently delete the milestone %{milestoneTitle}.
+This milestone is not currently used in any issues or merge requests.`),
           {
             milestoneTitle,
-            issuesWithCount: n__('%d issue', '%d issues', this.issueCount),
-            mergeRequestsWithCount: n__('%d merge request', '%d merge requests', this.mergeRequestCount),
           },
           false,
         );
-      },
-      title() {
-        return sprintf(s__('Milestones|Delete milestone %{milestoneTitle}?'), { milestoneTitle: this.milestoneTitle });
-      },
-    },
-    methods: {
-      onSubmit() {
-        eventHub.$emit('deleteMilestoneModal.requestStarted', this.milestoneUrl);
+      }
 
-        return axios.delete(this.milestoneUrl)
-          .then((response) => {
-            eventHub.$emit('deleteMilestoneModal.requestFinished', { milestoneUrl: this.milestoneUrl, successful: true });
+      return sprintf(
+        s__(`Milestones|
+You’re about to permanently delete the milestone %{milestoneTitle} and remove it from %{issuesWithCount} and %{mergeRequestsWithCount}.
+Once deleted, it cannot be undone or recovered.`),
+        {
+          milestoneTitle,
+          issuesWithCount: n__('%d issue', '%d issues', this.issueCount),
+          mergeRequestsWithCount: n__(
+            '%d merge request',
+            '%d merge requests',
+            this.mergeRequestCount,
+          ),
+        },
+        false,
+      );
+    },
+    title() {
+      return sprintf(s__('Milestones|Delete milestone %{milestoneTitle}?'), {
+        milestoneTitle: this.milestoneTitle,
+      });
+    },
+  },
+  methods: {
+    onSubmit() {
+      eventHub.$emit('deleteMilestoneModal.requestStarted', this.milestoneUrl);
 
-            // follow the rediect to milestones overview page
-            redirectTo(response.request.responseURL);
-          })
-          .catch((error) => {
-            eventHub.$emit('deleteMilestoneModal.requestFinished', { milestoneUrl: this.milestoneUrl, successful: false });
+      return axios
+        .delete(this.milestoneUrl)
+        .then(response => {
+          eventHub.$emit('deleteMilestoneModal.requestFinished', {
+            milestoneUrl: this.milestoneUrl,
+            successful: true,
+          });
 
-            if (error.response && error.response.status === 404) {
-              Flash(sprintf(s__('Milestones|Milestone %{milestoneTitle} was not found'), { milestoneTitle: this.milestoneTitle }));
-            } else {
-              Flash(sprintf(s__('Milestones|Failed to delete milestone %{milestoneTitle}'), { milestoneTitle: this.milestoneTitle }));
-            }
-            throw error;
+          // follow the rediect to milestones overview page
+          redirectTo(response.request.responseURL);
+        })
+        .catch(error => {
+          eventHub.$emit('deleteMilestoneModal.requestFinished', {
+            milestoneUrl: this.milestoneUrl,
+            successful: false,
           });
-      },
+
+          if (error.response && error.response.status === 404) {
+            Flash(
+              sprintf(s__('Milestones|Milestone %{milestoneTitle} was not found'), {
+                milestoneTitle: this.milestoneTitle,
+              }),
+            );
+          } else {
+            Flash(
+              sprintf(s__('Milestones|Failed to delete milestone %{milestoneTitle}'), {
+                milestoneTitle: this.milestoneTitle,
+              }),
+            );
+          }
+          throw error;
+        });
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/pages/milestones/shared/delete_milestone_modal_init.js b/app/assets/javascripts/pages/milestones/shared/delete_milestone_modal_init.js
index d51b5c221e3..1d559dc6e41 100644
--- a/app/assets/javascripts/pages/milestones/shared/delete_milestone_modal_init.js
+++ b/app/assets/javascripts/pages/milestones/shared/delete_milestone_modal_init.js
@@ -7,7 +7,9 @@ export default () => {
   Vue.use(Translate);
 
   const onRequestFinished = ({ milestoneUrl, successful }) => {
-    const button = document.querySelector(`.js-delete-milestone-button[data-milestone-url="${milestoneUrl}"]`);
+    const button = document.querySelector(
+      `.js-delete-milestone-button[data-milestone-url="${milestoneUrl}"]`,
+    );
 
     if (!successful) {
       button.removeAttribute('disabled');
@@ -16,14 +18,16 @@ export default () => {
     button.querySelector('.js-loading-icon').classList.add('hidden');
   };
 
-  const onRequestStarted = (milestoneUrl) => {
-    const button = document.querySelector(`.js-delete-milestone-button[data-milestone-url="${milestoneUrl}"]`);
+  const onRequestStarted = milestoneUrl => {
+    const button = document.querySelector(
+      `.js-delete-milestone-button[data-milestone-url="${milestoneUrl}"]`,
+    );
     button.setAttribute('disabled', '');
     button.querySelector('.js-loading-icon').classList.remove('hidden');
     eventHub.$once('deleteMilestoneModal.requestFinished', onRequestFinished);
   };
 
-  const onDeleteButtonClick = (event) => {
+  const onDeleteButtonClick = event => {
     const button = event.currentTarget;
     const modalProps = {
       milestoneId: parseInt(button.dataset.milestoneId, 10),
@@ -37,12 +41,12 @@ export default () => {
   };
 
   const deleteMilestoneButtons = document.querySelectorAll('.js-delete-milestone-button');
-  deleteMilestoneButtons.forEach((button) => {
+  deleteMilestoneButtons.forEach(button => {
     button.addEventListener('click', onDeleteButtonClick);
   });
 
   eventHub.$once('deleteMilestoneModal.mounted', () => {
-    deleteMilestoneButtons.forEach((button) => {
+    deleteMilestoneButtons.forEach(button => {
       button.removeAttribute('disabled');
     });
   });
diff --git a/app/assets/javascripts/pages/milestones/shared/promote_milestone_modal_init.js b/app/assets/javascripts/pages/milestones/shared/promote_milestone_modal_init.js
index 8e79341e96a..fcc62a2b2af 100644
--- a/app/assets/javascripts/pages/milestones/shared/promote_milestone_modal_init.js
+++ b/app/assets/javascripts/pages/milestones/shared/promote_milestone_modal_init.js
@@ -7,20 +7,24 @@ Vue.use(Translate);
 
 export default () => {
   const onRequestFinished = ({ milestoneUrl, successful }) => {
-    const button = document.querySelector(`.js-promote-project-milestone-button[data-url="${milestoneUrl}"]`);
+    const button = document.querySelector(
+      `.js-promote-project-milestone-button[data-url="${milestoneUrl}"]`,
+    );
 
     if (!successful) {
       button.removeAttribute('disabled');
     }
   };
 
-  const onRequestStarted = (milestoneUrl) => {
-    const button = document.querySelector(`.js-promote-project-milestone-button[data-url="${milestoneUrl}"]`);
+  const onRequestStarted = milestoneUrl => {
+    const button = document.querySelector(
+      `.js-promote-project-milestone-button[data-url="${milestoneUrl}"]`,
+    );
     button.setAttribute('disabled', '');
     eventHub.$once('promoteMilestoneModal.requestFinished', onRequestFinished);
   };
 
-  const onDeleteButtonClick = (event) => {
+  const onDeleteButtonClick = event => {
     const button = event.currentTarget;
     const modalProps = {
       milestoneTitle: button.dataset.milestoneTitle,
@@ -32,12 +36,12 @@ export default () => {
   };
 
   const promoteMilestoneButtons = document.querySelectorAll('.js-promote-project-milestone-button');
-  promoteMilestoneButtons.forEach((button) => {
+  promoteMilestoneButtons.forEach(button => {
     button.addEventListener('click', onDeleteButtonClick);
   });
 
   eventHub.$once('promoteMilestoneModal.mounted', () => {
-    promoteMilestoneButtons.forEach((button) => {
+    promoteMilestoneButtons.forEach(button => {
       button.removeAttribute('disabled');
     });
   });
diff --git a/app/assets/javascripts/pages/profiles/index.js b/app/assets/javascripts/pages/profiles/index.js
index 04e50963699..883be18b336 100644
--- a/app/assets/javascripts/pages/profiles/index.js
+++ b/app/assets/javascripts/pages/profiles/index.js
@@ -3,9 +3,12 @@ import '~/profile/gl_crop';
 import Profile from '~/profile/profile';
 
 document.addEventListener('DOMContentLoaded', () => {
-  $(document).on('input.ssh_key', '#key_key', function () { // eslint-disable-line func-names
+  // eslint-disable-next-line func-names
+  $(document).on('input.ssh_key', '#key_key', function() {
     const $title = $('#key_title');
-    const comment = $(this).val().match(/^\S+ \S+ (.+)\n?$/);
+    const comment = $(this)
+      .val()
+      .match(/^\S+ \S+ (.+)\n?$/);
 
     // Extract the SSH Key title from its comment
     if (comment && comment.length > 1) {
diff --git a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
index 8e8f47c21d8..417935e2ad0 100644
--- a/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
+++ b/app/assets/javascripts/pages/profiles/two_factor_auths/index.js
@@ -5,7 +5,9 @@ document.addEventListener('DOMContentLoaded', () => {
   const twoFactorNode = document.querySelector('.js-two-factor-auth');
   const skippable = twoFactorNode.dataset.twoFactorSkippable === 'true';
   if (skippable) {
-    const button = `<a class="btn btn-sm btn-warning float-right" data-method="patch" href="${twoFactorNode.dataset.two_factor_skip_url}">Configure it later</a>`;
+    const button = `<a class="btn btn-sm btn-warning float-right" data-method="patch" href="${
+      twoFactorNode.dataset.two_factor_skip_url
+    }">Configure it later</a>`;
     const flashAlert = document.querySelector('.flash-alert .container-fluid');
     if (flashAlert) flashAlert.insertAdjacentHTML('beforeend', button);
   }
diff --git a/app/assets/javascripts/pages/projects/branches/new/index.js b/app/assets/javascripts/pages/projects/branches/new/index.js
index a9658fd1eb4..13ff47d53c2 100644
--- a/app/assets/javascripts/pages/projects/branches/new/index.js
+++ b/app/assets/javascripts/pages/projects/branches/new/index.js
@@ -1,6 +1,11 @@
 import $ from 'jquery';
 import NewBranchForm from '~/new_branch_form';
 
-document.addEventListener('DOMContentLoaded', () => (
-  new NewBranchForm($('.js-create-branch-form'), JSON.parse(document.getElementById('availableRefs').innerHTML))
-));
+document.addEventListener(
+  'DOMContentLoaded',
+  () =>
+    new NewBranchForm(
+      $('.js-create-branch-form'),
+      JSON.parse(document.getElementById('availableRefs').innerHTML),
+    ),
+);
diff --git a/app/assets/javascripts/pages/projects/graphs/charts/index.js b/app/assets/javascripts/pages/projects/graphs/charts/index.js
index 80159a82bd4..3ccad513c05 100644
--- a/app/assets/javascripts/pages/projects/graphs/charts/index.js
+++ b/app/assets/javascripts/pages/projects/graphs/charts/index.js
@@ -31,14 +31,16 @@ document.addEventListener('DOMContentLoaded', () => {
 
   const chartData = data => ({
     labels: Object.keys(data),
-    datasets: [{
-      fillColor: 'rgba(220,220,220,0.5)',
-      strokeColor: 'rgba(220,220,220,1)',
-      barStrokeWidth: 1,
-      barValueSpacing: 1,
-      barDatasetSpacing: 1,
-      data: _.values(data),
-    }],
+    datasets: [
+      {
+        fillColor: 'rgba(220,220,220,0.5)',
+        strokeColor: 'rgba(220,220,220,1)',
+        barStrokeWidth: 1,
+        barValueSpacing: 1,
+        barDatasetSpacing: 1,
+        data: _.values(data),
+      },
+    ],
   });
 
   const hourData = chartData(projectChartData.hour);
@@ -51,7 +53,9 @@ document.addEventListener('DOMContentLoaded', () => {
   responsiveChart($('#month-chart'), monthData);
 
   const data = projectChartData.languages;
-  const ctx = $('#languages-chart').get(0).getContext('2d');
+  const ctx = $('#languages-chart')
+    .get(0)
+    .getContext('2d');
   const options = {
     scaleOverlay: true,
     responsive: true,
diff --git a/app/assets/javascripts/pages/projects/graphs/show/index.js b/app/assets/javascripts/pages/projects/graphs/show/index.js
index 71f629fbc13..f79c386b59e 100644
--- a/app/assets/javascripts/pages/projects/graphs/show/index.js
+++ b/app/assets/javascripts/pages/projects/graphs/show/index.js
@@ -7,7 +7,8 @@ import ContributorsStatGraph from './stat_graph_contributors';
 document.addEventListener('DOMContentLoaded', () => {
   const url = document.querySelector('.js-graphs-show').dataset.projectGraphPath;
 
-  axios.get(url)
+  axios
+    .get(url)
     .then(({ data }) => {
       const graph = new ContributorsStatGraph();
       graph.init(data);
diff --git a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors.js b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors.js
index 58bb8c5b0c8..76613394af6 100644
--- a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors.js
+++ b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors.js
@@ -3,7 +3,11 @@
 import $ from 'jquery';
 import _ from 'underscore';
 import { n__, s__, createDateTimeFormat, sprintf } from '~/locale';
-import { ContributorsGraph, ContributorsAuthorGraph, ContributorsMasterGraph } from './stat_graph_contributors_graph';
+import {
+  ContributorsGraph,
+  ContributorsAuthorGraph,
+  ContributorsMasterGraph,
+} from './stat_graph_contributors_graph';
 import ContributorsStatGraphUtil from './stat_graph_contributors_util';
 
 export default (function() {
@@ -14,7 +18,7 @@ export default (function() {
   ContributorsStatGraph.prototype.init = function(log) {
     var author_commits, total_commits;
     this.parsed_log = ContributorsStatGraphUtil.parse_log(log);
-    this.set_current_field("commits");
+    this.set_current_field('commits');
     total_commits = ContributorsStatGraphUtil.get_total_data(this.parsed_log, this.field);
     author_commits = ContributorsStatGraphUtil.get_author_data(this.parsed_log, this.field);
     this.add_master_graph(total_commits);
@@ -31,23 +35,26 @@ export default (function() {
     var limited_author_data;
     this.authors = [];
     limited_author_data = author_data.slice(0, 100);
-    return _.each(limited_author_data, (function(_this) {
-      return function(d) {
-        var author_graph, author_header;
-        author_header = _this.create_author_header(d);
-        $(".contributors-list").append(author_header);
-
-        author_graph = new ContributorsAuthorGraph(d.dates);
-        _this.authors[d.author_name] = author_graph;
-        return author_graph.draw();
-      };
-    })(this));
+    return _.each(
+      limited_author_data,
+      (function(_this) {
+        return function(d) {
+          var author_graph, author_header;
+          author_header = _this.create_author_header(d);
+          $('.contributors-list').append(author_header);
+
+          author_graph = new ContributorsAuthorGraph(d.dates);
+          _this.authors[d.author_name] = author_graph;
+          return author_graph.draw();
+        };
+      })(this),
+    );
   };
 
   ContributorsStatGraph.prototype.format_author_commit_info = function(author) {
     var commits;
     commits = $('<span/>', {
-      "class": 'graph-author-commits-count'
+      class: 'graph-author-commits-count',
     });
     commits.text(n__('%d commit', '%d commits', author.commits));
     return $('<span/>').append(commits);
@@ -56,13 +63,13 @@ export default (function() {
   ContributorsStatGraph.prototype.create_author_header = function(author) {
     var author_commit_info, author_commit_info_span, author_email, author_name, list_item;
     list_item = $('<li/>', {
-      "class": 'person',
-      style: 'display: block;'
+      class: 'person',
+      style: 'display: block;',
     });
     author_name = $('<h4>' + author.author_name + '</h4>');
     author_email = $('<p class="graph-author-email">' + author.author_email + '</p>');
     author_commit_info_span = $('<span/>', {
-      "class": 'commits'
+      class: 'commits',
     });
     author_commit_info = this.format_author_commit_info(author);
     author_commit_info_span.html(author_commit_info);
@@ -80,37 +87,41 @@ export default (function() {
   };
 
   ContributorsStatGraph.prototype.redraw_authors = function() {
-    $("ol").html("");
+    $('ol').html('');
 
     const { x_domain } = ContributorsGraph.prototype;
-    const author_commits = ContributorsStatGraphUtil.get_author_data(this.parsed_log, this.field, x_domain);
-
-    return _.each(author_commits, (function(_this) {
-      return function(d) {
-        _this.redraw_author_commit_info(d);
-        if (_this.authors[d.author_name] != null) {
-          $(_this.authors[d.author_name].list_item).appendTo("ol");
-          _this.authors[d.author_name].set_data(d.dates);
-          return _this.authors[d.author_name].redraw();
-        }
-        return '';
-      };
-    })(this));
+    const author_commits = ContributorsStatGraphUtil.get_author_data(
+      this.parsed_log,
+      this.field,
+      x_domain,
+    );
+
+    return _.each(
+      author_commits,
+      (function(_this) {
+        return function(d) {
+          _this.redraw_author_commit_info(d);
+          if (_this.authors[d.author_name] != null) {
+            $(_this.authors[d.author_name].list_item).appendTo('ol');
+            _this.authors[d.author_name].set_data(d.dates);
+            return _this.authors[d.author_name].redraw();
+          }
+          return '';
+        };
+      })(this),
+    );
   };
 
   ContributorsStatGraph.prototype.set_current_field = function(field) {
-    return this.field = field;
+    return (this.field = field);
   };
 
   ContributorsStatGraph.prototype.change_date_header = function() {
     const { x_domain } = ContributorsGraph.prototype;
-    const formattedDateRange = sprintf(
-      s__('ContributorsPage|%{startDate} – %{endDate}'),
-      {
-        startDate: this.dateFormat.format(new Date(x_domain[0])),
-        endDate: this.dateFormat.format(new Date(x_domain[1])),
-      },
-    );
+    const formattedDateRange = sprintf(s__('ContributorsPage|%{startDate} – %{endDate}'), {
+      startDate: this.dateFormat.format(new Date(x_domain[0])),
+      endDate: this.dateFormat.format(new Date(x_domain[1])),
+    });
     return $('#date_header').text(formattedDateRange);
   };
 
@@ -120,7 +131,7 @@ export default (function() {
     if ($author != null) {
       author_list_item = $(this.authors[author.author_name].list_item);
       author_commit_info = this.format_author_commit_info(author);
-      return author_list_item.find("span").html(author_commit_info);
+      return author_list_item.find('span').html(author_commit_info);
     }
     return '';
   };
diff --git a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js
index 5f91686347a..377dce6c746 100644
--- a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js
+++ b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js
@@ -11,10 +11,32 @@ import { brushX } from 'd3-brush';
 import { timeParse } from 'd3-time-format';
 import { dateTickFormat } from '~/lib/utils/tick_formats';
 
-const d3 = { extent, max, select, scaleTime, scaleLinear, axisLeft, axisBottom, area, brushX, timeParse };
+const d3 = {
+  extent,
+  max,
+  select,
+  scaleTime,
+  scaleLinear,
+  axisLeft,
+  axisBottom,
+  area,
+  brushX,
+  timeParse,
+};
 
 const hasProp = {}.hasOwnProperty;
-const extend = function(child, parent) { for (const key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
+const extend = function(child, parent) {
+  for (const key in parent) {
+    if (hasProp.call(parent, key)) child[key] = parent[key];
+  }
+  function ctor() {
+    this.constructor = child;
+  }
+  ctor.prototype = parent.prototype;
+  child.prototype = new ctor();
+  child.__super__ = parent.prototype;
+  return child;
+};
 
 export const ContributorsGraph = (function() {
   function ContributorsGraph() {}
@@ -23,7 +45,7 @@ export const ContributorsGraph = (function() {
     top: 20,
     right: 10,
     bottom: 30,
-    left: 40
+    left: 40,
   };
 
   ContributorsGraph.prototype.x_domain = null;
@@ -33,35 +55,39 @@ export const ContributorsGraph = (function() {
   ContributorsGraph.prototype.dates = [];
 
   ContributorsGraph.prototype.determine_width = function(baseWidth, $parentElement) {
-    const parentPaddingWidth = parseFloat($parentElement.css('padding-left')) + parseFloat($parentElement.css('padding-right'));
+    const parentPaddingWidth =
+      parseFloat($parentElement.css('padding-left')) +
+      parseFloat($parentElement.css('padding-right'));
     const marginWidth = this.MARGIN.left + this.MARGIN.right;
     return baseWidth - parentPaddingWidth - marginWidth;
   };
 
   ContributorsGraph.set_x_domain = function(data) {
-    return ContributorsGraph.prototype.x_domain = data;
+    return (ContributorsGraph.prototype.x_domain = data);
   };
 
   ContributorsGraph.set_y_domain = function(data) {
-    return ContributorsGraph.prototype.y_domain = [
-      0, d3.max(data, function(d) {
-        return d.commits = d.commits || d.additions || d.deletions;
-      })
-    ];
+    return (ContributorsGraph.prototype.y_domain = [
+      0,
+      d3.max(data, function(d) {
+        return (d.commits = d.commits || d.additions || d.deletions);
+      }),
+    ]);
   };
 
   ContributorsGraph.init_x_domain = function(data) {
-    return ContributorsGraph.prototype.x_domain = d3.extent(data, function(d) {
+    return (ContributorsGraph.prototype.x_domain = d3.extent(data, function(d) {
       return d.date;
-    });
+    }));
   };
 
   ContributorsGraph.init_y_domain = function(data) {
-    return ContributorsGraph.prototype.y_domain = [
-      0, d3.max(data, function(d) {
-        return d.commits = d.commits || d.additions || d.deletions;
-      })
-    ];
+    return (ContributorsGraph.prototype.y_domain = [
+      0,
+      d3.max(data, function(d) {
+        return (d.commits = d.commits || d.additions || d.deletions);
+      }),
+    ]);
   };
 
   ContributorsGraph.init_domain = function(data) {
@@ -70,7 +96,7 @@ export const ContributorsGraph = (function() {
   };
 
   ContributorsGraph.set_dates = function(data) {
-    return ContributorsGraph.prototype.dates = data;
+    return (ContributorsGraph.prototype.dates = data);
   };
 
   ContributorsGraph.prototype.set_x_domain = function() {
@@ -87,20 +113,33 @@ export const ContributorsGraph = (function() {
   };
 
   ContributorsGraph.prototype.create_scale = function(width, height) {
-    this.x = d3.scaleTime().range([0, width]).clamp(true);
-    return this.y = d3.scaleLinear().range([height, 0]).nice();
+    this.x = d3
+      .scaleTime()
+      .range([0, width])
+      .clamp(true);
+    return (this.y = d3
+      .scaleLinear()
+      .range([height, 0])
+      .nice());
   };
 
   ContributorsGraph.prototype.draw_x_axis = function() {
-    return this.svg.append("g").attr("class", "x axis").attr("transform", "translate(0, " + this.height + ")").call(this.x_axis);
+    return this.svg
+      .append('g')
+      .attr('class', 'x axis')
+      .attr('transform', 'translate(0, ' + this.height + ')')
+      .call(this.x_axis);
   };
 
   ContributorsGraph.prototype.draw_y_axis = function() {
-    return this.svg.append("g").attr("class", "y axis").call(this.y_axis);
+    return this.svg
+      .append('g')
+      .attr('class', 'y axis')
+      .call(this.y_axis);
   };
 
   ContributorsGraph.prototype.set_data = function(data) {
-    return this.data = data;
+    return (this.data = data);
   };
 
   return ContributorsGraph;
@@ -137,9 +176,9 @@ export const ContributorsMasterGraph = (function(superClass) {
   };
 
   ContributorsMasterGraph.prototype.parse_dates = function(data) {
-    const parseDate = d3.timeParse("%Y-%m-%d");
+    const parseDate = d3.timeParse('%Y-%m-%d');
     return data.forEach(function(d) {
-      return d.date = parseDate(d.date);
+      return (d.date = parseDate(d.date));
     });
   };
 
@@ -148,42 +187,63 @@ export const ContributorsMasterGraph = (function(superClass) {
   };
 
   ContributorsMasterGraph.prototype.create_axes = function() {
-    this.x_axis = d3.axisBottom()
+    this.x_axis = d3
+      .axisBottom()
       .scale(this.x)
       .tickFormat(dateTickFormat);
-    return this.y_axis = d3.axisLeft().scale(this.y).ticks(5);
+    return (this.y_axis = d3
+      .axisLeft()
+      .scale(this.y)
+      .ticks(5));
   };
 
   ContributorsMasterGraph.prototype.create_svg = function() {
-    this.svg = d3.select("#contributors-master")
-      .append("svg")
-      .attr("width", this.width + this.MARGIN.left + this.MARGIN.right)
-      .attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom)
-      .attr("class", "tint-box")
-      .append("g")
-      .attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")");
+    this.svg = d3
+      .select('#contributors-master')
+      .append('svg')
+      .attr('width', this.width + this.MARGIN.left + this.MARGIN.right)
+      .attr('height', this.height + this.MARGIN.top + this.MARGIN.bottom)
+      .attr('class', 'tint-box')
+      .append('g')
+      .attr('transform', 'translate(' + this.MARGIN.left + ',' + this.MARGIN.top + ')');
     return this.svg;
   };
 
   ContributorsMasterGraph.prototype.create_area = function(x, y) {
-    return this.area = d3.area().x(function(d) {
-      return x(d.date);
-    }).y0(this.height).y1(function(d) {
-      d.commits = d.commits || d.additions || d.deletions;
-      return y(d.commits);
-    });
+    return (this.area = d3
+      .area()
+      .x(function(d) {
+        return x(d.date);
+      })
+      .y0(this.height)
+      .y1(function(d) {
+        d.commits = d.commits || d.additions || d.deletions;
+        return y(d.commits);
+      }));
   };
 
   ContributorsMasterGraph.prototype.create_brush = function() {
-    return this.brush = d3.brushX(this.x).extent([[this.x.range()[0], 0], [this.x.range()[1], this.height]]).on("end", this.update_content);
+    return (this.brush = d3
+      .brushX(this.x)
+      .extent([[this.x.range()[0], 0], [this.x.range()[1], this.height]])
+      .on('end', this.update_content));
   };
 
   ContributorsMasterGraph.prototype.draw_path = function(data) {
-    return this.svg.append("path").datum(data).attr("class", "area").attr("d", this.area);
+    return this.svg
+      .append('path')
+      .datum(data)
+      .attr('class', 'area')
+      .attr('d', this.area);
   };
 
   ContributorsMasterGraph.prototype.add_brush = function() {
-    return this.svg.append("g").attr("class", "selection").call(this.brush).selectAll("rect").attr("height", this.height);
+    return this.svg
+      .append('g')
+      .attr('class', 'selection')
+      .call(this.brush)
+      .selectAll('rect')
+      .attr('height', this.height);
   };
 
   ContributorsMasterGraph.prototype.update_content = function() {
@@ -193,7 +253,7 @@ export const ContributorsMasterGraph = (function(superClass) {
     } else {
       ContributorsGraph.set_x_domain(this.x_max_domain);
     }
-    return $("#brush_change").trigger('change');
+    return $('#brush_change').trigger('change');
   };
 
   ContributorsMasterGraph.prototype.draw = function() {
@@ -216,9 +276,9 @@ export const ContributorsMasterGraph = (function(superClass) {
     this.process_dates(this.data);
     ContributorsGraph.set_y_domain(this.data);
     this.set_y_domain();
-    this.svg.select("path").datum(this.data);
-    this.svg.select("path").attr("d", this.area);
-    return this.svg.select(".y.axis").call(this.y_axis);
+    this.svg.select('path').datum(this.data);
+    this.svg.select('path').attr('d', this.area);
+    return this.svg.select('.y.axis').call(this.y_axis);
   };
 
   return ContributorsMasterGraph;
@@ -252,43 +312,58 @@ export const ContributorsAuthorGraph = (function(superClass) {
   };
 
   ContributorsAuthorGraph.prototype.create_axes = function() {
-    this.x_axis = d3.axisBottom()
+    this.x_axis = d3
+      .axisBottom()
       .scale(this.x)
       .ticks(8)
       .tickFormat(dateTickFormat);
-    return this.y_axis = d3.axisLeft().scale(this.y).ticks(5);
+    return (this.y_axis = d3
+      .axisLeft()
+      .scale(this.y)
+      .ticks(5));
   };
 
   ContributorsAuthorGraph.prototype.create_area = function(x, y) {
-    return this.area = d3.area().x(function(d) {
-      const parseDate = d3.timeParse("%Y-%m-%d");
-      return x(parseDate(d));
-    }).y0(this.height).y1((function(_this) {
-      return function(d) {
-        if (_this.data[d] != null) {
-          return y(_this.data[d]);
-        } else {
-          return y(0);
-        }
-      };
-    })(this));
+    return (this.area = d3
+      .area()
+      .x(function(d) {
+        const parseDate = d3.timeParse('%Y-%m-%d');
+        return x(parseDate(d));
+      })
+      .y0(this.height)
+      .y1(
+        (function(_this) {
+          return function(d) {
+            if (_this.data[d] != null) {
+              return y(_this.data[d]);
+            } else {
+              return y(0);
+            }
+          };
+        })(this),
+      ));
   };
 
   ContributorsAuthorGraph.prototype.create_svg = function() {
     const persons = document.querySelectorAll('.person');
     this.list_item = persons[persons.length - 1];
-    this.svg = d3.select(this.list_item)
-      .append("svg")
-      .attr("width", this.width + this.MARGIN.left + this.MARGIN.right)
-      .attr("height", this.height + this.MARGIN.top + this.MARGIN.bottom)
-      .attr("class", "spark")
-      .append("g")
-      .attr("transform", "translate(" + this.MARGIN.left + "," + this.MARGIN.top + ")");
+    this.svg = d3
+      .select(this.list_item)
+      .append('svg')
+      .attr('width', this.width + this.MARGIN.left + this.MARGIN.right)
+      .attr('height', this.height + this.MARGIN.top + this.MARGIN.bottom)
+      .attr('class', 'spark')
+      .append('g')
+      .attr('transform', 'translate(' + this.MARGIN.left + ',' + this.MARGIN.top + ')');
     return this.svg;
   };
 
   ContributorsAuthorGraph.prototype.draw_path = function(data) {
-    return this.svg.append("path").datum(data).attr("class", "area-contributor").attr("d", this.area);
+    return this.svg
+      .append('path')
+      .datum(data)
+      .attr('class', 'area-contributor')
+      .attr('d', this.area);
   };
 
   ContributorsAuthorGraph.prototype.draw = function() {
@@ -304,10 +379,10 @@ export const ContributorsAuthorGraph = (function(superClass) {
 
   ContributorsAuthorGraph.prototype.redraw = function() {
     this.set_domain();
-    this.svg.select("path").datum(this.dates);
-    this.svg.select("path").attr("d", this.area);
-    this.svg.select(".x.axis").call(this.x_axis);
-    return this.svg.select(".y.axis").call(this.y_axis);
+    this.svg.select('path').datum(this.dates);
+    this.svg.select('path').attr('d', this.area);
+    this.svg.select('.x.axis').call(this.x_axis);
+    return this.svg.select('.y.axis').call(this.y_axis);
   };
 
   return ContributorsAuthorGraph;
diff --git a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_util.js b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_util.js
index cd0e2bc023c..988ae164955 100644
--- a/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_util.js
+++ b/app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_util.js
@@ -26,12 +26,12 @@ export default {
     by_author = _.toArray(by_author);
     return {
       total: total,
-      by_author: by_author
+      by_author: by_author,
     };
   },
   add_date: function(date, collection) {
     collection[date] = {};
-    return collection[date].date = date;
+    return (collection[date].date = date);
   },
   add_author: function(author, by_author, by_email) {
     var data, normalized_email;
@@ -49,28 +49,28 @@ export default {
     return this.store_deletions(entry, total, by_author);
   },
   store_commits: function(total, by_author) {
-    this.add(total, "commits", 1);
-    return this.add(by_author, "commits", 1);
+    this.add(total, 'commits', 1);
+    return this.add(by_author, 'commits', 1);
   },
   add: function(collection, field, value) {
     if (collection[field] == null) {
       collection[field] = 0;
     }
-    return collection[field] += value;
+    return (collection[field] += value);
   },
   store_additions: function(entry, total, by_author) {
     if (entry.additions == null) {
       entry.additions = 0;
     }
-    this.add(total, "additions", entry.additions);
-    return this.add(by_author, "additions", entry.additions);
+    this.add(total, 'additions', entry.additions);
+    return this.add(by_author, 'additions', entry.additions);
   },
   store_deletions: function(entry, total, by_author) {
     if (entry.deletions == null) {
       entry.deletions = 0;
     }
-    this.add(total, "deletions", entry.deletions);
-    return this.add(by_author, "deletions", entry.deletions);
+    this.add(total, 'deletions', entry.deletions);
+    return this.add(by_author, 'deletions', entry.deletions);
   },
   get_total_data: function(parsed_log, field) {
     var log, total_data;
@@ -95,15 +95,18 @@ export default {
     }
     log = parsed_log.by_author;
     author_data = [];
-    _.each(log, (function(_this) {
-      return function(log_entry) {
-        var parsed_log_entry;
-        parsed_log_entry = _this.parse_log_entry(log_entry, field, date_range);
-        if (!_.isEmpty(parsed_log_entry.dates)) {
-          return author_data.push(parsed_log_entry);
-        }
-      };
-    })(this));
+    _.each(
+      log,
+      (function(_this) {
+        return function(log_entry) {
+          var parsed_log_entry;
+          parsed_log_entry = _this.parse_log_entry(log_entry, field, date_range);
+          if (!_.isEmpty(parsed_log_entry.dates)) {
+            return author_data.push(parsed_log_entry);
+          }
+        };
+      })(this),
+    );
     return _.sortBy(author_data, function(d) {
       return d[field];
     }).reverse();
@@ -120,16 +123,19 @@ export default {
     parsed_entry.additions = 0;
     parsed_entry.deletions = 0;
 
-    _.each(_.omit(log_entry, 'author_name', 'author_email'), (function(_this) {
-      return function(value, key) {
-        if (_this.in_range(value.date, date_range)) {
-          parsed_entry.dates[value.date] = value[field];
-          parsed_entry.commits += value.commits;
-          parsed_entry.additions += value.additions;
-          return parsed_entry.deletions += value.deletions;
-        }
-      };
-    })(this));
+    _.each(
+      _.omit(log_entry, 'author_name', 'author_email'),
+      (function(_this) {
+        return function(value, key) {
+          if (_this.in_range(value.date, date_range)) {
+            parsed_entry.dates[value.date] = value[field];
+            parsed_entry.commits += value.commits;
+            parsed_entry.additions += value.additions;
+            return (parsed_entry.deletions += value.deletions);
+          }
+        };
+      })(this),
+    );
     return parsed_entry;
   },
   in_range: function(date, date_range) {
@@ -139,5 +145,5 @@ export default {
     } else {
       return false;
     }
-  }
+  },
 };
diff --git a/app/assets/javascripts/pages/projects/init_blob.js b/app/assets/javascripts/pages/projects/init_blob.js
index bc08ccf3584..bd8afa2d5ba 100644
--- a/app/assets/javascripts/pages/projects/init_blob.js
+++ b/app/assets/javascripts/pages/projects/init_blob.js
@@ -16,7 +16,8 @@ export default () => {
   );
 
   const fileBlobPermalinkUrlElement = document.querySelector('.js-data-file-blob-permalink-url');
-  const fileBlobPermalinkUrl = fileBlobPermalinkUrlElement && fileBlobPermalinkUrlElement.getAttribute('href');
+  const fileBlobPermalinkUrl =
+    fileBlobPermalinkUrlElement && fileBlobPermalinkUrlElement.getAttribute('href');
 
   new ShortcutsNavigation(); // eslint-disable-line no-new
 
diff --git a/app/assets/javascripts/pages/projects/init_form.js b/app/assets/javascripts/pages/projects/init_form.js
index 9f20a3e4e46..019efe077f7 100644
--- a/app/assets/javascripts/pages/projects/init_form.js
+++ b/app/assets/javascripts/pages/projects/init_form.js
@@ -1,7 +1,7 @@
 import ZenMode from '~/zen_mode';
 import GLForm from '~/gl_form';
 
-export default function ($formEl) {
+export default function($formEl) {
   new ZenMode(); // eslint-disable-line no-new
   new GLForm($formEl); // eslint-disable-line no-new
 }
diff --git a/app/assets/javascripts/pages/projects/issues/show.js b/app/assets/javascripts/pages/projects/issues/show.js
index ef65196872c..8987c8e3f47 100644
--- a/app/assets/javascripts/pages/projects/issues/show.js
+++ b/app/assets/javascripts/pages/projects/issues/show.js
@@ -5,7 +5,7 @@ import ZenMode from '~/zen_mode';
 import '~/notes/index';
 import initIssueableApp from '~/issue_show';
 
-export default function () {
+export default function() {
   initIssueableApp();
   new Issue(); // eslint-disable-line no-new
   new ShortcutsIssuable(); // eslint-disable-line no-new
diff --git a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue
index 5d2247f6c6d..e8b646f3f6e 100644
--- a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue
+++ b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue
@@ -1,72 +1,86 @@
 <script>
-  import _ from 'underscore';
-  import axios from '~/lib/utils/axios_utils';
-  import createFlash from '~/flash';
-  import GlModal from '~/vue_shared/components/gl_modal.vue';
-  import { s__, sprintf } from '~/locale';
-  import { visitUrl } from '~/lib/utils/url_utility';
-  import eventHub from '../event_hub';
+import _ from 'underscore';
+import axios from '~/lib/utils/axios_utils';
+import createFlash from '~/flash';
+import GlModal from '~/vue_shared/components/gl_modal.vue';
+import { s__, sprintf } from '~/locale';
+import { visitUrl } from '~/lib/utils/url_utility';
+import eventHub from '../event_hub';
 
-  export default {
-    components: {
-      GlModal,
+export default {
+  components: {
+    GlModal,
+  },
+  props: {
+    url: {
+      type: String,
+      required: true,
     },
-    props: {
-      url: {
-        type: String,
-        required: true,
-      },
-      labelTitle: {
-        type: String,
-        required: true,
-      },
-      labelColor: {
-        type: String,
-        required: true,
-      },
-      labelTextColor: {
-        type: String,
-        required: true,
-      },
-      groupName: {
-        type: String,
-        required: true,
-      },
+    labelTitle: {
+      type: String,
+      required: true,
     },
-    computed: {
-      text() {
-        return sprintf(s__(`Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}. 
-        Existing project labels with the same title will be merged. This action cannot be reversed.`), {
+    labelColor: {
+      type: String,
+      required: true,
+    },
+    labelTextColor: {
+      type: String,
+      required: true,
+    },
+    groupName: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    text() {
+      return sprintf(
+        s__(`Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}.
+        Existing project labels with the same title will be merged. This action cannot be reversed.`),
+        {
           labelTitle: this.labelTitle,
           groupName: this.groupName,
-        });
-      },
-      title() {
-        const label = `<span
+        },
+      );
+    },
+    title() {
+      const label = `<span
           class="label color-label"
           style="background-color: ${this.labelColor}; color: ${this.labelTextColor};"
         >${_.escape(this.labelTitle)}</span>`;
 
-        return sprintf(s__('Labels|<span>Promote label</span> %{labelTitle} <span>to Group Label?</span>'), {
+      return sprintf(
+        s__('Labels|<span>Promote label</span> %{labelTitle} <span>to Group Label?</span>'),
+        {
           labelTitle: label,
-        }, false);
-      },
+        },
+        false,
+      );
     },
-    methods: {
-      onSubmit() {
-        eventHub.$emit('promoteLabelModal.requestStarted', this.url);
-        return axios.post(this.url, { params: { format: 'json' } })
-          .then((response) => {
-            eventHub.$emit('promoteLabelModal.requestFinished', { labelUrl: this.url, successful: true });
-            visitUrl(response.data.url);
-          })
-          .catch((error) => {
-            eventHub.$emit('promoteLabelModal.requestFinished', { labelUrl: this.url, successful: false });
-            createFlash(error);
+  },
+  methods: {
+    onSubmit() {
+      eventHub.$emit('promoteLabelModal.requestStarted', this.url);
+      return axios
+        .post(this.url, { params: { format: 'json' } })
+        .then(response => {
+          eventHub.$emit('promoteLabelModal.requestFinished', {
+            labelUrl: this.url,
+            successful: true,
+          });
+          visitUrl(response.data.url);
+        })
+        .catch(error => {
+          eventHub.$emit('promoteLabelModal.requestFinished', {
+            labelUrl: this.url,
+            successful: false,
           });
-      },
+          createFlash(error);
+        });
     },
-  };
+  },
+};
 </script>
 <template>
   <gl-modal
diff --git a/app/assets/javascripts/pages/projects/labels/index/index.js b/app/assets/javascripts/pages/projects/labels/index/index.js
index 03cfef61311..36cf485f33d 100644
--- a/app/assets/javascripts/pages/projects/labels/index/index.js
+++ b/app/assets/javascripts/pages/projects/labels/index/index.js
@@ -10,20 +10,24 @@ const initLabelIndex = () => {
   initLabels();
 
   const onRequestFinished = ({ labelUrl, successful }) => {
-    const button = document.querySelector(`.js-promote-project-label-button[data-url="${labelUrl}"]`);
+    const button = document.querySelector(
+      `.js-promote-project-label-button[data-url="${labelUrl}"]`,
+    );
 
     if (!successful) {
       button.removeAttribute('disabled');
     }
   };
 
-  const onRequestStarted = (labelUrl) => {
-    const button = document.querySelector(`.js-promote-project-label-button[data-url="${labelUrl}"]`);
+  const onRequestStarted = labelUrl => {
+    const button = document.querySelector(
+      `.js-promote-project-label-button[data-url="${labelUrl}"]`,
+    );
     button.setAttribute('disabled', '');
     eventHub.$once('promoteLabelModal.requestFinished', onRequestFinished);
   };
 
-  const onDeleteButtonClick = (event) => {
+  const onDeleteButtonClick = event => {
     const button = event.currentTarget;
     const modalProps = {
       labelTitle: button.dataset.labelTitle,
@@ -37,12 +41,12 @@ const initLabelIndex = () => {
   };
 
   const promoteLabelButtons = document.querySelectorAll('.js-promote-project-label-button');
-  promoteLabelButtons.forEach((button) => {
+  promoteLabelButtons.forEach(button => {
     button.addEventListener('click', onDeleteButtonClick);
   });
 
   eventHub.$once('promoteLabelModal.mounted', () => {
-    promoteLabelButtons.forEach((button) => {
+    promoteLabelButtons.forEach(button => {
       button.removeAttribute('disabled');
     });
   });
diff --git a/app/assets/javascripts/pages/projects/network/network.js b/app/assets/javascripts/pages/projects/network/network.js
index 70fbb3f301c..226d63f05c4 100644
--- a/app/assets/javascripts/pages/projects/network/network.js
+++ b/app/assets/javascripts/pages/projects/network/network.js
@@ -6,13 +6,15 @@ import BranchGraph from '../../../network/branch_graph';
 export default (function() {
   function Network(opts) {
     var vph;
-    $("#filter_ref").click(function() {
-      return $(this).closest('form').submit();
+    $('#filter_ref').click(function() {
+      return $(this)
+        .closest('form')
+        .submit();
     });
-    this.branch_graph = new BranchGraph($(".network-graph"), opts);
+    this.branch_graph = new BranchGraph($('.network-graph'), opts);
     vph = $(window).height() - 250;
     $('.network-graph').css({
-      'height': vph + 'px'
+      height: vph + 'px',
     });
   }
 
diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js b/app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js
index 544360dcd51..6197dc8a9db 100644
--- a/app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js
+++ b/app/assets/javascripts/pages/projects/pipeline_schedules/index/index.js
@@ -1,12 +1,16 @@
 import Vue from 'vue';
 import PipelineSchedulesCallout from '../shared/components/pipeline_schedules_callout.vue';
 
-document.addEventListener('DOMContentLoaded', () => new Vue({
-  el: '#pipeline-schedules-callout',
-  components: {
-    'pipeline-schedules-callout': PipelineSchedulesCallout,
-  },
-  render(createElement) {
-    return createElement('pipeline-schedules-callout');
-  },
-}));
+document.addEventListener(
+  'DOMContentLoaded',
+  () =>
+    new Vue({
+      el: '#pipeline-schedules-callout',
+      components: {
+        'pipeline-schedules-callout': PipelineSchedulesCallout,
+      },
+      render(createElement) {
+        return createElement('pipeline-schedules-callout');
+      },
+    }),
+);
diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
index ef53d67e7cb..ab6f42d928c 100644
--- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
+++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/interval_pattern_input.vue
@@ -1,63 +1,63 @@
 <script>
-  import _ from 'underscore';
+import _ from 'underscore';
 
-  export default {
-    props: {
-      initialCronInterval: {
-        type: String,
-        required: false,
-        default: '',
-      },
-    },
-    data() {
-      return {
-        inputNameAttribute: 'schedule[cron]',
-        cronInterval: this.initialCronInterval,
-        cronIntervalPresets: {
-          everyDay: '0 4 * * *',
-          everyWeek: '0 4 * * 0',
-          everyMonth: '0 4 1 * *',
-        },
-        cronSyntaxUrl: 'https://en.wikipedia.org/wiki/Cron',
-        customInputEnabled: false,
-      };
+export default {
+  props: {
+    initialCronInterval: {
+      type: String,
+      required: false,
+      default: '',
     },
-    computed: {
-      intervalIsPreset() {
-        return _.contains(this.cronIntervalPresets, this.cronInterval);
-      },
-      // The text input is editable when there's a custom interval, or when it's
-      // a preset interval and the user clicks the 'custom' radio button
-      isEditable() {
-        return !!(this.customInputEnabled || !this.intervalIsPreset);
+  },
+  data() {
+    return {
+      inputNameAttribute: 'schedule[cron]',
+      cronInterval: this.initialCronInterval,
+      cronIntervalPresets: {
+        everyDay: '0 4 * * *',
+        everyWeek: '0 4 * * 0',
+        everyMonth: '0 4 1 * *',
       },
+      cronSyntaxUrl: 'https://en.wikipedia.org/wiki/Cron',
+      customInputEnabled: false,
+    };
+  },
+  computed: {
+    intervalIsPreset() {
+      return _.contains(this.cronIntervalPresets, this.cronInterval);
     },
-    watch: {
-      cronInterval() {
-        // updates field validation state when model changes, as
-        // glFieldError only updates on input.
-        this.$nextTick(() => {
-          gl.pipelineScheduleFieldErrors.updateFormValidityState();
-        });
-      },
+    // The text input is editable when there's a custom interval, or when it's
+    // a preset interval and the user clicks the 'custom' radio button
+    isEditable() {
+      return !!(this.customInputEnabled || !this.intervalIsPreset);
     },
-    created() {
-      if (this.intervalIsPreset) {
-        this.enableCustomInput = false;
-      }
+  },
+  watch: {
+    cronInterval() {
+      // updates field validation state when model changes, as
+      // glFieldError only updates on input.
+      this.$nextTick(() => {
+        gl.pipelineScheduleFieldErrors.updateFormValidityState();
+      });
     },
-    methods: {
-      toggleCustomInput(shouldEnable) {
-        this.customInputEnabled = shouldEnable;
+  },
+  created() {
+    if (this.intervalIsPreset) {
+      this.enableCustomInput = false;
+    }
+  },
+  methods: {
+    toggleCustomInput(shouldEnable) {
+      this.customInputEnabled = shouldEnable;
 
-        if (shouldEnable) {
-          // We need to change the value so other radios don't remain selected
-          // because the model (cronInterval) hasn't changed. The server trims it.
-          this.cronInterval = `${this.cronInterval} `;
-        }
-      },
+      if (shouldEnable) {
+        // We need to change the value so other radios don't remain selected
+        // because the model (cronInterval) hasn't changed. The server trims it.
+        this.cronInterval = `${this.cronInterval} `;
+      }
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
index 77508e62cef..33fc2420e4d 100644
--- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
+++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue
@@ -1,31 +1,31 @@
 <script>
-  import Vue from 'vue';
-  import Cookies from 'js-cookie';
-  import Translate from '../../../../../vue_shared/translate';
-  import illustrationSvg from '../icons/intro_illustration.svg';
+import Vue from 'vue';
+import Cookies from 'js-cookie';
+import Translate from '../../../../../vue_shared/translate';
+import illustrationSvg from '../icons/intro_illustration.svg';
 
-  Vue.use(Translate);
+Vue.use(Translate);
 
-  const cookieKey = 'pipeline_schedules_callout_dismissed';
+const cookieKey = 'pipeline_schedules_callout_dismissed';
 
-  export default {
-    name: 'PipelineSchedulesCallout',
-    data() {
-      return {
-        docsUrl: document.getElementById('pipeline-schedules-callout').dataset.docsUrl,
-        calloutDismissed: Cookies.get(cookieKey) === 'true',
-      };
+export default {
+  name: 'PipelineSchedulesCallout',
+  data() {
+    return {
+      docsUrl: document.getElementById('pipeline-schedules-callout').dataset.docsUrl,
+      calloutDismissed: Cookies.get(cookieKey) === 'true',
+    };
+  },
+  created() {
+    this.illustrationSvg = illustrationSvg;
+  },
+  methods: {
+    dismissCallout() {
+      this.calloutDismissed = true;
+      Cookies.set(cookieKey, this.calloutDismissed, { expires: 365 });
     },
-    created() {
-      this.illustrationSvg = illustrationSvg;
-    },
-    methods: {
-      dismissCallout() {
-        this.calloutDismissed = true;
-        Cookies.set(cookieKey, this.calloutDismissed, { expires: 365 });
-      },
-    },
-  };
+  },
+};
 </script>
 <template>
   <div
diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/target_branch_dropdown.js b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/target_branch_dropdown.js
index 4ef0d11dd36..0057700c1b3 100644
--- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/target_branch_dropdown.js
+++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/components/target_branch_dropdown.js
@@ -26,8 +26,7 @@ export default class TargetBranchDropdown {
   }
 
   formatBranchesList() {
-    return this.$dropdown.data('data')
-      .map(val => ({ name: val }));
+    return this.$dropdown.data('data').map(val => ({ name: val }));
   }
 
   setDropdownToggle() {
diff --git a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js
index c3ac54733a3..4d494efef6c 100644
--- a/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js
+++ b/app/assets/javascripts/pages/projects/pipeline_schedules/shared/init_form.js
@@ -11,7 +11,9 @@ Vue.use(Translate);
 
 function initIntervalPatternInput() {
   const intervalPatternMount = document.getElementById('interval-pattern-input');
-  const initialCronInterval = intervalPatternMount ? intervalPatternMount.dataset.initialInterval : '';
+  const initialCronInterval = intervalPatternMount
+    ? intervalPatternMount.dataset.initialInterval
+    : '';
 
   return new Vue({
     el: intervalPatternMount,
diff --git a/app/assets/javascripts/pages/projects/pipelines/charts/index.js b/app/assets/javascripts/pages/projects/pipelines/charts/index.js
index 07b6992eba1..48353f3b4ef 100644
--- a/app/assets/javascripts/pages/projects/pipelines/charts/index.js
+++ b/app/assets/javascripts/pages/projects/pipelines/charts/index.js
@@ -7,26 +7,29 @@ const options = {
   maintainAspectRatio: false,
 };
 
-const buildChart = (chartScope) => {
+const buildChart = chartScope => {
   const data = {
     labels: chartScope.labels,
-    datasets: [{
-      fillColor: '#707070',
-      strokeColor: '#707070',
-      pointColor: '#707070',
-      pointStrokeColor: '#EEE',
-      data: chartScope.totalValues,
-    },
-    {
-      fillColor: '#1aaa55',
-      strokeColor: '#1aaa55',
-      pointColor: '#1aaa55',
-      pointStrokeColor: '#fff',
-      data: chartScope.successValues,
-    },
+    datasets: [
+      {
+        fillColor: '#707070',
+        strokeColor: '#707070',
+        pointColor: '#707070',
+        pointStrokeColor: '#EEE',
+        data: chartScope.totalValues,
+      },
+      {
+        fillColor: '#1aaa55',
+        strokeColor: '#1aaa55',
+        pointColor: '#1aaa55',
+        pointStrokeColor: '#fff',
+        data: chartScope.successValues,
+      },
     ],
   };
-  const ctx = $(`#${chartScope.scope}Chart`).get(0).getContext('2d');
+  const ctx = $(`#${chartScope.scope}Chart`)
+    .get(0)
+    .getContext('2d');
 
   new Chart(ctx).Line(data, options);
 };
@@ -36,14 +39,16 @@ document.addEventListener('DOMContentLoaded', () => {
   const chartsData = JSON.parse(document.getElementById('pipelinesChartsData').innerHTML);
   const data = {
     labels: chartTimesData.labels,
-    datasets: [{
-      fillColor: 'rgba(220,220,220,0.5)',
-      strokeColor: 'rgba(220,220,220,1)',
-      barStrokeWidth: 1,
-      barValueSpacing: 1,
-      barDatasetSpacing: 1,
-      data: chartTimesData.values,
-    }],
+    datasets: [
+      {
+        fillColor: 'rgba(220,220,220,0.5)',
+        strokeColor: 'rgba(220,220,220,1)',
+        barStrokeWidth: 1,
+        barValueSpacing: 1,
+        barDatasetSpacing: 1,
+        data: chartTimesData.values,
+      },
+    ],
   };
 
   if (window.innerWidth < 768) {
@@ -51,7 +56,11 @@ document.addEventListener('DOMContentLoaded', () => {
     options.scaleFontSize = 8;
   }
 
-  new Chart($('#build_timesChart').get(0).getContext('2d')).Bar(data, options);
+  new Chart(
+    $('#build_timesChart')
+      .get(0)
+      .getContext('2d'),
+  ).Bar(data, options);
 
   chartsData.forEach(scope => buildChart(scope));
 });
diff --git a/app/assets/javascripts/pages/projects/pipelines/index/index.js b/app/assets/javascripts/pages/projects/pipelines/index/index.js
index a84e2790680..fc337a7609b 100644
--- a/app/assets/javascripts/pages/projects/pipelines/index/index.js
+++ b/app/assets/javascripts/pages/projects/pipelines/index/index.js
@@ -6,35 +6,39 @@ import { convertPermissionToBoolean } from '../../../../lib/utils/common_utils';
 
 Vue.use(Translate);
 
-document.addEventListener('DOMContentLoaded', () => new Vue({
-  el: '#pipelines-list-vue',
-  components: {
-    pipelinesComponent,
-  },
-  data() {
-    return {
-      store: new PipelinesStore(),
-    };
-  },
-  created() {
-    this.dataset = document.querySelector(this.$options.el).dataset;
-  },
-  render(createElement) {
-    return createElement('pipelines-component', {
-      props: {
-        store: this.store,
-        endpoint: this.dataset.endpoint,
-        helpPagePath: this.dataset.helpPagePath,
-        emptyStateSvgPath: this.dataset.emptyStateSvgPath,
-        errorStateSvgPath: this.dataset.errorStateSvgPath,
-        noPipelinesSvgPath: this.dataset.noPipelinesSvgPath,
-        autoDevopsPath: this.dataset.helpAutoDevopsPath,
-        newPipelinePath: this.dataset.newPipelinePath,
-        canCreatePipeline: convertPermissionToBoolean(this.dataset.canCreatePipeline),
-        hasGitlabCi: convertPermissionToBoolean(this.dataset.hasGitlabCi),
-        ciLintPath: this.dataset.ciLintPath,
-        resetCachePath: this.dataset.resetCachePath,
+document.addEventListener(
+  'DOMContentLoaded',
+  () =>
+    new Vue({
+      el: '#pipelines-list-vue',
+      components: {
+        pipelinesComponent,
       },
-    });
-  },
-}));
+      data() {
+        return {
+          store: new PipelinesStore(),
+        };
+      },
+      created() {
+        this.dataset = document.querySelector(this.$options.el).dataset;
+      },
+      render(createElement) {
+        return createElement('pipelines-component', {
+          props: {
+            store: this.store,
+            endpoint: this.dataset.endpoint,
+            helpPagePath: this.dataset.helpPagePath,
+            emptyStateSvgPath: this.dataset.emptyStateSvgPath,
+            errorStateSvgPath: this.dataset.errorStateSvgPath,
+            noPipelinesSvgPath: this.dataset.noPipelinesSvgPath,
+            autoDevopsPath: this.dataset.helpAutoDevopsPath,
+            newPipelinePath: this.dataset.newPipelinePath,
+            canCreatePipeline: convertPermissionToBoolean(this.dataset.canCreatePipeline),
+            hasGitlabCi: convertPermissionToBoolean(this.dataset.hasGitlabCi),
+            ciLintPath: this.dataset.ciLintPath,
+            resetCachePath: this.dataset.resetCachePath,
+          },
+        });
+      },
+    }),
+);
diff --git a/app/assets/javascripts/pages/projects/pipelines/init_pipelines.js b/app/assets/javascripts/pages/projects/pipelines/init_pipelines.js
index 94dfeb96e8c..ba4ae04ab3d 100644
--- a/app/assets/javascripts/pages/projects/pipelines/init_pipelines.js
+++ b/app/assets/javascripts/pages/projects/pipelines/init_pipelines.js
@@ -2,9 +2,12 @@ import Pipelines from '~/pipelines';
 
 export default () => {
   const { controllerAction } = document.querySelector('.js-pipeline-container').dataset;
-  const pipelineStatusUrl = `${document.querySelector('.js-pipeline-tab-link a').getAttribute('href')}/status.json`;
+  const pipelineStatusUrl = `${document
+    .querySelector('.js-pipeline-tab-link a')
+    .getAttribute('href')}/status.json`;
 
-  new Pipelines({ // eslint-disable-line no-new
+  // eslint-disable-next-line no-new
+  new Pipelines({
     initTabs: true,
     pipelineStatusUrl,
     tabsOptions: {
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue
index 06101290f6c..dced839c883 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue
@@ -1,73 +1,71 @@
 <script>
-  import projectFeatureToggle from '../../../../../vue_shared/components/toggle_button.vue';
+import projectFeatureToggle from '../../../../../vue_shared/components/toggle_button.vue';
 
-  export default {
-    components: {
-      projectFeatureToggle,
-    },
+export default {
+  components: {
+    projectFeatureToggle,
+  },
 
-    model: {
-      prop: 'value',
-      event: 'change',
-    },
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
 
-    props: {
-      name: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      options: {
-        type: Array,
-        required: false,
-        default: () => [],
-      },
-      value: {
-        type: Number,
-        required: false,
-        default: 0,
-      },
-      disabledInput: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
+  props: {
+    name: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    options: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    value: {
+      type: Number,
+      required: false,
+      default: 0,
     },
+    disabledInput: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
 
-    computed: {
-      featureEnabled() {
-        return this.value !== 0;
-      },
+  computed: {
+    featureEnabled() {
+      return this.value !== 0;
+    },
 
-      displayOptions() {
-        if (this.featureEnabled) {
-          return this.options;
-        }
-        return [
-          [0, 'Enable feature to choose access level'],
-        ];
-      },
+    displayOptions() {
+      if (this.featureEnabled) {
+        return this.options;
+      }
+      return [[0, 'Enable feature to choose access level']];
+    },
 
-      displaySelectInput() {
-        return this.disabledInput || !this.featureEnabled || this.displayOptions.length < 2;
-      },
+    displaySelectInput() {
+      return this.disabledInput || !this.featureEnabled || this.displayOptions.length < 2;
     },
+  },
 
-    methods: {
-      toggleFeature(featureEnabled) {
-        if (featureEnabled === false || this.options.length < 1) {
-          this.$emit('change', 0);
-        } else {
-          const [firstOptionValue] = this.options[this.options.length - 1];
-          this.$emit('change', firstOptionValue);
-        }
-      },
+  methods: {
+    toggleFeature(featureEnabled) {
+      if (featureEnabled === false || this.options.length < 1) {
+        this.$emit('change', 0);
+      } else {
+        const [firstOptionValue] = this.options[this.options.length - 1];
+        this.$emit('change', firstOptionValue);
+      }
+    },
 
-      selectOption(e) {
-        this.$emit('change', Number(e.target.value));
-      },
+    selectOption(e) {
+      this.$emit('change', Number(e.target.value));
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue b/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue
index 83437363af5..898d605463f 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue
+++ b/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue
@@ -1,23 +1,23 @@
 <script>
-  export default {
-    props: {
-      label: {
-        type: String,
-        required: false,
-        default: null,
-      },
-      helpPath: {
-        type: String,
-        required: false,
-        default: null,
-      },
-      helpText: {
-        type: String,
-        required: false,
-        default: null,
-      },
+export default {
+  props: {
+    label: {
+      type: String,
+      required: false,
+      default: null,
     },
-  };
+    helpPath: {
+      type: String,
+      required: false,
+      default: null,
+    },
+    helpText: {
+      type: String,
+      required: false,
+      default: null,
+    },
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/pages/projects/shared/permissions/constants.js b/app/assets/javascripts/pages/projects/shared/permissions/constants.js
index ce47562f259..bc5c29d12b5 100644
--- a/app/assets/javascripts/pages/projects/shared/permissions/constants.js
+++ b/app/assets/javascripts/pages/projects/shared/permissions/constants.js
@@ -5,7 +5,9 @@ export const visibilityOptions = {
 };
 
 export const visibilityLevelDescriptions = {
-  [visibilityOptions.PRIVATE]: 'The project is accessible only by members of the project. Access must be granted explicitly to each user.',
+  [visibilityOptions.PRIVATE]:
+    'The project is accessible only by members of the project. Access must be granted explicitly to each user.',
   [visibilityOptions.INTERNAL]: 'The project can be accessed by any user who is logged in.',
-  [visibilityOptions.PUBLIC]: 'The project can be accessed by anyone, regardless of authentication.',
+  [visibilityOptions.PUBLIC]:
+    'The project can be accessed by anyone, regardless of authentication.',
 };
diff --git a/app/assets/javascripts/pages/projects/shared/project_avatar.js b/app/assets/javascripts/pages/projects/shared/project_avatar.js
index 447877752fe..1e69ecb481d 100644
--- a/app/assets/javascripts/pages/projects/shared/project_avatar.js
+++ b/app/assets/javascripts/pages/projects/shared/project_avatar.js
@@ -8,8 +8,9 @@ export default function projectAvatar() {
 
   $('.js-project-avatar-input').bind('change', function onClickAvatarInput() {
     const form = $(this).closest('form');
-    // eslint-disable-next-line no-useless-escape
-    const filename = $(this).val().replace(/^.*[\\\/]/, '');
+    const filename = $(this)
+      .val()
+      .replace(/^.*[\\\/]/, ''); // eslint-disable-line no-useless-escape
     return form.find('.js-avatar-filename').text(filename);
   });
 }
diff --git a/app/assets/javascripts/pages/projects/wikis/index.js b/app/assets/javascripts/pages/projects/wikis/index.js
index c2629090f01..f5fd84d69ac 100644
--- a/app/assets/javascripts/pages/projects/wikis/index.js
+++ b/app/assets/javascripts/pages/projects/wikis/index.js
@@ -21,7 +21,8 @@ document.addEventListener('DOMContentLoaded', () => {
 
     const { deleteWikiUrl, pageTitle } = deleteWikiModalWrapperEl.dataset;
 
-    new Vue({ // eslint-disable-line no-new
+    // eslint-disable-next-line no-new
+    new Vue({
       el: deleteWikiModalWrapperEl,
       data: {
         deleteWikiUrl: '',
diff --git a/app/assets/javascripts/pages/search/show/search.js b/app/assets/javascripts/pages/search/show/search.js
index e3e0ab91993..0c896c8599e 100644
--- a/app/assets/javascripts/pages/search/show/search.js
+++ b/app/assets/javascripts/pages/search/show/search.js
@@ -22,7 +22,7 @@ export default class Search {
         fields: ['full_name'],
       },
       data(term, callback) {
-        return Api.groups(term, {}, (data) => {
+        return Api.groups(term, {}, data => {
           data.unshift({
             full_name: 'Any',
           });
@@ -37,7 +37,7 @@ export default class Search {
         return obj.full_name;
       },
       toggleLabel(obj) {
-        return `${($groupDropdown.data('defaultLabel'))} ${obj.full_name}`;
+        return `${$groupDropdown.data('defaultLabel')} ${obj.full_name}`;
       },
       clicked: () => Search.submitSearch(),
     });
@@ -52,7 +52,7 @@ export default class Search {
       },
       data: (term, callback) => {
         this.getProjectsData(term)
-          .then((data) => {
+          .then(data => {
             data.unshift({
               name_with_namespace: 'Any',
             });
@@ -70,7 +70,7 @@ export default class Search {
         return obj.name_with_namespace;
       },
       toggleLabel(obj) {
-        return `${($projectDropdown.data('defaultLabel'))} ${obj.name_with_namespace}`;
+        return `${$projectDropdown.data('defaultLabel')} ${obj.name_with_namespace}`;
       },
       clicked: () => Search.submitSearch(),
     });
@@ -99,17 +99,24 @@ export default class Search {
   }
 
   clearSearchField() {
-    return $(this.searchInput).val('').trigger('keyup').focus();
+    return $(this.searchInput)
+      .val('')
+      .trigger('keyup')
+      .focus();
   }
 
   getProjectsData(term) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       if (this.groupId) {
         Api.groupProjects(this.groupId, term, {}, resolve);
       } else {
-        Api.projects(term, {
-          order_by: 'id',
-        }, resolve);
+        Api.projects(
+          term,
+          {
+            order_by: 'id',
+          },
+          resolve,
+        );
       }
     });
   }
diff --git a/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js b/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js
index 1e7c29aefaa..2b8f1e8b0ef 100644
--- a/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js
+++ b/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js
@@ -20,7 +20,7 @@ export default class SigninTabsMemoizer {
   bootstrap() {
     const tabs = document.querySelectorAll(this.tabSelector);
     if (tabs.length > 0) {
-      tabs[0].addEventListener('click', (e) => {
+      tabs[0].addEventListener('click', e => {
         if (e.target && e.target.nodeName === 'A') {
           const anchorName = e.target.getAttribute('href');
           this.saveData(anchorName);
diff --git a/app/assets/javascripts/pages/sessions/new/username_validator.js b/app/assets/javascripts/pages/sessions/new/username_validator.js
index d621f988d86..7a41805bada 100644
--- a/app/assets/javascripts/pages/sessions/new/username_validator.js
+++ b/app/assets/javascripts/pages/sessions/new/username_validator.js
@@ -22,10 +22,10 @@ export default class UsernameValidator {
       available: false,
       valid: false,
       pending: false,
-      empty: true
+      empty: true,
     };
 
-    const debounceTimeout = _.debounce((username) => {
+    const debounceTimeout = _.debounce(username => {
       this.validateUsername(username);
     }, debounceTimeoutDuration);
 
@@ -81,7 +81,8 @@ export default class UsernameValidator {
       this.state.pending = true;
       this.state.available = false;
       this.renderState();
-      axios.get(`${gon.relative_url_root}/users/${username}/exists`)
+      axios
+        .get(`${gon.relative_url_root}/users/${username}/exists`)
         .then(({ data }) => this.setAvailabilityState(data.exists))
         .catch(() => flash(__('An error occurred while validating username')));
     }
@@ -100,8 +101,7 @@ export default class UsernameValidator {
   clearFieldValidationState() {
     this.inputElement.siblings('p').hide();
 
-    this.inputElement.removeClass(invalidInputClass)
-      .removeClass(successInputClass);
+    this.inputElement.removeClass(invalidInputClass).removeClass(successInputClass);
   }
 
   setUnavailableState() {
diff --git a/app/assets/javascripts/pages/users/index.js b/app/assets/javascripts/pages/users/index.js
index 6b1626b0161..a191df00dfa 100644
--- a/app/assets/javascripts/pages/users/index.js
+++ b/app/assets/javascripts/pages/users/index.js
@@ -13,10 +13,12 @@ function initUserProfile(action) {
   new UserTabs({ parentEl: '.user-profile', action });
 
   // hide project limit message
-  $('.hide-project-limit-message').on('click', (e) => {
+  $('.hide-project-limit-message').on('click', e => {
     e.preventDefault();
     Cookies.set('hide_project_limit_message', 'false');
-    $(this).parents('.project-limit-message').remove();
+    $(this)
+      .parents('.project-limit-message')
+      .remove();
   });
 }
 
-- 
cgit v1.2.3


From b49c400a968499d5b0464fcac0b41cce38cb2200 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 10 Oct 2018 01:47:49 -0500
Subject: Prettify performance_bar notes and profile modules

---
 .../notes/components/note_awards_list.vue          |  25 +---
 .../javascripts/notes/stores/collapse_utils.js     |   5 +-
 app/assets/javascripts/notes/stores/index.js       |   3 +-
 .../performance_bar/components/simple_metric.vue   |  46 ++++----
 app/assets/javascripts/performance_bar/index.js    |   3 +-
 .../services/performance_bar_service.js            |  11 +-
 .../stores/performance_bar_store.js                |   4 +-
 .../account/components/delete_account_modal.vue    | 126 ++++++++++-----------
 app/assets/javascripts/profile/gl_crop.js          |  47 +++++---
 app/assets/javascripts/profile/profile.js          |   6 +-
 10 files changed, 134 insertions(+), 142 deletions(-)

diff --git a/app/assets/javascripts/notes/components/note_awards_list.vue b/app/assets/javascripts/notes/components/note_awards_list.vue
index c68860d98ae..e707f44bf5a 100644
--- a/app/assets/javascripts/notes/components/note_awards_list.vue
+++ b/app/assets/javascripts/notes/components/note_awards_list.vue
@@ -95,29 +95,20 @@ export default {
       return awardList.filter(award => award.user.id === this.getUserData.id).length;
     },
     awardTitle(awardsList) {
-      const hasReactionByCurrentUser = this.hasReactionByCurrentUser(
-        awardsList,
-      );
+      const hasReactionByCurrentUser = this.hasReactionByCurrentUser(awardsList);
       const TOOLTIP_NAME_COUNT = hasReactionByCurrentUser ? 9 : 10;
       let awardList = awardsList;
 
       // Filter myself from list if I am awarded.
       if (hasReactionByCurrentUser) {
-        awardList = awardList.filter(
-          award => award.user.id !== this.getUserData.id,
-        );
+        awardList = awardList.filter(award => award.user.id !== this.getUserData.id);
       }
 
       // Get only 9-10 usernames to show in tooltip text.
-      const namesToShow = awardList
-        .slice(0, TOOLTIP_NAME_COUNT)
-        .map(award => award.user.name);
+      const namesToShow = awardList.slice(0, TOOLTIP_NAME_COUNT).map(award => award.user.name);
 
       // Get the remaining list to use in `and x more` text.
-      const remainingAwardList = awardList.slice(
-        TOOLTIP_NAME_COUNT,
-        awardList.length,
-      );
+      const remainingAwardList = awardList.slice(TOOLTIP_NAME_COUNT, awardList.length);
 
       // Add myself to the begining of the list so title will start with You.
       if (hasReactionByCurrentUser) {
@@ -128,9 +119,7 @@ export default {
 
       // We have 10+ awarded user, join them with comma and add `and x more`.
       if (remainingAwardList.length) {
-        title = `${namesToShow.join(', ')}, and ${
-          remainingAwardList.length
-        } more.`;
+        title = `${namesToShow.join(', ')}, and ${remainingAwardList.length} more.`;
       } else if (namesToShow.length > 1) {
         // Join all names with comma but not the last one, it will be added with and text.
         title = namesToShow.slice(0, namesToShow.length - 1).join(', ');
@@ -170,9 +159,7 @@ export default {
         awardName: parsedName,
       };
 
-      this.toggleAwardRequest(data).catch(() =>
-        Flash('Something went wrong on our end.'),
-      );
+      this.toggleAwardRequest(data).catch(() => Flash('Something went wrong on our end.'));
     },
   },
 };
diff --git a/app/assets/javascripts/notes/stores/collapse_utils.js b/app/assets/javascripts/notes/stores/collapse_utils.js
index fa4a1c56b20..4532226aa07 100644
--- a/app/assets/javascripts/notes/stores/collapse_utils.js
+++ b/app/assets/javascripts/notes/stores/collapse_utils.js
@@ -68,10 +68,7 @@ export const collapseSystemNotes = notes => {
         lastDescriptionSystemNote = note;
         lastDescriptionSystemNoteIndex = acc.length;
       } else if (lastDescriptionSystemNote) {
-        const timeDifferenceMinutes = getTimeDifferenceMinutes(
-          lastDescriptionSystemNote,
-          note,
-        );
+        const timeDifferenceMinutes = getTimeDifferenceMinutes(lastDescriptionSystemNote, note);
 
         // are they less than 10 minutes appart?
         if (timeDifferenceMinutes > 10) {
diff --git a/app/assets/javascripts/notes/stores/index.js b/app/assets/javascripts/notes/stores/index.js
index f105b7d0d11..d41b02b4a4b 100644
--- a/app/assets/javascripts/notes/stores/index.js
+++ b/app/assets/javascripts/notes/stores/index.js
@@ -4,5 +4,4 @@ import notesModule from './modules';
 
 Vue.use(Vuex);
 
-export default () =>
-  new Vuex.Store(notesModule());
+export default () => new Vuex.Store(notesModule());
diff --git a/app/assets/javascripts/performance_bar/components/simple_metric.vue b/app/assets/javascripts/performance_bar/components/simple_metric.vue
index 760ea8fe1e6..7a558558c4d 100644
--- a/app/assets/javascripts/performance_bar/components/simple_metric.vue
+++ b/app/assets/javascripts/performance_bar/components/simple_metric.vue
@@ -1,29 +1,29 @@
 <script>
-  export default {
-    props: {
-      currentRequest: {
-        type: Object,
-        required: true,
-      },
-      metric: {
-        type: String,
-        required: true,
-      },
+export default {
+  props: {
+    currentRequest: {
+      type: Object,
+      required: true,
     },
-    computed: {
-      duration() {
-        return (
-          this.currentRequest.details[this.metric] &&
-          this.currentRequest.details[this.metric].duration
-        );
-      },
-      calls() {
-        return (
-          this.currentRequest.details[this.metric] && this.currentRequest.details[this.metric].calls
-        );
-      },
+    metric: {
+      type: String,
+      required: true,
     },
-  };
+  },
+  computed: {
+    duration() {
+      return (
+        this.currentRequest.details[this.metric] &&
+        this.currentRequest.details[this.metric].duration
+      );
+    },
+    calls() {
+      return (
+        this.currentRequest.details[this.metric] && this.currentRequest.details[this.metric].calls
+      );
+    },
+  },
+};
 </script>
 <template>
   <div
diff --git a/app/assets/javascripts/performance_bar/index.js b/app/assets/javascripts/performance_bar/index.js
index 6e5ef0ac0b2..29bfb7ee5df 100644
--- a/app/assets/javascripts/performance_bar/index.js
+++ b/app/assets/javascripts/performance_bar/index.js
@@ -9,8 +9,7 @@ export default ({ container }) =>
       performanceBarApp: () => import('./components/performance_bar_app.vue'),
     },
     data() {
-      const performanceBarData = document.querySelector(this.$options.el)
-        .dataset;
+      const performanceBarData = document.querySelector(this.$options.el).dataset;
       const store = new PerformanceBarStore();
 
       return {
diff --git a/app/assets/javascripts/performance_bar/services/performance_bar_service.js b/app/assets/javascripts/performance_bar/services/performance_bar_service.js
index 60d9ba62570..3a496fa2ed8 100644
--- a/app/assets/javascripts/performance_bar/services/performance_bar_service.js
+++ b/app/assets/javascripts/performance_bar/services/performance_bar_service.js
@@ -11,8 +11,10 @@ export default class PerformanceBarService {
 
   static registerInterceptor(peekUrl, callback) {
     const interceptor = response => {
-      const [fireCallback, requestId, requestUrl] =
-        PerformanceBarService.callbackParams(response, peekUrl);
+      const [fireCallback, requestId, requestUrl] = PerformanceBarService.callbackParams(
+        response,
+        peekUrl,
+      );
 
       if (fireCallback) {
         callback(requestId, requestUrl);
@@ -30,10 +32,7 @@ export default class PerformanceBarService {
 
   static removeInterceptor(interceptor) {
     axios.interceptors.response.eject(interceptor);
-    Vue.http.interceptors = _.without(
-      Vue.http.interceptors,
-      vueResourceInterceptor,
-    );
+    Vue.http.interceptors = _.without(Vue.http.interceptors, vueResourceInterceptor);
   }
 
   static callbackParams(response, peekUrl) {
diff --git a/app/assets/javascripts/performance_bar/stores/performance_bar_store.js b/app/assets/javascripts/performance_bar/stores/performance_bar_store.js
index c6b2f55243c..031e774d533 100644
--- a/app/assets/javascripts/performance_bar/stores/performance_bar_store.js
+++ b/app/assets/javascripts/performance_bar/stores/performance_bar_store.js
@@ -32,8 +32,6 @@ export default class PerformanceBarStore {
   }
 
   canTrackRequest(requestUrl) {
-    return (
-      this.requests.filter(request => request.url === requestUrl).length < 2
-    );
+    return this.requests.filter(request => request.url === requestUrl).length < 2;
   }
 }
diff --git a/app/assets/javascripts/profile/account/components/delete_account_modal.vue b/app/assets/javascripts/profile/account/components/delete_account_modal.vue
index 974629fa2af..99b57f4c9d5 100644
--- a/app/assets/javascripts/profile/account/components/delete_account_modal.vue
+++ b/app/assets/javascripts/profile/account/components/delete_account_modal.vue
@@ -1,78 +1,78 @@
 <script>
-  import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
-  import { __, s__, sprintf } from '~/locale';
-  import csrf from '~/lib/utils/csrf';
+import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
+import { __, s__, sprintf } from '~/locale';
+import csrf from '~/lib/utils/csrf';
 
-  export default {
-    components: {
-      DeprecatedModal,
+export default {
+  components: {
+    DeprecatedModal,
+  },
+  props: {
+    actionUrl: {
+      type: String,
+      required: true,
     },
-    props: {
-      actionUrl: {
-        type: String,
-        required: true,
-      },
-      confirmWithPassword: {
-        type: Boolean,
-        required: true,
-      },
-      username: {
-        type: String,
-        required: true,
-      },
+    confirmWithPassword: {
+      type: Boolean,
+      required: true,
     },
-    data() {
-      return {
-        enteredPassword: '',
-        enteredUsername: '',
-      };
+    username: {
+      type: String,
+      required: true,
     },
-    computed: {
-      csrfToken() {
-        return csrf.token;
-      },
-      inputLabel() {
-        let confirmationValue;
-        if (this.confirmWithPassword) {
-          confirmationValue = __('password');
-        } else {
-          confirmationValue = __('username');
-        }
+  },
+  data() {
+    return {
+      enteredPassword: '',
+      enteredUsername: '',
+    };
+  },
+  computed: {
+    csrfToken() {
+      return csrf.token;
+    },
+    inputLabel() {
+      let confirmationValue;
+      if (this.confirmWithPassword) {
+        confirmationValue = __('password');
+      } else {
+        confirmationValue = __('username');
+      }
 
-        confirmationValue = `<code>${confirmationValue}</code>`;
+      confirmationValue = `<code>${confirmationValue}</code>`;
 
-        return sprintf(
-          s__('Profiles|Type your %{confirmationValue} to confirm:'),
-          { confirmationValue },
-          false,
-        );
-      },
-      text() {
-        return sprintf(
-          s__(`Profiles|
+      return sprintf(
+        s__('Profiles|Type your %{confirmationValue} to confirm:'),
+        { confirmationValue },
+        false,
+      );
+    },
+    text() {
+      return sprintf(
+        s__(`Profiles|
 You are about to permanently delete %{yourAccount}, and all of the issues, merge requests, and groups linked to your account.
 Once you confirm %{deleteAccount}, it cannot be undone or recovered.`),
-          {
-            yourAccount: `<strong>${s__('Profiles|your account')}</strong>`,
-            deleteAccount: `<strong>${s__('Profiles|Delete Account')}</strong>`,
-          },
-          false,
-        );
-      },
+        {
+          yourAccount: `<strong>${s__('Profiles|your account')}</strong>`,
+          deleteAccount: `<strong>${s__('Profiles|Delete Account')}</strong>`,
+        },
+        false,
+      );
     },
-    methods: {
-      canSubmit() {
-        if (this.confirmWithPassword) {
-          return this.enteredPassword !== '';
-        }
+  },
+  methods: {
+    canSubmit() {
+      if (this.confirmWithPassword) {
+        return this.enteredPassword !== '';
+      }
 
-        return this.enteredUsername === this.username;
-      },
-      onSubmit() {
-        this.$refs.form.submit();
-      },
+      return this.enteredUsername === this.username;
+    },
+    onSubmit() {
+      this.$refs.form.submit();
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/profile/gl_crop.js b/app/assets/javascripts/profile/gl_crop.js
index af134881f31..befe91c332f 100644
--- a/app/assets/javascripts/profile/gl_crop.js
+++ b/app/assets/javascripts/profile/gl_crop.js
@@ -4,20 +4,35 @@ import $ from 'jquery';
 import 'cropper';
 import _ from 'underscore';
 
-((global) => {
+(global => {
   // Matches everything but the file name
   const FILENAMEREGEX = /^.*[\\\/]/;
 
   class GitLabCrop {
-    constructor(input, { filename, previewImage, modalCrop, pickImageEl, uploadImageBtn, modalCropImg,
-        exportWidth = 200, exportHeight = 200, cropBoxWidth = 200, cropBoxHeight = 200 } = {}) {
+    constructor(
+      input,
+      {
+        filename,
+        previewImage,
+        modalCrop,
+        pickImageEl,
+        uploadImageBtn,
+        modalCropImg,
+        exportWidth = 200,
+        exportHeight = 200,
+        cropBoxWidth = 200,
+        cropBoxHeight = 200,
+      } = {},
+    ) {
       this.onUploadImageBtnClick = this.onUploadImageBtnClick.bind(this);
       this.onModalHide = this.onModalHide.bind(this);
       this.onModalShow = this.onModalShow.bind(this);
       this.onPickImageClick = this.onPickImageClick.bind(this);
       this.fileInput = $(input);
       this.modalCropImg = _.isString(this.modalCropImg) ? $(this.modalCropImg) : this.modalCropImg;
-      this.fileInput.attr('name', `${this.fileInput.attr('name')}-trigger`).attr('id', `${this.fileInput.attr('id')}-trigger`);
+      this.fileInput
+        .attr('name', `${this.fileInput.attr('name')}-trigger`)
+        .attr('id', `${this.fileInput.attr('id')}-trigger`);
       this.exportWidth = exportWidth;
       this.exportHeight = exportHeight;
       this.cropBoxWidth = cropBoxWidth;
@@ -59,7 +74,7 @@ import _ from 'underscore';
         btn = this;
         return _this.onActionBtnClick(btn);
       });
-      return this.croppedImageBlob = null;
+      return (this.croppedImageBlob = null);
     }
 
     onPickImageClick() {
@@ -94,9 +109,9 @@ import _ from 'underscore';
             width: cropBoxWidth,
             height: cropBoxHeight,
             left: (container.width - cropBoxWidth) / 2,
-            top: (container.height - cropBoxHeight) / 2
+            top: (container.height - cropBoxHeight) / 2,
           });
-        }
+        },
       });
     }
 
@@ -116,7 +131,7 @@ import _ from 'underscore';
       var data, result;
       data = $(btn).data();
       if (this.modalCropImg.data('cropper') && data.method) {
-        return result = this.modalCropImg.cropper(data.method, data.option);
+        return (result = this.modalCropImg.cropper(data.method, data.option));
       }
     }
 
@@ -127,7 +142,7 @@ import _ from 'underscore';
     readFile(input) {
       var _this, reader;
       _this = this;
-      reader = new FileReader;
+      reader = new FileReader();
       reader.onload = () => {
         _this.modalCropImg.attr('src', reader.result);
         return _this.modalCrop.modal('show');
@@ -145,7 +160,7 @@ import _ from 'underscore';
         array.push(binary.charCodeAt(i));
       }
       return new Blob([new Uint8Array(array)], {
-        type: 'image/png'
+        type: 'image/png',
       });
     }
 
@@ -157,11 +172,13 @@ import _ from 'underscore';
     }
 
     setBlob() {
-      this.dataURL = this.modalCropImg.cropper('getCroppedCanvas', {
-        width: 200,
-        height: 200
-      }).toDataURL('image/png');
-      return this.croppedImageBlob = this.dataURLtoBlob(this.dataURL);
+      this.dataURL = this.modalCropImg
+        .cropper('getCroppedCanvas', {
+          width: 200,
+          height: 200,
+        })
+        .toDataURL('image/png');
+      return (this.croppedImageBlob = this.dataURLtoBlob(this.dataURL));
     }
 
     getBlob() {
diff --git a/app/assets/javascripts/profile/profile.js b/app/assets/javascripts/profile/profile.js
index e49c67ffb5c..8704a655b28 100644
--- a/app/assets/javascripts/profile/profile.js
+++ b/app/assets/javascripts/profile/profile.js
@@ -26,11 +26,7 @@ export default class Profile {
   }
 
   bindEvents() {
-    $('.js-preferences-form').on(
-      'change.preference',
-      'input[type=radio]',
-      this.submitForm,
-    );
+    $('.js-preferences-form').on('change.preference', 'input[type=radio]', this.submitForm);
     $('#user_notification_email').on('change', this.submitForm);
     $('#user_notified_of_own_activity').on('change', this.submitForm);
     this.form.on('submit', this.onSubmitForm);
-- 
cgit v1.2.3


From c0d26698c419cde5ce1c114988f63247dd6c64b3 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 10 Oct 2018 01:48:36 -0500
Subject: Prettify protected_branches and protected_tags modules

---
 .../protected_branches/protected_branch_create.js  |  8 ++-
 .../protected_branches/protected_branch_edit.js    | 59 ++++++++++++++--------
 .../protected_tags/protected_tag_create.js         |  4 +-
 .../protected_tags/protected_tag_edit.js           | 37 ++++++++------
 4 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/protected_branches/protected_branch_create.js b/app/assets/javascripts/protected_branches/protected_branch_create.js
index b601b19e7be..48343c8ba0a 100644
--- a/app/assets/javascripts/protected_branches/protected_branch_create.js
+++ b/app/assets/javascripts/protected_branches/protected_branch_create.js
@@ -46,8 +46,12 @@ export default class ProtectedBranchCreate {
   onSelect() {
     // Enable submit button
     const $branchInput = this.$form.find('input[name="protected_branch[name]"]');
-    const $allowedToMergeInput = this.$form.find('input[name="protected_branch[merge_access_levels_attributes][0][access_level]"]');
-    const $allowedToPushInput = this.$form.find('input[name="protected_branch[push_access_levels_attributes][0][access_level]"]');
+    const $allowedToMergeInput = this.$form.find(
+      'input[name="protected_branch[merge_access_levels_attributes][0][access_level]"]',
+    );
+    const $allowedToPushInput = this.$form.find(
+      'input[name="protected_branch[push_access_levels_attributes][0][access_level]"]',
+    );
     const completedForm = !(
       $branchInput.val() &&
       $allowedToMergeInput.length &&
diff --git a/app/assets/javascripts/protected_branches/protected_branch_edit.js b/app/assets/javascripts/protected_branches/protected_branch_edit.js
index 54560d08ad7..5bc08f60d16 100644
--- a/app/assets/javascripts/protected_branches/protected_branch_edit.js
+++ b/app/assets/javascripts/protected_branches/protected_branch_edit.js
@@ -29,8 +29,12 @@ export default class ProtectedBranchEdit {
   }
 
   onSelect() {
-    const $allowedToMergeInput = this.$wrap.find(`input[name="${this.$allowedToMergeDropdown.data('fieldName')}"]`);
-    const $allowedToPushInput = this.$wrap.find(`input[name="${this.$allowedToPushDropdown.data('fieldName')}"]`);
+    const $allowedToMergeInput = this.$wrap.find(
+      `input[name="${this.$allowedToMergeDropdown.data('fieldName')}"]`,
+    );
+    const $allowedToPushInput = this.$wrap.find(
+      `input[name="${this.$allowedToPushDropdown.data('fieldName')}"]`,
+    );
 
     // Do not update if one dropdown has not selected any option
     if (!($allowedToMergeInput.length && $allowedToPushInput.length)) return;
@@ -38,25 +42,36 @@ export default class ProtectedBranchEdit {
     this.$allowedToMergeDropdown.disable();
     this.$allowedToPushDropdown.disable();
 
-    axios.patch(this.$wrap.data('url'), {
-      protected_branch: {
-        merge_access_levels_attributes: [{
-          id: this.$allowedToMergeDropdown.data('accessLevelId'),
-          access_level: $allowedToMergeInput.val(),
-        }],
-        push_access_levels_attributes: [{
-          id: this.$allowedToPushDropdown.data('accessLevelId'),
-          access_level: $allowedToPushInput.val(),
-        }],
-      },
-    }).then(() => {
-      this.$allowedToMergeDropdown.enable();
-      this.$allowedToPushDropdown.enable();
-    }).catch(() => {
-      this.$allowedToMergeDropdown.enable();
-      this.$allowedToPushDropdown.enable();
-
-      flash('Failed to update branch!', 'alert', document.querySelector('.js-protected-branches-list'));
-    });
+    axios
+      .patch(this.$wrap.data('url'), {
+        protected_branch: {
+          merge_access_levels_attributes: [
+            {
+              id: this.$allowedToMergeDropdown.data('accessLevelId'),
+              access_level: $allowedToMergeInput.val(),
+            },
+          ],
+          push_access_levels_attributes: [
+            {
+              id: this.$allowedToPushDropdown.data('accessLevelId'),
+              access_level: $allowedToPushInput.val(),
+            },
+          ],
+        },
+      })
+      .then(() => {
+        this.$allowedToMergeDropdown.enable();
+        this.$allowedToPushDropdown.enable();
+      })
+      .catch(() => {
+        this.$allowedToMergeDropdown.enable();
+        this.$allowedToPushDropdown.enable();
+
+        flash(
+          'Failed to update branch!',
+          'alert',
+          document.querySelector('.js-protected-branches-list'),
+        );
+      });
   }
 }
diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js
index 2f8116df0d2..fddf2674cbb 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_create.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_create.js
@@ -40,7 +40,9 @@ export default class ProtectedTagCreate {
     const $tagInput = this.$form.find('input[name="protected_tag[name]"]');
     const $allowedToCreateInput = this.$form.find('#create_access_levels_attributes');
 
-    this.$form.find('input[type="submit"]').prop('disabled', !($tagInput.val() && $allowedToCreateInput.length));
+    this.$form
+      .find('input[type="submit"]')
+      .prop('disabled', !($tagInput.val() && $allowedToCreateInput.length));
   }
 
   static getProtectedTags(term, callback) {
diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js
index 8687b2a4044..c52497e62f2 100644
--- a/app/assets/javascripts/protected_tags/protected_tag_edit.js
+++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js
@@ -21,26 +21,33 @@ export default class ProtectedTagEdit {
   }
 
   onSelect() {
-    const $allowedToCreateInput = this.$wrap.find(`input[name="${this.$allowedToCreateDropdownButton.data('fieldName')}"]`);
+    const $allowedToCreateInput = this.$wrap.find(
+      `input[name="${this.$allowedToCreateDropdownButton.data('fieldName')}"]`,
+    );
 
     // Do not update if one dropdown has not selected any option
     if (!$allowedToCreateInput.length) return;
 
     this.$allowedToCreateDropdownButton.disable();
 
-    axios.patch(this.$wrap.data('url'), {
-      protected_tag: {
-        create_access_levels_attributes: [{
-          id: this.$allowedToCreateDropdownButton.data('accessLevelId'),
-          access_level: $allowedToCreateInput.val(),
-        }],
-      },
-    }).then(() => {
-      this.$allowedToCreateDropdownButton.enable();
-    }).catch(() => {
-      this.$allowedToCreateDropdownButton.enable();
-
-      flash('Failed to update tag!', 'alert', document.querySelector('.js-protected-tags-list'));
-    });
+    axios
+      .patch(this.$wrap.data('url'), {
+        protected_tag: {
+          create_access_levels_attributes: [
+            {
+              id: this.$allowedToCreateDropdownButton.data('accessLevelId'),
+              access_level: $allowedToCreateInput.val(),
+            },
+          ],
+        },
+      })
+      .then(() => {
+        this.$allowedToCreateDropdownButton.enable();
+      })
+      .catch(() => {
+        this.$allowedToCreateDropdownButton.enable();
+
+        flash('Failed to update tag!', 'alert', document.querySelector('.js-protected-tags-list'));
+      });
   }
 }
-- 
cgit v1.2.3


From 4695b311130d33593ef938fa13e60aecfa27eb52 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 10 Oct 2018 01:49:24 -0500
Subject: Prettify registry and reports modules

---
 app/assets/javascripts/registry/components/app.vue |  65 +++++------
 .../registry/components/collapsible_container.vue  |  99 ++++++++--------
 .../registry/components/table_registry.vue         | 102 ++++++++---------
 app/assets/javascripts/registry/index.js           |  39 ++++---
 .../javascripts/registry/stores/mutations.js       |   1 -
 .../components/grouped_test_reports_app.vue        | 127 ++++++++++-----------
 .../reports/components/issue_status_icon.vue       |   6 +-
 .../javascripts/reports/components/issues_list.vue |   6 +-
 .../javascripts/reports/components/modal.vue       |  40 +++----
 .../reports/components/test_issue_body.vue         |  42 +++----
 app/assets/javascripts/reports/store/actions.js    |   8 +-
 app/assets/javascripts/reports/store/index.js      |  13 ++-
 .../javascripts/reports/store/mutation_types.js    |   1 -
 app/assets/javascripts/reports/store/mutations.js  |   3 +-
 app/assets/javascripts/reports/store/state.js      |   1 -
 15 files changed, 262 insertions(+), 291 deletions(-)

diff --git a/app/assets/javascripts/registry/components/app.vue b/app/assets/javascripts/registry/components/app.vue
index 7e2287ac4db..9dd1c87a87d 100644
--- a/app/assets/javascripts/registry/components/app.vue
+++ b/app/assets/javascripts/registry/components/app.vue
@@ -1,42 +1,35 @@
 <script>
-  import { mapGetters, mapActions } from 'vuex';
-  import Flash from '../../flash';
-  import store from '../stores';
-  import collapsibleContainer from './collapsible_container.vue';
-  import { errorMessages, errorMessagesTypes } from '../constants';
+import { mapGetters, mapActions } from 'vuex';
+import Flash from '../../flash';
+import store from '../stores';
+import collapsibleContainer from './collapsible_container.vue';
+import { errorMessages, errorMessagesTypes } from '../constants';
 
-  export default {
-    name: 'RegistryListApp',
-    components: {
-      collapsibleContainer,
+export default {
+  name: 'RegistryListApp',
+  components: {
+    collapsibleContainer,
+  },
+  props: {
+    endpoint: {
+      type: String,
+      required: true,
     },
-    props: {
-      endpoint: {
-        type: String,
-        required: true,
-      },
-    },
-    store,
-    computed: {
-      ...mapGetters([
-        'isLoading',
-        'repos',
-      ]),
-    },
-    created() {
-      this.setMainEndpoint(this.endpoint);
-    },
-    mounted() {
-      this.fetchRepos()
-        .catch(() => Flash(errorMessages[errorMessagesTypes.FETCH_REPOS]));
-    },
-    methods: {
-      ...mapActions([
-        'setMainEndpoint',
-        'fetchRepos',
-      ]),
-    },
-  };
+  },
+  store,
+  computed: {
+    ...mapGetters(['isLoading', 'repos']),
+  },
+  created() {
+    this.setMainEndpoint(this.endpoint);
+  },
+  mounted() {
+    this.fetchRepos().catch(() => Flash(errorMessages[errorMessagesTypes.FETCH_REPOS]));
+  },
+  methods: {
+    ...mapActions(['setMainEndpoint', 'fetchRepos']),
+  },
+};
 </script>
 <template>
   <div>
diff --git a/app/assets/javascripts/registry/components/collapsible_container.vue b/app/assets/javascripts/registry/components/collapsible_container.vue
index d9bf41924d1..501b2625ae5 100644
--- a/app/assets/javascripts/registry/components/collapsible_container.vue
+++ b/app/assets/javascripts/registry/components/collapsible_container.vue
@@ -1,62 +1,59 @@
 <script>
-  import { mapActions } from 'vuex';
-  import Flash from '../../flash';
-  import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
-  import tableRegistry from './table_registry.vue';
-  import { errorMessages, errorMessagesTypes } from '../constants';
-  import { __ } from '../../locale';
+import { mapActions } from 'vuex';
+import Flash from '../../flash';
+import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
+import tooltip from '../../vue_shared/directives/tooltip';
+import tableRegistry from './table_registry.vue';
+import { errorMessages, errorMessagesTypes } from '../constants';
+import { __ } from '../../locale';
 
-  export default {
-    name: 'CollapsibeContainerRegisty',
-    components: {
-      clipboardButton,
-      tableRegistry,
+export default {
+  name: 'CollapsibeContainerRegisty',
+  components: {
+    clipboardButton,
+    tableRegistry,
+  },
+  directives: {
+    tooltip,
+  },
+  props: {
+    repo: {
+      type: Object,
+      required: true,
     },
-    directives: {
-      tooltip,
-    },
-    props: {
-      repo: {
-        type: Object,
-        required: true,
-      },
-    },
-    data() {
-      return {
-        isOpen: false,
-      };
-    },
-    methods: {
-      ...mapActions([
-        'fetchRepos',
-        'fetchList',
-        'deleteRepo',
-      ]),
+  },
+  data() {
+    return {
+      isOpen: false,
+    };
+  },
+  methods: {
+    ...mapActions(['fetchRepos', 'fetchList', 'deleteRepo']),
 
-      toggleRepo() {
-        this.isOpen = !this.isOpen;
+    toggleRepo() {
+      this.isOpen = !this.isOpen;
 
-        if (this.isOpen) {
-          this.fetchList({ repo: this.repo })
-          .catch(() => this.showError(errorMessagesTypes.FETCH_REGISTRY));
-        }
-      },
+      if (this.isOpen) {
+        this.fetchList({ repo: this.repo }).catch(() =>
+          this.showError(errorMessagesTypes.FETCH_REGISTRY),
+        );
+      }
+    },
 
-      handleDeleteRepository() {
-        this.deleteRepo(this.repo)
-          .then(() => {
-            Flash(__('This container registry has been scheduled for deletion.'), 'notice');
-            this.fetchRepos();
-          })
-          .catch(() => this.showError(errorMessagesTypes.DELETE_REPO));
-      },
+    handleDeleteRepository() {
+      this.deleteRepo(this.repo)
+        .then(() => {
+          Flash(__('This container registry has been scheduled for deletion.'), 'notice');
+          this.fetchRepos();
+        })
+        .catch(() => this.showError(errorMessagesTypes.DELETE_REPO));
+    },
 
-      showError(message) {
-        Flash(errorMessages[message]);
-      },
+    showError(message) {
+      Flash(errorMessages[message]);
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/registry/components/table_registry.vue b/app/assets/javascripts/registry/components/table_registry.vue
index fafb35bd69a..bb6c977fc63 100644
--- a/app/assets/javascripts/registry/components/table_registry.vue
+++ b/app/assets/javascripts/registry/components/table_registry.vue
@@ -1,66 +1,62 @@
 <script>
-  import { mapActions } from 'vuex';
-  import { n__ } from '../../locale';
-  import Flash from '../../flash';
-  import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
-  import tablePagination from '../../vue_shared/components/table_pagination.vue';
-  import tooltip from '../../vue_shared/directives/tooltip';
-  import timeagoMixin from '../../vue_shared/mixins/timeago';
-  import { errorMessages, errorMessagesTypes } from '../constants';
-  import { numberToHumanSize } from '../../lib/utils/number_utils';
+import { mapActions } from 'vuex';
+import { n__ } from '../../locale';
+import Flash from '../../flash';
+import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
+import tablePagination from '../../vue_shared/components/table_pagination.vue';
+import tooltip from '../../vue_shared/directives/tooltip';
+import timeagoMixin from '../../vue_shared/mixins/timeago';
+import { errorMessages, errorMessagesTypes } from '../constants';
+import { numberToHumanSize } from '../../lib/utils/number_utils';
 
-  export default {
-    components: {
-      clipboardButton,
-      tablePagination,
+export default {
+  components: {
+    clipboardButton,
+    tablePagination,
+  },
+  directives: {
+    tooltip,
+  },
+  mixins: [timeagoMixin],
+  props: {
+    repo: {
+      type: Object,
+      required: true,
     },
-    directives: {
-      tooltip,
+  },
+  computed: {
+    shouldRenderPagination() {
+      return this.repo.pagination.total > this.repo.pagination.perPage;
     },
-    mixins: [
-      timeagoMixin,
-    ],
-    props: {
-      repo: {
-        type: Object,
-        required: true,
-      },
-    },
-    computed: {
-      shouldRenderPagination() {
-        return this.repo.pagination.total > this.repo.pagination.perPage;
-      },
-    },
-    methods: {
-      ...mapActions([
-        'fetchList',
-        'deleteRegistry',
-      ]),
+  },
+  methods: {
+    ...mapActions(['fetchList', 'deleteRegistry']),
 
-      layers(item) {
-        return item.layers ? n__('%d layer', '%d layers', item.layers) : '';
-      },
+    layers(item) {
+      return item.layers ? n__('%d layer', '%d layers', item.layers) : '';
+    },
 
-      formatSize(size) {
-        return numberToHumanSize(size);
-      },
+    formatSize(size) {
+      return numberToHumanSize(size);
+    },
 
-      handleDeleteRegistry(registry) {
-        this.deleteRegistry(registry)
-          .then(() => this.fetchList({ repo: this.repo }))
-          .catch(() => this.showError(errorMessagesTypes.DELETE_REGISTRY));
-      },
+    handleDeleteRegistry(registry) {
+      this.deleteRegistry(registry)
+        .then(() => this.fetchList({ repo: this.repo }))
+        .catch(() => this.showError(errorMessagesTypes.DELETE_REGISTRY));
+    },
 
-      onPageChange(pageNumber) {
-        this.fetchList({ repo: this.repo, page: pageNumber })
-          .catch(() => this.showError(errorMessagesTypes.FETCH_REGISTRY));
-      },
+    onPageChange(pageNumber) {
+      this.fetchList({ repo: this.repo, page: pageNumber }).catch(() =>
+        this.showError(errorMessagesTypes.FETCH_REGISTRY),
+      );
+    },
 
-      showError(message) {
-        Flash(errorMessages[message]);
-      },
+    showError(message) {
+      Flash(errorMessages[message]);
     },
-  };
+  },
+};
 </script>
 <template>
   <div>
diff --git a/app/assets/javascripts/registry/index.js b/app/assets/javascripts/registry/index.js
index e15cd94a915..025afefe7f0 100644
--- a/app/assets/javascripts/registry/index.js
+++ b/app/assets/javascripts/registry/index.js
@@ -4,22 +4,23 @@ import Translate from '../vue_shared/translate';
 
 Vue.use(Translate);
 
-export default () => new Vue({
-  el: '#js-vue-registry-images',
-  components: {
-    registryApp,
-  },
-  data() {
-    const { dataset } = document.querySelector(this.$options.el);
-    return {
-      endpoint: dataset.endpoint,
-    };
-  },
-  render(createElement) {
-    return createElement('registry-app', {
-      props: {
-        endpoint: this.endpoint,
-      },
-    });
-  },
-});
+export default () =>
+  new Vue({
+    el: '#js-vue-registry-images',
+    components: {
+      registryApp,
+    },
+    data() {
+      const { dataset } = document.querySelector(this.$options.el);
+      return {
+        endpoint: dataset.endpoint,
+      };
+    },
+    render(createElement) {
+      return createElement('registry-app', {
+        props: {
+          endpoint: this.endpoint,
+        },
+      });
+    },
+  });
diff --git a/app/assets/javascripts/registry/stores/mutations.js b/app/assets/javascripts/registry/stores/mutations.js
index 208c3c39866..69c051cd2d6 100644
--- a/app/assets/javascripts/registry/stores/mutations.js
+++ b/app/assets/javascripts/registry/stores/mutations.js
@@ -2,7 +2,6 @@ import * as types from './mutation_types';
 import { parseIntPagination, normalizeHeaders } from '../../lib/utils/common_utils';
 
 export default {
-
   [types.SET_MAIN_ENDPOINT](state, endpoint) {
     Object.assign(state, { endpoint });
   },
diff --git a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
index fb8c6402d02..9f3a41180cc 100644
--- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
+++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
@@ -1,79 +1,72 @@
 <script>
-  import { mapActions, mapGetters, mapState } from 'vuex';
-  import { s__ } from '~/locale';
-  import { componentNames } from './issue_body';
-  import ReportSection from './report_section.vue';
-  import SummaryRow from './summary_row.vue';
-  import IssuesList from './issues_list.vue';
-  import Modal from './modal.vue';
-  import createStore from '../store';
-  import { summaryTextBuilder, reportTextBuilder, statusIcon } from '../store/utils';
+import { mapActions, mapGetters, mapState } from 'vuex';
+import { s__ } from '~/locale';
+import { componentNames } from './issue_body';
+import ReportSection from './report_section.vue';
+import SummaryRow from './summary_row.vue';
+import IssuesList from './issues_list.vue';
+import Modal from './modal.vue';
+import createStore from '../store';
+import { summaryTextBuilder, reportTextBuilder, statusIcon } from '../store/utils';
 
-  export default {
-    name: 'GroupedTestReportsApp',
-    store: createStore(),
-    components: {
-      ReportSection,
-      SummaryRow,
-      IssuesList,
-      Modal,
+export default {
+  name: 'GroupedTestReportsApp',
+  store: createStore(),
+  components: {
+    ReportSection,
+    SummaryRow,
+    IssuesList,
+    Modal,
+  },
+  props: {
+    endpoint: {
+      type: String,
+      required: true,
     },
-    props: {
-      endpoint: {
-        type: String,
-        required: true,
-      },
-    },
-    componentNames,
-    computed: {
-      ...mapState([
-        'reports',
-        'isLoading',
-        'hasError',
-        'summary',
-      ]),
-      ...mapState({
-        modalTitle: state => state.modal.title || '',
-        modalData: state => state.modal.data || {},
-      }),
-      ...mapGetters([
-        'summaryStatus',
-      ]),
-      groupedSummaryText() {
-        if (this.isLoading) {
-          return s__('Reports|Test summary results are being parsed');
-        }
+  },
+  componentNames,
+  computed: {
+    ...mapState(['reports', 'isLoading', 'hasError', 'summary']),
+    ...mapState({
+      modalTitle: state => state.modal.title || '',
+      modalData: state => state.modal.data || {},
+    }),
+    ...mapGetters(['summaryStatus']),
+    groupedSummaryText() {
+      if (this.isLoading) {
+        return s__('Reports|Test summary results are being parsed');
+      }
 
-        if (this.hasError) {
-          return s__('Reports|Test summary failed loading results');
-        }
+      if (this.hasError) {
+        return s__('Reports|Test summary failed loading results');
+      }
 
-        return summaryTextBuilder(s__('Reports|Test summary'), this.summary);
-      },
+      return summaryTextBuilder(s__('Reports|Test summary'), this.summary);
     },
-    created() {
-      this.setEndpoint(this.endpoint);
+  },
+  created() {
+    this.setEndpoint(this.endpoint);
 
-      this.fetchReports();
+    this.fetchReports();
+  },
+  methods: {
+    ...mapActions(['setEndpoint', 'fetchReports']),
+    reportText(report) {
+      const summary = report.summary || {};
+      return reportTextBuilder(report.name, summary);
+    },
+    getReportIcon(report) {
+      return statusIcon(report.status);
     },
-    methods: {
-      ...mapActions(['setEndpoint', 'fetchReports']),
-      reportText(report) {
-        const summary = report.summary || {};
-        return reportTextBuilder(report.name, summary);
-      },
-      getReportIcon(report) {
-        return statusIcon(report.status);
-      },
-      shouldRenderIssuesList(report) {
-        return (
-          report.existing_failures.length > 0 ||
-          report.new_failures.length > 0 ||
-          report.resolved_failures.length > 0
-        );
-      },
+    shouldRenderIssuesList(report) {
+      return (
+        report.existing_failures.length > 0 ||
+        report.new_failures.length > 0 ||
+        report.resolved_failures.length > 0
+      );
     },
-  };
+  },
+};
 </script>
 <template>
   <report-section
diff --git a/app/assets/javascripts/reports/components/issue_status_icon.vue b/app/assets/javascripts/reports/components/issue_status_icon.vue
index 85811698a37..6e143c4f98c 100644
--- a/app/assets/javascripts/reports/components/issue_status_icon.vue
+++ b/app/assets/javascripts/reports/components/issue_status_icon.vue
@@ -1,10 +1,6 @@
 <script>
 import Icon from '~/vue_shared/components/icon.vue';
-import {
-  STATUS_FAILED,
-  STATUS_NEUTRAL,
-  STATUS_SUCCESS,
-} from '../constants';
+import { STATUS_FAILED, STATUS_NEUTRAL, STATUS_SUCCESS } from '../constants';
 
 export default {
   name: 'IssueStatusIcon',
diff --git a/app/assets/javascripts/reports/components/issues_list.vue b/app/assets/javascripts/reports/components/issues_list.vue
index df42201b5de..3b425ee2fed 100644
--- a/app/assets/javascripts/reports/components/issues_list.vue
+++ b/app/assets/javascripts/reports/components/issues_list.vue
@@ -1,10 +1,6 @@
 <script>
 import IssuesBlock from '~/reports/components/report_issues.vue';
-import {
-  STATUS_SUCCESS,
-  STATUS_FAILED,
-  STATUS_NEUTRAL,
-} from '~/reports/constants';
+import { STATUS_SUCCESS, STATUS_FAILED, STATUS_NEUTRAL } from '~/reports/constants';
 
 /**
  * Renders block of issues
diff --git a/app/assets/javascripts/reports/components/modal.vue b/app/assets/javascripts/reports/components/modal.vue
index acc5c6d85e2..5f9e4072b2d 100644
--- a/app/assets/javascripts/reports/components/modal.vue
+++ b/app/assets/javascripts/reports/components/modal.vue
@@ -1,27 +1,27 @@
 <script>
-  import Modal from '~/vue_shared/components/gl_modal.vue';
-  import LoadingButton from '~/vue_shared/components/loading_button.vue';
-  import CodeBlock from '~/vue_shared/components/code_block.vue';
-  import { fieldTypes } from '../constants';
+import Modal from '~/vue_shared/components/gl_modal.vue';
+import LoadingButton from '~/vue_shared/components/loading_button.vue';
+import CodeBlock from '~/vue_shared/components/code_block.vue';
+import { fieldTypes } from '../constants';
 
-  export default {
-    components: {
-      Modal,
-      LoadingButton,
-      CodeBlock,
+export default {
+  components: {
+    Modal,
+    LoadingButton,
+    CodeBlock,
+  },
+  props: {
+    title: {
+      type: String,
+      required: true,
     },
-    props: {
-      title: {
-        type: String,
-        required: true,
-      },
-      modalData: {
-        type: Object,
-        required: true,
-      },
+    modalData: {
+      type: Object,
+      required: true,
     },
-    fieldTypes,
-  };
+  },
+  fieldTypes,
+};
 </script>
 <template>
   <modal
diff --git a/app/assets/javascripts/reports/components/test_issue_body.vue b/app/assets/javascripts/reports/components/test_issue_body.vue
index cd443a49b52..1a87822fcc3 100644
--- a/app/assets/javascripts/reports/components/test_issue_body.vue
+++ b/app/assets/javascripts/reports/components/test_issue_body.vue
@@ -1,28 +1,28 @@
 <script>
-  import { mapActions } from 'vuex';
+import { mapActions } from 'vuex';
 
-  export default {
-    name: 'TestIssueBody',
-    props: {
-      issue: {
-        type: Object,
-        required: true,
-      },
-      // failed || success
-      status: {
-        type: String,
-        required: true,
-      },
-      isNew: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
+export default {
+  name: 'TestIssueBody',
+  props: {
+    issue: {
+      type: Object,
+      required: true,
     },
-    methods: {
-      ...mapActions(['openModal']),
+    // failed || success
+    status: {
+      type: String,
+      required: true,
     },
-  };
+    isNew: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  methods: {
+    ...mapActions(['openModal']),
+  },
+};
 </script>
 <template>
   <div class="report-block-list-issue-description prepend-top-5 append-bottom-5">
diff --git a/app/assets/javascripts/reports/store/actions.js b/app/assets/javascripts/reports/store/actions.js
index acabcc1d193..db8ab5ccb80 100644
--- a/app/assets/javascripts/reports/store/actions.js
+++ b/app/assets/javascripts/reports/store/actions.js
@@ -43,9 +43,11 @@ export const fetchReports = ({ state, dispatch }) => {
     },
     data: state.endpoint,
     method: 'getReports',
-    successCallback: ({ data, status }) => dispatch('receiveReportsSuccess', {
-      data, status,
-    }),
+    successCallback: ({ data, status }) =>
+      dispatch('receiveReportsSuccess', {
+        data,
+        status,
+      }),
     errorCallback: () => dispatch('receiveReportsError'),
   });
 
diff --git a/app/assets/javascripts/reports/store/index.js b/app/assets/javascripts/reports/store/index.js
index 9d8f7dc3b74..467c692b438 100644
--- a/app/assets/javascripts/reports/store/index.js
+++ b/app/assets/javascripts/reports/store/index.js
@@ -7,9 +7,10 @@ import state from './state';
 
 Vue.use(Vuex);
 
-export default () => new Vuex.Store({
-  actions,
-  mutations,
-  getters,
-  state: state(),
-});
+export default () =>
+  new Vuex.Store({
+    actions,
+    mutations,
+    getters,
+    state: state(),
+  });
diff --git a/app/assets/javascripts/reports/store/mutation_types.js b/app/assets/javascripts/reports/store/mutation_types.js
index 82bda31df5d..599d4862dfe 100644
--- a/app/assets/javascripts/reports/store/mutation_types.js
+++ b/app/assets/javascripts/reports/store/mutation_types.js
@@ -4,4 +4,3 @@ export const REQUEST_REPORTS = 'REQUEST_REPORTS';
 export const RECEIVE_REPORTS_SUCCESS = 'RECEIVE_REPORTS_SUCCESS';
 export const RECEIVE_REPORTS_ERROR = 'RECEIVE_REPORTS_ERROR';
 export const SET_ISSUE_MODAL_DATA = 'SET_ISSUE_MODAL_DATA';
-
diff --git a/app/assets/javascripts/reports/store/mutations.js b/app/assets/javascripts/reports/store/mutations.js
index b88bff97075..2a37f5b74fa 100644
--- a/app/assets/javascripts/reports/store/mutations.js
+++ b/app/assets/javascripts/reports/store/mutations.js
@@ -19,7 +19,6 @@ export default {
 
     state.status = response.status;
     state.reports = response.suites;
-
   },
   [types.RECEIVE_REPORTS_ERROR](state) {
     state.isLoading = false;
@@ -36,7 +35,7 @@ export default {
   [types.SET_ISSUE_MODAL_DATA](state, payload) {
     state.modal.title = payload.issue.name;
 
-    Object.keys(payload.issue).forEach((key) => {
+    Object.keys(payload.issue).forEach(key => {
       if (Object.prototype.hasOwnProperty.call(state.modal.data, key)) {
         state.modal.data[key] = {
           ...state.modal.data[key],
diff --git a/app/assets/javascripts/reports/store/state.js b/app/assets/javascripts/reports/store/state.js
index 4cab2e27a16..5484900276c 100644
--- a/app/assets/javascripts/reports/store/state.js
+++ b/app/assets/javascripts/reports/store/state.js
@@ -57,5 +57,4 @@ export default () => ({
       },
     },
   },
-
 });
-- 
cgit v1.2.3


From 46e3ad4b948dedf67245708493ee17c4429f8bf3 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 10 Oct 2018 01:53:35 -0500
Subject: Prettify sidebar modules

---
 .../components/assignees/sidebar_assignees.vue     |   3 +-
 .../confidential/confidential_issue_sidebar.vue    |   6 +-
 .../sidebar/components/lock/lock_issue_sidebar.vue |  20 +--
 .../components/participants/participants.vue       | 132 +++++++-------
 .../participants/sidebar_participants.vue          |  34 ++--
 .../subscriptions/sidebar_subscriptions.vue        |   7 +-
 .../components/time_tracking/collapsed_state.vue   | 192 ++++++++++-----------
 .../components/time_tracking/help_state.vue        |  14 +-
 .../time_tracking/sidebar_time_tracking.vue        |   6 +-
 .../sidebar/components/todo_toggle/todo.vue        |   6 +-
 .../javascripts/sidebar/lib/sidebar_move_issue.js  |  20 +--
 .../javascripts/sidebar/mount_milestone_sidebar.js |  19 +-
 app/assets/javascripts/sidebar/mount_sidebar.js    |  39 +++--
 .../sidebar/services/sidebar_service.js            |  14 +-
 14 files changed, 258 insertions(+), 254 deletions(-)

diff --git a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue
index 123c92aff64..cfa7029b388 100644
--- a/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue
@@ -69,7 +69,8 @@ export default {
         this.loading = false;
       }
 
-      this.mediator.saveAssignees(this.field)
+      this.mediator
+        .saveAssignees(this.field)
         .then(setLoadingFalse.bind(this))
         .catch(() => {
           setLoadingFalse();
diff --git a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
index 2b8d6207dea..439e8a69df0 100644
--- a/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
+++ b/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue
@@ -56,11 +56,7 @@ export default {
         .update('issue', { confidential })
         .then(() => window.location.reload())
         .catch(() => {
-          Flash(
-            __(
-              'Something went wrong trying to change the confidentiality of this issue',
-            ),
-          );
+          Flash(__('Something went wrong trying to change the confidentiality of this issue'));
         });
     },
   },
diff --git a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
index cdff4105335..48a2b9194aa 100644
--- a/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
+++ b/app/assets/javascripts/sidebar/components/lock/lock_issue_sidebar.vue
@@ -34,11 +34,7 @@ export default {
       required: true,
       type: Object,
       validator(mediatorObject) {
-        return (
-          mediatorObject.service &&
-          mediatorObject.service.update &&
-          mediatorObject.store
-        );
+        return mediatorObject.service && mediatorObject.service.update && mediatorObject.store;
       },
     },
   },
@@ -67,8 +63,7 @@ export default {
 
   methods: {
     toggleForm() {
-      this.mediator.store.isLockDialogOpen = !this.mediator.store
-        .isLockDialogOpen;
+      this.mediator.store.isLockDialogOpen = !this.mediator.store.isLockDialogOpen;
     },
 
     updateLockedAttribute(locked) {
@@ -79,9 +74,14 @@ export default {
         .then(() => window.location.reload())
         .catch(() =>
           Flash(
-            sprintf(__('Something went wrong trying to change the locked state of this %{issuableDisplayName}'), {
-              issuableDisplayName: this.issuableDisplayName,
-            }),
+            sprintf(
+              __(
+                'Something went wrong trying to change the locked state of this %{issuableDisplayName}',
+              ),
+              {
+                issuableDisplayName: this.issuableDisplayName,
+              },
+            ),
           ),
         );
     },
diff --git a/app/assets/javascripts/sidebar/components/participants/participants.vue b/app/assets/javascripts/sidebar/components/participants/participants.vue
index 286a16f7bbf..11b5dbe5f8e 100644
--- a/app/assets/javascripts/sidebar/components/participants/participants.vue
+++ b/app/assets/javascripts/sidebar/components/participants/participants.vue
@@ -1,78 +1,78 @@
 <script>
-  import { __, n__, sprintf } from '~/locale';
-  import tooltip from '~/vue_shared/directives/tooltip';
-  import userAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
+import { __, n__, sprintf } from '~/locale';
+import tooltip from '~/vue_shared/directives/tooltip';
+import userAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
 
-  export default {
-    directives: {
-      tooltip,
+export default {
+  directives: {
+    tooltip,
+  },
+  components: {
+    userAvatarImage,
+  },
+  props: {
+    loading: {
+      type: Boolean,
+      required: false,
+      default: false,
     },
-    components: {
-      userAvatarImage,
+    participants: {
+      type: Array,
+      required: false,
+      default: () => [],
     },
-    props: {
-      loading: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
-      participants: {
-        type: Array,
-        required: false,
-        default: () => [],
-      },
-      numberOfLessParticipants: {
-        type: Number,
-        required: false,
-        default: 7,
-      },
+    numberOfLessParticipants: {
+      type: Number,
+      required: false,
+      default: 7,
     },
-    data() {
-      return {
-        isShowingMoreParticipants: false,
-      };
+  },
+  data() {
+    return {
+      isShowingMoreParticipants: false,
+    };
+  },
+  computed: {
+    lessParticipants() {
+      return this.participants.slice(0, this.numberOfLessParticipants);
     },
-    computed: {
-      lessParticipants() {
-        return this.participants.slice(0, this.numberOfLessParticipants);
-      },
-      visibleParticipants() {
-        return this.isShowingMoreParticipants ? this.participants : this.lessParticipants;
-      },
-      hasMoreParticipants() {
-        return this.participants.length > this.numberOfLessParticipants;
-      },
-      toggleLabel() {
-        let label = '';
-        if (this.isShowingMoreParticipants) {
-          label = __('- show less');
-        } else {
-          label = sprintf(__('+ %{moreCount} more'), {
-            moreCount: this.participants.length - this.numberOfLessParticipants,
-          });
-        }
+    visibleParticipants() {
+      return this.isShowingMoreParticipants ? this.participants : this.lessParticipants;
+    },
+    hasMoreParticipants() {
+      return this.participants.length > this.numberOfLessParticipants;
+    },
+    toggleLabel() {
+      let label = '';
+      if (this.isShowingMoreParticipants) {
+        label = __('- show less');
+      } else {
+        label = sprintf(__('+ %{moreCount} more'), {
+          moreCount: this.participants.length - this.numberOfLessParticipants,
+        });
+      }
 
-        return label;
-      },
-      participantLabel() {
-        return sprintf(
-          n__('%{count} participant', '%{count} participants', this.participants.length),
-          { count: this.loading ? '' : this.participantCount },
-        );
-      },
-      participantCount() {
-        return this.participants.length;
-      },
+      return label;
+    },
+    participantLabel() {
+      return sprintf(
+        n__('%{count} participant', '%{count} participants', this.participants.length),
+        { count: this.loading ? '' : this.participantCount },
+      );
+    },
+    participantCount() {
+      return this.participants.length;
+    },
+  },
+  methods: {
+    toggleMoreParticipants() {
+      this.isShowingMoreParticipants = !this.isShowingMoreParticipants;
     },
-    methods: {
-      toggleMoreParticipants() {
-        this.isShowingMoreParticipants = !this.isShowingMoreParticipants;
-      },
-      onClickCollapsedIcon() {
-        this.$emit('toggleSidebar');
-      },
+    onClickCollapsedIcon() {
+      this.$emit('toggleSidebar');
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/sidebar/components/participants/sidebar_participants.vue b/app/assets/javascripts/sidebar/components/participants/sidebar_participants.vue
index 5c1ead1a8ac..4ac515e552a 100644
--- a/app/assets/javascripts/sidebar/components/participants/sidebar_participants.vue
+++ b/app/assets/javascripts/sidebar/components/participants/sidebar_participants.vue
@@ -1,23 +1,23 @@
 <script>
-  import Store from '../../stores/sidebar_store';
-  import participants from './participants.vue';
+import Store from '../../stores/sidebar_store';
+import participants from './participants.vue';
 
-  export default {
-    components: {
-      participants,
+export default {
+  components: {
+    participants,
+  },
+  props: {
+    mediator: {
+      type: Object,
+      required: true,
     },
-    props: {
-      mediator: {
-        type: Object,
-        required: true,
-      },
-    },
-    data() {
-      return {
-        store: new Store(),
-      };
-    },
-  };
+  },
+  data() {
+    return {
+      store: new Store(),
+    };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
index 385717e7c1e..95a2c8cce6e 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
@@ -21,10 +21,9 @@ export default {
   },
   methods: {
     onToggleSubscription() {
-      this.mediator.toggleSubscription()
-        .catch(() => {
-          Flash(__('Error occurred when toggling the notification subscription'));
-        });
+      this.mediator.toggleSubscription().catch(() => {
+        Flash(__('Error occurred when toggling the notification subscription'));
+      });
     },
   },
 };
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
index 1d030c4f67f..a7bffa81045 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
@@ -1,111 +1,111 @@
 <script>
-  import { __, sprintf } from '~/locale';
-  import { abbreviateTime } from '~/lib/utils/pretty_time';
-  import icon from '~/vue_shared/components/icon.vue';
-  import tooltip from '~/vue_shared/directives/tooltip';
+import { __, sprintf } from '~/locale';
+import { abbreviateTime } from '~/lib/utils/pretty_time';
+import icon from '~/vue_shared/components/icon.vue';
+import tooltip from '~/vue_shared/directives/tooltip';
 
-  export default {
-    name: 'TimeTrackingCollapsedState',
-    components: {
-      icon,
+export default {
+  name: 'TimeTrackingCollapsedState',
+  components: {
+    icon,
+  },
+  directives: {
+    tooltip,
+  },
+  props: {
+    showComparisonState: {
+      type: Boolean,
+      required: true,
     },
-    directives: {
-      tooltip,
+    showSpentOnlyState: {
+      type: Boolean,
+      required: true,
     },
-    props: {
-      showComparisonState: {
-        type: Boolean,
-        required: true,
-      },
-      showSpentOnlyState: {
-        type: Boolean,
-        required: true,
-      },
-      showEstimateOnlyState: {
-        type: Boolean,
-        required: true,
-      },
-      showNoTimeTrackingState: {
-        type: Boolean,
-        required: true,
-      },
-      timeSpentHumanReadable: {
-        type: String,
-        required: false,
-        default: '',
-      },
-      timeEstimateHumanReadable: {
-        type: String,
-        required: false,
-        default: '',
-      },
+    showEstimateOnlyState: {
+      type: Boolean,
+      required: true,
     },
-    computed: {
-      timeSpent() {
-        return this.abbreviateTime(this.timeSpentHumanReadable);
-      },
-      timeEstimate() {
-        return this.abbreviateTime(this.timeEstimateHumanReadable);
-      },
-      divClass() {
-        if (this.showComparisonState) {
-          return 'compare';
-        } else if (this.showEstimateOnlyState) {
-          return 'estimate-only';
-        } else if (this.showSpentOnlyState) {
-          return 'spend-only';
-        } else if (this.showNoTimeTrackingState) {
-          return 'no-tracking';
-        }
+    showNoTimeTrackingState: {
+      type: Boolean,
+      required: true,
+    },
+    timeSpentHumanReadable: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    timeEstimateHumanReadable: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  computed: {
+    timeSpent() {
+      return this.abbreviateTime(this.timeSpentHumanReadable);
+    },
+    timeEstimate() {
+      return this.abbreviateTime(this.timeEstimateHumanReadable);
+    },
+    divClass() {
+      if (this.showComparisonState) {
+        return 'compare';
+      } else if (this.showEstimateOnlyState) {
+        return 'estimate-only';
+      } else if (this.showSpentOnlyState) {
+        return 'spend-only';
+      } else if (this.showNoTimeTrackingState) {
+        return 'no-tracking';
+      }
 
+      return '';
+    },
+    spanClass() {
+      if (this.showComparisonState) {
         return '';
-      },
-      spanClass() {
-        if (this.showComparisonState) {
-          return '';
-        } else if (this.showEstimateOnlyState || this.showSpentOnlyState) {
-          return 'bold';
-        } else if (this.showNoTimeTrackingState) {
-          return 'no-value';
-        }
+      } else if (this.showEstimateOnlyState || this.showSpentOnlyState) {
+        return 'bold';
+      } else if (this.showNoTimeTrackingState) {
+        return 'no-value';
+      }
 
-        return '';
-      },
-      text() {
-        if (this.showComparisonState) {
-          return `${this.timeSpent} / ${this.timeEstimate}`;
-        } else if (this.showEstimateOnlyState) {
-          return `-- / ${this.timeEstimate}`;
-        } else if (this.showSpentOnlyState) {
-          return `${this.timeSpent} / --`;
-        } else if (this.showNoTimeTrackingState) {
-          return 'None';
-        }
+      return '';
+    },
+    text() {
+      if (this.showComparisonState) {
+        return `${this.timeSpent} / ${this.timeEstimate}`;
+      } else if (this.showEstimateOnlyState) {
+        return `-- / ${this.timeEstimate}`;
+      } else if (this.showSpentOnlyState) {
+        return `${this.timeSpent} / --`;
+      } else if (this.showNoTimeTrackingState) {
+        return 'None';
+      }
 
-        return '';
-      },
-      timeTrackedTooltipText() {
-        let title;
-        if (this.showComparisonState) {
-          title = __('Time remaining');
-        } else if (this.showEstimateOnlyState) {
-          title = __('Estimated');
-        } else if (this.showSpentOnlyState) {
-          title = __('Time spent');
-        }
+      return '';
+    },
+    timeTrackedTooltipText() {
+      let title;
+      if (this.showComparisonState) {
+        title = __('Time remaining');
+      } else if (this.showEstimateOnlyState) {
+        title = __('Estimated');
+      } else if (this.showSpentOnlyState) {
+        title = __('Time spent');
+      }
 
-        return sprintf('%{title}: %{text}', ({ title, text: this.text }));
-      },
-      tooltipText() {
-        return this.showNoTimeTrackingState ? __('Time tracking') : this.timeTrackedTooltipText;
-      },
+      return sprintf('%{title}: %{text}', { title, text: this.text });
+    },
+    tooltipText() {
+      return this.showNoTimeTrackingState ? __('Time tracking') : this.timeTrackedTooltipText;
     },
-    methods: {
-      abbreviateTime(timeStr) {
-        return abbreviateTime(timeStr);
-      },
+  },
+  methods: {
+    abbreviateTime(timeStr) {
+      return abbreviateTime(timeStr);
     },
-  };
+  },
+};
 </script>
 
 <template>
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
index 19ec0f05a26..91909cd49b8 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/help_state.vue
@@ -15,16 +15,22 @@ export default {
     },
     estimateText() {
       return sprintf(
-        s__('estimateCommand|%{slash_command} will update the estimated time with the latest command.'), {
+        s__(
+          'estimateCommand|%{slash_command} will update the estimated time with the latest command.',
+        ),
+        {
           slash_command: '<code>/estimate</code>',
-        }, false,
+        },
+        false,
       );
     },
     spendText() {
       return sprintf(
-        s__('spendCommand|%{slash_command} will update the sum of the time spent.'), {
+        s__('spendCommand|%{slash_command} will update the sum of the time spent.'),
+        {
           slash_command: '<code>/spend</code>',
-        }, false,
+        },
+        false,
       );
     },
   },
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
index 8660b0546cf..8e8b9f19b6e 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
@@ -26,7 +26,7 @@ export default {
   methods: {
     listenForQuickActions() {
       $(document).on('ajax:success', '.gfm-form', this.quickActionListened);
-      eventHub.$on('timeTrackingUpdated', (data) => {
+      eventHub.$on('timeTrackingUpdated', data => {
         this.quickActionListened(null, data);
       });
     },
@@ -34,9 +34,7 @@ export default {
       const subscribedCommands = ['spend_time', 'time_estimate'];
       let changedCommands;
       if (data !== undefined) {
-        changedCommands = data.commands_changes
-          ? Object.keys(data.commands_changes)
-          : [];
+        changedCommands = data.commands_changes ? Object.keys(data.commands_changes) : [];
       } else {
         changedCommands = [];
       }
diff --git a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
index a6b3a674952..bc59774f0a8 100644
--- a/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
+++ b/app/assets/javascripts/sidebar/components/todo_toggle/todo.vue
@@ -41,9 +41,9 @@ export default {
   },
   computed: {
     buttonClasses() {
-      return this.collapsed ?
-        'btn-blank btn-todo sidebar-collapsed-icon dont-change-state' :
-        'btn btn-default btn-todo issuable-header-btn float-right';
+      return this.collapsed
+        ? 'btn-blank btn-todo sidebar-collapsed-icon dont-change-state'
+        : 'btn btn-default btn-todo issuable-header-btn float-right';
     },
     buttonLabel() {
       return this.isTodo ? MARK_TEXT : TODO_TEXT;
diff --git a/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js b/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
index b267422cd97..225ebb61195 100644
--- a/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
+++ b/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js
@@ -37,7 +37,8 @@ class SidebarMoveIssue {
       // Keep the dropdown open after selecting an option
       shouldPropagate: false,
       data: (searchTerm, callback) => {
-        this.mediator.fetchAutocompleteProjects(searchTerm)
+        this.mediator
+          .fetchAutocompleteProjects(searchTerm)
           .then(callback)
           .catch(() => new window.Flash('An error occurred while fetching projects autocomplete.'));
       },
@@ -48,7 +49,7 @@ class SidebarMoveIssue {
           </a>
         </li>
       `,
-      clicked: (options) => {
+      clicked: options => {
         const project = options.selectedObj;
         const selectedProjectId = options.isMarking ? project.id : 0;
         this.mediator.setMoveToProjectId(selectedProjectId);
@@ -68,17 +69,12 @@ class SidebarMoveIssue {
 
   onConfirmClicked() {
     if (isValidProjectId(this.mediator.store.moveToProjectId)) {
-      this.$confirmButton
-        .disable()
-        .addClass('is-loading');
+      this.$confirmButton.disable().addClass('is-loading');
 
-      this.mediator.moveIssue()
-        .catch(() => {
-          window.Flash('An error occurred while moving the issue.');
-          this.$confirmButton
-            .enable()
-            .removeClass('is-loading');
-        });
+      this.mediator.moveIssue().catch(() => {
+        window.Flash('An error occurred while moving the issue.');
+        this.$confirmButton.enable().removeClass('is-loading');
+      });
     }
   }
 }
diff --git a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js
index 87da65a1b1f..1ebdbec7bc9 100644
--- a/app/assets/javascripts/sidebar/mount_milestone_sidebar.js
+++ b/app/assets/javascripts/sidebar/mount_milestone_sidebar.js
@@ -15,15 +15,16 @@ export default class SidebarMilestone {
       components: {
         timeTracker,
       },
-      render: createElement => createElement('timeTracker', {
-        props: {
-          timeEstimate: parseInt(timeEstimate, 10),
-          timeSpent: parseInt(timeSpent, 10),
-          humanTimeEstimate,
-          humanTimeSpent,
-          rootPath: '/',
-        },
-      }),
+      render: createElement =>
+        createElement('timeTracker', {
+          props: {
+            timeEstimate: parseInt(timeEstimate, 10),
+            timeSpent: parseInt(timeSpent, 10),
+            humanTimeEstimate,
+            humanTimeSpent,
+            rootPath: '/',
+          },
+        }),
     });
   }
 }
diff --git a/app/assets/javascripts/sidebar/mount_sidebar.js b/app/assets/javascripts/sidebar/mount_sidebar.js
index 655bf9198b7..6f8214b18ee 100644
--- a/app/assets/javascripts/sidebar/mount_sidebar.js
+++ b/app/assets/javascripts/sidebar/mount_sidebar.js
@@ -22,14 +22,15 @@ function mountAssigneesComponent(mediator) {
     components: {
       SidebarAssignees,
     },
-    render: createElement => createElement('sidebar-assignees', {
-      props: {
-        mediator,
-        field: el.dataset.field,
-        signedIn: el.hasAttribute('data-signed-in'),
-        issuableType: gl.utils.isInIssuePage() ? 'issue' : 'merge_request',
-      },
-    }),
+    render: createElement =>
+      createElement('sidebar-assignees', {
+        props: {
+          mediator,
+          field: el.dataset.field,
+          signedIn: el.hasAttribute('data-signed-in'),
+          issuableType: gl.utils.isInIssuePage() ? 'issue' : 'merge_request',
+        },
+      }),
   });
 }
 
@@ -83,11 +84,12 @@ function mountParticipantsComponent(mediator) {
     components: {
       sidebarParticipants,
     },
-    render: createElement => createElement('sidebar-participants', {
-      props: {
-        mediator,
-      },
-    }),
+    render: createElement =>
+      createElement('sidebar-participants', {
+        props: {
+          mediator,
+        },
+      }),
   });
 }
 
@@ -102,11 +104,12 @@ function mountSubscriptionsComponent(mediator) {
     components: {
       sidebarSubscriptions,
     },
-    render: createElement => createElement('sidebar-subscriptions', {
-      props: {
-        mediator,
-      },
-    }),
+    render: createElement =>
+      createElement('sidebar-subscriptions', {
+        props: {
+          mediator,
+        },
+      }),
   });
 }
 
diff --git a/app/assets/javascripts/sidebar/services/sidebar_service.js b/app/assets/javascripts/sidebar/services/sidebar_service.js
index 37c97225bfd..cbe20f761ff 100644
--- a/app/assets/javascripts/sidebar/services/sidebar_service.js
+++ b/app/assets/javascripts/sidebar/services/sidebar_service.js
@@ -22,11 +22,15 @@ export default class SidebarService {
   }
 
   update(key, data) {
-    return Vue.http.put(this.endpoint, {
-      [key]: data,
-    }, {
-      emulateJSON: true,
-    });
+    return Vue.http.put(
+      this.endpoint,
+      {
+        [key]: data,
+      },
+      {
+        emulateJSON: true,
+      },
+    );
   }
 
   getProjectsAutocomplete(searchTerm) {
-- 
cgit v1.2.3


From d96585f5739f4cb83fd00fa402192a15d6958881 Mon Sep 17 00:00:00 2001
From: Eagllus <rvanzon@gitlab.com>
Date: Tue, 16 Oct 2018 15:18:25 +0200
Subject: Moving state_count to Milestone model and related tests

By moving and improving state_count the functions in GlobalMilestone
are no longer used.
---
 app/models/global_milestone.rb       | 60 ------------------------------------
 app/models/milestone.rb              | 16 ++++++++++
 spec/models/global_milestone_spec.rb | 35 ---------------------
 spec/models/milestone_spec.rb        | 35 +++++++++++++++++++++
 4 files changed, 51 insertions(+), 95 deletions(-)

diff --git a/app/models/global_milestone.rb b/app/models/global_milestone.rb
index d07ef43c97e..085ffd16c6a 100644
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
@@ -34,66 +34,6 @@ class GlobalMilestone
     new(title, child_milestones)
   end
 
-  def self.states_count(projects, groups = nil)
-    legacy_group_milestones_count = legacy_group_milestone_states_count(projects)
-    group_milestones_count = groups_milestone_state_count(groups)
-
-    legacy_group_milestones_count.merge(group_milestones_count) do |k, legacy_group_milestones_count, group_milestones_count|
-      legacy_group_milestones_count + group_milestones_count
-    end
-  end
-
-  def self.groups_milestone_state_count(groups)
-    return STATE_COUNT_HASH unless groups
-    return self.group_milestones_states_count(groups) unless groups.respond_to?(:each)
-
-    milestone_states = STATE_COUNT_HASH
-
-    groups.each do |group|
-      group_milestones_count = self.group_milestones_states_count(group)
-      milestone_states = milestone_states.merge(group_milestones_count) do |k, milestone_state, group_milestones_count|
-        milestone_state + group_milestones_count
-      end
-    end
-
-    milestone_states
-  end
-
-  def self.group_milestones_states_count(group)
-    return STATE_COUNT_HASH unless group
-
-    params = { group_ids: [group.id], state: 'all' }
-
-    relation = MilestonesFinder.new(params).execute # rubocop: disable CodeReuse/Finder
-    grouped_by_state = relation.reorder(nil).group(:state).count
-
-    {
-      opened: grouped_by_state['active'] || 0,
-      closed: grouped_by_state['closed'] || 0,
-      all: grouped_by_state.values.sum
-    }
-  end
-
-  # Counts the legacy group milestones which must be grouped by title
-  def self.legacy_group_milestone_states_count(projects)
-    return STATE_COUNT_HASH unless projects
-
-    params = { project_ids: projects.map(&:id), state: 'all' }
-
-    relation = MilestonesFinder.new(params).execute # rubocop: disable CodeReuse/Finder
-    project_milestones_by_state_and_title = relation.reorder(nil).group(:state, :title).count
-
-    opened = count_by_state(project_milestones_by_state_and_title, 'active')
-    closed = count_by_state(project_milestones_by_state_and_title, 'closed')
-    all = project_milestones_by_state_and_title.map { |(_, title), _| title }.uniq.count
-
-    {
-      opened: opened,
-      closed: closed,
-      all: all
-    }
-  end
-
   def self.count_by_state(milestones_by_state_and_title, state)
     milestones_by_state_and_title.count do |(milestone_state, _), _|
       milestone_state == state
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 892a680f221..9f2c4efaa96 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -170,6 +170,22 @@ class Milestone < ActiveRecord::Base
     sorted.with_order_id_desc
   end
 
+  def self.states_count(projects, groups = nil)
+    return STATE_COUNT_HASH unless projects || groups
+
+    counts = Milestone
+               .for_projects_and_groups(projects&.map(&:id), groups&.map(&:id))
+               .reorder(nil)
+               .group(:state)
+               .count
+
+    {
+        opened: counts['active'] || 0,
+        closed: counts['closed'] || 0,
+        all: counts.values.sum
+    }
+  end
+
   ##
   # Returns the String necessary to reference this Milestone in Markdown. Group
   # milestones only support name references, and do not support cross-project
diff --git a/spec/models/global_milestone_spec.rb b/spec/models/global_milestone_spec.rb
index ab58f5c5021..b6355455c1d 100644
--- a/spec/models/global_milestone_spec.rb
+++ b/spec/models/global_milestone_spec.rb
@@ -92,41 +92,6 @@ describe GlobalMilestone do
     end
   end
 
-  describe '.states_count' do
-    context 'when the projects have milestones' do
-      before do
-        create(:closed_milestone, title: 'Active Group Milestone', project: project3)
-        create(:active_milestone, title: 'Active Group Milestone', project: project1)
-        create(:active_milestone, title: 'Active Group Milestone', project: project2)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project1)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project2)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project3)
-      end
-
-      it 'returns the quantity of global milestones in each possible state' do
-        expected_count = { opened: 1, closed: 2, all: 2 }
-
-        count = described_class.states_count(Project.all)
-
-        expect(count).to eq(expected_count)
-      end
-    end
-
-    context 'when the projects do not have milestones' do
-      before do
-        project1
-      end
-
-      it 'returns 0 as the quantity of global milestones in each state' do
-        expected_count = { opened: 0, closed: 0, all: 0 }
-
-        count = described_class.states_count(Project.all)
-
-        expect(count).to eq(expected_count)
-      end
-    end
-  end
-
   describe '#initialize' do
     let(:milestone1_project1) { create(:milestone, title: "Milestone v1.2", project: project1) }
     let(:milestone1_project2) { create(:milestone, title: "Milestone v1.2", project: project2) }
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 27d4e622710..b6aad769e3b 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -348,4 +348,39 @@ describe Milestone do
       end
     end
   end
+
+  describe '.states_count' do
+    context 'when the projects have milestones' do
+      let(:project_1) { create(:project) }
+      let(:project_2) { create(:project) }
+      let(:project_3) { create(:project) }
+
+      before do
+        create(:closed_milestone, title: 'Active Group Milestone', project: project_3)
+        create(:active_milestone, title: 'Active Group Milestone', project: project_1)
+        create(:active_milestone, title: 'Active Group Milestone', project: project_2)
+        create(:closed_milestone, title: 'Closed Group Milestone', project: project_1)
+        create(:closed_milestone, title: 'Closed Group Milestone', project: project_2)
+        create(:closed_milestone, title: 'Closed Group Milestone', project: project_3)
+      end
+
+      it 'returns the quantity of milestones in each possible state' do
+        expected_count = { opened: 5, closed: 4, all: 9 }
+
+        count = described_class.states_count(Project.all)
+
+        expect(count).to eq(expected_count)
+      end
+    end
+
+    context 'when the projects do not have milestones' do
+      it 'returns 0 as the quantity of global milestones in each state' do
+        expected_count = { opened: 0, closed: 0, all: 0 }
+
+        count = described_class.states_count([project])
+
+        expect(count).to eq(expected_count)
+      end
+    end
+  end
 end
-- 
cgit v1.2.3


From c42f15c03f3e4f72aa0bd5d978cc4ee1cf2a75de Mon Sep 17 00:00:00 2001
From: Eagllus <rvanzon@gitlab.com>
Date: Thu, 18 Oct 2018 09:13:49 +0200
Subject: Update related tests

---
 spec/features/groups/milestone_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb
index 80df0618a6a..a7ef215df5f 100644
--- a/spec/features/groups/milestone_spec.rb
+++ b/spec/features/groups/milestone_spec.rb
@@ -95,9 +95,9 @@ describe 'Group milestones' do
       end
 
       it 'counts milestones correctly' do
-        expect(find('.top-area .active .badge').text).to eq("2")
-        expect(find('.top-area .closed .badge').text).to eq("2")
-        expect(find('.top-area .all .badge').text).to eq("4")
+        expect(find('.top-area .active .badge').text).to eq("3")
+        expect(find('.top-area .closed .badge').text).to eq("3")
+        expect(find('.top-area .all .badge').text).to eq("6")
       end
 
       it 'lists legacy group milestones and group milestones' do
-- 
cgit v1.2.3


From 473138f1151905b86527c2664d822c056f57b5cd Mon Sep 17 00:00:00 2001
From: Eagllus <rvanzon@gitlab.com>
Date: Mon, 22 Oct 2018 13:56:08 +0200
Subject: Update related tests based on comment

---
 spec/models/milestone_spec.rb | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index b6aad769e3b..617f0151f33 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -353,21 +353,26 @@ describe Milestone do
     context 'when the projects have milestones' do
       let(:project_1) { create(:project) }
       let(:project_2) { create(:project) }
-      let(:project_3) { create(:project) }
+      let(:group_1) { create(:group) }
+      let(:group_2) { create(:group) }
 
       before do
-        create(:closed_milestone, title: 'Active Group Milestone', project: project_3)
         create(:active_milestone, title: 'Active Group Milestone', project: project_1)
-        create(:active_milestone, title: 'Active Group Milestone', project: project_2)
         create(:closed_milestone, title: 'Closed Group Milestone', project: project_1)
+        create(:active_milestone, title: 'Active Group Milestone', project: project_2)
         create(:closed_milestone, title: 'Closed Group Milestone', project: project_2)
-        create(:closed_milestone, title: 'Closed Group Milestone', project: project_3)
+        create(:closed_milestone, title: 'Active Group Milestone', group: group_1)
+        create(:closed_milestone, title: 'Closed Group Milestone', group: group_1)
+        create(:closed_milestone, title: 'Active Group Milestone', group: group_2)
+        create(:closed_milestone, title: 'Closed Group Milestone', group: group_2)
       end
 
       it 'returns the quantity of milestones in each possible state' do
-        expected_count = { opened: 5, closed: 4, all: 9 }
+        expected_count = { opened: 5, closed: 6, all: 11 }
+
+        count = described_class.states_count(Project.all, Group.all)
 
-        count = described_class.states_count(Project.all)
+        p Project.all, Group.all
 
         expect(count).to eq(expected_count)
       end
-- 
cgit v1.2.3


From e211ef4e9d3a1d1b44872b600d694afc38d4d820 Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Tue, 23 Oct 2018 12:00:28 +1100
Subject: Make new merge request URL more friendly when pushing code

---
 app/controllers/projects/merge_requests/creations_controller.rb     | 2 ++
 app/services/merge_requests/get_urls_service.rb                     | 4 ++--
 .../unreleased/blackst0ne-update-push-new-merge-request-url.yml     | 5 +++++
 config/routes/project.rb                                            | 3 +--
 spec/requests/api/internal_spec.rb                                  | 6 +++---
 spec/services/merge_requests/get_urls_service_spec.rb               | 4 ++--
 6 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 changelogs/unreleased/blackst0ne-update-push-new-merge-request-url.yml

diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb
index 5639402a1e9..bbf662a63c8 100644
--- a/app/controllers/projects/merge_requests/creations_controller.rb
+++ b/app/controllers/projects/merge_requests/creations_controller.rb
@@ -89,6 +89,8 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap
 
   def build_merge_request
     params[:merge_request] ||= ActionController::Parameters.new(source_project: @project)
+    params[:merge_request][:source_branch] ||= params[:merge_request_source_branch].presence
+
     @merge_request = ::MergeRequests::BuildService.new(project, current_user, merge_request_params.merge(diff_options: diff_options)).execute
   end
 
diff --git a/app/services/merge_requests/get_urls_service.rb b/app/services/merge_requests/get_urls_service.rb
index 7c88c9abb41..35a22449e34 100644
--- a/app/services/merge_requests/get_urls_service.rb
+++ b/app/services/merge_requests/get_urls_service.rb
@@ -50,8 +50,8 @@ module MergeRequests
     end
 
     def url_for_new_merge_request(branch_name)
-      merge_request_params = { source_branch: branch_name }
-      url = Gitlab::Routing.url_helpers.project_new_merge_request_url(project, merge_request: merge_request_params)
+      url = Gitlab::Routing.url_helpers.project_new_merge_request_url(project, branch_name)
+
       { branch_name: branch_name, url: url, new_merge_request: true }
     end
 
diff --git a/changelogs/unreleased/blackst0ne-update-push-new-merge-request-url.yml b/changelogs/unreleased/blackst0ne-update-push-new-merge-request-url.yml
new file mode 100644
index 00000000000..b89ba754952
--- /dev/null
+++ b/changelogs/unreleased/blackst0ne-update-push-new-merge-request-url.yml
@@ -0,0 +1,5 @@
+---
+title: Make new merge request URL more friendly when pushing code
+merge_request: 22526
+author: "@blackst0ne"
+type: changed
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 9cbd5b644f6..e621f5eb8dd 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -150,8 +150,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         post '', action: :create, as: nil
 
         scope path: 'new', as: :new_merge_request do
-          get '', action: :new
-
           scope constraints: { format: nil }, action: :new do
             get :diffs, defaults: { tab: 'diffs' }
             get :pipelines, defaults: { tab: 'pipelines' }
@@ -165,6 +163,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           get :diff_for_path
           get :branch_from
           get :branch_to
+          get '(:merge_request_source_branch)', action: :new
         end
       end
 
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index e0b5b34f9c4..5fbcc8ec55d 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -665,7 +665,7 @@ describe API::Internal do
 
       expect(json_response).to match [{
         "branch_name" => "new_branch",
-        "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch",
+        "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch",
         "new_merge_request" => true
       }]
     end
@@ -686,7 +686,7 @@ describe API::Internal do
 
         expect(json_response).to match [{
           "branch_name" => "new_branch",
-          "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch",
+          "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch",
           "new_merge_request" => true
         }]
       end
@@ -819,7 +819,7 @@ describe API::Internal do
 
       expect(json_response['merge_request_urls']).to match [{
         "branch_name" => "new_branch",
-        "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch",
+        "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch",
         "new_merge_request" => true
       }]
     end
diff --git a/spec/services/merge_requests/get_urls_service_spec.rb b/spec/services/merge_requests/get_urls_service_spec.rb
index 274624aa8bb..3e33a165e55 100644
--- a/spec/services/merge_requests/get_urls_service_spec.rb
+++ b/spec/services/merge_requests/get_urls_service_spec.rb
@@ -6,7 +6,7 @@ describe MergeRequests::GetUrlsService do
   let(:project) { create(:project, :public, :repository) }
   let(:service) { described_class.new(project) }
   let(:source_branch) { "merge-test" }
-  let(:new_merge_request_url) { "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=#{source_branch}" }
+  let(:new_merge_request_url) { "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/#{source_branch}" }
   let(:show_merge_request_url) { "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/#{merge_request.iid}" }
   let(:new_branch_changes) { "#{Gitlab::Git::BLANK_SHA} 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/#{source_branch}" }
   let(:deleted_branch_changes) { "d14d6c0abdd253381df51a723d58691b2ee1ab08 #{Gitlab::Git::BLANK_SHA} refs/heads/#{source_branch}" }
@@ -117,7 +117,7 @@ describe MergeRequests::GetUrlsService do
       let(:new_branch_changes) { "#{Gitlab::Git::BLANK_SHA} 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/new_branch" }
       let(:existing_branch_changes) { "d14d6c0abdd253381df51a723d58691b2ee1ab08 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/markdown" }
       let(:changes) { "#{new_branch_changes}\n#{existing_branch_changes}" }
-      let(:new_merge_request_url) { "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch" }
+      let(:new_merge_request_url) { "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch" }
 
       it 'returns 2 urls for both creating new and showing merge request' do
         result = service.execute(changes)
-- 
cgit v1.2.3


From c265fc25f7d3664d71763767d18d3b02ab83cb03 Mon Sep 17 00:00:00 2001
From: danielgruesso <dgruesso@gitlab.com>
Date: Tue, 23 Oct 2018 19:42:01 -0400
Subject: Add first draft for runbook docs

---
 doc/README.md                |  1 +
 doc/topics/runbooks/index.md | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 doc/topics/runbooks/index.md

diff --git a/doc/README.md b/doc/README.md
index 03371226041..f6c1a4f1d88 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -165,6 +165,7 @@ configuration. Then customize everything from buildpacks to CI/CD.
 - [Deployment of Helm, Ingress, and Prometheus on Kubernetes](user/project/clusters/index.md#installing-applications)
 - [Protected variables](ci/variables/README.md#protected-variables)
 - [Easy creation of Kubernetes clusters on GKE](user/project/clusters/index.md#adding-and-creating-a-new-gke-cluster-via-gitlab)
+- [Executable Runbooks](topics/runbooks/index.md)
 
 ### Monitor
 
diff --git a/doc/topics/runbooks/index.md b/doc/topics/runbooks/index.md
new file mode 100644
index 00000000000..f55d2868f20
--- /dev/null
+++ b/doc/topics/runbooks/index.md
@@ -0,0 +1,36 @@
+# Runbooks
+
+Runbooks are a collection of documented procedures that explain how to 
+carry out a particular process, be it starting, stopping, debugging, 
+or troubleshooting a particular system.
+
+## Overview
+
+Historically, runbooks took the form of a decision tree or a detailed 
+step-by-step guide depending on the condition or system. 
+
+Modern implementations have introduced the concept of an "executable 
+runbooks", where along with a well define process, operators can execute 
+code blocks or database queries against a given environment.
+
+## Nurtch Executable Runbooks
+
+> [Introduced][ce-45912] in GitLab 11.4.
+
+The JupyterHub app offered via GitLab’s Kubernetes integration now ships 
+with Nurtch’s Rubix library, providing a simple way to create DevOps 
+runbooks. A sample runbook is provided, showcasing common operations.
+
+The below video provides an overview of how this is acomplished in GitLab.
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/Q_OqHIIUPjE" 
+frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
+
+## Requirements
+
+To create an executable runbook, you will need:
+
+1. **Kubernetes Cluster** - 
+1. **Helm Tiller** - 
+1. **Ingress** -
+1. **JupyterHub** -
\ No newline at end of file
-- 
cgit v1.2.3


From 38a6ecbe3ef69273dd05d79947c5422f76aa21e4 Mon Sep 17 00:00:00 2001
From: Sanad Liaquat <sliaquat@gitlab.com>
Date: Wed, 24 Oct 2018 13:45:09 +0500
Subject: Added ldap_ssl tag to existing test

---
 qa/qa.rb                                                      |  1 +
 qa/qa/scenario/test/integration/ldap_ssl.rb                   | 11 +++++++++++
 .../1_manage/login/log_into_gitlab_via_ldap_spec.rb           |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 qa/qa/scenario/test/integration/ldap_ssl.rb

diff --git a/qa/qa.rb b/qa/qa.rb
index 36a37dbb270..1d85b2c96e7 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -101,6 +101,7 @@ module QA
       module Integration
         autoload :Github, 'qa/scenario/test/integration/github'
         autoload :LDAP, 'qa/scenario/test/integration/ldap'
+        autoload :LDAPSSL, 'qa/scenario/test/integration/ldap_ssl'
         autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml'
         autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
         autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
diff --git a/qa/qa/scenario/test/integration/ldap_ssl.rb b/qa/qa/scenario/test/integration/ldap_ssl.rb
new file mode 100644
index 00000000000..5b6286cd336
--- /dev/null
+++ b/qa/qa/scenario/test/integration/ldap_ssl.rb
@@ -0,0 +1,11 @@
+module QA
+  module Scenario
+    module Test
+      module Integration
+        class LDAPSSL < Test::Instance::All
+          tags :ldap_ssl
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
index eb9e0297287..e041b312a4a 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Manage', :orchestrated, :ldap do
+  context 'Manage', :orchestrated, :ldap, :ldap_ssl do
     describe 'LDAP login' do
       it 'user logs into GitLab using LDAP credentials' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
-- 
cgit v1.2.3


From 02268a85be615877b9080a8c931ad93ae73ef2e2 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 24 Oct 2018 10:13:58 +0100
Subject: Extract EE-specific lines from issues controller

---
 app/controllers/projects/issues_controller.rb | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index b06a6f3bb0d..308f666394c 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -9,12 +9,25 @@ class Projects::IssuesController < Projects::ApplicationController
   include IssuesCalendar
   include SpammableActions
 
-  prepend_before_action :authenticate_user!, only: [:new]
+  def self.authenticate_user_only_actions
+    %i[new]
+  end
+
+  def self.issue_except_actions
+    %i[index calendar new create bulk_update]
+  end
+
+  def self.set_issuables_index_only_actions
+    %i[index calendar]
+  end
+
+  prepend_before_action :authenticate_user!, only: authenticate_user_only_actions
 
   before_action :whitelist_query_limiting, only: [:create, :create_merge_request, :move, :bulk_update]
   before_action :check_issues_available!
-  before_action :issue, except: [:index, :calendar, :new, :create, :bulk_update]
-  before_action :set_issuables_index, only: [:index, :calendar]
+  before_action :issue, except: issue_except_actions
+
+  before_action :set_issuables_index, only: set_issuables_index_only_actions
 
   # Allow write(create) issue
   before_action :authorize_create_issue!, only: [:new, :create]
-- 
cgit v1.2.3


From f3fabd86033f12829b817e1d430ea1cdb29ca473 Mon Sep 17 00:00:00 2001
From: Marcel Amirault <ravlen@gmail.com>
Date: Wed, 24 Oct 2018 11:50:00 +0000
Subject: Update links to external sites

---
 doc/administration/high_availability/redis.md               | 8 ++++----
 doc/administration/high_availability/redis_source.md        | 4 ++--
 doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md | 6 +++---
 doc/topics/authentication/index.md                          | 2 +-
 doc/university/README.md                                    | 2 +-
 doc/university/glossary/README.md                           | 2 +-
 doc/user/project/pages/getting_started_part_three.md        | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md
index b5d1ff698c6..dcee57def74 100644
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@@ -15,7 +15,7 @@ Omnibus GitLab packages.
 
 > **Notes:**
 > - Redis requires authentication for High Availability. See
->  [Redis Security](http://redis.io/topics/security) documentation for more
+>  [Redis Security](https://redis.io/topics/security) documentation for more
 >  information. We recommend using a combination of a Redis password and tight
 >  firewall rules to secure your Redis service.
 > - You are highly encouraged to read the [Redis Sentinel][sentinel] documentation
@@ -82,7 +82,7 @@ When a **Master** fails to respond, it's the application's responsibility
 for a new **Master**).
 
 To get a better understanding on how to correctly set up Sentinel, please read
-the [Redis Sentinel documentation](http://redis.io/topics/sentinel) first, as
+the [Redis Sentinel documentation](https://redis.io/topics/sentinel) first, as
 failing to configure it correctly can lead to data loss or can bring your
 whole cluster down, invalidating the failover effort.
 
@@ -885,8 +885,8 @@ Read more on High Availability:
 [reconfigure]: ../restart_gitlab.md#omnibus-gitlab-reconfigure
 [gh-531]: https://github.com/redis/redis-rb/issues/531
 [gh-534]: https://github.com/redis/redis-rb/issues/534
-[redis]: http://redis.io/
-[sentinel]: http://redis.io/topics/sentinel
+[redis]: https://redis.io/
+[sentinel]: https://redis.io/topics/sentinel
 [omnifile]: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/libraries/gitlab_rails.rb
 [source]: ../../install/installation.md
 [ce]: https://about.gitlab.com/downloads
diff --git a/doc/administration/high_availability/redis_source.md b/doc/administration/high_availability/redis_source.md
index 5823c575251..2101d36d2b6 100644
--- a/doc/administration/high_availability/redis_source.md
+++ b/doc/administration/high_availability/redis_source.md
@@ -107,7 +107,7 @@ starting with `sentinel` prefix.
 Assuming that the Redis Sentinel is installed on the same instance as Redis
 master with IP `10.0.0.1` (some settings might overlap with the master):
 
-1. [Install Redis Sentinel](http://redis.io/topics/sentinel)
+1. [Install Redis Sentinel](https://redis.io/topics/sentinel)
 1. Edit `/etc/redis/sentinel.conf`:
 
     ```conf
@@ -363,7 +363,7 @@ production:
       port: 26379 # point to sentinel, not to redis port
 ```
 
-When in doubt, please read [Redis Sentinel documentation](http://redis.io/topics/sentinel).
+When in doubt, please read [Redis Sentinel documentation](https://redis.io/topics/sentinel).
 
 [gh-531]: https://github.com/redis/redis-rb/issues/531
 [downloads]: https://about.gitlab.com/downloads
diff --git a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
index b2c73caae2e..c0346d78141 100644
--- a/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
+++ b/doc/ci/examples/test_phoenix_app_with_gitlab_ci_cd/index.md
@@ -398,10 +398,10 @@ other reasons][ci-reasons] to keep using GitLab CI/CD. The benefits to our teams
 - [Using Docker images documentation][using-docker]
 - [Example project: Hello GitLab CI/CD on GitLab][hello-gitlab]
 
-[phoenix-site]: http://phoenixframework.org/ "Phoenix Framework"
+[phoenix-site]: https://phoenixframework.org/ "Phoenix Framework"
 [phoenix-learning-guide]: https://hexdocs.pm/phoenix/learning.html "Phoenix Learning Guide"
-[phoenix-install]: http://www.phoenixframework.org/docs/installation "Phoenix Installation"
-[phoenix-mysql]: http://www.phoenixframework.org/docs/using-mysql "Phoenix with MySQL"
+[phoenix-install]: https://hexdocs.pm/phoenix/installation.html "Phoenix Installation"
+[phoenix-mysql]: https://hexdocs.pm/phoenix/ecto.html#using-mysql "Phoenix with MySQL"
 [elixir-site]: http://elixir-lang.org/ "Elixir"
 [elixir-mix]: http://elixir-lang.org/getting-started/mix-otp/introduction-to-mix.html "Introduction to mix"
 [elixir-docs]: http://elixir-lang.org/getting-started/introduction.html "Elixir Documentation"
diff --git a/doc/topics/authentication/index.md b/doc/topics/authentication/index.md
index 9546f43eea8..73301394e9f 100644
--- a/doc/topics/authentication/index.md
+++ b/doc/topics/authentication/index.md
@@ -43,7 +43,7 @@ This page gathers all the resources for the topic **Authentication** within GitL
 ## Third-party resources
 
 - [Kanboard Plugin GitLab Authentication](https://github.com/kanboard/plugin-gitlab-auth)
-- [Jenkins GitLab OAuth Plugin](https://wiki.jenkins-ci.org/display/JENKINS/GitLab+OAuth+Plugin)
+- [Jenkins GitLab OAuth Plugin](https://wiki.jenkins.io/display/JENKINS/GitLab+OAuth+Plugin)
 - [Set up Gitlab CE with Active Directory authentication](https://www.caseylabs.com/setup-gitlab-ce-with-active-directory-authentication/)
 - [How to customize GitLab to support OpenID authentication](http://eric.van-der-vlist.com/blog/2013/11/23/how-to-customize-gitlab-to-support-openid-authentication/)
 - [Openshift - Configuring Authentication and User Agent](https://docs.openshift.org/latest/install_config/configuring_authentication.html#GitLab)
diff --git a/doc/university/README.md b/doc/university/README.md
index 5edf92b3b09..f19b1ffd3d9 100644
--- a/doc/university/README.md
+++ b/doc/university/README.md
@@ -205,7 +205,7 @@ The curriculum is composed of GitLab videos, screencasts, presentations, project
 
 ### 4. External Articles
 
-1. [2011 WSJ article by Marc Andreessen - Software is Eating the World](http://www.wsj.com/articles/SB10001424053111903480904576512250915629460)
+1. [2011 WSJ article by Marc Andreessen - Software is Eating the World](https://www.wsj.com/articles/SB10001424053111903480904576512250915629460)
 1. [2014 Blog post by Chris Dixon - Software eats software development](http://cdixon.org/2014/04/13/software-eats-software-development/)
 1. [2015 Venture Beat article - Actually, Open Source is Eating the World](http://venturebeat.com/2015/12/06/its-actually-open-source-software-thats-eating-the-world/)
 
diff --git a/doc/university/glossary/README.md b/doc/university/glossary/README.md
index 6ff27e495fb..6e0f71017c6 100644
--- a/doc/university/glossary/README.md
+++ b/doc/university/glossary/README.md
@@ -303,7 +303,7 @@ A [tool](https://docs.gitlab.com/ee/integration/external-issue-tracker.html) use
 
 ### Jenkins
 
-An Open Source CI tool written using the Java programming language. [Jenkins](https://jenkins-ci.org/) does the same job as GitLab CI, Bamboo, and Travis CI. It is extremely popular. Related [documentation](https://docs.gitlab.com/ee/integration/jenkins.html). 
+An Open Source CI tool written using the Java programming language. [Jenkins](https://jenkins.io/) does the same job as GitLab CI, Bamboo, and Travis CI. It is extremely popular. Related [documentation](https://docs.gitlab.com/ee/integration/jenkins.html). 
 
 ### Jira
 
diff --git a/doc/user/project/pages/getting_started_part_three.md b/doc/user/project/pages/getting_started_part_three.md
index e1eede8bbed..89b9621b8b9 100644
--- a/doc/user/project/pages/getting_started_part_three.md
+++ b/doc/user/project/pages/getting_started_part_three.md
@@ -212,7 +212,7 @@ security measure, necessary just for big companies, like banks and shoppings sit
 with financial transactions.
 Now we have a different picture. [According to Josh Aas](https://letsencrypt.org/2015/10/29/phishing-and-malware.html), Executive Director at [ISRG](https://en.wikipedia.org/wiki/Internet_Security_Research_Group):
 
-> _We’ve since come to realize that HTTPS is important for almost all websites. It’s important for any website that allows people to log in with a password, any website that [tracks its users](https://www.washingtonpost.com/news/the-switch/wp/2013/12/10/nsa-uses-google-cookies-to-pinpoint-targets-for-hacking/) in any way, any website that [doesn’t want its content altered](http://arstechnica.com/tech-policy/2014/09/why-comcasts-javascript-ad-injections-threaten-security-net-neutrality/), and for any site that offers content people might not want others to know they are consuming. We’ve also learned that any site not secured by HTTPS [can be used to attack other sites](http://krebsonsecurity.com/2015/04/dont-be-fodder-for-chinas-great-cannon/)._
+> _We’ve since come to realize that HTTPS is important for almost all websites. It’s important for any website that allows people to log in with a password, any website that [tracks its users](https://www.washingtonpost.com/news/the-switch/wp/2013/12/10/nsa-uses-google-cookies-to-pinpoint-targets-for-hacking/) in any way, any website that [doesn’t want its content altered](http://arstechnica.com/tech-policy/2014/09/why-comcasts-javascript-ad-injections-threaten-security-net-neutrality/), and for any site that offers content people might not want others to know they are consuming. We’ve also learned that any site not secured by HTTPS [can be used to attack other sites](https://krebsonsecurity.com/2015/04/dont-be-fodder-for-chinas-great-cannon/)._
 
 Therefore, the reason why certificates are so important is that they encrypt
 the connection between the **client** (you, me, your visitors)
-- 
cgit v1.2.3


From 7983c798af6f2f01748b67ea3cdbc2dec2554604 Mon Sep 17 00:00:00 2001
From: Sanad Liaquat <sliaquat@gitlab.com>
Date: Wed, 24 Oct 2018 17:43:30 +0500
Subject: Renamed to ldap_no_ssl and ldap_ssl

---
 qa/qa.rb                                                     |  2 +-
 qa/qa/scenario/test/integration/ldap.rb                      | 11 -----------
 qa/qa/scenario/test/integration/ldap_no_ssl.rb               | 11 +++++++++++
 .../1_manage/login/log_into_gitlab_via_ldap_spec.rb          |  2 +-
 .../features/browser_ui/1_manage/login/register_spec.rb      |  2 +-
 .../features/browser_ui/3_create/repository/clone_spec.rb    |  2 +-
 .../browser_ui/3_create/repository/push_over_http_spec.rb    |  2 +-
 .../3_create/repository/push_protected_branch_spec.rb        |  2 +-
 qa/spec/scenario/test/integration/ldap_spec.rb               | 12 ++++++++++--
 9 files changed, 27 insertions(+), 19 deletions(-)
 delete mode 100644 qa/qa/scenario/test/integration/ldap.rb
 create mode 100644 qa/qa/scenario/test/integration/ldap_no_ssl.rb

diff --git a/qa/qa.rb b/qa/qa.rb
index 1d85b2c96e7..437ce59eef2 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -100,7 +100,7 @@ module QA
 
       module Integration
         autoload :Github, 'qa/scenario/test/integration/github'
-        autoload :LDAP, 'qa/scenario/test/integration/ldap'
+        autoload :LDAPNoSSL, 'qa/scenario/test/integration/ldap_no_ssl'
         autoload :LDAPSSL, 'qa/scenario/test/integration/ldap_ssl'
         autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml'
         autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
diff --git a/qa/qa/scenario/test/integration/ldap.rb b/qa/qa/scenario/test/integration/ldap.rb
deleted file mode 100644
index 769fa389785..00000000000
--- a/qa/qa/scenario/test/integration/ldap.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module QA
-  module Scenario
-    module Test
-      module Integration
-        class LDAP < Test::Instance::All
-          tags :ldap
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/scenario/test/integration/ldap_no_ssl.rb b/qa/qa/scenario/test/integration/ldap_no_ssl.rb
new file mode 100644
index 00000000000..581feb59431
--- /dev/null
+++ b/qa/qa/scenario/test/integration/ldap_no_ssl.rb
@@ -0,0 +1,11 @@
+module QA
+  module Scenario
+    module Test
+      module Integration
+        class LDAPNoSSL < Test::Instance::All
+          tags :ldap_no_ssl
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
index e041b312a4a..92a86569349 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Manage', :orchestrated, :ldap, :ldap_ssl do
+  context 'Manage', :orchestrated, :ldap_no_ssl, :ldap_ssl do
     describe 'LDAP login' do
       it 'user logs into GitLab using LDAP credentials' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
index 45cb5df8252..7f9beeec46e 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
@@ -22,7 +22,7 @@ module QA
     end
   end
 
-  context 'Manage', :orchestrated, :ldap, :skip_signup_disabled do
+  context 'Manage', :orchestrated, :ldap_no_ssl, :skip_signup_disabled do
     describe 'while LDAP is enabled' do
       it_behaves_like 'registration and login'
     end
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
index 9c64a9a3439..5ff35b01783 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Git clone over HTTP', :ldap do
+    describe 'Git clone over HTTP', :ldap_no_ssl do
       let(:location) do
         Page::Project::Show.act do
           choose_repository_clone_http
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
index b9bed39662f..09679db5cfb 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Git push over HTTP', :ldap do
+    describe 'Git push over HTTP', :ldap_no_ssl do
       it 'user pushes code to the repository'  do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.act { sign_in_using_credentials }
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
index 5f42cb00bd3..8998154dbfd 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Protected branch support', :ldap do
+    describe 'Protected branch support', :ldap_no_ssl do
       let(:branch_name) { 'protected-branch' }
       let(:commit_message) { 'Protected push commit message' }
       let(:project) do
diff --git a/qa/spec/scenario/test/integration/ldap_spec.rb b/qa/spec/scenario/test/integration/ldap_spec.rb
index 198856aec3f..9019c6562b6 100644
--- a/qa/spec/scenario/test/integration/ldap_spec.rb
+++ b/qa/spec/scenario/test/integration/ldap_spec.rb
@@ -1,9 +1,17 @@
 # frozen_string_literal: true
 
-describe QA::Scenario::Test::Integration::LDAP do
+describe QA::Scenario::Test::Integration::LDAPNoSSL do
   context '#perform' do
     it_behaves_like 'a QA scenario class' do
-      let(:tags) { [:ldap] }
+      let(:tags) { [:ldap_no_ssl] }
+    end
+  end
+end
+
+describe QA::Scenario::Test::Integration::LDAPSSL do
+  context '#perform' do
+    it_behaves_like 'a QA scenario class' do
+      let(:tags) { [:ldap_ssl] }
     end
   end
 end
-- 
cgit v1.2.3


From d67be3aa20d90d48f755b6178d7ce8923f6674ed Mon Sep 17 00:00:00 2001
From: Sanad Liaquat <sliaquat@gitlab.com>
Date: Wed, 24 Oct 2018 18:17:29 +0500
Subject: Fix rubocop issues

---
 .rubocop.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 0f4018326a1..0afe7367b83 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -80,6 +80,9 @@ Naming/FileName:
     - 'locale/unfound_translations.rb'
     - 'ee/locale/unfound_translations.rb'
     - 'ee/lib/generators/**/*'
+    - 'qa/qa/scenario/test/integration/ldap_no_ssl.rb'
+    - 'qa/qa/scenario/test/integration/ldap_ssl.rb'
+
   IgnoreExecutableScripts: true
   AllowedAcronyms:
     - EE
-- 
cgit v1.2.3


From d9b9b01f2c69256cddec34234eadcbac4f5f1948 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Wed, 24 Oct 2018 10:29:58 -0500
Subject: Remove .katex-display from selector

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

diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 6d891e21556..e261bd7c0ca 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -34,7 +34,7 @@
     margin-bottom: 0;
   }
 
-  *:first-child:not(.katex-display) {
+  *:first-child {
     margin-top: 0;
   }
 
-- 
cgit v1.2.3


From 861772846bd7725eb630a0bda40a3be1ec112af4 Mon Sep 17 00:00:00 2001
From: Johann Hubert Sonntagbauer <johann.sonntagbauer@gmail.com>
Date: Wed, 24 Oct 2018 19:24:54 +0200
Subject: Link button in markdown editor recognize URLs

---
 app/assets/javascripts/lib/utils/text_markdown.js  | 17 ++++++++++++++
 ...on-in-markdown-editor-should-recognize-URLs.yml |  5 ++++
 spec/javascripts/lib/utils/text_markdown_spec.js   | 27 ++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 changelogs/unreleased/52115-Link-button-in-markdown-editor-should-recognize-URLs.yml

diff --git a/app/assets/javascripts/lib/utils/text_markdown.js b/app/assets/javascripts/lib/utils/text_markdown.js
index e26a6b986be..c52cfb806a2 100644
--- a/app/assets/javascripts/lib/utils/text_markdown.js
+++ b/app/assets/javascripts/lib/utils/text_markdown.js
@@ -2,6 +2,8 @@
 import $ from 'jquery';
 import { insertText } from '~/lib/utils/common_utils';
 
+const LINK_TAG_PATTERN = '[{text}](url)';
+
 function selectedText(text, textarea) {
   return text.substring(textarea.selectionStart, textarea.selectionEnd);
 }
@@ -76,6 +78,21 @@ export function insertMarkdownText({ textArea, text, tag, blockTag, selected, wr
   removedFirstNewLine = false;
   currentLineEmpty = false;
 
+  // check for link pattern and selected text is an URL
+  // if so fill in the url part instead of the text part of the pattern.
+  if (tag === LINK_TAG_PATTERN) {
+    if (URL) {
+      try {
+        const ignoredUrl = new URL(selected);
+        // valid url
+        tag = '[text]({text})';
+        select = 'text';
+      } catch (e) {
+        // ignore - no valid url
+      }
+    }
+  }
+
   // Remove the first newline
   if (selected.indexOf('\n') === 0) {
     removedFirstNewLine = true;
diff --git a/changelogs/unreleased/52115-Link-button-in-markdown-editor-should-recognize-URLs.yml b/changelogs/unreleased/52115-Link-button-in-markdown-editor-should-recognize-URLs.yml
new file mode 100644
index 00000000000..8521335c2ea
--- /dev/null
+++ b/changelogs/unreleased/52115-Link-button-in-markdown-editor-should-recognize-URLs.yml
@@ -0,0 +1,5 @@
+---
+title: Link button in markdown editor recognize URLs
+merge_request: 1983
+author: Johann Hubert Sonntagbauer
+type: changed
diff --git a/spec/javascripts/lib/utils/text_markdown_spec.js b/spec/javascripts/lib/utils/text_markdown_spec.js
index bb7a29fe30a..b9e805628f8 100644
--- a/spec/javascripts/lib/utils/text_markdown_spec.js
+++ b/spec/javascripts/lib/utils/text_markdown_spec.js
@@ -166,6 +166,33 @@ describe('init markdown', () => {
         expect(textArea.selectionStart).toEqual(expectedText.lastIndexOf(select));
         expect(textArea.selectionEnd).toEqual(expectedText.lastIndexOf(select) + select.length);
       });
+
+      it('should support selected urls', () => {
+        const expectedUrl = 'http://www.gitlab.com';
+        const expectedSelectionText = 'text';
+        const expectedText = `text [${expectedSelectionText}](${expectedUrl}) text`;
+        const initialValue = `text ${expectedUrl} text`;
+
+        textArea.value = initialValue;
+        const selectedIndex = initialValue.indexOf(expectedUrl);
+        textArea.setSelectionRange(selectedIndex, selectedIndex + expectedUrl.length);
+
+        insertMarkdownText({
+          textArea,
+          text: textArea.value,
+          tag,
+          blockTag: null,
+          selected: expectedUrl,
+          wrap: false,
+          select,
+        });
+
+        expect(textArea.value).toEqual(expectedText);
+        expect(textArea.selectionStart).toEqual(expectedText.indexOf(expectedSelectionText, 1));
+        expect(textArea.selectionEnd).toEqual(
+          expectedText.indexOf(expectedSelectionText, 1) + expectedSelectionText.length,
+        );
+      });
     });
   });
 });
-- 
cgit v1.2.3


From 07f15f9adca9d922057599d9cc064c8ebfdf41f7 Mon Sep 17 00:00:00 2001
From: Adriel Santiago <adriel@gitlab.com>
Date: Tue, 16 Oct 2018 13:25:08 -0400
Subject: Fix prometheus graphs in firefox

---
 app/assets/javascripts/monitoring/components/graph.vue               | 5 +++--
 .../unreleased/40372-prometheus-dashboard-broken-on-firefox.yml      | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/40372-prometheus-dashboard-broken-on-firefox.yml

diff --git a/app/assets/javascripts/monitoring/components/graph.vue b/app/assets/javascripts/monitoring/components/graph.vue
index ed5c8b15945..5c6e2e09e46 100644
--- a/app/assets/javascripts/monitoring/components/graph.vue
+++ b/app/assets/javascripts/monitoring/components/graph.vue
@@ -121,6 +121,7 @@ export default {
     draw() {
       const breakpointSize = bp.getBreakpointSize();
       const query = this.graphData.queries[0];
+      const svgWidth = this.$refs.baseSvg.getBoundingClientRect().width;
       this.margin = measurements.large.margin;
       if (this.smallGraph || breakpointSize === 'xs' || breakpointSize === 'sm') {
         this.graphHeight = 300;
@@ -130,13 +131,13 @@ export default {
       this.unitOfDisplay = query.unit || '';
       this.yAxisLabel = this.graphData.y_label || 'Values';
       this.legendTitle = query.label || 'Average';
-      this.graphWidth = this.$refs.baseSvg.clientWidth - this.margin.left - this.margin.right;
+      this.graphWidth = svgWidth - this.margin.left - this.margin.right;
       this.graphHeight = this.graphHeight - this.margin.top - this.margin.bottom;
       this.baseGraphHeight = this.graphHeight - 50;
       this.baseGraphWidth = this.graphWidth;
 
       // pixel offsets inside the svg and outside are not 1:1
-      this.realPixelRatio = this.$refs.baseSvg.clientWidth / this.baseGraphWidth;
+      this.realPixelRatio = svgWidth / this.baseGraphWidth;
 
       this.renderAxesPaths();
       this.formatDeployments();
diff --git a/changelogs/unreleased/40372-prometheus-dashboard-broken-on-firefox.yml b/changelogs/unreleased/40372-prometheus-dashboard-broken-on-firefox.yml
new file mode 100644
index 00000000000..8376fac7abf
--- /dev/null
+++ b/changelogs/unreleased/40372-prometheus-dashboard-broken-on-firefox.yml
@@ -0,0 +1,5 @@
+---
+title: Fix prometheus graphs in firefox
+merge_request: 22400
+author:
+type: fixed
-- 
cgit v1.2.3


From 0d09595bc07fa90108fd257e790f2d59651d6ca2 Mon Sep 17 00:00:00 2001
From: Daniel Gruesso <dgruesso@gitlab.com>
Date: Wed, 24 Oct 2018 22:40:28 +0000
Subject: Update index.md

---
 doc/topics/runbooks/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/topics/runbooks/index.md b/doc/topics/runbooks/index.md
index f55d2868f20..0f7d48233a5 100644
--- a/doc/topics/runbooks/index.md
+++ b/doc/topics/runbooks/index.md
@@ -15,7 +15,7 @@ code blocks or database queries against a given environment.
 
 ## Nurtch Executable Runbooks
 
-> [Introduced][ce-45912] in GitLab 11.4.
+> [Introduced][https://gitlab.com/gitlab-org/gitlab-ce/issues/45912] in GitLab 11.4.
 
 The JupyterHub app offered via GitLab’s Kubernetes integration now ships 
 with Nurtch’s Rubix library, providing a simple way to create DevOps 
-- 
cgit v1.2.3

-- 
cgit v1.2.3


From 4453adb59b0cbc33c90237403b29cd1ffee0aa52 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 24 Oct 2018 16:33:19 -0700
Subject: Upgrade parser gem to 2.5.1.2

---
 Gemfile.lock        | 2 +-
 Gemfile.rails5.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bf16bef4f32..240fcd4e551 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -547,7 +547,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.0.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
     parslet (1.8.2)
     peek (1.0.1)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 81547303ed2..22c783c2d3b 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -551,7 +551,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.0.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
     parslet (1.8.2)
     peek (1.0.1)
-- 
cgit v1.2.3


From f49034ba4962e924cac9d803a5fbe07b8057a632 Mon Sep 17 00:00:00 2001
From: Sanad Liaquat <sliaquat@gitlab.com>
Date: Thu, 25 Oct 2018 13:11:19 +0500
Subject: Rename  SSL to TLS

---
 .rubocop.yml                                                  |  4 ++--
 qa/qa.rb                                                      |  4 ++--
 qa/qa/scenario/test/integration/ldap_no_ssl.rb                | 11 -----------
 qa/qa/scenario/test/integration/ldap_no_tls.rb                | 11 +++++++++++
 qa/qa/scenario/test/integration/ldap_ssl.rb                   | 11 -----------
 qa/qa/scenario/test/integration/ldap_tls.rb                   | 11 +++++++++++
 .../1_manage/login/log_into_gitlab_via_ldap_spec.rb           |  2 +-
 .../specs/features/browser_ui/1_manage/login/register_spec.rb |  2 +-
 .../features/browser_ui/3_create/repository/clone_spec.rb     |  2 +-
 .../browser_ui/3_create/repository/push_over_http_spec.rb     |  2 +-
 .../3_create/repository/push_protected_branch_spec.rb         |  2 +-
 qa/spec/scenario/test/integration/ldap_spec.rb                |  8 ++++----
 12 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 qa/qa/scenario/test/integration/ldap_no_ssl.rb
 create mode 100644 qa/qa/scenario/test/integration/ldap_no_tls.rb
 delete mode 100644 qa/qa/scenario/test/integration/ldap_ssl.rb
 create mode 100644 qa/qa/scenario/test/integration/ldap_tls.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 0afe7367b83..dd2d836faae 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -80,8 +80,8 @@ Naming/FileName:
     - 'locale/unfound_translations.rb'
     - 'ee/locale/unfound_translations.rb'
     - 'ee/lib/generators/**/*'
-    - 'qa/qa/scenario/test/integration/ldap_no_ssl.rb'
-    - 'qa/qa/scenario/test/integration/ldap_ssl.rb'
+    - 'qa/qa/scenario/test/integration/ldap_no_tls.rb'
+    - 'qa/qa/scenario/test/integration/ldap_tls.rb'
 
   IgnoreExecutableScripts: true
   AllowedAcronyms:
diff --git a/qa/qa.rb b/qa/qa.rb
index 437ce59eef2..a22a91f8146 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -100,8 +100,8 @@ module QA
 
       module Integration
         autoload :Github, 'qa/scenario/test/integration/github'
-        autoload :LDAPNoSSL, 'qa/scenario/test/integration/ldap_no_ssl'
-        autoload :LDAPSSL, 'qa/scenario/test/integration/ldap_ssl'
+        autoload :LDAPNoTLS, 'qa/scenario/test/integration/ldap_no_tls'
+        autoload :LDAPTLS, 'qa/scenario/test/integration/ldap_tls'
         autoload :InstanceSAML, 'qa/scenario/test/integration/instance_saml'
         autoload :Kubernetes, 'qa/scenario/test/integration/kubernetes'
         autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
diff --git a/qa/qa/scenario/test/integration/ldap_no_ssl.rb b/qa/qa/scenario/test/integration/ldap_no_ssl.rb
deleted file mode 100644
index 581feb59431..00000000000
--- a/qa/qa/scenario/test/integration/ldap_no_ssl.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module QA
-  module Scenario
-    module Test
-      module Integration
-        class LDAPNoSSL < Test::Instance::All
-          tags :ldap_no_ssl
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/scenario/test/integration/ldap_no_tls.rb b/qa/qa/scenario/test/integration/ldap_no_tls.rb
new file mode 100644
index 00000000000..3ecc5ccf208
--- /dev/null
+++ b/qa/qa/scenario/test/integration/ldap_no_tls.rb
@@ -0,0 +1,11 @@
+module QA
+  module Scenario
+    module Test
+      module Integration
+        class LDAPNoTLS < Test::Instance::All
+          tags :ldap_no_tls
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/scenario/test/integration/ldap_ssl.rb b/qa/qa/scenario/test/integration/ldap_ssl.rb
deleted file mode 100644
index 5b6286cd336..00000000000
--- a/qa/qa/scenario/test/integration/ldap_ssl.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module QA
-  module Scenario
-    module Test
-      module Integration
-        class LDAPSSL < Test::Instance::All
-          tags :ldap_ssl
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/scenario/test/integration/ldap_tls.rb b/qa/qa/scenario/test/integration/ldap_tls.rb
new file mode 100644
index 00000000000..40d6e4b5b3d
--- /dev/null
+++ b/qa/qa/scenario/test/integration/ldap_tls.rb
@@ -0,0 +1,11 @@
+module QA
+  module Scenario
+    module Test
+      module Integration
+        class LDAPTLS < Test::Instance::All
+          tags :ldap_tls
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
index 92a86569349..a397df03bd2 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  context 'Manage', :orchestrated, :ldap_no_ssl, :ldap_ssl do
+  context 'Manage', :orchestrated, :ldap_no_tls, :ldap_tls do
     describe 'LDAP login' do
       it 'user logs into GitLab using LDAP credentials' do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
index 7f9beeec46e..44071ec3e45 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
@@ -22,7 +22,7 @@ module QA
     end
   end
 
-  context 'Manage', :orchestrated, :ldap_no_ssl, :skip_signup_disabled do
+  context 'Manage', :orchestrated, :ldap_no_tls, :skip_signup_disabled do
     describe 'while LDAP is enabled' do
       it_behaves_like 'registration and login'
     end
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
index 5ff35b01783..b18dee53cbc 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/clone_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Git clone over HTTP', :ldap_no_ssl do
+    describe 'Git clone over HTTP', :ldap_no_tls do
       let(:location) do
         Page::Project::Show.act do
           choose_repository_clone_http
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
index 09679db5cfb..2f63a07e0c3 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Git push over HTTP', :ldap_no_ssl do
+    describe 'Git push over HTTP', :ldap_no_tls do
       it 'user pushes code to the repository'  do
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.act { sign_in_using_credentials }
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
index 8998154dbfd..ac71cf52b6f 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   context 'Create' do
-    describe 'Protected branch support', :ldap_no_ssl do
+    describe 'Protected branch support', :ldap_no_tls do
       let(:branch_name) { 'protected-branch' }
       let(:commit_message) { 'Protected push commit message' }
       let(:project) do
diff --git a/qa/spec/scenario/test/integration/ldap_spec.rb b/qa/spec/scenario/test/integration/ldap_spec.rb
index 9019c6562b6..b6d798bf504 100644
--- a/qa/spec/scenario/test/integration/ldap_spec.rb
+++ b/qa/spec/scenario/test/integration/ldap_spec.rb
@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-describe QA::Scenario::Test::Integration::LDAPNoSSL do
+describe QA::Scenario::Test::Integration::LDAPNoTLS do
   context '#perform' do
     it_behaves_like 'a QA scenario class' do
-      let(:tags) { [:ldap_no_ssl] }
+      let(:tags) { [:ldap_no_tls] }
     end
   end
 end
 
-describe QA::Scenario::Test::Integration::LDAPSSL do
+describe QA::Scenario::Test::Integration::LDAPTLS do
   context '#perform' do
     it_behaves_like 'a QA scenario class' do
-      let(:tags) { [:ldap_ssl] }
+      let(:tags) { [:ldap_tls] }
     end
   end
 end
-- 
cgit v1.2.3


From 084a8b6101c25e5d3d4f97f078abd9a649a2fb64 Mon Sep 17 00:00:00 2001
From: Tiago Botelho <tiagonbotelho@hotmail.com>
Date: Mon, 22 Oct 2018 15:49:20 +0100
Subject: Adds tracing messages for slow git pushes

Whenever a git push takes more than 50 seconds the user
will receive a trace from each check performed along with
their timings
---
 app/controllers/projects/git_http_controller.rb    |   5 +
 ...ack-for-internal-git-access-checks-timeouts.yml |   5 +
 lib/api/internal.rb                                |   2 +
 lib/gitlab/checks/change_access.rb                 | 108 ++++++++++++++-------
 lib/gitlab/checks/lfs_integrity.rb                 |   5 +-
 lib/gitlab/checks/timed_logger.rb                  |  69 +++++++++++++
 lib/gitlab/git/lfs_changes.rb                      |   4 +-
 lib/gitlab/git_access.rb                           |  22 ++++-
 lib/gitlab/gitaly_client/blob_service.rb           |  17 +++-
 spec/lib/gitlab/checks/change_access_spec.rb       |  18 +++-
 spec/lib/gitlab/checks/lfs_integrity_spec.rb       |   3 +-
 spec/lib/gitlab/checks/timed_logger_spec.rb        |  75 ++++++++++++++
 spec/lib/gitlab/git/lfs_changes_spec.rb            |   4 +
 spec/lib/gitlab/git_access_spec.rb                 |  10 ++
 spec/requests/api/internal_spec.rb                 |  18 ++++
 15 files changed, 317 insertions(+), 48 deletions(-)
 create mode 100644 changelogs/unreleased/42790-improve-feedback-for-internal-git-access-checks-timeouts.yml
 create mode 100644 lib/gitlab/checks/timed_logger.rb
 create mode 100644 spec/lib/gitlab/checks/timed_logger_spec.rb

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index be708835e30..c0aa39d87c6 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -8,6 +8,7 @@ class Projects::GitHttpController < Projects::GitHttpClientController
   rescue_from Gitlab::GitAccess::UnauthorizedError, with: :render_403
   rescue_from Gitlab::GitAccess::NotFoundError, with: :render_404
   rescue_from Gitlab::GitAccess::ProjectCreationError, with: :render_422
+  rescue_from Gitlab::GitAccess::TimeoutError, with: :render_503
 
   # GET /foo/bar.git/info/refs?service=git-upload-pack (git pull)
   # GET /foo/bar.git/info/refs?service=git-receive-pack (git push)
@@ -62,6 +63,10 @@ class Projects::GitHttpController < Projects::GitHttpClientController
     render plain: exception.message, status: :unprocessable_entity
   end
 
+  def render_503(exception)
+    render plain: exception.message, status: :service_unavailable
+  end
+
   def access
     @access ||= access_klass.new(access_actor, project,
       'http', authentication_abilities: authentication_abilities,
diff --git a/changelogs/unreleased/42790-improve-feedback-for-internal-git-access-checks-timeouts.yml b/changelogs/unreleased/42790-improve-feedback-for-internal-git-access-checks-timeouts.yml
new file mode 100644
index 00000000000..d58d8da3a0e
--- /dev/null
+++ b/changelogs/unreleased/42790-improve-feedback-for-internal-git-access-checks-timeouts.yml
@@ -0,0 +1,5 @@
+---
+title: Adds trace of each access check when git push times out
+merge_request: 22265
+author:
+type: added
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 4dd6b19e353..ae40b5f7557 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -65,6 +65,8 @@ module API
                          result
                        rescue Gitlab::GitAccess::UnauthorizedError => e
                          break response_with_status(code: 401, success: false, message: e.message)
+                       rescue Gitlab::GitAccess::TimeoutError => e
+                         break response_with_status(code: 503, success: false, message: e.message)
                        rescue Gitlab::GitAccess::NotFoundError => e
                          break response_with_status(code: 404, success: false, message: e.message)
                        end
diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb
index 49e7f7e1fd7..52a72de3b15 100644
--- a/lib/gitlab/checks/change_access.rb
+++ b/lib/gitlab/checks/change_access.rb
@@ -18,11 +18,24 @@ module Gitlab
         lfs_objects_missing: 'LFS objects are missing. Ensure LFS is properly set up or try a manual "git lfs push --all".'
       }.freeze
 
-      attr_reader :user_access, :project, :skip_authorization, :skip_lfs_integrity_check, :protocol, :oldrev, :newrev, :ref, :branch_name, :tag_name
+      LOG_MESSAGES = {
+        push_checks: "Checking if you are allowed to push...",
+        delete_default_branch_check: "Checking if default branch is being deleted...",
+        protected_branch_checks: "Checking if you are force pushing to a protected branch...",
+        protected_branch_push_checks: "Checking if you are allowed to push to the protected branch...",
+        protected_branch_deletion_checks: "Checking if you are allowed to delete the protected branch...",
+        tag_checks: "Checking if you are allowed to change existing tags...",
+        protected_tag_checks: "Checking if you are creating, updating or deleting a protected tag...",
+        lfs_objects_exist_check: "Scanning repository for blobs stored in LFS and verifying their files have been uploaded to GitLab...",
+        commits_check_file_paths_validation: "Validating commits' file paths...",
+        commits_check: "Validating commits..." # different message in EE
+      }.freeze
+
+      attr_reader :user_access, :project, :skip_authorization, :skip_lfs_integrity_check, :protocol, :oldrev, :newrev, :ref, :branch_name, :tag_name, :logger
 
       def initialize(
         change, user_access:, project:, skip_authorization: false,
-        skip_lfs_integrity_check: false, protocol:
+        skip_lfs_integrity_check: false, protocol:, logger:
       )
         @oldrev, @newrev, @ref = change.values_at(:oldrev, :newrev, :ref)
         @branch_name = Gitlab::Git.branch_name(@ref)
@@ -32,6 +45,9 @@ module Gitlab
         @skip_authorization = skip_authorization
         @skip_lfs_integrity_check = skip_lfs_integrity_check
         @protocol = protocol
+
+        @logger = logger
+        @logger.log << "Running checks for ref: #{@branch_name || @tag_name}"
       end
 
       def exec(skip_commits_check: false)
@@ -49,26 +65,32 @@ module Gitlab
       protected
 
       def push_checks
-        unless can_push?
-          raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:push_code]
+        logger.log_timed(LOG_MESSAGES[__method__]) do
+          unless can_push?
+            raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:push_code]
+          end
         end
       end
 
       def branch_checks
         return unless branch_name
 
-        if deletion? && branch_name == project.default_branch
-          raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:delete_default_branch]
+        logger.log_timed(LOG_MESSAGES[:delete_default_branch_check]) do
+          if deletion? && branch_name == project.default_branch
+            raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:delete_default_branch]
+          end
         end
 
         protected_branch_checks
       end
 
       def protected_branch_checks
-        return unless ProtectedBranch.protected?(project, branch_name)
+        logger.log_timed(LOG_MESSAGES[__method__]) do
+          return unless ProtectedBranch.protected?(project, branch_name) # rubocop:disable Cop/AvoidReturnFromBlocks
 
-        if forced_push?
-          raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:force_push_protected_branch]
+          if forced_push?
+            raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:force_push_protected_branch]
+          end
         end
 
         if deletion?
@@ -79,23 +101,27 @@ module Gitlab
       end
 
       def protected_branch_deletion_checks
-        unless user_access.can_delete_branch?(branch_name)
-          raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:non_master_delete_protected_branch]
-        end
+        logger.log_timed(LOG_MESSAGES[__method__]) do
+          unless user_access.can_delete_branch?(branch_name)
+            raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:non_master_delete_protected_branch]
+          end
 
-        unless updated_from_web?
-          raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:non_web_delete_protected_branch]
+          unless updated_from_web?
+            raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:non_web_delete_protected_branch]
+          end
         end
       end
 
       def protected_branch_push_checks
-        if matching_merge_request?
-          unless user_access.can_merge_to_branch?(branch_name) || user_access.can_push_to_branch?(branch_name)
-            raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:merge_protected_branch]
-          end
-        else
-          unless user_access.can_push_to_branch?(branch_name)
-            raise GitAccess::UnauthorizedError, push_to_protected_branch_rejected_message
+        logger.log_timed(LOG_MESSAGES[__method__]) do
+          if matching_merge_request?
+            unless user_access.can_merge_to_branch?(branch_name) || user_access.can_push_to_branch?(branch_name)
+              raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:merge_protected_branch]
+            end
+          else
+            unless user_access.can_push_to_branch?(branch_name)
+              raise GitAccess::UnauthorizedError, push_to_protected_branch_rejected_message
+            end
           end
         end
       end
@@ -103,21 +129,25 @@ module Gitlab
       def tag_checks
         return unless tag_name
 
-        if tag_exists? && user_access.cannot_do_action?(:admin_project)
-          raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:change_existing_tags]
+        logger.log_timed(LOG_MESSAGES[__method__]) do
+          if tag_exists? && user_access.cannot_do_action?(:admin_project)
+            raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:change_existing_tags]
+          end
         end
 
         protected_tag_checks
       end
 
       def protected_tag_checks
-        return unless ProtectedTag.protected?(project, tag_name)
+        logger.log_timed(LOG_MESSAGES[__method__]) do
+          return unless ProtectedTag.protected?(project, tag_name) # rubocop:disable Cop/AvoidReturnFromBlocks
 
-        raise(GitAccess::UnauthorizedError, ERROR_MESSAGES[:update_protected_tag]) if update?
-        raise(GitAccess::UnauthorizedError, ERROR_MESSAGES[:delete_protected_tag]) if deletion?
+          raise(GitAccess::UnauthorizedError, ERROR_MESSAGES[:update_protected_tag]) if update?
+          raise(GitAccess::UnauthorizedError, ERROR_MESSAGES[:delete_protected_tag]) if deletion?
 
-        unless user_access.can_create_tag?(tag_name)
-          raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:create_protected_tag]
+          unless user_access.can_create_tag?(tag_name)
+            raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:create_protected_tag]
+          end
         end
       end
 
@@ -125,14 +155,18 @@ module Gitlab
         return if deletion? || newrev.nil?
         return unless should_run_commit_validations?
 
-        # n+1: https://gitlab.com/gitlab-org/gitlab-ee/issues/3593
-        ::Gitlab::GitalyClient.allow_n_plus_1_calls do
-          commits.each do |commit|
-            commit_check.validate(commit, validations_for_commit(commit))
+        logger.log_timed(LOG_MESSAGES[__method__]) do
+          # n+1: https://gitlab.com/gitlab-org/gitlab-ee/issues/3593
+          ::Gitlab::GitalyClient.allow_n_plus_1_calls do
+            commits.each do |commit|
+              commit_check.validate(commit, validations_for_commit(commit))
+            end
           end
         end
 
-        commit_check.validate_file_paths
+        logger.log_timed(LOG_MESSAGES[:commits_check_file_paths_validation]) do
+          commit_check.validate_file_paths
+        end
       end
 
       # Method overwritten in EE to inject custom validations
@@ -194,10 +228,12 @@ module Gitlab
       end
 
       def lfs_objects_exist_check
-        lfs_check = Checks::LfsIntegrity.new(project, newrev)
+        logger.log_timed(LOG_MESSAGES[__method__]) do
+          lfs_check = Checks::LfsIntegrity.new(project, newrev, logger.time_left)
 
-        if lfs_check.objects_missing?
-          raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:lfs_objects_missing]
+          if lfs_check.objects_missing?
+            raise GitAccess::UnauthorizedError, ERROR_MESSAGES[:lfs_objects_missing]
+          end
         end
       end
 
diff --git a/lib/gitlab/checks/lfs_integrity.rb b/lib/gitlab/checks/lfs_integrity.rb
index fa3dc1808df..1652d5a30a4 100644
--- a/lib/gitlab/checks/lfs_integrity.rb
+++ b/lib/gitlab/checks/lfs_integrity.rb
@@ -3,9 +3,10 @@
 module Gitlab
   module Checks
     class LfsIntegrity
-      def initialize(project, newrev)
+      def initialize(project, newrev, time_left)
         @project = project
         @newrev = newrev
+        @time_left = time_left
       end
 
       # rubocop: disable CodeReuse/ActiveRecord
@@ -13,7 +14,7 @@ module Gitlab
         return false unless @newrev && @project.lfs_enabled?
 
         new_lfs_pointers = Gitlab::Git::LfsChanges.new(@project.repository, @newrev)
-                                                  .new_pointers(object_limit: ::Gitlab::Git::Repository::REV_LIST_COMMIT_LIMIT)
+                                                  .new_pointers(object_limit: ::Gitlab::Git::Repository::REV_LIST_COMMIT_LIMIT, dynamic_timeout: @time_left)
 
         return false unless new_lfs_pointers.present?
 
diff --git a/lib/gitlab/checks/timed_logger.rb b/lib/gitlab/checks/timed_logger.rb
new file mode 100644
index 00000000000..cbb079a5383
--- /dev/null
+++ b/lib/gitlab/checks/timed_logger.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Checks
+    class TimedLogger
+      TimeoutError = Class.new(StandardError)
+
+      attr_reader :start_time
+      attr_accessor :log, :timeout
+
+      def initialize(start_time: Time.now, log: [], timeout:)
+        @start_time = start_time
+        @timeout = timeout
+        @log = log
+      end
+
+      def log_timed(log_message, start = Time.now)
+        check_timeout_reached
+
+        timed = true
+
+        yield
+
+        log << log_message + time_suffix_message(start: start)
+      rescue GRPC::DeadlineExceeded, TimeoutError
+        args = { cancelled: true }
+        args[:start] = start if timed
+
+        log << log_message + time_suffix_message(args)
+
+        raise TimeoutError
+      end
+
+      def check_timeout_reached
+        return unless time_expired?
+
+        raise TimeoutError
+      end
+
+      def time_left
+        (start_time + timeout.seconds) - Time.now
+      end
+
+      private
+
+      def time_expired?
+        time_left <= 0
+      end
+
+      def time_suffix_message(cancelled: false, start: nil)
+        return " (#{elapsed_time(start)}ms)" unless cancelled
+
+        if start
+          " (cancelled after #{elapsed_time(start)}ms)"
+        else
+          " (cancelled)"
+        end
+      end
+
+      def elapsed_time(start)
+        to_ms(Time.now - start)
+      end
+
+      def to_ms(elapsed)
+        (elapsed.to_f * 1000).round(2)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/git/lfs_changes.rb b/lib/gitlab/git/lfs_changes.rb
index f0fab1e76a3..d7148165408 100644
--- a/lib/gitlab/git/lfs_changes.rb
+++ b/lib/gitlab/git/lfs_changes.rb
@@ -6,8 +6,8 @@ module Gitlab
         @newrev = newrev
       end
 
-      def new_pointers(object_limit: nil, not_in: nil)
-        @repository.gitaly_blob_client.get_new_lfs_pointers(@newrev, object_limit, not_in)
+      def new_pointers(object_limit: nil, not_in: nil, dynamic_timeout: nil)
+        @repository.gitaly_blob_client.get_new_lfs_pointers(@newrev, object_limit, not_in, dynamic_timeout)
       end
 
       def all_pointers
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index 827c04ae035..713a98bb556 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -9,6 +9,7 @@ module Gitlab
     UnauthorizedError = Class.new(StandardError)
     NotFoundError = Class.new(StandardError)
     ProjectCreationError = Class.new(StandardError)
+    TimeoutError = Class.new(StandardError)
     ProjectMovedError = Class.new(NotFoundError)
 
     ERROR_MESSAGES = {
@@ -26,11 +27,12 @@ module Gitlab
       cannot_push_to_read_only: "You can't push code to a read-only GitLab instance."
     }.freeze
 
+    INTERNAL_TIMEOUT = 50.seconds.freeze
     DOWNLOAD_COMMANDS = %w{git-upload-pack git-upload-archive}.freeze
     PUSH_COMMANDS = %w{git-receive-pack}.freeze
     ALL_COMMANDS = DOWNLOAD_COMMANDS + PUSH_COMMANDS
 
-    attr_reader :actor, :project, :protocol, :authentication_abilities, :namespace_path, :project_path, :redirected_path, :auth_result_type, :changes
+    attr_reader :actor, :project, :protocol, :authentication_abilities, :namespace_path, :project_path, :redirected_path, :auth_result_type, :changes, :logger
 
     def initialize(actor, project, protocol, authentication_abilities:, namespace_path: nil, project_path: nil, redirected_path: nil, auth_result_type: nil)
       @actor    = actor
@@ -44,6 +46,7 @@ module Gitlab
     end
 
     def check(cmd, changes)
+      @logger = Checks::TimedLogger.new(timeout: INTERNAL_TIMEOUT)
       @changes = changes
 
       check_protocol!
@@ -269,14 +272,25 @@ module Gitlab
     end
 
     def check_single_change_access(change, skip_lfs_integrity_check: false)
-      Checks::ChangeAccess.new(
+      change_access = Checks::ChangeAccess.new(
         change,
         user_access: user_access,
         project: project,
         skip_authorization: deploy_key?,
         skip_lfs_integrity_check: skip_lfs_integrity_check,
-        protocol: protocol
-      ).exec
+        protocol: protocol,
+        logger: logger
+      )
+
+      change_access.exec
+    rescue Checks::TimedLogger::TimeoutError
+      header = <<~MESSAGE
+      Push operation timed out
+
+      Timing information for debugging purposes:
+      MESSAGE
+
+      raise TimeoutError, header + logger.log.join("\n")
     end
 
     def deploy_key
diff --git a/lib/gitlab/gitaly_client/blob_service.rb b/lib/gitlab/gitaly_client/blob_service.rb
index 1840bf45154..086ce31e678 100644
--- a/lib/gitlab/gitaly_client/blob_service.rb
+++ b/lib/gitlab/gitaly_client/blob_service.rb
@@ -72,7 +72,7 @@ module Gitlab
         GitalyClient::BlobsStitcher.new(response)
       end
 
-      def get_new_lfs_pointers(revision, limit, not_in)
+      def get_new_lfs_pointers(revision, limit, not_in, dynamic_timeout = nil)
         request = Gitaly::GetNewLFSPointersRequest.new(
           repository: @gitaly_repo,
           revision: encode_binary(revision),
@@ -85,7 +85,20 @@ module Gitlab
           request.not_in_refs += not_in
         end
 
-        response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_new_lfs_pointers, request, timeout: GitalyClient.medium_timeout)
+        timeout =
+          if dynamic_timeout
+            [dynamic_timeout, GitalyClient.medium_timeout].min
+          else
+            GitalyClient.medium_timeout
+          end
+
+        response = GitalyClient.call(
+          @gitaly_repo.storage_name,
+          :blob_service,
+          :get_new_lfs_pointers,
+          request,
+          timeout: timeout
+        )
 
         map_lfs_pointers(response)
       end
diff --git a/spec/lib/gitlab/checks/change_access_spec.rb b/spec/lib/gitlab/checks/change_access_spec.rb
index 4df426c54ae..81804ba5c76 100644
--- a/spec/lib/gitlab/checks/change_access_spec.rb
+++ b/spec/lib/gitlab/checks/change_access_spec.rb
@@ -10,13 +10,16 @@ describe Gitlab::Checks::ChangeAccess do
     let(:ref) { 'refs/heads/master' }
     let(:changes) { { oldrev: oldrev, newrev: newrev, ref: ref } }
     let(:protocol) { 'ssh' }
+    let(:timeout) { Gitlab::GitAccess::INTERNAL_TIMEOUT }
+    let(:logger) { Gitlab::Checks::TimedLogger.new(timeout: timeout) }
 
     subject(:change_access) do
       described_class.new(
         changes,
         project: project,
         user_access: user_access,
-        protocol: protocol
+        protocol: protocol,
+        logger: logger
       )
     end
 
@@ -30,6 +33,19 @@ describe Gitlab::Checks::ChangeAccess do
       end
     end
 
+    context 'when time limit was reached' do
+      it 'raises a TimeoutError' do
+        logger = Gitlab::Checks::TimedLogger.new(start_time: timeout.ago, timeout: timeout)
+        access = described_class.new(changes,
+                                     project: project,
+                                     user_access: user_access,
+                                     protocol: protocol,
+                                     logger: logger)
+
+        expect { access.exec }.to raise_error(Gitlab::Checks::TimedLogger::TimeoutError)
+      end
+    end
+
     context 'when the user is not allowed to push to the repo' do
       it 'raises an error' do
         expect(user_access).to receive(:can_do_action?).with(:push_code).and_return(false)
diff --git a/spec/lib/gitlab/checks/lfs_integrity_spec.rb b/spec/lib/gitlab/checks/lfs_integrity_spec.rb
index ec22e3a198e..0488720cec8 100644
--- a/spec/lib/gitlab/checks/lfs_integrity_spec.rb
+++ b/spec/lib/gitlab/checks/lfs_integrity_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Gitlab::Checks::LfsIntegrity do
   include ProjectForksHelper
 
+  let!(:time_left) { 50 }
   let(:project) { create(:project, :repository) }
   let(:repository) { project.repository }
   let(:newrev) do
@@ -15,7 +16,7 @@ describe Gitlab::Checks::LfsIntegrity do
     operations.commit_tree('8856a329dd38ca86dfb9ce5aa58a16d88cc119bd', "New LFS objects")
   end
 
-  subject { described_class.new(project, newrev) }
+  subject { described_class.new(project, newrev, time_left) }
 
   describe '#objects_missing?' do
     let(:blob_object) { repository.blob_at_branch('lfs', 'files/lfs/lfs_object.iso') }
diff --git a/spec/lib/gitlab/checks/timed_logger_spec.rb b/spec/lib/gitlab/checks/timed_logger_spec.rb
new file mode 100644
index 00000000000..726f2bf2144
--- /dev/null
+++ b/spec/lib/gitlab/checks/timed_logger_spec.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Checks::TimedLogger do
+  let(:log_messages) do
+    {
+      foo: "Foo message..."
+    }
+  end
+
+  class FooCheck
+    attr_accessor :logger
+
+    INTERNAL_TIMEOUT = 50.seconds.freeze
+
+    def initialize(start_time, ref)
+      @logger = Gitlab::Checks::TimedLogger.new(start_time: start_time, timeout: INTERNAL_TIMEOUT)
+      @logger.log << "Checking ref: #{ref}"
+    end
+
+    def bar_check
+      2 + 2
+    end
+
+    def grpc_check
+      raise GRPC::DeadlineExceeded
+    end
+  end
+
+  describe '#log_timed' do
+    it 'logs message' do
+      start = Time.now
+      check = FooCheck.new(start, "bar")
+
+      Timecop.freeze(start + 30.seconds) do
+        check.logger.log_timed(log_messages[:foo], start) { check.bar_check }
+      end
+
+      expect(check.logger.log).to eq(["Checking ref: bar", "Foo message... (30000.0ms)"])
+    end
+
+    context 'when time limit was reached' do
+      it 'cancels action' do
+        start = Time.now
+        check = FooCheck.new(start, "bar")
+
+        Timecop.freeze(start + 50.seconds) do
+          expect do
+            check.logger.log_timed(log_messages[:foo], start) do
+              check.bar_check
+            end
+          end.to raise_error(described_class::TimeoutError)
+        end
+
+        expect(check.logger.log).to eq(["Checking ref: bar", "Foo message... (cancelled)"])
+      end
+
+      it 'cancels action with time elapsed if work was performed' do
+        start = Time.now
+        check = FooCheck.new(start, "bar")
+
+        Timecop.freeze(start + 30.seconds) do
+          expect do
+            check.logger.log_timed(log_messages[:foo], start) do
+              check.grpc_check
+            end
+          end.to raise_error(described_class::TimeoutError)
+
+          expect(check.logger.log).to eq(["Checking ref: bar", "Foo message... (cancelled after 30000.0ms)"])
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/git/lfs_changes_spec.rb b/spec/lib/gitlab/git/lfs_changes_spec.rb
index c5e7ab959b2..d035df7e0c2 100644
--- a/spec/lib/gitlab/git/lfs_changes_spec.rb
+++ b/spec/lib/gitlab/git/lfs_changes_spec.rb
@@ -15,5 +15,9 @@ describe Gitlab::Git::LfsChanges do
     it 'limits new_objects using object_limit' do
       expect(subject.new_pointers(object_limit: 1)).to eq([])
     end
+
+    it 'times out if given a small dynamic timeout' do
+      expect { subject.new_pointers(dynamic_timeout: 0.001) }.to raise_error(GRPC::DeadlineExceeded)
+    end
   end
 end
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index e7da5565c26..a417ef77c9e 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -934,6 +934,16 @@ describe Gitlab::GitAccess do
         # There is still an N+1 query with protected branches
         expect { access.check('git-receive-pack', changes) }.not_to exceed_query_limit(control_count).with_threshold(1)
       end
+
+      it 'raises TimeoutError when #check_single_change_access raises a timeout error' do
+        message = "Push operation timed out\n\nTiming information for debugging purposes:\nRunning checks for ref: wow"
+
+        expect_next_instance_of(Gitlab::Checks::ChangeAccess) do |check|
+          expect(check).to receive(:exec).and_raise(Gitlab::Checks::TimedLogger::TimeoutError)
+        end
+
+        expect { access.check('git-receive-pack', changes) }.to raise_error(described_class::TimeoutError, message)
+      end
     end
   end
 
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb
index e0b5b34f9c4..2ebcb787d06 100644
--- a/spec/requests/api/internal_spec.rb
+++ b/spec/requests/api/internal_spec.rb
@@ -494,6 +494,24 @@ describe API::Internal do
       end
     end
 
+    context 'request times out' do
+      context 'git push' do
+        it 'responds with a gateway timeout' do
+          personal_project = create(:project, namespace: user.namespace)
+
+          expect_next_instance_of(Gitlab::GitAccess) do |access|
+            expect(access).to receive(:check).and_raise(Gitlab::GitAccess::TimeoutError, "Foo")
+          end
+          push(key, personal_project)
+
+          expect(response).to have_gitlab_http_status(503)
+          expect(json_response['status']).to be_falsey
+          expect(json_response['message']).to eq("Foo")
+          expect(user.reload.last_activity_on).to be_nil
+        end
+      end
+    end
+
     context "archived project" do
       before do
         project.add_developer(user)
-- 
cgit v1.2.3


From cb5f4d0cad520629aecaa838ddf1e84d7265ff49 Mon Sep 17 00:00:00 2001
From: Tiago Botelho <tiagonbotelho@hotmail.com>
Date: Thu, 25 Oct 2018 09:49:59 +0100
Subject: Refactors TimedLogger to be more OOP compliant

Adds a #full_message method so that external classes
do not have access to the state of the logger.

Adds a #append_message to always append to the array in-place
---
 lib/gitlab/checks/change_access.rb |  2 +-
 lib/gitlab/checks/timed_logger.rb  | 22 +++++++++++++++++-----
 lib/gitlab/git_access.rb           | 16 ++++++++--------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb
index 52a72de3b15..7036ae9191d 100644
--- a/lib/gitlab/checks/change_access.rb
+++ b/lib/gitlab/checks/change_access.rb
@@ -47,7 +47,7 @@ module Gitlab
         @protocol = protocol
 
         @logger = logger
-        @logger.log << "Running checks for ref: #{@branch_name || @tag_name}"
+        @logger.append_message("Running checks for ref: #{@branch_name || @tag_name}")
       end
 
       def exec(skip_commits_check: false)
diff --git a/lib/gitlab/checks/timed_logger.rb b/lib/gitlab/checks/timed_logger.rb
index cbb079a5383..11c08429d3d 100644
--- a/lib/gitlab/checks/timed_logger.rb
+++ b/lib/gitlab/checks/timed_logger.rb
@@ -5,15 +5,18 @@ module Gitlab
     class TimedLogger
       TimeoutError = Class.new(StandardError)
 
-      attr_reader :start_time
-      attr_accessor :log, :timeout
+      attr_reader :start_time, :header, :log, :timeout
 
-      def initialize(start_time: Time.now, log: [], timeout:)
+      def initialize(start_time: Time.now, log: [], timeout:, header: "")
         @start_time = start_time
         @timeout = timeout
+        @header = header
         @log = log
       end
 
+      # Adds trace of method being tracked with
+      # the correspondent time it took to run it
+      #
       def log_timed(log_message, start = Time.now)
         check_timeout_reached
 
@@ -21,12 +24,12 @@ module Gitlab
 
         yield
 
-        log << log_message + time_suffix_message(start: start)
+        append_message(log_message + time_suffix_message(start: start))
       rescue GRPC::DeadlineExceeded, TimeoutError
         args = { cancelled: true }
         args[:start] = start if timed
 
-        log << log_message + time_suffix_message(args)
+        append_message(log_message + time_suffix_message(args))
 
         raise TimeoutError
       end
@@ -41,6 +44,15 @@ module Gitlab
         (start_time + timeout.seconds) - Time.now
       end
 
+      def full_message
+        header + log.join("\n")
+      end
+
+      # We always want to append in-place on the log
+      def append_message(message)
+        log << message
+      end
+
       private
 
       def time_expired?
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index 713a98bb556..1da466cbfd6 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -27,6 +27,12 @@ module Gitlab
       cannot_push_to_read_only: "You can't push code to a read-only GitLab instance."
     }.freeze
 
+    LOG_HEADER = <<~MESSAGE
+      Push operation timed out
+
+      Timing information for debugging purposes:
+    MESSAGE
+
     INTERNAL_TIMEOUT = 50.seconds.freeze
     DOWNLOAD_COMMANDS = %w{git-upload-pack git-upload-archive}.freeze
     PUSH_COMMANDS = %w{git-receive-pack}.freeze
@@ -46,7 +52,7 @@ module Gitlab
     end
 
     def check(cmd, changes)
-      @logger = Checks::TimedLogger.new(timeout: INTERNAL_TIMEOUT)
+      @logger = Checks::TimedLogger.new(timeout: INTERNAL_TIMEOUT, header: LOG_HEADER)
       @changes = changes
 
       check_protocol!
@@ -284,13 +290,7 @@ module Gitlab
 
       change_access.exec
     rescue Checks::TimedLogger::TimeoutError
-      header = <<~MESSAGE
-      Push operation timed out
-
-      Timing information for debugging purposes:
-      MESSAGE
-
-      raise TimeoutError, header + logger.log.join("\n")
+      raise TimeoutError, logger.full_message
     end
 
     def deploy_key
-- 
cgit v1.2.3


From e0225aea1beb741601b888d4f505abd97f0f67a6 Mon Sep 17 00:00:00 2001
From: Tiago Botelho <tiagonbotelho@hotmail.com>
Date: Thu, 25 Oct 2018 10:36:40 +0100
Subject: Iterating through commit list times out

Validating each commit on ChangeAccess times out if
it already took too long to complete.

Improves the TimedLogger specs to not make use of a stubbed
class anymore
---
 lib/gitlab/checks/change_access.rb          |  2 +
 lib/gitlab/checks/timed_logger.rb           |  6 ++-
 lib/gitlab/git_access.rb                    |  2 +-
 spec/lib/gitlab/checks/timed_logger_spec.rb | 58 ++++++++++++-----------------
 4 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb
index 7036ae9191d..28ec6beb7e0 100644
--- a/lib/gitlab/checks/change_access.rb
+++ b/lib/gitlab/checks/change_access.rb
@@ -159,6 +159,8 @@ module Gitlab
           # n+1: https://gitlab.com/gitlab-org/gitlab-ee/issues/3593
           ::Gitlab::GitalyClient.allow_n_plus_1_calls do
             commits.each do |commit|
+              logger.check_timeout_reached
+
               commit_check.validate(commit, validations_for_commit(commit))
             end
           end
diff --git a/lib/gitlab/checks/timed_logger.rb b/lib/gitlab/checks/timed_logger.rb
index 11c08429d3d..f365e0a43f6 100644
--- a/lib/gitlab/checks/timed_logger.rb
+++ b/lib/gitlab/checks/timed_logger.rb
@@ -7,7 +7,7 @@ module Gitlab
 
       attr_reader :start_time, :header, :log, :timeout
 
-      def initialize(start_time: Time.now, log: [], timeout:, header: "")
+      def initialize(start_time: Time.now, log: [], header: "", timeout:)
         @start_time = start_time
         @timeout = timeout
         @header = header
@@ -15,7 +15,9 @@ module Gitlab
       end
 
       # Adds trace of method being tracked with
-      # the correspondent time it took to run it
+      # the correspondent time it took to run it.
+      # We make use of the start default argument
+      # on unit tests related to this method
       #
       def log_timed(log_message, start = Time.now)
         check_timeout_reached
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index 1da466cbfd6..802fa65dd63 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -27,13 +27,13 @@ module Gitlab
       cannot_push_to_read_only: "You can't push code to a read-only GitLab instance."
     }.freeze
 
+    INTERNAL_TIMEOUT = 50.seconds.freeze
     LOG_HEADER = <<~MESSAGE
       Push operation timed out
 
       Timing information for debugging purposes:
     MESSAGE
 
-    INTERNAL_TIMEOUT = 50.seconds.freeze
     DOWNLOAD_COMMANDS = %w{git-upload-pack git-upload-archive}.freeze
     PUSH_COMMANDS = %w{git-receive-pack}.freeze
     ALL_COMMANDS = DOWNLOAD_COMMANDS + PUSH_COMMANDS
diff --git a/spec/lib/gitlab/checks/timed_logger_spec.rb b/spec/lib/gitlab/checks/timed_logger_spec.rb
index 726f2bf2144..0ed3940c038 100644
--- a/spec/lib/gitlab/checks/timed_logger_spec.rb
+++ b/spec/lib/gitlab/checks/timed_logger_spec.rb
@@ -3,73 +3,61 @@
 require 'spec_helper'
 
 describe Gitlab::Checks::TimedLogger do
-  let(:log_messages) do
+  let!(:timeout) { 50.seconds }
+  let!(:start) { Time.now }
+  let!(:ref) { "bar" }
+  let!(:logger) { described_class.new(start_time: start, timeout: timeout) }
+  let!(:log_messages) do
     {
       foo: "Foo message..."
     }
   end
 
-  class FooCheck
-    attr_accessor :logger
-
-    INTERNAL_TIMEOUT = 50.seconds.freeze
-
-    def initialize(start_time, ref)
-      @logger = Gitlab::Checks::TimedLogger.new(start_time: start_time, timeout: INTERNAL_TIMEOUT)
-      @logger.log << "Checking ref: #{ref}"
-    end
-
-    def bar_check
-      2 + 2
-    end
-
-    def grpc_check
-      raise GRPC::DeadlineExceeded
-    end
+  before do
+    logger.append_message("Checking ref: #{ref}")
   end
 
   describe '#log_timed' do
     it 'logs message' do
-      start = Time.now
-      check = FooCheck.new(start, "bar")
-
       Timecop.freeze(start + 30.seconds) do
-        check.logger.log_timed(log_messages[:foo], start) { check.bar_check }
+        logger.log_timed(log_messages[:foo], start) { bar_check }
       end
 
-      expect(check.logger.log).to eq(["Checking ref: bar", "Foo message... (30000.0ms)"])
+      expect(logger.full_message).to eq("Checking ref: bar\nFoo message... (30000.0ms)")
     end
 
     context 'when time limit was reached' do
       it 'cancels action' do
-        start = Time.now
-        check = FooCheck.new(start, "bar")
-
         Timecop.freeze(start + 50.seconds) do
           expect do
-            check.logger.log_timed(log_messages[:foo], start) do
-              check.bar_check
+            logger.log_timed(log_messages[:foo], start) do
+              bar_check
             end
           end.to raise_error(described_class::TimeoutError)
         end
 
-        expect(check.logger.log).to eq(["Checking ref: bar", "Foo message... (cancelled)"])
+        expect(logger.full_message).to eq("Checking ref: bar\nFoo message... (cancelled)")
       end
 
       it 'cancels action with time elapsed if work was performed' do
-        start = Time.now
-        check = FooCheck.new(start, "bar")
-
         Timecop.freeze(start + 30.seconds) do
           expect do
-            check.logger.log_timed(log_messages[:foo], start) do
-              check.grpc_check
+            logger.log_timed(log_messages[:foo], start) do
+              grpc_check
             end
           end.to raise_error(described_class::TimeoutError)
 
-          expect(check.logger.log).to eq(["Checking ref: bar", "Foo message... (cancelled after 30000.0ms)"])
+          expect(logger.full_message).to eq("Checking ref: bar\nFoo message... (cancelled after 30000.0ms)")
         end
       end
     end
   end
+
+  def bar_check
+    2 + 2
+  end
+
+  def grpc_check
+    raise GRPC::DeadlineExceeded
+  end
 end
-- 
cgit v1.2.3


From 0ff5b0f45361cf9fe622cc3265b943a999c14d0e Mon Sep 17 00:00:00 2001
From: Ronald van Zon <rvzon84@gmail.com>
Date: Thu, 25 Oct 2018 09:52:26 +0000
Subject: Removed the print in test

---
 spec/models/milestone_spec.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 617f0151f33..651f0540824 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -371,9 +371,6 @@ describe Milestone do
         expected_count = { opened: 5, closed: 6, all: 11 }
 
         count = described_class.states_count(Project.all, Group.all)
-
-        p Project.all, Group.all
-
         expect(count).to eq(expected_count)
       end
     end
-- 
cgit v1.2.3


From f8ee07d9ee6d01b255902ad976a07beef59a95fb Mon Sep 17 00:00:00 2001
From: Tiago Botelho <tiagonbotelho@hotmail.com>
Date: Mon, 22 Oct 2018 14:18:45 +0100
Subject: User not defined in PostReceive#process_project_changes

When Gitlab::GitPostReceive#changes_refs is empty
user would not get defined and nil would be passed
to PostReceive#after_project_changes_hooks which would
then throw an error.
---
 app/workers/post_receive.rb                        |  12 +-
 ...5-fail-early-when-user-cannot-be-identified.yml |   5 +
 lib/gitlab/git_post_receive.rb                     |   2 +-
 spec/workers/post_receive_spec.rb                  | 124 +++++++++++----------
 4 files changed, 81 insertions(+), 62 deletions(-)
 create mode 100644 changelogs/unreleased/51335-fail-early-when-user-cannot-be-identified.yml

diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index 09a594cdb4e..207eef6229f 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -29,14 +29,11 @@ class PostReceive
   def process_project_changes(post_received)
     changes = []
     refs = Set.new
+    @user = post_received.identify
 
     post_received.changes_refs do |oldrev, newrev, ref|
       @user ||= post_received.identify(newrev)
-
-      unless @user
-        log("Triggered hook for non-existing user \"#{post_received.identifier}\"")
-        return false # rubocop:disable Cop/AvoidReturnFromBlocks
-      end
+      break unless @user
 
       if Gitlab::Git.tag_ref?(ref)
         GitTagPushService.new(post_received.project, @user, oldrev: oldrev, newrev: newrev, ref: ref).execute
@@ -48,6 +45,11 @@ class PostReceive
       refs << ref
     end
 
+    unless @user
+      log("Triggered hook for non-existing user \"#{post_received.identifier}\"")
+      return false
+    end
+
     after_project_changes_hooks(post_received, @user, refs.to_a, changes)
   end
 
diff --git a/changelogs/unreleased/51335-fail-early-when-user-cannot-be-identified.yml b/changelogs/unreleased/51335-fail-early-when-user-cannot-be-identified.yml
new file mode 100644
index 00000000000..a042debc28f
--- /dev/null
+++ b/changelogs/unreleased/51335-fail-early-when-user-cannot-be-identified.yml
@@ -0,0 +1,5 @@
+---
+title: If user was not found, service hooks won't run on post receive background job
+merge_request: 22519
+author:
+type: fixed
diff --git a/lib/gitlab/git_post_receive.rb b/lib/gitlab/git_post_receive.rb
index e731e654f3c..f5470ffa2da 100644
--- a/lib/gitlab/git_post_receive.rb
+++ b/lib/gitlab/git_post_receive.rb
@@ -11,7 +11,7 @@ module Gitlab
       @changes = deserialize_changes(changes)
     end
 
-    def identify(revision)
+    def identify(revision = nil)
       super(identifier, project, revision)
     end
 
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index cd6661f09a1..1184bd9492a 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -6,7 +6,7 @@ describe PostReceive do
   let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) }
   let(:gl_repository) { "project-#{project.id}" }
   let(:key) { create(:key, user: project.owner) }
-  let(:key_id) { key.shell_id }
+  let!(:key_id) { key.shell_id }
 
   let(:project) do
     create(:project, :repository, auto_cancel_pending_pipelines: 'disabled')
@@ -31,85 +31,97 @@ describe PostReceive do
   end
 
   describe "#process_project_changes" do
-    before do
-      allow_any_instance_of(Gitlab::GitPostReceive).to receive(:identify).and_return(project.owner)
+    context 'empty changes' do
+      it "does not call any PushService but runs after project hooks" do
+        expect(GitPushService).not_to receive(:new)
+        expect(GitTagPushService).not_to receive(:new)
+        expect_next_instance_of(SystemHooksService) { |service| expect(service).to receive(:execute_hooks) }
+
+        described_class.new.perform(gl_repository, key_id, "")
+      end
     end
 
-    context "branches" do
-      let(:changes) { "123456 789012 refs/heads/tést" }
+    context 'with changes' do
+      before do
+        allow_any_instance_of(Gitlab::GitPostReceive).to receive(:identify).and_return(project.owner)
+      end
+
+      context "branches" do
+        let(:changes) { "123456 789012 refs/heads/tést" }
 
-      it "calls GitTagPushService" do
-        expect_any_instance_of(GitPushService).to receive(:execute).and_return(true)
-        expect_any_instance_of(GitTagPushService).not_to receive(:execute)
-        described_class.new.perform(gl_repository, key_id, base64_changes)
+        it "calls GitPushService" do
+          expect_any_instance_of(GitPushService).to receive(:execute).and_return(true)
+          expect_any_instance_of(GitTagPushService).not_to receive(:execute)
+          described_class.new.perform(gl_repository, key_id, base64_changes)
+        end
       end
-    end
 
-    context "tags" do
-      let(:changes) { "123456 789012 refs/tags/tag" }
+      context "tags" do
+        let(:changes) { "123456 789012 refs/tags/tag" }
 
-      it "calls GitTagPushService" do
-        expect_any_instance_of(GitPushService).not_to receive(:execute)
-        expect_any_instance_of(GitTagPushService).to receive(:execute).and_return(true)
-        described_class.new.perform(gl_repository, key_id, base64_changes)
+        it "calls GitTagPushService" do
+          expect_any_instance_of(GitPushService).not_to receive(:execute)
+          expect_any_instance_of(GitTagPushService).to receive(:execute).and_return(true)
+          described_class.new.perform(gl_repository, key_id, base64_changes)
+        end
       end
-    end
 
-    context "merge-requests" do
-      let(:changes) { "123456 789012 refs/merge-requests/123" }
+      context "merge-requests" do
+        let(:changes) { "123456 789012 refs/merge-requests/123" }
 
-      it "does not call any of the services" do
-        expect_any_instance_of(GitPushService).not_to receive(:execute)
-        expect_any_instance_of(GitTagPushService).not_to receive(:execute)
-        described_class.new.perform(gl_repository, key_id, base64_changes)
+        it "does not call any of the services" do
+          expect_any_instance_of(GitPushService).not_to receive(:execute)
+          expect_any_instance_of(GitTagPushService).not_to receive(:execute)
+          described_class.new.perform(gl_repository, key_id, base64_changes)
+        end
       end
-    end
 
-    context "gitlab-ci.yml" do
-      let(:changes) { "123456 789012 refs/heads/feature\n654321 210987 refs/tags/tag" }
+      context "gitlab-ci.yml" do
+        let(:changes) { "123456 789012 refs/heads/feature\n654321 210987 refs/tags/tag" }
 
-      subject { described_class.new.perform(gl_repository, key_id, base64_changes) }
+        subject { described_class.new.perform(gl_repository, key_id, base64_changes) }
 
-      context "creates a Ci::Pipeline for every change" do
-        before do
-          stub_ci_pipeline_to_return_yaml_file
+        context "creates a Ci::Pipeline for every change" do
+          before do
+            stub_ci_pipeline_to_return_yaml_file
+
+            allow_any_instance_of(Project)
+              .to receive(:commit)
+              .and_return(project.commit)
 
-          allow_any_instance_of(Project)
-            .to receive(:commit)
-            .and_return(project.commit)
+            allow_any_instance_of(Repository)
+              .to receive(:branch_exists?)
+              .and_return(true)
+          end
 
-          allow_any_instance_of(Repository)
-            .to receive(:branch_exists?)
-            .and_return(true)
+          it { expect { subject }.to change { Ci::Pipeline.count }.by(2) }
         end
 
-        it { expect { subject }.to change { Ci::Pipeline.count }.by(2) }
-      end
+        context "does not create a Ci::Pipeline" do
+          before do
+            stub_ci_pipeline_yaml_file(nil)
+          end
 
-      context "does not create a Ci::Pipeline" do
-        before do
-          stub_ci_pipeline_yaml_file(nil)
+          it { expect { subject }.not_to change { Ci::Pipeline.count } }
         end
-
-        it { expect { subject }.not_to change { Ci::Pipeline.count } }
       end
-    end
 
-    context 'after project changes hooks' do
-      let(:changes) { '123456 789012 refs/heads/tést' }
-      let(:fake_hook_data) { Hash.new(event_name: 'repository_update') }
+      context 'after project changes hooks' do
+        let(:changes) { '123456 789012 refs/heads/tést' }
+        let(:fake_hook_data) { Hash.new(event_name: 'repository_update') }
 
-      before do
-        allow_any_instance_of(Gitlab::DataBuilder::Repository).to receive(:update).and_return(fake_hook_data)
-        # silence hooks so we can isolate
-        allow_any_instance_of(Key).to receive(:post_create_hook).and_return(true)
-        allow_any_instance_of(GitPushService).to receive(:execute).and_return(true)
-      end
+        before do
+          allow_any_instance_of(Gitlab::DataBuilder::Repository).to receive(:update).and_return(fake_hook_data)
+          # silence hooks so we can isolate
+          allow_any_instance_of(Key).to receive(:post_create_hook).and_return(true)
+          allow_any_instance_of(GitPushService).to receive(:execute).and_return(true)
+        end
 
-      it 'calls SystemHooksService' do
-        expect_any_instance_of(SystemHooksService).to receive(:execute_hooks).with(fake_hook_data, :repository_update_hooks).and_return(true)
+        it 'calls SystemHooksService' do
+          expect_any_instance_of(SystemHooksService).to receive(:execute_hooks).with(fake_hook_data, :repository_update_hooks).and_return(true)
 
-        described_class.new.perform(gl_repository, key_id, base64_changes)
+          described_class.new.perform(gl_repository, key_id, base64_changes)
+        end
       end
     end
   end
-- 
cgit v1.2.3


From 83d64ed40c95c912c5d4c0f6e7d3d23bf7489053 Mon Sep 17 00:00:00 2001
From: Sanad Liaquat <sliaquat@gitlab.com>
Date: Thu, 25 Oct 2018 15:28:59 +0500
Subject: Add missing frozen_string_literal

---
 qa/qa/scenario/test/integration/ldap_no_tls.rb | 2 ++
 qa/qa/scenario/test/integration/ldap_tls.rb    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/qa/qa/scenario/test/integration/ldap_no_tls.rb b/qa/qa/scenario/test/integration/ldap_no_tls.rb
index 3ecc5ccf208..bbf4c847f33 100644
--- a/qa/qa/scenario/test/integration/ldap_no_tls.rb
+++ b/qa/qa/scenario/test/integration/ldap_no_tls.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module QA
   module Scenario
     module Test
diff --git a/qa/qa/scenario/test/integration/ldap_tls.rb b/qa/qa/scenario/test/integration/ldap_tls.rb
index 40d6e4b5b3d..2a767e57bc6 100644
--- a/qa/qa/scenario/test/integration/ldap_tls.rb
+++ b/qa/qa/scenario/test/integration/ldap_tls.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module QA
   module Scenario
     module Test
-- 
cgit v1.2.3


From 679d9b21b7aac55796ef59d5694b7d2e0fb40b35 Mon Sep 17 00:00:00 2001
From: Tiago Botelho <tiagonbotelho@hotmail.com>
Date: Thu, 25 Oct 2018 11:09:53 +0100
Subject: Removes idenfitication by commit from Gitlab::Identifier

Before we would need to identify a user when pushing
through the GitLab UI. Since this is no longer the case
we can remove the identification by commit and instead,
use the identify_using_user
---
 app/workers/post_receive.rb        | 13 ++++------
 lib/gitlab/git_post_receive.rb     |  4 ++--
 lib/gitlab/identifier.rb           | 21 +++-------------
 spec/lib/gitlab/identifier_spec.rb | 49 ++++----------------------------------
 spec/workers/post_receive_spec.rb  | 11 +++++++++
 5 files changed, 25 insertions(+), 73 deletions(-)

diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index 207eef6229f..72a1733a2a8 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -31,10 +31,12 @@ class PostReceive
     refs = Set.new
     @user = post_received.identify
 
-    post_received.changes_refs do |oldrev, newrev, ref|
-      @user ||= post_received.identify(newrev)
-      break unless @user
+    unless @user
+      log("Triggered hook for non-existing user \"#{post_received.identifier}\"")
+      return false
+    end
 
+    post_received.changes_refs do |oldrev, newrev, ref|
       if Gitlab::Git.tag_ref?(ref)
         GitTagPushService.new(post_received.project, @user, oldrev: oldrev, newrev: newrev, ref: ref).execute
       elsif Gitlab::Git.branch_ref?(ref)
@@ -45,11 +47,6 @@ class PostReceive
       refs << ref
     end
 
-    unless @user
-      log("Triggered hook for non-existing user \"#{post_received.identifier}\"")
-      return false
-    end
-
     after_project_changes_hooks(post_received, @user, refs.to_a, changes)
   end
 
diff --git a/lib/gitlab/git_post_receive.rb b/lib/gitlab/git_post_receive.rb
index f5470ffa2da..cf2329e489d 100644
--- a/lib/gitlab/git_post_receive.rb
+++ b/lib/gitlab/git_post_receive.rb
@@ -11,8 +11,8 @@ module Gitlab
       @changes = deserialize_changes(changes)
     end
 
-    def identify(revision = nil)
-      super(identifier, project, revision)
+    def identify
+      super(identifier)
     end
 
     def changes_refs
diff --git a/lib/gitlab/identifier.rb b/lib/gitlab/identifier.rb
index 28a9fe29465..d5f94ad04f1 100644
--- a/lib/gitlab/identifier.rb
+++ b/lib/gitlab/identifier.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 # Detect user based on identifier like
-# key-13 or user-36 or last commit
+# key-13 or user-36
 module Gitlab
   module Identifier
-    def identify(identifier, project = nil, newrev = nil)
-      if identifier.blank?
-        identify_using_commit(project, newrev)
-      elsif identifier =~ /\Auser-\d+\Z/
+    def identify(identifier)
+      if identifier =~ /\Auser-\d+\Z/
         # git push over http
         identify_using_user(identifier)
       elsif identifier =~ /\Akey-\d+\Z/
@@ -16,19 +14,6 @@ module Gitlab
       end
     end
 
-    # Tries to identify a user based on a commit SHA.
-    def identify_using_commit(project, ref)
-      return if project.nil? && ref.nil?
-
-      commit = project.commit(ref)
-
-      return if !commit || !commit.author_email
-
-      identify_with_cache(:email, commit.author_email) do
-        commit.author
-      end
-    end
-
     # Tries to identify a user based on a user identifier (e.g. "user-123").
     # rubocop: disable CodeReuse/ActiveRecord
     def identify_using_user(identifier)
diff --git a/spec/lib/gitlab/identifier_spec.rb b/spec/lib/gitlab/identifier_spec.rb
index 0385dd762c2..1e583f4cee2 100644
--- a/spec/lib/gitlab/identifier_spec.rb
+++ b/spec/lib/gitlab/identifier_spec.rb
@@ -11,11 +11,8 @@ describe Gitlab::Identifier do
 
   describe '#identify' do
     context 'without an identifier' do
-      it 'identifies the user using a commit' do
-        expect(identifier).to receive(:identify_using_commit)
-          .with(project, '123')
-
-        identifier.identify('', project, '123')
+      it 'returns nil' do
+        expect(identifier.identify('')).to be nil
       end
     end
 
@@ -24,7 +21,7 @@ describe Gitlab::Identifier do
         expect(identifier).to receive(:identify_using_user)
           .with("user-#{user.id}")
 
-        identifier.identify("user-#{user.id}", project, '123')
+        identifier.identify("user-#{user.id}")
       end
     end
 
@@ -33,49 +30,11 @@ describe Gitlab::Identifier do
         expect(identifier).to receive(:identify_using_ssh_key)
           .with("key-#{key.id}")
 
-        identifier.identify("key-#{key.id}", project, '123')
+        identifier.identify("key-#{key.id}")
       end
     end
   end
 
-  describe '#identify_using_commit' do
-    it "returns the User for an existing commit author's Email address" do
-      commit = double(:commit, author: user, author_email: user.email)
-
-      expect(project).to receive(:commit).with('123').and_return(commit)
-
-      expect(identifier.identify_using_commit(project, '123')).to eq(user)
-    end
-
-    it 'returns nil when no user could be found' do
-      allow(project).to receive(:commit).with('123').and_return(nil)
-
-      expect(identifier.identify_using_commit(project, '123')).to be_nil
-    end
-
-    it 'returns nil when the commit does not have an author Email' do
-      commit = double(:commit, author_email: nil)
-
-      expect(project).to receive(:commit).with('123').and_return(commit)
-
-      expect(identifier.identify_using_commit(project, '123')).to be_nil
-    end
-
-    it 'caches the found users per Email' do
-      commit = double(:commit, author: user, author_email: user.email)
-
-      expect(project).to receive(:commit).with('123').twice.and_return(commit)
-
-      2.times do
-        expect(identifier.identify_using_commit(project, '123')).to eq(user)
-      end
-    end
-
-    it 'returns nil if the project & ref are not present' do
-      expect(identifier.identify_using_commit(nil, nil)).to be_nil
-    end
-  end
-
   describe '#identify_using_user' do
     it 'returns the User for an existing ID in the identifier' do
       found = identifier.identify_using_user("user-#{user.id}")
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index 1184bd9492a..9176eb12b12 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -41,6 +41,17 @@ describe PostReceive do
       end
     end
 
+    context 'unidentified user' do
+      let!(:key_id) { "" }
+
+      it 'returns false' do
+        expect(GitPushService).not_to receive(:new)
+        expect(GitTagPushService).not_to receive(:new)
+
+        expect(described_class.new.perform(gl_repository, key_id, base64_changes)).to be false
+      end
+    end
+
     context 'with changes' do
       before do
         allow_any_instance_of(Gitlab::GitPostReceive).to receive(:identify).and_return(project.owner)
-- 
cgit v1.2.3


From bc8ced6287dd50fee4c4c2eca682c71c3fc80698 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <pleitzen@gitlab.com>
Date: Thu, 25 Oct 2018 12:36:38 +0200
Subject: Upgrade Prometheus and alertmanager

Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2
---
 changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml | 5 +++++
 vendor/prometheus/values.yaml                               | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml

diff --git a/changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml b/changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml
new file mode 100644
index 00000000000..d0c8ed8001d
--- /dev/null
+++ b/changelogs/unreleased/pl-uprade-prometheus-alertmanager.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2
+merge_request: 22600
+author:
+type: other
diff --git a/vendor/prometheus/values.yaml b/vendor/prometheus/values.yaml
index c432be72163..02ec3e2d9fe 100644
--- a/vendor/prometheus/values.yaml
+++ b/vendor/prometheus/values.yaml
@@ -1,5 +1,7 @@
 alertmanager:
   enabled: false
+  image:
+    tag: v0.15.2
 
 kubeStateMetrics:
   enabled: true
@@ -16,7 +18,7 @@ rbac:
 server:
   fullnameOverride: "prometheus-prometheus-server"
   image:
-    tag: v2.1.0
+    tag: v2.4.3
 
 serverFiles:
   alerts: {}
-- 
cgit v1.2.3


From 324ff19571cada7e148c53bb70e70f823eff4335 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Wed, 24 Oct 2018 16:03:00 +0100
Subject: Backport SSH host key detection code to CE

This functionality is needed for SSH push mirroring support, which is a
CE feature.
---
 app/controllers/projects/mirrors_controller.rb     |  16 ++
 app/models/ssh_host_key.rb                         | 130 ++++++++++++++++
 config/routes/project.rb                           |   1 +
 .../projects/mirrors_controller_spec.rb            |  63 ++++++++
 spec/models/ssh_host_key_spec.rb                   | 164 +++++++++++++++++++++
 5 files changed, 374 insertions(+)
 create mode 100644 app/models/ssh_host_key.rb
 create mode 100644 spec/models/ssh_host_key_spec.rb

diff --git a/app/controllers/projects/mirrors_controller.rb b/app/controllers/projects/mirrors_controller.rb
index 78d5faf2326..53176978416 100644
--- a/app/controllers/projects/mirrors_controller.rb
+++ b/app/controllers/projects/mirrors_controller.rb
@@ -44,6 +44,22 @@ class Projects::MirrorsController < Projects::ApplicationController
     redirect_to_repository_settings(project, anchor: 'js-push-remote-settings')
   end
 
+  def ssh_host_keys
+    lookup = SshHostKey.new(project: project, url: params[:ssh_url], compare_host_keys: params[:compare_host_keys])
+
+    if lookup.error.present?
+      # Failed to read keys
+      render json: { message: lookup.error }, status: :bad_request
+    elsif lookup.known_hosts.nil?
+      # Still working, come back later
+      render body: nil, status: :no_content
+    else
+      render json: lookup
+    end
+  rescue ArgumentError => err
+    render json: { message: err.message }, status: :bad_request
+  end
+
   private
 
   def remote_mirror
diff --git a/app/models/ssh_host_key.rb b/app/models/ssh_host_key.rb
new file mode 100644
index 00000000000..b6844dbe870
--- /dev/null
+++ b/app/models/ssh_host_key.rb
@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+# Detected SSH host keys are transiently stored in Redis
+class SshHostKey
+  class Fingerprint < Gitlab::SSHPublicKey
+    attr_reader :index
+
+    def initialize(key, index: nil)
+      super(key)
+
+      @index = index
+    end
+
+    def as_json(*)
+      { bits: bits, fingerprint: fingerprint, type: type, index: index }
+    end
+  end
+
+  include ReactiveCaching
+
+  self.reactive_cache_key = ->(key) { [key.class.to_s, key.id] }
+
+  # Do not refresh the data in the background - it is not expected to change.
+  # This is achieved by making the lifetime shorter than the refresh interval.
+  self.reactive_cache_refresh_interval = 15.minutes
+  self.reactive_cache_lifetime = 10.minutes
+
+  def self.find_by(opts = {})
+    return nil unless opts.key?(:id)
+
+    project_id, url = opts[:id].split(':', 2)
+    project = Project.find_by(id: project_id)
+
+    project.presence && new(project: project, url: url)
+  end
+
+  def self.fingerprint_host_keys(data)
+    return [] unless data.is_a?(String)
+
+    data
+      .each_line
+      .each_with_index
+      .map { |line, index| Fingerprint.new(line, index: index) }
+      .select(&:valid?)
+  end
+
+  attr_reader :project, :url, :compare_host_keys
+
+  def initialize(project:, url:, compare_host_keys: nil)
+    @project = project
+    @url = normalize_url(url)
+    @compare_host_keys = compare_host_keys
+  end
+
+  def id
+    [project.id, url].join(':')
+  end
+
+  def as_json(*)
+    {
+      host_keys_changed: host_keys_changed?,
+      fingerprints: fingerprints,
+      known_hosts: known_hosts
+    }
+  end
+
+  def known_hosts
+    with_reactive_cache { |data| data[:known_hosts] }
+  end
+
+  def fingerprints
+    @fingerprints ||= self.class.fingerprint_host_keys(known_hosts)
+  end
+
+  # Returns true if the known_hosts data differs from the version passed in at
+  # initialization as `compare_host_keys`. Comments, ordering, etc, is ignored
+  def host_keys_changed?
+    cleanup(known_hosts) != cleanup(compare_host_keys)
+  end
+
+  def error
+    with_reactive_cache { |data| data[:error] }
+  end
+
+  def calculate_reactive_cache
+    known_hosts, errors, status =
+      Open3.popen3({}, *%W[ssh-keyscan -T 5 -p #{url.port} -f-]) do |stdin, stdout, stderr, wait_thr|
+        stdin.puts(url.host)
+        stdin.close
+
+        [
+          cleanup(stdout.read),
+          cleanup(stderr.read),
+          wait_thr.value
+        ]
+      end
+
+    # ssh-keyscan returns an exit code 0 in several error conditions, such as an
+    # unknown hostname, so check both STDERR and the exit code
+    if status.success? && !errors.present?
+      { known_hosts: known_hosts }
+    else
+      Rails.logger.debug("Failed to detect SSH host keys for #{id}: #{errors}")
+
+      { error: 'Failed to detect SSH host keys' }
+    end
+  end
+
+  private
+
+  # Remove comments and duplicate entries
+  def cleanup(data)
+    data
+      .to_s
+      .each_line
+      .reject { |line| line.start_with?('#') || line.chomp.empty? }
+      .uniq
+      .sort
+      .join
+  end
+
+  def normalize_url(url)
+    full_url = ::Addressable::URI.parse(url)
+    raise ArgumentError.new("Invalid URL") unless full_url&.scheme == 'ssh'
+
+    Addressable::URI.parse("ssh://#{full_url.host}:#{full_url.inferred_port}")
+  rescue Addressable::URI::InvalidURIError
+    raise ArgumentError.new("Invalid URL")
+  end
+end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 9cbd5b644f6..85872a4122a 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -178,6 +178,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
       resource :mirror, only: [:show, :update] do
         member do
+          get :ssh_host_keys, constraints: { format: :json }
           post :update_now
         end
       end
diff --git a/spec/controllers/projects/mirrors_controller_spec.rb b/spec/controllers/projects/mirrors_controller_spec.rb
index 6114eef7003..00c1e617e3a 100644
--- a/spec/controllers/projects/mirrors_controller_spec.rb
+++ b/spec/controllers/projects/mirrors_controller_spec.rb
@@ -63,6 +63,69 @@ describe Projects::MirrorsController do
     end
   end
 
+  describe '#ssh_host_keys', :use_clean_rails_memory_store_caching do
+    let(:project) { create(:project) }
+    let(:cache) { SshHostKey.new(project: project, url: "ssh://example.com:22") }
+
+    before do
+      sign_in(project.owner)
+    end
+
+    context 'invalid URLs' do
+      %w[
+        INVALID
+        git@example.com:foo/bar.git
+        ssh://git@example.com:foo/bar.git
+      ].each do |url|
+        it "returns an error with a 400 response for URL #{url.inspect}" do
+          do_get(project, url)
+
+          expect(response).to have_gitlab_http_status(400)
+          expect(json_response).to eq('message' => 'Invalid URL')
+        end
+      end
+    end
+
+    context 'no data in cache' do
+      it 'requests the cache to be filled and returns a 204 response' do
+        expect(ReactiveCachingWorker).to receive(:perform_async).with(cache.class, cache.id).at_least(:once)
+
+        do_get(project)
+
+        expect(response).to have_gitlab_http_status(204)
+      end
+    end
+
+    context 'error in the cache' do
+      it 'returns the error with a 400 response' do
+        stub_reactive_cache(cache, error: 'An error')
+
+        do_get(project)
+
+        expect(response).to have_gitlab_http_status(400)
+        expect(json_response).to eq('message' => 'An error')
+      end
+    end
+
+    context 'data in the cache' do
+      let(:ssh_key) { 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf' }
+      let(:ssh_fp) { { type: 'ed25519', bits: 256, fingerprint: '2e:65:6a:c8:cf:bf:b2:8b:9a:bd:6d:9f:11:5c:12:16', index: 0 } }
+
+      it 'returns the data with a 200 response' do
+        stub_reactive_cache(cache, known_hosts: ssh_key)
+
+        do_get(project)
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response).to eq('known_hosts' => ssh_key, 'fingerprints' => [ssh_fp.stringify_keys], 'host_keys_changed' => true)
+      end
+    end
+
+    def do_get(project, url = 'ssh://example.com')
+      get :ssh_host_keys, namespace_id: project.namespace, project_id: project, ssh_url: url
+    end
+  end
+
   def do_put(project, options, extra_attrs = {})
     attrs = extra_attrs.merge(namespace_id: project.namespace.to_param, project_id: project.to_param)
     attrs[:project] = options
diff --git a/spec/models/ssh_host_key_spec.rb b/spec/models/ssh_host_key_spec.rb
new file mode 100644
index 00000000000..75db43b3d56
--- /dev/null
+++ b/spec/models/ssh_host_key_spec.rb
@@ -0,0 +1,164 @@
+require 'spec_helper'
+
+describe SshHostKey do
+  using RSpec::Parameterized::TableSyntax
+  include ReactiveCachingHelpers
+
+  let(:key1) do
+    'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3UpyF2iLqy1d63M6k3jH1vuEnq/NWtE+o' \
+    'rJe1Xn7JoRbduKd6zpsJ0JhBGWgcQK0ph0aGW5PcudzzBSc+SlYfCc4GTaxDtmj41hW0o72m' \
+    'NiuDW3oKXXShOiVRde2ZOquH8Z865jGiZIC8BI/bXZD29IGUih0hPu7Rjp70VYiE+35QRf/p' \
+    'sD0Ddrz8QUIG3A/2dMzLI5F5ZORk3BIX2F3mJwJOvZxRhR/SqyphDMZ5eZ0EzqbFBCDE6HAB' \
+    'Woz9ck8RBGLvCIggmDHj3FmMLcQGMDiy6wKp7QdnBtxjCP6vtE6YPUM223AqsWt+9NTtCfB8' \
+    'YdNAH7YcHHOR1FgtSk1x'
+  end
+
+  let(:key2) do
+    'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLIp+4ciR2YO9f9rpldc7InNQw/TBUtcNb' \
+    'J2XR0rr15/5ytz7YM16xXG0Qjx576PNSmqs4gbTrvTuFZak+v1Jx/9deHRq/yqp9f+tv33+i' \
+    'aJGCQCX/+OVY7aWgV2R9YsS7XQ4mnv4XlOTEssib/rGAIT+ATd/GcdYSEOO+dh4O09/6O/jI' \
+    'MGSeP+NNetgn1nPCnLOjrXFZUnUtNDi6EEKeIlrliJjSb7Jr4f7gjvZnv4RskWHHFo8FgAAq' \
+    't0gOMT6EmKrnypBe2vLGSAXbtkXr01q6/DNPH+n9VA1LTV6v1KN/W5CN5tQV11wRSKiM8g5O' \
+    'Ebi86VjJRi2sOuYoXQU1'
+  end
+
+  # Purposefully ordered so that `sort` will make changes
+  let(:known_hosts) do
+    <<~EOF
+      example.com #{key1} git@localhost
+      @revoked other.example.com #{key2} git@localhost
+    EOF
+  end
+
+  let(:extra) { known_hosts + "foo\nbar\n" }
+  let(:reversed) { known_hosts.lines.reverse.join }
+
+  let(:compare_host_keys) { nil }
+
+  def stub_ssh_keyscan(args, status: true, stdout: "", stderr: "")
+    stdin = StringIO.new
+    stdout = double(:stdout, read: stdout)
+    stderr = double(:stderr, read: stderr)
+    wait_thr = double(:wait_thr, value: double(success?: status))
+
+    expect(Open3).to receive(:popen3).with({}, 'ssh-keyscan', *args).and_yield(stdin, stdout, stderr, wait_thr)
+
+    stdin
+  end
+
+  let(:project) { build(:project) }
+
+  subject(:ssh_host_key) { described_class.new(project: project, url: 'ssh://example.com:2222', compare_host_keys: compare_host_keys) }
+
+  describe '#fingerprints', :use_clean_rails_memory_store_caching do
+    it 'returns an array of indexed fingerprints when the cache is filled' do
+      stub_reactive_cache(ssh_host_key, known_hosts: known_hosts)
+
+      expected = [key1, key2]
+        .map { |data| Gitlab::SSHPublicKey.new(data) }
+        .each_with_index
+        .map { |key, i| { bits: key.bits, fingerprint: key.fingerprint, type: key.type, index: i } }
+
+      expect(ssh_host_key.fingerprints.as_json).to eq(expected)
+    end
+
+    it 'returns an empty array when the cache is empty' do
+      expect(ssh_host_key.fingerprints).to eq([])
+    end
+  end
+
+  describe '#fingerprints', :use_clean_rails_memory_store_caching do
+    it 'returns an array of indexed fingerprints when the cache is filled' do
+      stub_reactive_cache(ssh_host_key, known_hosts: known_hosts)
+
+      expect(ssh_host_key.fingerprints.as_json).to eq(
+        [
+          { bits: 2048, fingerprint: Gitlab::SSHPublicKey.new(key1).fingerprint, type: :rsa, index: 0 },
+          { bits: 2048, fingerprint: Gitlab::SSHPublicKey.new(key2).fingerprint, type: :rsa, index: 1 }
+        ]
+      )
+    end
+
+    it 'returns an empty array when the cache is empty' do
+      expect(ssh_host_key.fingerprints).to eq([])
+    end
+  end
+
+  describe '#host_keys_changed?' do
+    where(:known_hosts_a, :known_hosts_b, :result) do
+      known_hosts | extra       | true
+      known_hosts | "foo\n"     | true
+      known_hosts | ''          | true
+      known_hosts | nil         | true
+      known_hosts | known_hosts | false
+      reversed    | known_hosts | false
+      extra       | "foo\n"     | true
+      ''          | ''          | false
+      nil         | nil         | false
+      ''          | nil         | false
+    end
+
+    with_them do
+      let(:compare_host_keys) { known_hosts_b }
+
+      subject { ssh_host_key.host_keys_changed? }
+
+      context '(normal)' do
+        let(:compare_host_keys) { known_hosts_b }
+
+        before do
+          expect(ssh_host_key).to receive(:known_hosts).and_return(known_hosts_a)
+        end
+
+        it { is_expected.to eq(result) }
+      end
+
+      # Comparisons should be symmetrical, so test the reverse too
+      context '(reversed)' do
+        let(:compare_host_keys) { known_hosts_a }
+
+        before do
+          expect(ssh_host_key).to receive(:known_hosts).and_return(known_hosts_b)
+        end
+
+        it { is_expected.to eq(result) }
+      end
+    end
+  end
+
+  describe '#calculate_reactive_cache' do
+    subject(:cache) { ssh_host_key.calculate_reactive_cache }
+
+    it 'writes the hostname to STDIN' do
+      stdin = stub_ssh_keyscan(%w[-T 5 -p 2222 -f-])
+
+      cache
+
+      expect(stdin.string).to eq("example.com\n")
+    end
+
+    context 'successful key scan' do
+      it 'stores the cleaned known_hosts data' do
+        stub_ssh_keyscan(%w[-T 5 -p 2222 -f-], stdout: "KEY 1\nKEY 1\n\n# comment\nKEY 2\n")
+
+        is_expected.to eq(known_hosts: "KEY 1\nKEY 2\n")
+      end
+    end
+
+    context 'failed key scan (exit code 1)' do
+      it 'returns a generic error' do
+        stub_ssh_keyscan(%w[-T 5 -p 2222 -f-], stdout: 'blarg', status: false)
+
+        is_expected.to eq(error: 'Failed to detect SSH host keys')
+      end
+    end
+
+    context 'failed key scan (exit code 0)' do
+      it 'returns a generic error' do
+        stub_ssh_keyscan(%w[-T 5 -p 2222 -f-], stderr: 'Unknown host')
+
+        is_expected.to eq(error: 'Failed to detect SSH host keys')
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From aaa6cab05a2744b3c1f326b73d62e87b456ed62e Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Thu, 25 Oct 2018 17:20:29 +0200
Subject: Resolve circular dependencies in merge request widget

---
 .../vue_merge_request_widget/dependencies.js       | 47 ----------------
 .../ee_switch_mr_widget_options.js                 |  3 +
 .../javascripts/vue_merge_request_widget/index.js  |  5 +-
 .../vue_merge_request_widget/mr_widget_options.vue | 64 +++++++++++-----------
 .../services/ee_switch_mr_widget_service.js        |  3 +
 .../stores/ee_switch_get_state_key.js              |  3 +
 .../stores/ee_switch_mr_widget_store.js            |  3 +
 .../stores/ee_switch_state_maps.js                 |  3 +
 .../stores/mr_widget_store.js                      |  2 +-
 9 files changed, 50 insertions(+), 83 deletions(-)
 delete mode 100644 app/assets/javascripts/vue_merge_request_widget/dependencies.js
 create mode 100644 app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js
 create mode 100644 app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js
 create mode 100644 app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js
 create mode 100644 app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js
 create mode 100644 app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_state_maps.js

diff --git a/app/assets/javascripts/vue_merge_request_widget/dependencies.js b/app/assets/javascripts/vue_merge_request_widget/dependencies.js
deleted file mode 100644
index a23496c6bf5..00000000000
--- a/app/assets/javascripts/vue_merge_request_widget/dependencies.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * This file is the centerpiece of an attempt to reduce potential conflicts
- * between the CE and EE versions of the MR widget. EE additions to the MR widget should
- * be contained in the ee/vue_merge_request_widget directory, and should **extend**
- * rather than mutate CE MR Widget code.
- *
- * This file should be the only source of conflicts between EE and CE. EE-only components should
- * imported directly where they are needed, and import paths for EE extensions of CE components
- * should overwrite import paths **without** changing the order of dependencies listed here.
- */
-
-export { default as Vue } from 'vue';
-export { default as SmartInterval } from '~/smart_interval';
-export { default as WidgetHeader } from './components/mr_widget_header.vue';
-export { default as WidgetMergeHelp } from './components/mr_widget_merge_help.vue';
-export { default as WidgetPipeline } from './components/mr_widget_pipeline.vue';
-export { default as Deployment } from './components/deployment.vue';
-export { default as WidgetRelatedLinks } from './components/mr_widget_related_links.vue';
-export { default as MergedState } from './components/states/mr_widget_merged.vue';
-export { default as FailedToMerge } from './components/states/mr_widget_failed_to_merge.vue';
-export { default as ClosedState } from './components/states/mr_widget_closed.vue';
-export { default as MergingState } from './components/states/mr_widget_merging.vue';
-export { default as WorkInProgressState } from './components/states/work_in_progress.vue';
-export { default as ArchivedState } from './components/states/mr_widget_archived.vue';
-export { default as ConflictsState } from './components/states/mr_widget_conflicts.vue';
-export { default as NothingToMergeState } from './components/states/nothing_to_merge.vue';
-export { default as MissingBranchState } from './components/states/mr_widget_missing_branch.vue';
-export { default as NotAllowedState } from './components/states/mr_widget_not_allowed.vue';
-export { default as ReadyToMergeState } from './components/states/ready_to_merge.vue';
-export { default as ShaMismatchState } from './components/states/sha_mismatch.vue';
-export { default as UnresolvedDiscussionsState } from './components/states/unresolved_discussions.vue';
-export { default as PipelineBlockedState } from './components/states/mr_widget_pipeline_blocked.vue';
-export { default as PipelineFailedState } from './components/states/pipeline_failed.vue';
-export { default as MergeWhenPipelineSucceedsState } from './components/states/mr_widget_merge_when_pipeline_succeeds.vue';
-export { default as RebaseState } from './components/states/mr_widget_rebase.vue';
-export { default as AutoMergeFailed } from './components/states/mr_widget_auto_merge_failed.vue';
-export { default as CheckingState } from './components/states/mr_widget_checking.vue';
-export { default as MRWidgetStore } from './stores/mr_widget_store';
-export { default as MRWidgetService } from './services/mr_widget_service';
-export { default as eventHub } from './event_hub';
-export { default as getStateKey } from './stores/get_state_key';
-export { default as stateMaps } from './stores/state_maps';
-export { default as SquashBeforeMerge } from './components/states/squash_before_merge.vue';
-export { default as notify } from '../lib/utils/notify';
-export { default as SourceBranchRemovalStatus } from './components/source_branch_removal_status.vue';
-
-export { default as mrWidgetOptions } from './mr_widget_options.vue';
diff --git a/app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js
new file mode 100644
index 00000000000..8780aa4bd1c
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/ee_switch_mr_widget_options.js
@@ -0,0 +1,3 @@
+import MRWidgetOptions from './mr_widget_options.vue';
+
+export default MRWidgetOptions;
diff --git a/app/assets/javascripts/vue_merge_request_widget/index.js b/app/assets/javascripts/vue_merge_request_widget/index.js
index cc6e620f365..60cebbfc2b2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/index.js
+++ b/app/assets/javascripts/vue_merge_request_widget/index.js
@@ -1,4 +1,5 @@
-import { Vue, mrWidgetOptions } from './dependencies';
+import Vue from 'vue';
+import MrWidgetOptions from './ee_switch_mr_widget_options';
 import Translate from '../vue_shared/translate';
 
 Vue.use(Translate);
@@ -6,7 +7,7 @@ Vue.use(Translate);
 export default () => {
   gl.mrWidgetData.gitlabLogo = gon.gitlab_logo;
 
-  const vm = new Vue(mrWidgetOptions);
+  const vm = new Vue(MrWidgetOptions);
 
   window.gl.mrWidget = {
     checkStatus: vm.checkStatus,
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index 8180f13a7cb..5d9f7cebcf2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -2,39 +2,37 @@
 import Project from '~/pages/projects/project';
 import SmartInterval from '~/smart_interval';
 import createFlash from '../flash';
-import {
-  WidgetHeader,
-  WidgetMergeHelp,
-  WidgetPipeline,
-  Deployment,
-  WidgetRelatedLinks,
-  MergedState,
-  ClosedState,
-  MergingState,
-  RebaseState,
-  WorkInProgressState,
-  ArchivedState,
-  ConflictsState,
-  NothingToMergeState,
-  MissingBranchState,
-  NotAllowedState,
-  ReadyToMergeState,
-  ShaMismatchState,
-  UnresolvedDiscussionsState,
-  PipelineBlockedState,
-  PipelineFailedState,
-  FailedToMerge,
-  MergeWhenPipelineSucceedsState,
-  AutoMergeFailed,
-  CheckingState,
-  MRWidgetStore,
-  MRWidgetService,
-  eventHub,
-  stateMaps,
-  SquashBeforeMerge,
-  notify,
-  SourceBranchRemovalStatus,
-} from './dependencies';
+import WidgetHeader from './components/mr_widget_header.vue';
+import WidgetMergeHelp from './components/mr_widget_merge_help.vue';
+import WidgetPipeline from './components/mr_widget_pipeline.vue';
+import Deployment from './components/deployment.vue';
+import WidgetRelatedLinks from './components/mr_widget_related_links.vue';
+import MergedState from './components/states/mr_widget_merged.vue';
+import ClosedState from './components/states/mr_widget_closed.vue';
+import MergingState from './components/states/mr_widget_merging.vue';
+import RebaseState from './components/states/mr_widget_rebase.vue';
+import WorkInProgressState from './components/states/work_in_progress.vue';
+import ArchivedState from './components/states/mr_widget_archived.vue';
+import ConflictsState from './components/states/mr_widget_conflicts.vue';
+import NothingToMergeState from './components/states/nothing_to_merge.vue';
+import MissingBranchState from './components/states/mr_widget_missing_branch.vue';
+import NotAllowedState from './components/states/mr_widget_not_allowed.vue';
+import ReadyToMergeState from './components/states/ready_to_merge.vue';
+import ShaMismatchState from './components/states/sha_mismatch.vue';
+import UnresolvedDiscussionsState from './components/states/unresolved_discussions.vue';
+import PipelineBlockedState from './components/states/mr_widget_pipeline_blocked.vue';
+import PipelineFailedState from './components/states/pipeline_failed.vue';
+import FailedToMerge from './components/states/mr_widget_failed_to_merge.vue';
+import MergeWhenPipelineSucceedsState from './components/states/mr_widget_merge_when_pipeline_succeeds.vue';
+import AutoMergeFailed from './components/states/mr_widget_auto_merge_failed.vue';
+import CheckingState from './components/states/mr_widget_checking.vue';
+import MRWidgetStore from './stores/ee_switch_mr_widget_store';
+import MRWidgetService from './services/ee_switch_mr_widget_service';
+import eventHub from './event_hub';
+import stateMaps from './stores/ee_switch_state_maps';
+import SquashBeforeMerge from './components/states/squash_before_merge.vue';
+import notify from '~/lib/utils/notify';
+import SourceBranchRemovalStatus from './components/source_branch_removal_status.vue';
 import GroupedTestReportsApp from '../reports/components/grouped_test_reports_app.vue';
 import { setFaviconOverlay } from '../lib/utils/common_utils';
 
diff --git a/app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js b/app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js
new file mode 100644
index 00000000000..ea2aabb78fe
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/services/ee_switch_mr_widget_service.js
@@ -0,0 +1,3 @@
+import MRWidgetService from './mr_widget_service';
+
+export default MRWidgetService;
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js b/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js
new file mode 100644
index 00000000000..ebef30e3eab
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_get_state_key.js
@@ -0,0 +1,3 @@
+import getStateKey from './get_state_key';
+
+export default getStateKey;
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js
new file mode 100644
index 00000000000..92a07c53f2d
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_mr_widget_store.js
@@ -0,0 +1,3 @@
+import MergeRequestStore from './mr_widget_store';
+
+export default MergeRequestStore;
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_state_maps.js b/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_state_maps.js
new file mode 100644
index 00000000000..50cf9503ea7
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/ee_switch_state_maps.js
@@ -0,0 +1,3 @@
+import stateMaps from './state_maps';
+
+export default stateMaps;
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index 672e5280b5e..e6655914700 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -1,5 +1,5 @@
 import Timeago from 'timeago.js';
-import { getStateKey } from '../dependencies';
+import getStateKey from './ee_switch_get_state_key';
 import { stateKey } from './state_maps';
 import { formatDate } from '../../lib/utils/datetime_utility';
 
-- 
cgit v1.2.3


From 7a525004a7c9fa7b5a4d11ec5f8bf7854519178c Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Thu, 25 Oct 2018 18:12:12 +0200
Subject: Preload user status for label events

This makes sure the user_status for the user of a label event is
preloaded. Otherwise it would not be rendered in the fake system note.
---
 app/services/resource_events/merge_into_notes_service.rb       | 2 +-
 changelogs/unreleased/bvl-preload-user-status-for-events.yml   | 5 +++++
 spec/features/issues/resource_label_events_spec.rb             | 7 +++++++
 spec/services/resource_events/merge_into_notes_service_spec.rb | 9 +++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/bvl-preload-user-status-for-events.yml

diff --git a/app/services/resource_events/merge_into_notes_service.rb b/app/services/resource_events/merge_into_notes_service.rb
index 596c0105ea0..7504773a002 100644
--- a/app/services/resource_events/merge_into_notes_service.rb
+++ b/app/services/resource_events/merge_into_notes_service.rb
@@ -34,7 +34,7 @@ module ResourceEvents
     def label_events_by_discussion_id
       return [] unless resource.respond_to?(:resource_label_events)
 
-      events = resource.resource_label_events.includes(:label, :user)
+      events = resource.resource_label_events.includes(:label, user: :status)
       events = since_fetch_at(events)
 
       events.group_by { |event| event.discussion_id }
diff --git a/changelogs/unreleased/bvl-preload-user-status-for-events.yml b/changelogs/unreleased/bvl-preload-user-status-for-events.yml
new file mode 100644
index 00000000000..e13b19b19c1
--- /dev/null
+++ b/changelogs/unreleased/bvl-preload-user-status-for-events.yml
@@ -0,0 +1,5 @@
+---
+title: Show user status for label events in system notes
+merge_request: 22609
+author:
+type: fixed
diff --git a/spec/features/issues/resource_label_events_spec.rb b/spec/features/issues/resource_label_events_spec.rb
index 40c452c991a..b0764db7751 100644
--- a/spec/features/issues/resource_label_events_spec.rb
+++ b/spec/features/issues/resource_label_events_spec.rb
@@ -7,6 +7,7 @@ describe 'List issue resource label events', :js do
   let(:project)  { create(:project, :public) }
   let(:issue)    { create(:issue, project: project, author: user) }
   let!(:label)    { create(:label, project: project, title: 'foo') }
+  let!(:user_status) { create(:user_status, user: user) }
 
   context 'when user displays the issue' do
     let!(:note)     { create(:note_on_issue, author: user, project: project, noteable: issue, note: 'some note') }
@@ -23,6 +24,12 @@ describe 'List issue resource label events', :js do
         expect(find("#note_#{event.discussion_id}")).to have_content 'added foo label'
       end
     end
+
+    it 'shows the user status on the system note for the label' do
+      page.within("#note_#{event.discussion_id}") do
+        expect(page).to show_user_status user_status
+      end
+    end
   end
 
   context 'when user adds label to the issue' do
diff --git a/spec/services/resource_events/merge_into_notes_service_spec.rb b/spec/services/resource_events/merge_into_notes_service_spec.rb
index 0d333d541c9..c76f6e6f77e 100644
--- a/spec/services/resource_events/merge_into_notes_service_spec.rb
+++ b/spec/services/resource_events/merge_into_notes_service_spec.rb
@@ -66,5 +66,14 @@ describe ResourceEvents::MergeIntoNotesService do
       expect(notes.count).to eq 1
       expect(notes.first.discussion_id).to eq event.discussion_id
     end
+
+    it "preloads the note author's status" do
+      event = create_event(created_at: time)
+      create(:user_status, user: event.user)
+
+      notes = described_class.new(resource, user).execute
+
+      expect(notes.first.author.association(:status)).to be_loaded
+    end
   end
 end
-- 
cgit v1.2.3


From 62f516a674f8ba8e1404932b9ad438d82d14bf39 Mon Sep 17 00:00:00 2001
From: Daniel Gruesso <dgruesso@gitlab.com>
Date: Thu, 25 Oct 2018 16:39:32 +0000
Subject: update to match EE

---
 doc/topics/runbooks/index.md | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/doc/topics/runbooks/index.md b/doc/topics/runbooks/index.md
index 0f7d48233a5..9c81c14b088 100644
--- a/doc/topics/runbooks/index.md
+++ b/doc/topics/runbooks/index.md
@@ -15,7 +15,7 @@ code blocks or database queries against a given environment.
 
 ## Nurtch Executable Runbooks
 
-> [Introduced][https://gitlab.com/gitlab-org/gitlab-ce/issues/45912] in GitLab 11.4.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/45912) in GitLab 11.4.
 
 The JupyterHub app offered via GitLab’s Kubernetes integration now ships 
 with Nurtch’s Rubix library, providing a simple way to create DevOps 
@@ -30,7 +30,21 @@ frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
 
 To create an executable runbook, you will need:
 
-1. **Kubernetes Cluster** - 
-1. **Helm Tiller** - 
-1. **Ingress** -
-1. **JupyterHub** -
\ No newline at end of file
+1. **Kubernetes** - A Kubernetes cluster is required to deploy the rest of the applications. 
+    The simplest way to get started is to add a cluster using [GitLab's GKE integration](https://docs.gitlab.com/ee/user/project/clusters/#adding-and-creating-a-new-gke-cluster-via-gitlab).
+1. **Helm Tiller** - Helm is a package manager for Kubernetes and is required to install 
+    all the other applications. It is installed in its own pod inside the cluster which 
+    can run the helm CLI in a safe environment.
+1. **Ingress** - Ingress can provide load balancing, SSL termination, and name-based 
+    virtual hosting. It acts as a web proxy for your applications.
+1. **JupyterHub** - JupyterHub is a multi-user service for managing notebooks across 
+    a team. Jupyter Notebooks provide a web-based interactive programming environment 
+    used for data analysis, visualization, and machine learning.
+
+## Nurtch
+
+Nurtch is the company behind the [Rubix library](https://github.com/Nurtch/rubix). Rubix is 
+an open-source python library that makes it easy to perform common DevOps tasks inside Jupyter Notebooks. 
+Tasks such as plotting Cloudwatch metrics and rolling your ECS/Kubernetes app are simplified 
+down to a couple of lines of code. Check the [Nurtch Documentation](http://docs.nurtch.com/en/latest) 
+for more information.
\ No newline at end of file
-- 
cgit v1.2.3


From 048ec287618324e295857be8976be418e4f09703 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Fri, 19 Oct 2018 19:54:26 +0200
Subject: Move datetime_utility_spec.js to correct location

---
 spec/javascripts/datetime_utility_spec.js          | 354 ---------------------
 .../javascripts/lib/utils/datetime_utility_spec.js | 354 +++++++++++++++++++++
 2 files changed, 354 insertions(+), 354 deletions(-)
 delete mode 100644 spec/javascripts/datetime_utility_spec.js
 create mode 100644 spec/javascripts/lib/utils/datetime_utility_spec.js

diff --git a/spec/javascripts/datetime_utility_spec.js b/spec/javascripts/datetime_utility_spec.js
deleted file mode 100644
index 2821f4d6793..00000000000
--- a/spec/javascripts/datetime_utility_spec.js
+++ /dev/null
@@ -1,354 +0,0 @@
-import * as datetimeUtility from '~/lib/utils/datetime_utility';
-
-describe('Date time utils', () => {
-  describe('timeFor', () => {
-    it('returns `past due` when in past', () => {
-      const date = new Date();
-      date.setFullYear(date.getFullYear() - 1);
-
-      expect(datetimeUtility.timeFor(date)).toBe('Past due');
-    });
-
-    it('returns remaining time when in the future', () => {
-      const date = new Date();
-      date.setFullYear(date.getFullYear() + 1);
-
-      // Add a day to prevent a transient error. If date is even 1 second
-      // short of a full year, timeFor will return '11 months remaining'
-      date.setDate(date.getDate() + 1);
-
-      expect(datetimeUtility.timeFor(date)).toBe('1 year remaining');
-    });
-  });
-
-  describe('get day name', () => {
-    it('should return Sunday', () => {
-      const day = datetimeUtility.getDayName(new Date('07/17/2016'));
-
-      expect(day).toBe('Sunday');
-    });
-
-    it('should return Monday', () => {
-      const day = datetimeUtility.getDayName(new Date('07/18/2016'));
-
-      expect(day).toBe('Monday');
-    });
-
-    it('should return Tuesday', () => {
-      const day = datetimeUtility.getDayName(new Date('07/19/2016'));
-
-      expect(day).toBe('Tuesday');
-    });
-
-    it('should return Wednesday', () => {
-      const day = datetimeUtility.getDayName(new Date('07/20/2016'));
-
-      expect(day).toBe('Wednesday');
-    });
-
-    it('should return Thursday', () => {
-      const day = datetimeUtility.getDayName(new Date('07/21/2016'));
-
-      expect(day).toBe('Thursday');
-    });
-
-    it('should return Friday', () => {
-      const day = datetimeUtility.getDayName(new Date('07/22/2016'));
-
-      expect(day).toBe('Friday');
-    });
-
-    it('should return Saturday', () => {
-      const day = datetimeUtility.getDayName(new Date('07/23/2016'));
-
-      expect(day).toBe('Saturday');
-    });
-  });
-
-  describe('get day difference', () => {
-    it('should return 7', () => {
-      const firstDay = new Date('07/01/2016');
-      const secondDay = new Date('07/08/2016');
-      const difference = datetimeUtility.getDayDifference(firstDay, secondDay);
-
-      expect(difference).toBe(7);
-    });
-
-    it('should return 31', () => {
-      const firstDay = new Date('07/01/2016');
-      const secondDay = new Date('08/01/2016');
-      const difference = datetimeUtility.getDayDifference(firstDay, secondDay);
-
-      expect(difference).toBe(31);
-    });
-
-    it('should return 365', () => {
-      const firstDay = new Date('07/02/2015');
-      const secondDay = new Date('07/01/2016');
-      const difference = datetimeUtility.getDayDifference(firstDay, secondDay);
-
-      expect(difference).toBe(365);
-    });
-  });
-});
-
-describe('timeIntervalInWords', () => {
-  it('should return string with number of minutes and seconds', () => {
-    expect(datetimeUtility.timeIntervalInWords(9.54)).toEqual('9 seconds');
-    expect(datetimeUtility.timeIntervalInWords(1)).toEqual('1 second');
-    expect(datetimeUtility.timeIntervalInWords(200)).toEqual('3 minutes 20 seconds');
-    expect(datetimeUtility.timeIntervalInWords(6008)).toEqual('100 minutes 8 seconds');
-  });
-});
-
-describe('dateInWords', () => {
-  const date = new Date('07/01/2016');
-
-  it('should return date in words', () => {
-    expect(datetimeUtility.dateInWords(date)).toEqual('July 1, 2016');
-  });
-
-  it('should return abbreviated month name', () => {
-    expect(datetimeUtility.dateInWords(date, true)).toEqual('Jul 1, 2016');
-  });
-
-  it('should return date in words without year', () => {
-    expect(datetimeUtility.dateInWords(date, true, true)).toEqual('Jul 1');
-  });
-});
-
-describe('monthInWords', () => {
-  const date = new Date('2017-01-20');
-
-  it('returns month name from provided date', () => {
-    expect(datetimeUtility.monthInWords(date)).toBe('January');
-  });
-
-  it('returns abbreviated month name from provided date', () => {
-    expect(datetimeUtility.monthInWords(date, true)).toBe('Jan');
-  });
-});
-
-describe('totalDaysInMonth', () => {
-  it('returns number of days in a month for given date', () => {
-    // 1st Feb, 2016 (leap year)
-    expect(datetimeUtility.totalDaysInMonth(new Date(2016, 1, 1))).toBe(29);
-
-    // 1st Feb, 2017
-    expect(datetimeUtility.totalDaysInMonth(new Date(2017, 1, 1))).toBe(28);
-
-    // 1st Jan, 2017
-    expect(datetimeUtility.totalDaysInMonth(new Date(2017, 0, 1))).toBe(31);
-  });
-});
-
-describe('getSundays', () => {
-  it('returns array of dates representing all Sundays of the month', () => {
-    // December, 2017 (it has 5 Sundays)
-    const dateOfSundays = [3, 10, 17, 24, 31];
-    const sundays = datetimeUtility.getSundays(new Date(2017, 11, 1));
-
-    expect(sundays.length).toBe(5);
-    sundays.forEach((sunday, index) => {
-      expect(sunday.getDate()).toBe(dateOfSundays[index]);
-    });
-  });
-});
-
-describe('getTimeframeWindowFrom', () => {
-  it('returns array of date objects upto provided length start with provided startDate', () => {
-    const startDate = new Date(2018, 0, 1);
-    const mockTimeframe = [
-      new Date(2018, 0, 1),
-      new Date(2018, 1, 1),
-      new Date(2018, 2, 1),
-      new Date(2018, 3, 1),
-      new Date(2018, 4, 31),
-    ];
-    const timeframe = datetimeUtility.getTimeframeWindowFrom(startDate, 5);
-
-    expect(timeframe.length).toBe(5);
-    timeframe.forEach((timeframeItem, index) => {
-      expect(timeframeItem.getFullYear()).toBe(mockTimeframe[index].getFullYear());
-      expect(timeframeItem.getMonth()).toBe(mockTimeframe[index].getMonth());
-      expect(timeframeItem.getDate()).toBe(mockTimeframe[index].getDate());
-    });
-  });
-});
-
-describe('formatTime', () => {
-  const expectedTimestamps = [
-    [0, '00:00:00'],
-    [1000, '00:00:01'],
-    [42000, '00:00:42'],
-    [121000, '00:02:01'],
-    [10921000, '03:02:01'],
-    [108000000, '30:00:00'],
-  ];
-
-  expectedTimestamps.forEach(([milliseconds, expectedTimestamp]) => {
-    it(`formats ${milliseconds}ms as ${expectedTimestamp}`, () => {
-      expect(datetimeUtility.formatTime(milliseconds)).toBe(expectedTimestamp);
-    });
-  });
-});
-
-describe('datefix', () => {
-  describe('pad', () => {
-    it('should add a 0 when length is smaller than 2', () => {
-      expect(datetimeUtility.pad(2)).toEqual('02');
-    });
-
-    it('should not add a zero when lenght matches the default', () => {
-      expect(datetimeUtility.pad(12)).toEqual('12');
-    });
-
-    it('should add a 0 when lenght is smaller than the provided', () => {
-      expect(datetimeUtility.pad(12, 3)).toEqual('012');
-    });
-  });
-
-  describe('parsePikadayDate', () => {
-    // removed because of https://gitlab.com/gitlab-org/gitlab-ce/issues/39834
-  });
-
-  describe('pikadayToString', () => {
-    it('should format a UTC date into yyyy-mm-dd format', () => {
-      expect(datetimeUtility.pikadayToString(new Date('2020-01-29:00:00'))).toEqual('2020-01-29');
-    });
-  });
-});
-
-describe('prettyTime methods', () => {
-  const assertTimeUnits = (obj, minutes, hours, days, weeks) => {
-    expect(obj.minutes).toBe(minutes);
-    expect(obj.hours).toBe(hours);
-    expect(obj.days).toBe(days);
-    expect(obj.weeks).toBe(weeks);
-  };
-
-  describe('parseSeconds', () => {
-    it('should correctly parse a negative value', () => {
-      const zeroSeconds = datetimeUtility.parseSeconds(-1000);
-
-      assertTimeUnits(zeroSeconds, 16, 0, 0, 0);
-    });
-
-    it('should correctly parse a zero value', () => {
-      const zeroSeconds = datetimeUtility.parseSeconds(0);
-
-      assertTimeUnits(zeroSeconds, 0, 0, 0, 0);
-    });
-
-    it('should correctly parse a small non-zero second values', () => {
-      const subOneMinute = datetimeUtility.parseSeconds(10);
-      const aboveOneMinute = datetimeUtility.parseSeconds(100);
-      const manyMinutes = datetimeUtility.parseSeconds(1000);
-
-      assertTimeUnits(subOneMinute, 0, 0, 0, 0);
-      assertTimeUnits(aboveOneMinute, 1, 0, 0, 0);
-      assertTimeUnits(manyMinutes, 16, 0, 0, 0);
-    });
-
-    it('should correctly parse large second values', () => {
-      const aboveOneHour = datetimeUtility.parseSeconds(4800);
-      const aboveOneDay = datetimeUtility.parseSeconds(110000);
-      const aboveOneWeek = datetimeUtility.parseSeconds(25000000);
-
-      assertTimeUnits(aboveOneHour, 20, 1, 0, 0);
-      assertTimeUnits(aboveOneDay, 33, 6, 3, 0);
-      assertTimeUnits(aboveOneWeek, 26, 0, 3, 173);
-    });
-
-    it('should correctly accept a custom param for hoursPerDay', () => {
-      const config = { hoursPerDay: 24 };
-
-      const aboveOneHour = datetimeUtility.parseSeconds(4800, config);
-      const aboveOneDay = datetimeUtility.parseSeconds(110000, config);
-      const aboveOneWeek = datetimeUtility.parseSeconds(25000000, config);
-
-      assertTimeUnits(aboveOneHour, 20, 1, 0, 0);
-      assertTimeUnits(aboveOneDay, 33, 6, 1, 0);
-      assertTimeUnits(aboveOneWeek, 26, 8, 4, 57);
-    });
-
-    it('should correctly accept a custom param for daysPerWeek', () => {
-      const config = { daysPerWeek: 7 };
-
-      const aboveOneHour = datetimeUtility.parseSeconds(4800, config);
-      const aboveOneDay = datetimeUtility.parseSeconds(110000, config);
-      const aboveOneWeek = datetimeUtility.parseSeconds(25000000, config);
-
-      assertTimeUnits(aboveOneHour, 20, 1, 0, 0);
-      assertTimeUnits(aboveOneDay, 33, 6, 3, 0);
-      assertTimeUnits(aboveOneWeek, 26, 0, 0, 124);
-    });
-
-    it('should correctly accept custom params for daysPerWeek and hoursPerDay', () => {
-      const config = { daysPerWeek: 55, hoursPerDay: 14 };
-
-      const aboveOneHour = datetimeUtility.parseSeconds(4800, config);
-      const aboveOneDay = datetimeUtility.parseSeconds(110000, config);
-      const aboveOneWeek = datetimeUtility.parseSeconds(25000000, config);
-
-      assertTimeUnits(aboveOneHour, 20, 1, 0, 0);
-      assertTimeUnits(aboveOneDay, 33, 2, 2, 0);
-      assertTimeUnits(aboveOneWeek, 26, 0, 1, 9);
-    });
-  });
-
-  describe('stringifyTime', () => {
-    it('should stringify values with all non-zero units', () => {
-      const timeObject = {
-        weeks: 1,
-        days: 4,
-        hours: 7,
-        minutes: 20,
-      };
-
-      const timeString = datetimeUtility.stringifyTime(timeObject);
-
-      expect(timeString).toBe('1w 4d 7h 20m');
-    });
-
-    it('should stringify values with some non-zero units', () => {
-      const timeObject = {
-        weeks: 0,
-        days: 4,
-        hours: 0,
-        minutes: 20,
-      };
-
-      const timeString = datetimeUtility.stringifyTime(timeObject);
-
-      expect(timeString).toBe('4d 20m');
-    });
-
-    it('should stringify values with no non-zero units', () => {
-      const timeObject = {
-        weeks: 0,
-        days: 0,
-        hours: 0,
-        minutes: 0,
-      };
-
-      const timeString = datetimeUtility.stringifyTime(timeObject);
-
-      expect(timeString).toBe('0m');
-    });
-  });
-
-  describe('abbreviateTime', () => {
-    it('should abbreviate stringified times for weeks', () => {
-      const fullTimeString = '1w 3d 4h 5m';
-
-      expect(datetimeUtility.abbreviateTime(fullTimeString)).toBe('1w');
-    });
-
-    it('should abbreviate stringified times for non-weeks', () => {
-      const fullTimeString = '0w 3d 4h 5m';
-
-      expect(datetimeUtility.abbreviateTime(fullTimeString)).toBe('3d');
-    });
-  });
-});
diff --git a/spec/javascripts/lib/utils/datetime_utility_spec.js b/spec/javascripts/lib/utils/datetime_utility_spec.js
new file mode 100644
index 00000000000..2821f4d6793
--- /dev/null
+++ b/spec/javascripts/lib/utils/datetime_utility_spec.js
@@ -0,0 +1,354 @@
+import * as datetimeUtility from '~/lib/utils/datetime_utility';
+
+describe('Date time utils', () => {
+  describe('timeFor', () => {
+    it('returns `past due` when in past', () => {
+      const date = new Date();
+      date.setFullYear(date.getFullYear() - 1);
+
+      expect(datetimeUtility.timeFor(date)).toBe('Past due');
+    });
+
+    it('returns remaining time when in the future', () => {
+      const date = new Date();
+      date.setFullYear(date.getFullYear() + 1);
+
+      // Add a day to prevent a transient error. If date is even 1 second
+      // short of a full year, timeFor will return '11 months remaining'
+      date.setDate(date.getDate() + 1);
+
+      expect(datetimeUtility.timeFor(date)).toBe('1 year remaining');
+    });
+  });
+
+  describe('get day name', () => {
+    it('should return Sunday', () => {
+      const day = datetimeUtility.getDayName(new Date('07/17/2016'));
+
+      expect(day).toBe('Sunday');
+    });
+
+    it('should return Monday', () => {
+      const day = datetimeUtility.getDayName(new Date('07/18/2016'));
+
+      expect(day).toBe('Monday');
+    });
+
+    it('should return Tuesday', () => {
+      const day = datetimeUtility.getDayName(new Date('07/19/2016'));
+
+      expect(day).toBe('Tuesday');
+    });
+
+    it('should return Wednesday', () => {
+      const day = datetimeUtility.getDayName(new Date('07/20/2016'));
+
+      expect(day).toBe('Wednesday');
+    });
+
+    it('should return Thursday', () => {
+      const day = datetimeUtility.getDayName(new Date('07/21/2016'));
+
+      expect(day).toBe('Thursday');
+    });
+
+    it('should return Friday', () => {
+      const day = datetimeUtility.getDayName(new Date('07/22/2016'));
+
+      expect(day).toBe('Friday');
+    });
+
+    it('should return Saturday', () => {
+      const day = datetimeUtility.getDayName(new Date('07/23/2016'));
+
+      expect(day).toBe('Saturday');
+    });
+  });
+
+  describe('get day difference', () => {
+    it('should return 7', () => {
+      const firstDay = new Date('07/01/2016');
+      const secondDay = new Date('07/08/2016');
+      const difference = datetimeUtility.getDayDifference(firstDay, secondDay);
+
+      expect(difference).toBe(7);
+    });
+
+    it('should return 31', () => {
+      const firstDay = new Date('07/01/2016');
+      const secondDay = new Date('08/01/2016');
+      const difference = datetimeUtility.getDayDifference(firstDay, secondDay);
+
+      expect(difference).toBe(31);
+    });
+
+    it('should return 365', () => {
+      const firstDay = new Date('07/02/2015');
+      const secondDay = new Date('07/01/2016');
+      const difference = datetimeUtility.getDayDifference(firstDay, secondDay);
+
+      expect(difference).toBe(365);
+    });
+  });
+});
+
+describe('timeIntervalInWords', () => {
+  it('should return string with number of minutes and seconds', () => {
+    expect(datetimeUtility.timeIntervalInWords(9.54)).toEqual('9 seconds');
+    expect(datetimeUtility.timeIntervalInWords(1)).toEqual('1 second');
+    expect(datetimeUtility.timeIntervalInWords(200)).toEqual('3 minutes 20 seconds');
+    expect(datetimeUtility.timeIntervalInWords(6008)).toEqual('100 minutes 8 seconds');
+  });
+});
+
+describe('dateInWords', () => {
+  const date = new Date('07/01/2016');
+
+  it('should return date in words', () => {
+    expect(datetimeUtility.dateInWords(date)).toEqual('July 1, 2016');
+  });
+
+  it('should return abbreviated month name', () => {
+    expect(datetimeUtility.dateInWords(date, true)).toEqual('Jul 1, 2016');
+  });
+
+  it('should return date in words without year', () => {
+    expect(datetimeUtility.dateInWords(date, true, true)).toEqual('Jul 1');
+  });
+});
+
+describe('monthInWords', () => {
+  const date = new Date('2017-01-20');
+
+  it('returns month name from provided date', () => {
+    expect(datetimeUtility.monthInWords(date)).toBe('January');
+  });
+
+  it('returns abbreviated month name from provided date', () => {
+    expect(datetimeUtility.monthInWords(date, true)).toBe('Jan');
+  });
+});
+
+describe('totalDaysInMonth', () => {
+  it('returns number of days in a month for given date', () => {
+    // 1st Feb, 2016 (leap year)
+    expect(datetimeUtility.totalDaysInMonth(new Date(2016, 1, 1))).toBe(29);
+
+    // 1st Feb, 2017
+    expect(datetimeUtility.totalDaysInMonth(new Date(2017, 1, 1))).toBe(28);
+
+    // 1st Jan, 2017
+    expect(datetimeUtility.totalDaysInMonth(new Date(2017, 0, 1))).toBe(31);
+  });
+});
+
+describe('getSundays', () => {
+  it('returns array of dates representing all Sundays of the month', () => {
+    // December, 2017 (it has 5 Sundays)
+    const dateOfSundays = [3, 10, 17, 24, 31];
+    const sundays = datetimeUtility.getSundays(new Date(2017, 11, 1));
+
+    expect(sundays.length).toBe(5);
+    sundays.forEach((sunday, index) => {
+      expect(sunday.getDate()).toBe(dateOfSundays[index]);
+    });
+  });
+});
+
+describe('getTimeframeWindowFrom', () => {
+  it('returns array of date objects upto provided length start with provided startDate', () => {
+    const startDate = new Date(2018, 0, 1);
+    const mockTimeframe = [
+      new Date(2018, 0, 1),
+      new Date(2018, 1, 1),
+      new Date(2018, 2, 1),
+      new Date(2018, 3, 1),
+      new Date(2018, 4, 31),
+    ];
+    const timeframe = datetimeUtility.getTimeframeWindowFrom(startDate, 5);
+
+    expect(timeframe.length).toBe(5);
+    timeframe.forEach((timeframeItem, index) => {
+      expect(timeframeItem.getFullYear()).toBe(mockTimeframe[index].getFullYear());
+      expect(timeframeItem.getMonth()).toBe(mockTimeframe[index].getMonth());
+      expect(timeframeItem.getDate()).toBe(mockTimeframe[index].getDate());
+    });
+  });
+});
+
+describe('formatTime', () => {
+  const expectedTimestamps = [
+    [0, '00:00:00'],
+    [1000, '00:00:01'],
+    [42000, '00:00:42'],
+    [121000, '00:02:01'],
+    [10921000, '03:02:01'],
+    [108000000, '30:00:00'],
+  ];
+
+  expectedTimestamps.forEach(([milliseconds, expectedTimestamp]) => {
+    it(`formats ${milliseconds}ms as ${expectedTimestamp}`, () => {
+      expect(datetimeUtility.formatTime(milliseconds)).toBe(expectedTimestamp);
+    });
+  });
+});
+
+describe('datefix', () => {
+  describe('pad', () => {
+    it('should add a 0 when length is smaller than 2', () => {
+      expect(datetimeUtility.pad(2)).toEqual('02');
+    });
+
+    it('should not add a zero when lenght matches the default', () => {
+      expect(datetimeUtility.pad(12)).toEqual('12');
+    });
+
+    it('should add a 0 when lenght is smaller than the provided', () => {
+      expect(datetimeUtility.pad(12, 3)).toEqual('012');
+    });
+  });
+
+  describe('parsePikadayDate', () => {
+    // removed because of https://gitlab.com/gitlab-org/gitlab-ce/issues/39834
+  });
+
+  describe('pikadayToString', () => {
+    it('should format a UTC date into yyyy-mm-dd format', () => {
+      expect(datetimeUtility.pikadayToString(new Date('2020-01-29:00:00'))).toEqual('2020-01-29');
+    });
+  });
+});
+
+describe('prettyTime methods', () => {
+  const assertTimeUnits = (obj, minutes, hours, days, weeks) => {
+    expect(obj.minutes).toBe(minutes);
+    expect(obj.hours).toBe(hours);
+    expect(obj.days).toBe(days);
+    expect(obj.weeks).toBe(weeks);
+  };
+
+  describe('parseSeconds', () => {
+    it('should correctly parse a negative value', () => {
+      const zeroSeconds = datetimeUtility.parseSeconds(-1000);
+
+      assertTimeUnits(zeroSeconds, 16, 0, 0, 0);
+    });
+
+    it('should correctly parse a zero value', () => {
+      const zeroSeconds = datetimeUtility.parseSeconds(0);
+
+      assertTimeUnits(zeroSeconds, 0, 0, 0, 0);
+    });
+
+    it('should correctly parse a small non-zero second values', () => {
+      const subOneMinute = datetimeUtility.parseSeconds(10);
+      const aboveOneMinute = datetimeUtility.parseSeconds(100);
+      const manyMinutes = datetimeUtility.parseSeconds(1000);
+
+      assertTimeUnits(subOneMinute, 0, 0, 0, 0);
+      assertTimeUnits(aboveOneMinute, 1, 0, 0, 0);
+      assertTimeUnits(manyMinutes, 16, 0, 0, 0);
+    });
+
+    it('should correctly parse large second values', () => {
+      const aboveOneHour = datetimeUtility.parseSeconds(4800);
+      const aboveOneDay = datetimeUtility.parseSeconds(110000);
+      const aboveOneWeek = datetimeUtility.parseSeconds(25000000);
+
+      assertTimeUnits(aboveOneHour, 20, 1, 0, 0);
+      assertTimeUnits(aboveOneDay, 33, 6, 3, 0);
+      assertTimeUnits(aboveOneWeek, 26, 0, 3, 173);
+    });
+
+    it('should correctly accept a custom param for hoursPerDay', () => {
+      const config = { hoursPerDay: 24 };
+
+      const aboveOneHour = datetimeUtility.parseSeconds(4800, config);
+      const aboveOneDay = datetimeUtility.parseSeconds(110000, config);
+      const aboveOneWeek = datetimeUtility.parseSeconds(25000000, config);
+
+      assertTimeUnits(aboveOneHour, 20, 1, 0, 0);
+      assertTimeUnits(aboveOneDay, 33, 6, 1, 0);
+      assertTimeUnits(aboveOneWeek, 26, 8, 4, 57);
+    });
+
+    it('should correctly accept a custom param for daysPerWeek', () => {
+      const config = { daysPerWeek: 7 };
+
+      const aboveOneHour = datetimeUtility.parseSeconds(4800, config);
+      const aboveOneDay = datetimeUtility.parseSeconds(110000, config);
+      const aboveOneWeek = datetimeUtility.parseSeconds(25000000, config);
+
+      assertTimeUnits(aboveOneHour, 20, 1, 0, 0);
+      assertTimeUnits(aboveOneDay, 33, 6, 3, 0);
+      assertTimeUnits(aboveOneWeek, 26, 0, 0, 124);
+    });
+
+    it('should correctly accept custom params for daysPerWeek and hoursPerDay', () => {
+      const config = { daysPerWeek: 55, hoursPerDay: 14 };
+
+      const aboveOneHour = datetimeUtility.parseSeconds(4800, config);
+      const aboveOneDay = datetimeUtility.parseSeconds(110000, config);
+      const aboveOneWeek = datetimeUtility.parseSeconds(25000000, config);
+
+      assertTimeUnits(aboveOneHour, 20, 1, 0, 0);
+      assertTimeUnits(aboveOneDay, 33, 2, 2, 0);
+      assertTimeUnits(aboveOneWeek, 26, 0, 1, 9);
+    });
+  });
+
+  describe('stringifyTime', () => {
+    it('should stringify values with all non-zero units', () => {
+      const timeObject = {
+        weeks: 1,
+        days: 4,
+        hours: 7,
+        minutes: 20,
+      };
+
+      const timeString = datetimeUtility.stringifyTime(timeObject);
+
+      expect(timeString).toBe('1w 4d 7h 20m');
+    });
+
+    it('should stringify values with some non-zero units', () => {
+      const timeObject = {
+        weeks: 0,
+        days: 4,
+        hours: 0,
+        minutes: 20,
+      };
+
+      const timeString = datetimeUtility.stringifyTime(timeObject);
+
+      expect(timeString).toBe('4d 20m');
+    });
+
+    it('should stringify values with no non-zero units', () => {
+      const timeObject = {
+        weeks: 0,
+        days: 0,
+        hours: 0,
+        minutes: 0,
+      };
+
+      const timeString = datetimeUtility.stringifyTime(timeObject);
+
+      expect(timeString).toBe('0m');
+    });
+  });
+
+  describe('abbreviateTime', () => {
+    it('should abbreviate stringified times for weeks', () => {
+      const fullTimeString = '1w 3d 4h 5m';
+
+      expect(datetimeUtility.abbreviateTime(fullTimeString)).toBe('1w');
+    });
+
+    it('should abbreviate stringified times for non-weeks', () => {
+      const fullTimeString = '0w 3d 4h 5m';
+
+      expect(datetimeUtility.abbreviateTime(fullTimeString)).toBe('3d');
+    });
+  });
+});
-- 
cgit v1.2.3


From 50222d4dc679dd3c9c8d8ff92a32f5691e607804 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Fri, 19 Oct 2018 19:53:41 +0200
Subject: Add calculateRemainingMilliseconds() helper function

---
 app/assets/javascripts/lib/utils/datetime_utility.js | 12 ++++++++++++
 spec/javascripts/lib/utils/datetime_utility_spec.js  | 18 ++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js
index 1bdf98d0c97..46740308f17 100644
--- a/app/assets/javascripts/lib/utils/datetime_utility.js
+++ b/app/assets/javascripts/lib/utils/datetime_utility.js
@@ -473,3 +473,15 @@ export const stringifyTime = timeObject => {
  */
 export const abbreviateTime = timeStr =>
   timeStr.split(' ').filter(unitStr => unitStr.charAt(0) !== '0')[0];
+
+/**
+ * Calculates the milliseconds between now and a given date string.
+ * The result cannot become negative.
+ *
+ * @param endDate date string that the time difference is calculated for
+ * @return {number} number of milliseconds remaining until the given date
+ */
+export const calculateRemainingMilliseconds = endDate => {
+  const remainingMilliseconds = new Date(endDate).getTime() - Date.now();
+  return Math.max(remainingMilliseconds, 0);
+};
diff --git a/spec/javascripts/lib/utils/datetime_utility_spec.js b/spec/javascripts/lib/utils/datetime_utility_spec.js
index 2821f4d6793..de6b96aab57 100644
--- a/spec/javascripts/lib/utils/datetime_utility_spec.js
+++ b/spec/javascripts/lib/utils/datetime_utility_spec.js
@@ -352,3 +352,21 @@ describe('prettyTime methods', () => {
     });
   });
 });
+
+describe('calculateRemainingMilliseconds', () => {
+  beforeEach(() => {
+    spyOn(Date, 'now').and.callFake(() => new Date('2063-04-04T00:42:00Z').getTime());
+  });
+
+  it('calculates the remaining time for a given end date', () => {
+    const milliseconds = datetimeUtility.calculateRemainingMilliseconds('2063-04-04T01:44:03Z');
+
+    expect(milliseconds).toBe(3723000);
+  });
+
+  it('returns 0 if the end date has passed', () => {
+    const milliseconds = datetimeUtility.calculateRemainingMilliseconds('2063-04-03T00:00:00Z');
+
+    expect(milliseconds).toBe(0);
+  });
+});
-- 
cgit v1.2.3


From 6e680647c23cfdbad8624703f8eb49dcf9474c7e Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Fri, 19 Oct 2018 19:50:38 +0200
Subject: Add reusable component for counting down

---
 .../vue_shared/components/gl_countdown.vue         | 46 ++++++++++++++++
 .../vue_shared/components/gl_countdown_spec.js     | 63 ++++++++++++++++++++++
 2 files changed, 109 insertions(+)
 create mode 100644 app/assets/javascripts/vue_shared/components/gl_countdown.vue
 create mode 100644 spec/javascripts/vue_shared/components/gl_countdown_spec.js

diff --git a/app/assets/javascripts/vue_shared/components/gl_countdown.vue b/app/assets/javascripts/vue_shared/components/gl_countdown.vue
new file mode 100644
index 00000000000..bc42d4611b3
--- /dev/null
+++ b/app/assets/javascripts/vue_shared/components/gl_countdown.vue
@@ -0,0 +1,46 @@
+<script>
+import { calculateRemainingMilliseconds, formatTime } from '~/lib/utils/datetime_utility';
+
+/**
+ * Counts down to a given end date.
+ */
+export default {
+  props: {
+    endDate: {
+      type: String,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      remainingTime: formatTime(0),
+      countdownUpdateIntervalId: null,
+    };
+  },
+
+  mounted() {
+    const updateRemainingTime = () => {
+      const remainingMilliseconds = calculateRemainingMilliseconds(this.endDate);
+      this.remainingTime = formatTime(remainingMilliseconds);
+    };
+
+    updateRemainingTime();
+    this.countdownUpdateIntervalId = window.setInterval(updateRemainingTime, 1000);
+  },
+
+  beforeDestroy() {
+    window.clearInterval(this.countdownUpdateIntervalId);
+  },
+};
+</script>
+
+<template>
+  <time
+    v-gl-tooltip
+    :datetime="endDate"
+    :title="endDate"
+  >
+    {{ remainingTime }}
+  </time>
+</template>
diff --git a/spec/javascripts/vue_shared/components/gl_countdown_spec.js b/spec/javascripts/vue_shared/components/gl_countdown_spec.js
new file mode 100644
index 00000000000..9f729c68f0a
--- /dev/null
+++ b/spec/javascripts/vue_shared/components/gl_countdown_spec.js
@@ -0,0 +1,63 @@
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import Vue from 'vue';
+import GlCountdown from '~/vue_shared/components/gl_countdown.vue';
+
+describe('GlCountdown', () => {
+  const Component = Vue.extend(GlCountdown);
+  let vm;
+  let now = '2000-01-01T00:00:00Z';
+
+  beforeEach(() => {
+    spyOn(Date, 'now').and.callFake(() => new Date(now).getTime());
+    jasmine.clock().install();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+    jasmine.clock().uninstall();
+  });
+
+  describe('when there is time remaining', () => {
+    beforeEach(done => {
+      vm = mountComponent(Component, {
+        endDate: '2000-01-01T01:02:03Z',
+      });
+
+      Vue.nextTick()
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('displays remaining time', () => {
+      expect(vm.$el).toContainText('01:02:03');
+    });
+
+    it('updates remaining time', done => {
+      now = '2000-01-01T00:00:01Z';
+      jasmine.clock().tick(1000);
+
+      Vue.nextTick()
+        .then(() => {
+          expect(vm.$el).toContainText('01:02:02');
+          done();
+        })
+        .catch(done.fail);
+    });
+  });
+
+  describe('when there is no time remaining', () => {
+    beforeEach(done => {
+      vm = mountComponent(Component, {
+        endDate: '1900-01-01T00:00:00Z',
+      });
+
+      Vue.nextTick()
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('displays 00:00:00', () => {
+      expect(vm.$el).toContainText('00:00:00');
+    });
+  });
+});
-- 
cgit v1.2.3


From 6bf2cb91bb5fa893746e905528467462e044e5ec Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Wed, 24 Oct 2018 18:17:30 +0200
Subject: Add validation for date strings passed to GlCountdown

---
 .../javascripts/vue_shared/components/gl_countdown.vue | 11 +++++++----
 .../vue_shared/components/gl_countdown_spec.js         | 18 ++++++++++++++++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/components/gl_countdown.vue b/app/assets/javascripts/vue_shared/components/gl_countdown.vue
index bc42d4611b3..9327a2a4a6c 100644
--- a/app/assets/javascripts/vue_shared/components/gl_countdown.vue
+++ b/app/assets/javascripts/vue_shared/components/gl_countdown.vue
@@ -6,9 +6,12 @@ import { calculateRemainingMilliseconds, formatTime } from '~/lib/utils/datetime
  */
 export default {
   props: {
-    endDate: {
+    endDateString: {
       type: String,
       required: true,
+      validator(value) {
+        return !Number.isNaN(new Date(value).getTime());
+      },
     },
   },
 
@@ -21,7 +24,7 @@ export default {
 
   mounted() {
     const updateRemainingTime = () => {
-      const remainingMilliseconds = calculateRemainingMilliseconds(this.endDate);
+      const remainingMilliseconds = calculateRemainingMilliseconds(this.endDateString);
       this.remainingTime = formatTime(remainingMilliseconds);
     };
 
@@ -38,8 +41,8 @@ export default {
 <template>
   <time
     v-gl-tooltip
-    :datetime="endDate"
-    :title="endDate"
+    :datetime="endDateString"
+    :title="endDateString"
   >
     {{ remainingTime }}
   </time>
diff --git a/spec/javascripts/vue_shared/components/gl_countdown_spec.js b/spec/javascripts/vue_shared/components/gl_countdown_spec.js
index 9f729c68f0a..929ffe219f4 100644
--- a/spec/javascripts/vue_shared/components/gl_countdown_spec.js
+++ b/spec/javascripts/vue_shared/components/gl_countdown_spec.js
@@ -20,7 +20,7 @@ describe('GlCountdown', () => {
   describe('when there is time remaining', () => {
     beforeEach(done => {
       vm = mountComponent(Component, {
-        endDate: '2000-01-01T01:02:03Z',
+        endDateString: '2000-01-01T01:02:03Z',
       });
 
       Vue.nextTick()
@@ -48,7 +48,7 @@ describe('GlCountdown', () => {
   describe('when there is no time remaining', () => {
     beforeEach(done => {
       vm = mountComponent(Component, {
-        endDate: '1900-01-01T00:00:00Z',
+        endDateString: '1900-01-01T00:00:00Z',
       });
 
       Vue.nextTick()
@@ -60,4 +60,18 @@ describe('GlCountdown', () => {
       expect(vm.$el).toContainText('00:00:00');
     });
   });
+
+  describe('when an invalid date is passed', () => {
+    it('throws a validation error', () => {
+      spyOn(Vue.config, 'warnHandler').and.stub();
+      vm = mountComponent(Component, {
+        endDateString: 'this is invalid',
+      });
+
+      expect(Vue.config.warnHandler).toHaveBeenCalledTimes(1);
+      const [errorMessage] = Vue.config.warnHandler.calls.argsFor(0);
+
+      expect(errorMessage).toMatch(/^Invalid prop: .* "endDateString"/);
+    });
+  });
 });
-- 
cgit v1.2.3


From 1065f8ce7a261dff5a3077be46405343141733df Mon Sep 17 00:00:00 2001
From: Andrew Newdigate <andrew@gitlab.com>
Date: Sat, 20 Oct 2018 19:00:19 +0100
Subject: Add experimental support for Puma

This allows us (and others) to test drive Puma without it affecting all
users. Puma can be enabled by setting the environment variable
"EXPERIMENTAL_PUMA" to a non empty value.
---
 .gitignore                                         |   1 +
 Gemfile                                            |   5 +
 Gemfile.lock                                       |   6 +
 Gemfile.rails5.lock                                |   6 +
 bin/web                                            |   5 +
 bin/web_puma                                       |  63 ++++
 changelogs/unreleased/an-multithreading.yml        |   5 +
 config/initializers/7_prometheus_metrics.rb        |  22 +-
 config/initializers/8_metrics.rb                   |   4 +-
 config/initializers/active_record_lifecycle.rb     |  23 ++
 config/initializers/macos.rb                       |  13 +
 config/initializers/rbtrace.rb                     |   9 +
 config/initializers/sidekiq.rb                     |   2 -
 config/puma.example.development.rb                 |  77 ++++
 config/unicorn.rb.example                          |  37 +-
 config/unicorn.rb.example.development              |  67 +++-
 doc/update/11.4-to-11.5.md                         | 404 +++++++++++++++++++++
 lib/gitlab/cluster/lifecycle_events.rb             |  99 +++++
 .../cluster/puma_worker_killer_initializer.rb      |  32 ++
 spec/rack_servers/configs/config.ru                |  12 +
 spec/rack_servers/configs/puma.rb                  |  32 ++
 spec/rack_servers/puma_spec.rb                     |  84 +++++
 spec/rack_servers/unicorn_spec.rb                  | 105 ++++++
 spec/unicorn/unicorn_spec.rb                       | 114 ------
 24 files changed, 1059 insertions(+), 168 deletions(-)
 create mode 100755 bin/web_puma
 create mode 100644 changelogs/unreleased/an-multithreading.yml
 create mode 100644 config/initializers/active_record_lifecycle.rb
 create mode 100644 config/initializers/macos.rb
 create mode 100644 config/initializers/rbtrace.rb
 create mode 100644 config/puma.example.development.rb
 create mode 100644 doc/update/11.4-to-11.5.md
 create mode 100644 lib/gitlab/cluster/lifecycle_events.rb
 create mode 100644 lib/gitlab/cluster/puma_worker_killer_initializer.rb
 create mode 100644 spec/rack_servers/configs/config.ru
 create mode 100644 spec/rack_servers/configs/puma.rb
 create mode 100644 spec/rack_servers/puma_spec.rb
 create mode 100644 spec/rack_servers/unicorn_spec.rb
 delete mode 100644 spec/unicorn/unicorn_spec.rb

diff --git a/.gitignore b/.gitignore
index 82b3d08f7a8..aecaae95b8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ eslint-report.html
 /config/redis.queues.yml
 /config/redis.shared_state.yml
 /config/unicorn.rb
+/config/puma.rb
 /config/secrets.yml
 /config/sidekiq.yml
 /config/registry.key
diff --git a/Gemfile b/Gemfile
index c442ed9065e..d8c996cf6c4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -153,6 +153,11 @@ group :unicorn do
   gem 'unicorn-worker-killer', '~> 0.4.4'
 end
 
+group :puma do
+  gem 'puma', '~> 3.12', require: false
+  gem 'puma_worker_killer', require: false
+end
+
 # State machine
 gem 'state_machines-activerecord', '~> 0.5.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bf16bef4f32..da74cae3f5f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -598,6 +598,10 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
+    puma (3.12.0)
+    puma_worker_killer (0.1.0)
+      get_process_mem (~> 0.2)
+      puma (>= 2.7, < 4)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.6.10)
     rack-accept (0.4.5)
@@ -1076,6 +1080,8 @@ DEPENDENCIES
   prometheus-client-mmap (~> 0.9.4)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
+  puma (~> 3.12)
+  puma_worker_killer
   rack-attack (~> 4.4.1)
   rack-cors (~> 1.0.0)
   rack-oauth2 (~> 1.2.1)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 81547303ed2..a1018753510 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -602,6 +602,10 @@ GEM
     pry-rails (0.3.6)
       pry (>= 0.10.4)
     public_suffix (3.0.3)
+    puma (3.12.0)
+    puma_worker_killer (0.1.0)
+      get_process_mem (~> 0.2)
+      puma (>= 2.7, < 4)
     pyu-ruby-sasl (0.0.3.3)
     rack (2.0.5)
     rack-accept (0.4.5)
@@ -1085,6 +1089,8 @@ DEPENDENCIES
   prometheus-client-mmap (~> 0.9.4)
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
+  puma (~> 3.12)
+  puma_worker_killer
   rack-attack (~> 4.4.1)
   rack-cors (~> 1.0.0)
   rack-oauth2 (~> 1.2.1)
diff --git a/bin/web b/bin/web
index ecd0bbd10b0..06ff7c39296 100755
--- a/bin/web
+++ b/bin/web
@@ -3,6 +3,11 @@
 cd $(dirname $0)/..
 app_root=$(pwd)
 
+# Switch to experimental PUMA configuration
+if [ -n "${EXPERIMENTAL_PUMA}" ]; then
+  exec bin/web_puma "$@"
+fi
+
 unicorn_pidfile="$app_root/tmp/pids/unicorn.pid"
 unicorn_config="$app_root/config/unicorn.rb"
 unicorn_cmd="bundle exec unicorn_rails -c $unicorn_config -E $RAILS_ENV"
diff --git a/bin/web_puma b/bin/web_puma
new file mode 100755
index 00000000000..178fe84800d
--- /dev/null
+++ b/bin/web_puma
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)/..
+app_root=$(pwd)
+
+puma_pidfile="$app_root/tmp/pids/puma.pid"
+puma_config="$app_root/config/puma.rb"
+
+spawn_puma()
+{
+  exec bundle exec puma --config "${puma_config}" "$@"
+}
+
+get_puma_pid()
+{
+  pid=$(cat "${puma_pidfile}")
+  if [ -z "$pid" ] ; then
+    echo "Could not find a PID in $puma_pidfile"
+    exit 1
+  fi
+  echo "${pid}"
+}
+
+start()
+{
+  spawn_puma -d
+}
+
+start_foreground()
+{
+  spawn_puma
+}
+
+stop()
+{
+  get_puma_pid
+  kill -QUIT "$(get_puma_pid)"
+}
+
+reload()
+{
+  kill -USR2 "$(get_puma_pid)"
+}
+
+case "$1" in
+  start)
+    start
+    ;;
+  start_foreground)
+    start_foreground
+    ;;
+  stop)
+    stop
+    ;;
+  reload)
+    reload
+    ;;
+  *)
+    echo "Usage: RAILS_ENV=your_env $0 {start|stop|reload}"
+    ;;
+esac
diff --git a/changelogs/unreleased/an-multithreading.yml b/changelogs/unreleased/an-multithreading.yml
new file mode 100644
index 00000000000..fca847e6ea4
--- /dev/null
+++ b/changelogs/unreleased/an-multithreading.yml
@@ -0,0 +1,5 @@
+---
+title: Experimental support for running Puma multithreaded web-server
+merge_request: 22372
+author:
+type: performance
diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index 146c4b1e024..8052880cc3d 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -26,9 +26,25 @@ Sidekiq.configure_server do |config|
 end
 
 if !Rails.env.test? && Gitlab::Metrics.prometheus_metrics_enabled?
-  unless Sidekiq.server?
-    Gitlab::Metrics::Samplers::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start
+  Gitlab::Cluster::LifecycleEvents.on_worker_start do
+    defined?(::Prometheus::Client.reinitialize_on_pid_change) && Prometheus::Client.reinitialize_on_pid_change
+
+    unless Sidekiq.server?
+      Gitlab::Metrics::Samplers::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start
+    end
+
+    Gitlab::Metrics::Samplers::RubySampler.initialize_instance(Settings.monitoring.ruby_sampler_interval).start
   end
+end
 
-  Gitlab::Metrics::Samplers::RubySampler.initialize_instance(Settings.monitoring.ruby_sampler_interval).start
+Gitlab::Cluster::LifecycleEvents.on_master_restart do
+  # The following is necessary to ensure stale Prometheus metrics don't
+  # accumulate over time. It needs to be done in this hook as opposed to
+  # inside an init script to ensure metrics files aren't deleted after new
+  # unicorn workers start after a SIGUSR2 is received.
+  prometheus_multiproc_dir = ENV['prometheus_multiproc_dir']
+  if prometheus_multiproc_dir
+    old_metrics = Dir[File.join(prometheus_multiproc_dir, '*.db')]
+    FileUtils.rm_rf(old_metrics)
+  end
 end
diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb
index eccf82ab8dc..c8d261d415e 100644
--- a/config/initializers/8_metrics.rb
+++ b/config/initializers/8_metrics.rb
@@ -158,7 +158,9 @@ if Gitlab::Metrics.enabled? && !Rails.env.test?
 
   GC::Profiler.enable
 
-  Gitlab::Metrics::Samplers::InfluxSampler.initialize_instance.start
+  Gitlab::Cluster::LifecycleEvents.on_worker_start do
+    Gitlab::Metrics::Samplers::InfluxSampler.initialize_instance.start
+  end
 
   module TrackNewRedisConnections
     def connect(*args)
diff --git a/config/initializers/active_record_lifecycle.rb b/config/initializers/active_record_lifecycle.rb
new file mode 100644
index 00000000000..7fa37121efc
--- /dev/null
+++ b/config/initializers/active_record_lifecycle.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# Don't handle sidekiq configuration as it
+# has its own special active record configuration here
+if defined?(ActiveRecord::Base) && !Sidekiq.server?
+  Gitlab::Cluster::LifecycleEvents.on_worker_start do
+    ActiveSupport.on_load(:active_record) do
+      ActiveRecord::Base.establish_connection
+
+      Rails.logger.debug("ActiveRecord connection established")
+    end
+  end
+end
+
+if defined?(ActiveRecord::Base)
+  Gitlab::Cluster::LifecycleEvents.on_before_fork do
+    # the following is highly recommended for Rails + "preload_app true"
+    # as there's no need for the master process to hold a connection
+    ActiveRecord::Base.connection.disconnect!
+
+    Rails.logger.debug("ActiveRecord connection disconnected")
+  end
+end
diff --git a/config/initializers/macos.rb b/config/initializers/macos.rb
new file mode 100644
index 00000000000..f410af6ed47
--- /dev/null
+++ b/config/initializers/macos.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+if /darwin/ =~ RUBY_PLATFORM
+  Gitlab::Cluster::LifecycleEvents.on_before_fork do
+    require 'fiddle'
+
+    # Dynamically load Foundation.framework, ~implicitly~ initialising
+    # the Objective-C runtime before any forking happens in Unicorn
+    #
+    # From https://bugs.ruby-lang.org/issues/14009
+    Fiddle.dlopen '/System/Library/Frameworks/Foundation.framework/Foundation'
+  end
+end
diff --git a/config/initializers/rbtrace.rb b/config/initializers/rbtrace.rb
new file mode 100644
index 00000000000..6a1b71bf4bd
--- /dev/null
+++ b/config/initializers/rbtrace.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+if ENV['ENABLE_RBTRACE']
+  Gitlab::Cluster::LifecycleEvents.on_worker_start do
+    # Unicorn clears out signals before it forks, so rbtrace won't work
+    # unless it is enabled after the fork.
+    require 'rbtrace'
+  end
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index bc6b7aed6aa..565efc858d1 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -14,8 +14,6 @@ Sidekiq.default_worker_options = { retry: 3 }
 enable_json_logs = Gitlab.config.sidekiq.log_format == 'json'
 
 Sidekiq.configure_server do |config|
-  require 'rbtrace' if ENV['ENABLE_RBTRACE']
-
   config.redis = queues_config_hash
 
   config.server_middleware do |chain|
diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb
new file mode 100644
index 00000000000..490c940077a
--- /dev/null
+++ b/config/puma.example.development.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+# -----------------------------------------------------------------------
+# This file is used by the GDK to generate a default config/puma.rb file
+# Note that `/home/git` will be substituted for the actual GDK root
+# directory when this file is generated
+# -----------------------------------------------------------------------
+
+# Load "path" as a rackup file.
+#
+# The default is "config.ru".
+#
+rackup 'config.ru'
+pidfile '/home/git/gitlab/tmp/pids/puma.pid'
+state_path '/home/git/gitlab/tmp/pids/puma.state'
+
+stdout_redirect '/home/git/gitlab/log/puma.stdout.log',
+  '/home/git/gitlab/log/puma.stderr.log',
+  true
+
+# Configure "min" to be the minimum number of threads to use to answer
+# requests and "max" the maximum.
+#
+# The default is "0, 16".
+#
+threads 1, 4
+
+# By default, workers accept all requests and queue them to pass to handlers.
+# When false, workers accept the number of simultaneous requests configured.
+#
+# Queueing requests generally improves performance, but can cause deadlocks if
+# the app is waiting on a request to itself. See https://github.com/puma/puma/issues/612
+#
+# When set to false this may require a reverse proxy to handle slow clients and
+# queue requests before they reach puma. This is due to disabling HTTP keepalive
+queue_requests false
+
+# Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only
+# accepted protocols.
+bind 'unix:///home/git/gitlab.socket'
+
+workers 2
+
+require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
+require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer"
+
+on_restart do
+  # Signal application hooks that we're about to restart
+  Gitlab::Cluster::LifecycleEvents.do_master_restart
+end
+
+before_fork do
+  # Signal to the puma killer
+  Gitlab::Cluster::PumaWorkerKillerInitializer.start @config.options unless ENV['DISABLE_PUMA_WORKER_KILLER']
+
+  # Signal application hooks that we're about to fork
+  Gitlab::Cluster::LifecycleEvents.do_before_fork
+end
+
+Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
+on_worker_boot do
+  # Signal application hooks of worker start
+  Gitlab::Cluster::LifecycleEvents.do_worker_start
+end
+
+# Preload the application before starting the workers; this conflicts with
+# phased restart feature. (off by default)
+
+preload_app!
+
+tag 'gitlab-puma-worker'
+
+# Verifies that all workers have checked in to the master process within
+# the given timeout. If not the worker process will be restarted. Default
+# value is 60 seconds.
+#
+worker_timeout 60
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index e06cce3e97a..4637eb8bc6e 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -81,22 +81,16 @@ preload_app true
 # fast LAN.
 check_client_connection false
 
+require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
+
 before_exec do |server|
-  # The following is necessary to ensure stale Prometheus metrics don't
-  # accumulate over time. It needs to be done in this hook as opposed to
-  # inside an init script to ensure metrics files aren't deleted after new
-  # unicorn workers start after a SIGUSR2 is received.
-  if ENV['prometheus_multiproc_dir']
-    old_metrics = Dir[File.join(ENV['prometheus_multiproc_dir'], '*.db')]
-    FileUtils.rm_rf(old_metrics)
-  end
+  # Signal application hooks that we're about to restart
+  Gitlab::Cluster::LifecycleEvents.do_master_restart
 end
 
 before_fork do |server, worker|
-  # the following is highly recommended for Rails + "preload_app true"
-  # as there's no need for the master process to hold a connection
-  defined?(ActiveRecord::Base) &&
-    ActiveRecord::Base.connection.disconnect!
+  # Signal application hooks that we're about to fork
+  Gitlab::Cluster::LifecycleEvents.do_before_fork
 
   # The following is only recommended for memory/DB-constrained
   # installations.  It is not needed if your system can house
@@ -124,25 +118,10 @@ before_fork do |server, worker|
 end
 
 after_fork do |server, worker|
-  # Unicorn clears out signals before it forks, so rbtrace won't work
-  # unless it is enabled after the fork.
-  require 'rbtrace' if ENV['ENABLE_RBTRACE']
+  # Signal application hooks of worker start
+  Gitlab::Cluster::LifecycleEvents.do_worker_start
 
   # per-process listener ports for debugging/admin/migrations
   # addr = "127.0.0.1:#{9293 + worker.nr}"
   # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
-
-  # the following is *required* for Rails + "preload_app true",
-  defined?(ActiveRecord::Base) &&
-    ActiveRecord::Base.establish_connection
-
-  # reset prometheus client, this will cause any opened metrics files to be closed
-  defined?(::Prometheus::Client.reinitialize_on_pid_change) &&
-    Prometheus::Client.reinitialize_on_pid_change
-
-  # if preload_app is true, then you may also want to check and
-  # restart any other shared sockets/descriptors such as Memcached,
-  # and Redis.  TokyoCabinet file handles are safe to reuse
-  # between any number of forked children (assuming your kernel
-  # correctly implements pread()/pwrite() system calls)
 end
diff --git a/config/unicorn.rb.example.development b/config/unicorn.rb.example.development
index f31df66015a..f7541bb9d55 100644
--- a/config/unicorn.rb.example.development
+++ b/config/unicorn.rb.example.development
@@ -1,32 +1,61 @@
+# frozen_string_literal: true
+
+# -------------------------------------------------------------------------
+# This file is used by the GDK to generate a default config/unicorn.rb file
+# Note that `/home/git` will be substituted for the actual GDK root
+# directory when this file is generated
+# -------------------------------------------------------------------------
+
 worker_processes 2
 timeout 60
 
+listen '/home/git/gitlab.socket'
+
 preload_app true
 check_client_connection false
 
+require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
+
+before_exec do |server|
+  # Signal application hooks that we're about to restart
+  Gitlab::Cluster::LifecycleEvents.do_master_restart
+end
+
 before_fork do |server, worker|
-  # the following is highly recommended for Rails + "preload_app true"
-  # as there's no need for the master process to hold a connection
-  defined?(ActiveRecord::Base) &&
-    ActiveRecord::Base.connection.disconnect!
-
-  if /darwin/ =~ RUBY_PLATFORM
-    require 'fiddle'
-
-    # Dynamically load Foundation.framework, ~implicitly~ initialising
-    # the Objective-C runtime before any forking happens in Unicorn
-    #
-    # From https://bugs.ruby-lang.org/issues/14009
-    Fiddle.dlopen '/System/Library/Frameworks/Foundation.framework/Foundation'
+  # Signal application hooks that we're about to fork
+  Gitlab::Cluster::LifecycleEvents.do_before_fork
+
+  # The following is only recommended for memory/DB-constrained
+  # installations.  It is not needed if your system can house
+  # twice as many worker_processes as you have configured.
+  #
+  # This allows a new master process to incrementally
+  # phase out the old master process with SIGTTOU to avoid a
+  # thundering herd (especially in the "preload_app false" case)
+  # when doing a transparent upgrade.  The last worker spawned
+  # will then kill off the old master process with a SIGQUIT.
+  old_pid = "#{server.config[:pid]}.oldbin"
+  if old_pid != server.pid
+    begin
+      sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+      Process.kill(sig, File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+    end
   end
+  #
+  # Throttle the master from forking too quickly by sleeping.  Due
+  # to the implementation of standard Unix signal handlers, this
+  # helps (but does not completely) prevent identical, repeated signals
+  # from being lost when the receiving process is busy.
+  # sleep 1
 end
 
 after_fork do |server, worker|
-  # Unicorn clears out signals before it forks, so rbtrace won't work
-  # unless it is enabled after the fork.
-  require 'rbtrace' if ENV['ENABLE_RBTRACE']
+  # Signal application hooks of worker start
+  Gitlab::Cluster::LifecycleEvents.do_worker_start
 
-  # the following is *required* for Rails + "preload_app true",
-  defined?(ActiveRecord::Base) &&
-    ActiveRecord::Base.establish_connection
+  # per-process listener ports for debugging/admin/migrations
+  # addr = "127.0.0.1:#{9293 + worker.nr}"
+  # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
 end
+
diff --git a/doc/update/11.4-to-11.5.md b/doc/update/11.4-to-11.5.md
new file mode 100644
index 00000000000..e64ab2acae2
--- /dev/null
+++ b/doc/update/11.4-to-11.5.md
@@ -0,0 +1,404 @@
+---
+comments: false
+---
+
+# From 11.4 to 11.5
+
+Make sure you view this update guide from the branch (version) of GitLab you would
+like to install (e.g., `11-5-stable`. You can select the branch in the version
+dropdown at the top left corner of GitLab (below the menu bar).
+
+If the highest number stable branch is unclear please check the
+[GitLab Blog](https://about.gitlab.com/blog/archives.html) for installation
+guide links by version.
+
+### 1. Stop server
+
+```bash
+sudo service gitlab stop
+```
+
+### 2. Backup
+
+NOTE: If you installed GitLab from source, make sure `rsync` is installed.
+
+```bash
+cd /home/git/gitlab
+
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
+
+### 3. Update Ruby
+
+NOTE: GitLab 11.0 and higher only support Ruby 2.4.x and dropped support for Ruby 2.3.x. Be
+sure to upgrade your interpreter if necessary.
+
+You can check which version you are running with `ruby -v`.
+
+Download Ruby and compile it:
+
+```bash
+mkdir /tmp/ruby && cd /tmp/ruby
+curl --remote-name --progress https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.5.tar.gz
+echo '4d650f302f1ec00256450b112bb023644b6ab6dd  ruby-2.4.5.tar.gz' | shasum -c - && tar xzf ruby-2.4.5.tar.gz
+cd ruby-2.4.5
+
+./configure --disable-install-rdoc
+make
+sudo make install
+```
+
+Install Bundler:
+
+```bash
+sudo gem install bundler --no-ri --no-rdoc
+```
+
+### 4. Update Node
+
+GitLab utilizes [webpack](http://webpack.js.org) to compile frontend assets.
+This requires a minimum version of node v6.0.0.
+
+You can check which version you are running with `node -v`. If you are running
+a version older than `v6.0.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.
+
+<https://nodejs.org/en/download/>
+
+GitLab also requires the use of yarn `>= v1.2.0` to manage JavaScript
+dependencies.
+
+```bash
+curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+sudo apt-get update
+sudo apt-get install yarn
+```
+
+More information can be found on the [yarn website](https://yarnpkg.com/en/docs/install).
+
+### 5. Update Go
+
+NOTE: GitLab 11.4 and higher only supports Go 1.10.x and newer, and dropped support for Go
+1.9.x. Be sure to upgrade your installation if necessary.
+
+You can check which version you are running with `go version`.
+
+Download and install Go:
+
+```bash
+# Remove former Go installation folder
+sudo rm -rf /usr/local/go
+
+curl --remote-name --progress https://dl.google.com/go/go1.10.3.linux-amd64.tar.gz
+echo 'fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035  go1.10.3.linux-amd64.tar.gz' | shasum -a256 -c - && \
+  sudo tar -C /usr/local -xzf go1.10.3.linux-amd64.tar.gz
+sudo ln -sf /usr/local/go/bin/{go,godoc,gofmt} /usr/local/bin/
+rm go1.10.3.linux-amd64.tar.gz
+```
+
+### 6. Get latest code
+
+```bash
+cd /home/git/gitlab
+
+sudo -u git -H git fetch --all --prune
+sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically
+sudo -u git -H git checkout -- locale
+```
+
+For GitLab Community Edition:
+
+```bash
+cd /home/git/gitlab
+
+sudo -u git -H git checkout 11-5-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+cd /home/git/gitlab
+
+sudo -u git -H git checkout 11-5-stable-ee
+```
+
+### 7. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+
+sudo -u git -H git fetch --all --tags --prune
+sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_SHELL_VERSION)
+sudo -u git -H bin/compile
+```
+
+### 8. Update gitlab-workhorse
+
+Install and compile gitlab-workhorse. GitLab-Workhorse uses
+[GNU Make](https://www.gnu.org/software/make/).
+If you are not using Linux you may have to run `gmake` instead of
+`make` below.
+
+```bash
+cd /home/git/gitlab-workhorse
+
+sudo -u git -H git fetch --all --tags --prune
+sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_WORKHORSE_VERSION)
+sudo -u git -H make
+```
+
+### 9. Update Gitaly
+
+#### New Gitaly configuration options required
+
+In order to function Gitaly needs some additional configuration information. Below we assume you installed Gitaly in `/home/git/gitaly` and GitLab Shell in `/home/git/gitlab-shell`.
+
+```shell
+echo '
+[gitaly-ruby]
+dir = "/home/git/gitaly/ruby"
+
+[gitlab-shell]
+dir = "/home/git/gitlab-shell"
+' | sudo -u git tee -a /home/git/gitaly/config.toml
+```
+
+#### Check Gitaly configuration
+
+Due to a bug in the `rake gitlab:gitaly:install` script your Gitaly
+configuration file may contain syntax errors. The block name
+`[[storages]]`, which may occur more than once in your `config.toml`
+file, should be `[[storage]]` instead.
+
+```shell
+sudo -u git -H sed -i.pre-10.1 's/\[\[storages\]\]/[[storage]]/' /home/git/gitaly/config.toml
+```
+
+#### Compile Gitaly
+
+```shell
+cd /home/git/gitaly
+sudo -u git -H git fetch --all --tags --prune
+sudo -u git -H git checkout v$(</home/git/gitlab/GITALY_SERVER_VERSION)
+sudo -u git -H make
+```
+
+### 10. Update gitlab-pages
+
+#### Only needed if you use GitLab Pages.
+
+Install and compile gitlab-pages. GitLab-Pages uses
+[GNU Make](https://www.gnu.org/software/make/).
+If you are not using Linux you may have to run `gmake` instead of
+`make` below.
+
+```bash
+cd /home/git/gitlab-pages
+
+sudo -u git -H git fetch --all --tags --prune
+sudo -u git -H git checkout v$(</home/git/gitlab/GITLAB_PAGES_VERSION)
+sudo -u git -H make
+```
+
+### 11. Update MySQL permissions
+
+If you are using MySQL you need to grant the GitLab user the necessary
+permissions on the database:
+
+```bash
+mysql -u root -p -e "GRANT TRIGGER ON \`gitlabhq_production\`.* TO 'git'@'localhost';"
+```
+
+If you use MySQL with replication, or just have MySQL configured with binary logging,
+you will need to also run the following on all of your MySQL servers:
+
+```bash
+mysql -u root -p -e "SET GLOBAL log_bin_trust_function_creators = 1;"
+```
+
+You can make this setting permanent by adding it to your `my.cnf`:
+
+```
+log_bin_trust_function_creators=1
+```
+
+### 12. Update configuration files
+
+#### New `unicorn.rb` configuration
+
+Note: we have made [changes](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22372) to `unicorn.rb` to allow GitLab run with both Unicorn and Puma in future.
+
+- Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/11-5-stable/config/unicorn.rb.example but with your settings.
+    - In particular, make sure that `require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"` line exists and the `before_exec`, `before_fork`, and `after_fork` handlers are configured as shown below:
+
+```ruby
+require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
+
+before_exec do |server|
+  # Signal application hooks that we're about to restart
+  Gitlab::Cluster::LifecycleEvents.do_master_restart
+end
+
+before_fork do |server, worker|
+  # Signal application hooks that we're about to fork
+  Gitlab::Cluster::LifecycleEvents.do_before_fork
+end
+
+after_fork do |server, worker|
+  # Signal application hooks of worker start
+  Gitlab::Cluster::LifecycleEvents.do_worker_start
+end
+```
+
+#### New configuration options for `gitlab.yml`
+
+There might be configuration options available for [`gitlab.yml`][yaml]. View them with the command below and apply them manually to your current `gitlab.yml`:
+
+```sh
+cd /home/git/gitlab
+
+git diff origin/11-4-stable:config/gitlab.yml.example origin/11-5-stable:config/gitlab.yml.example
+```
+
+#### Nginx configuration
+
+Ensure you're still up-to-date with the latest NGINX configuration changes:
+
+```sh
+cd /home/git/gitlab
+
+# For HTTPS configurations
+git diff origin/11-1-stable:lib/support/nginx/gitlab-ssl origin/11-5-stable:lib/support/nginx/gitlab-ssl
+
+# For HTTP configurations
+git diff origin/11-1-stable:lib/support/nginx/gitlab origin/11-5-stable:lib/support/nginx/gitlab
+```
+
+If you are using Strict-Transport-Security in your installation to continue using it you must enable it in your Nginx
+configuration as GitLab application no longer handles setting it.
+
+If you are using Apache instead of NGINX please see the updated [Apache templates].
+Also note that because Apache does not support upstreams behind Unix sockets you
+will need to let gitlab-workhorse listen on a TCP port. You can do this
+via [/etc/default/gitlab].
+
+[Apache templates]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache
+[/etc/default/gitlab]: https://gitlab.com/gitlab-org/gitlab-ce/blob/11-5-stable/lib/support/init.d/gitlab.default.example#L38
+
+#### SMTP configuration
+
+If you're installing from source and use SMTP to deliver mail, you will need to add the following line
+to config/initializers/smtp_settings.rb:
+
+```ruby
+ActionMailer::Base.delivery_method = :smtp
+```
+
+See [smtp_settings.rb.sample] as an example.
+
+[smtp_settings.rb.sample]: https://gitlab.com/gitlab-org/gitlab-ce/blob/11-5-stable/config/initializers/smtp_settings.rb.sample#L13
+
+#### Init script
+
+There might be new configuration options available for [`gitlab.default.example`][gl-example]. View them with the command below and apply them manually to your current `/etc/default/gitlab`:
+
+```sh
+cd /home/git/gitlab
+
+git diff origin/11-1-stable:lib/support/init.d/gitlab.default.example origin/11-5-stable:lib/support/init.d/gitlab.default.example
+```
+
+Ensure you're still up-to-date with the latest init script changes:
+
+```bash
+cd /home/git/gitlab
+
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+```
+
+For Ubuntu 16.04.1 LTS:
+
+```bash
+sudo systemctl daemon-reload
+```
+
+### 13. Install libs, migrations, etc.
+
+```bash
+cd /home/git/gitlab
+
+# MySQL installations (note: the line below states '--without postgres')
+sudo -u git -H bundle install --without postgres development test --deployment
+
+# PostgreSQL installations (note: the line below states '--without mysql')
+sudo -u git -H bundle install --without mysql development test --deployment
+
+# Optional: clean up old gems
+sudo -u git -H bundle clean
+
+# Run database migrations
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+
+# Compile GetText PO files
+
+sudo -u git -H bundle exec rake gettext:compile RAILS_ENV=production
+
+# Update node dependencies and recompile assets
+sudo -u git -H bundle exec rake yarn:install gitlab:assets:clean gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
+
+# Clean up cache
+sudo -u git -H bundle exec rake 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).
+
+### 14. Start application
+
+```bash
+sudo service gitlab start
+sudo service nginx restart
+```
+
+### 15. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+```bash
+cd /home/git/gitlab
+
+sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
+```
+
+To make sure you didn't miss anything run a more thorough check:
+
+```bash
+cd /home/git/gitlab
+
+sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+```
+
+If all items are green, then congratulations, the upgrade is complete!
+
+## Things went south? Revert to previous version (11.4)
+
+### 1. Revert the code to the previous version
+
+Follow the [upgrade guide from 11.3 to 11.4](11.3-to-11.4.md), except for the
+database migration (the backup is already migrated to the previous version).
+
+### 2. Restore from the backup
+
+```bash
+cd /home/git/gitlab
+
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```
+
+If you have more than one backup `*.tar` file(s) please add `BACKUP=timestamp_of_backup` to the command above.
+
+[yaml]: https://gitlab.com/gitlab-org/gitlab-ce/blob/11-5-stable/config/gitlab.yml.example
+[gl-example]: https://gitlab.com/gitlab-org/gitlab-ce/blob/11-5-stable/lib/support/init.d/gitlab.default.example
diff --git a/lib/gitlab/cluster/lifecycle_events.rb b/lib/gitlab/cluster/lifecycle_events.rb
new file mode 100644
index 00000000000..b05dca409d1
--- /dev/null
+++ b/lib/gitlab/cluster/lifecycle_events.rb
@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Cluster
+    #
+    # LifecycleEvents lets Rails initializers register application startup hooks
+    # that are sensitive to forking. For example, to defer the creation of
+    # watchdog threads. This lets us abstract away the Unix process
+    # lifecycles of Unicorn, Sidekiq, Puma, Puma Cluster, etc.
+    #
+    # We have three lifecycle events.
+    #
+    # - before_fork (only in forking processes)
+    # - worker_start
+    # - before_master_restart (only in forking processes)
+    #
+    # Blocks will be executed in the order in which they are registered.
+    #
+    class LifecycleEvents
+      class << self
+        #
+        # Hook registration methods (called from initializers)
+        #
+        def on_worker_start(&block)
+          if in_clustered_environment?
+            # Defer block execution
+            (@worker_start_hooks ||= []) << block
+          else
+            yield
+          end
+        end
+
+        def on_before_fork(&block)
+          return unless in_clustered_environment?
+
+          # Defer block execution
+          (@before_fork_hooks ||= []) << block
+        end
+
+        def on_master_restart(&block)
+          return unless in_clustered_environment?
+
+          # Defer block execution
+          (@master_restart_hooks ||= []) << block
+        end
+
+        #
+        # Lifecycle integration methods (called from unicorn.rb, puma.rb, etc.)
+        #
+        def do_worker_start
+          @worker_start_hooks&.each do |block|
+            block.call
+          end
+        end
+
+        def do_before_fork
+          @before_fork_hooks&.each do |block|
+            block.call
+          end
+        end
+
+        def do_master_restart
+          @master_restart_hooks && @master_restart_hooks.each do |block|
+            block.call
+          end
+        end
+
+        # Puma doesn't use singletons (which is good) but
+        # this means we need to pass through whether the
+        # puma server is running in single mode or cluster mode
+        def set_puma_options(options)
+          @puma_options = options
+        end
+
+        private
+
+        def in_clustered_environment?
+          # Sidekiq doesn't fork
+          return false if Sidekiq.server?
+
+          # Unicorn always forks
+          return true if defined?(::Unicorn)
+
+          # Puma sometimes forks
+          return true if in_clustered_puma?
+
+          # Default assumption is that we don't fork
+          false
+        end
+
+        def in_clustered_puma?
+          return false unless defined?(::Puma)
+
+          @puma_options && @puma_options[:workers] && @puma_options[:workers] > 0
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/cluster/puma_worker_killer_initializer.rb b/lib/gitlab/cluster/puma_worker_killer_initializer.rb
new file mode 100644
index 00000000000..331c39f7d6b
--- /dev/null
+++ b/lib/gitlab/cluster/puma_worker_killer_initializer.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Cluster
+    class PumaWorkerKillerInitializer
+      def self.start(puma_options, puma_per_worker_max_memory_mb: 650)
+        require 'puma_worker_killer'
+
+        PumaWorkerKiller.config do |config|
+          # Note! ram is expressed in megabytes (whereas GITLAB_UNICORN_MEMORY_MAX is in bytes)
+          # Importantly RAM is for _all_workers (ie, the cluster),
+          # not each worker as is the case with GITLAB_UNICORN_MEMORY_MAX
+          worker_count = puma_options[:workers] || 1
+          config.ram = worker_count * puma_per_worker_max_memory_mb
+
+          config.frequency = 20 # seconds
+
+          # We just want to limit to a fixed maximum, unrelated to the total amount
+          # of available RAM.
+          config.percent_usage = 0.98
+
+          # Ideally we'll never hit the maximum amount of memory. If so the worker
+          # is restarted already, thus periodically restarting workers shouldn't be
+          # needed.
+          config.rolling_restart_frequency = false
+        end
+
+        PumaWorkerKiller.start
+      end
+    end
+  end
+end
diff --git a/spec/rack_servers/configs/config.ru b/spec/rack_servers/configs/config.ru
new file mode 100644
index 00000000000..63daeb9eec5
--- /dev/null
+++ b/spec/rack_servers/configs/config.ru
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+app = proc do |env|
+  if env['REQUEST_METHOD'] == 'GET'
+    [200, {}, ["#{Process.pid}"]]
+  else
+    Process.kill(env['QUERY_STRING'], Process.pid)
+    [200, {}, ['Bye!']]
+  end
+end
+
+run app
diff --git a/spec/rack_servers/configs/puma.rb b/spec/rack_servers/configs/puma.rb
new file mode 100644
index 00000000000..d6b6d83d648
--- /dev/null
+++ b/spec/rack_servers/configs/puma.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# Note: this file is used for testing puma in `spec/rack_servers/puma_spec.rb` only
+# Note: as per the convention in `config/puma.example.development.rb`,
+# this file will replace `/home/git` with the actual working directory
+
+directory '/home/git'
+threads 1, 10
+queue_requests false
+pidfile '/home/git/gitlab/tmp/pids/puma.pid'
+bind 'unix:///home/git/gitlab/tmp/tests/puma.socket'
+workers 1
+preload_app!
+worker_timeout 60
+
+require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
+require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer"
+
+before_fork do
+  Gitlab::Cluster::PumaWorkerKillerInitializer.start @config.options
+  Gitlab::Cluster::LifecycleEvents.do_before_fork
+end
+
+Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
+on_worker_boot do
+  Gitlab::Cluster::LifecycleEvents.do_worker_start
+  File.write('/home/git/gitlab/tmp/tests/puma-worker-ready', Process.pid)
+end
+
+on_restart do
+  Gitlab::Cluster::LifecycleEvents.do_master_restart
+end
diff --git a/spec/rack_servers/puma_spec.rb b/spec/rack_servers/puma_spec.rb
new file mode 100644
index 00000000000..431fab87857
--- /dev/null
+++ b/spec/rack_servers/puma_spec.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+require 'excon'
+
+require 'spec_helper'
+
+describe 'Puma' do
+  before(:all) do
+    project_root = File.expand_path('../..', __dir__)
+
+    config_lines = File.read('spec/rack_servers/configs/puma.rb')
+      .gsub('/home/git/gitlab', project_root)
+      .gsub('/home/git', project_root)
+
+    config_path = File.join(project_root, "tmp/tests/puma.rb")
+    @socket_path = File.join(project_root, 'tmp/tests/puma.socket')
+
+    File.write(config_path, config_lines)
+
+    cmd = %W[puma -e test -C #{config_path} #{File.join(__dir__, 'configs/config.ru')}]
+    @puma_master_pid = spawn(*cmd)
+    wait_puma_boot!(@puma_master_pid, File.join(project_root, 'tmp/tests/puma-worker-ready'))
+    WebMock.allow_net_connect!
+  end
+
+  %w[SIGQUIT SIGTERM SIGKILL].each do |signal|
+    it "has a worker that self-terminates on signal #{signal}" do
+      response = Excon.get('unix://', socket: @socket_path)
+      expect(response.status).to eq(200)
+
+      worker_pid = response.body.to_i
+      expect(worker_pid).to be > 0
+
+      begin
+        Excon.post("unix://?#{signal}", socket: @socket_path)
+      rescue Excon::Error::Socket
+        # The connection may be closed abruptly
+      end
+
+      expect(pid_gone?(worker_pid)).to eq(true)
+    end
+  end
+
+  after(:all) do
+    begin
+      WebMock.disable_net_connect!(allow_localhost: true)
+      Process.kill('TERM', @puma_master_pid)
+    rescue Errno::ESRCH
+    end
+  end
+
+  def wait_puma_boot!(master_pid, ready_file)
+    # We have seen the boot timeout after 2 minutes in CI so let's set it to 5 minutes.
+    timeout = 5 * 60
+    timeout.times do
+      return if File.exist?(ready_file)
+
+      pid = Process.waitpid(master_pid, Process::WNOHANG)
+      raise "puma failed to boot: #{$?}" unless pid.nil?
+
+      sleep 1
+    end
+
+    raise "puma boot timed out after #{timeout} seconds"
+  end
+
+  def pid_gone?(pid)
+    # Worker termination should take less than a second. That makes 10
+    # seconds a generous timeout.
+    10.times do
+      begin
+        Process.kill(0, pid)
+      rescue Errno::ESRCH
+        return true
+      end
+
+      sleep 1
+    end
+
+    false
+  end
+end
diff --git a/spec/rack_servers/unicorn_spec.rb b/spec/rack_servers/unicorn_spec.rb
new file mode 100644
index 00000000000..6a02ebcd048
--- /dev/null
+++ b/spec/rack_servers/unicorn_spec.rb
@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+require 'excon'
+
+require 'spec_helper'
+
+describe 'Unicorn' do
+  before(:all) do
+    project_root = File.expand_path('../..', __dir__)
+
+    config_lines = File.read('config/unicorn.rb.example')
+      .gsub('/home/git/gitlab', project_root)
+      .gsub('/home/git', project_root)
+      .split("\n")
+
+    # Remove these because they make setup harder.
+    config_lines = config_lines.reject do |line|
+      %w[
+        worker_processes
+        listen
+        pid
+        stderr_path
+        stdout_path
+      ].any? { |prefix| line.start_with?(prefix) }
+    end
+
+    config_lines << "working_directory '#{Rails.root}'"
+
+    # We want to have exactly 1 worker process because that makes it
+    # predictable which process will handle our requests.
+    config_lines << 'worker_processes 1'
+
+    @socket_path = File.join(project_root, 'tmp/tests/unicorn.socket')
+    config_lines << "listen '#{@socket_path}'"
+
+    ready_file = File.join(project_root, 'tmp/tests/unicorn-worker-ready')
+    FileUtils.rm_f(ready_file)
+    after_fork_index = config_lines.index { |l| l.start_with?('after_fork') }
+    config_lines.insert(after_fork_index + 1, "File.write('#{ready_file}', Process.pid)")
+
+    config_path = File.join(project_root, 'tmp/tests/unicorn.rb')
+    File.write(config_path, config_lines.join("\n") + "\n")
+
+    cmd = %W[unicorn -E test -c #{config_path} spec/rack_servers/configs/config.ru]
+    @unicorn_master_pid = spawn(*cmd)
+    wait_unicorn_boot!(@unicorn_master_pid, ready_file)
+    WebMock.allow_net_connect!
+  end
+
+  %w[SIGQUIT SIGTERM SIGKILL].each do |signal|
+    it "has a worker that self-terminates on signal #{signal}" do
+      response = Excon.get('unix://', socket: @socket_path)
+      expect(response.status).to eq(200)
+
+      worker_pid = response.body.to_i
+      expect(worker_pid).to be > 0
+
+      begin
+        Excon.post("unix://?#{signal}", socket: @socket_path)
+      rescue Excon::Error::Socket
+        # The connection may be closed abruptly
+      end
+
+      expect(pid_gone?(worker_pid)).to eq(true)
+    end
+  end
+
+  after(:all) do
+    WebMock.disable_net_connect!(allow_localhost: true)
+    Process.kill('TERM', @unicorn_master_pid)
+  end
+
+  def wait_unicorn_boot!(master_pid, ready_file)
+    # We have seen the boot timeout after 2 minutes in CI so let's set it to 5 minutes.
+    timeout = 5 * 60
+    timeout.times do
+      return if File.exist?(ready_file)
+
+      pid = Process.waitpid(master_pid, Process::WNOHANG)
+      raise "unicorn failed to boot: #{$?}" unless pid.nil?
+
+      sleep 1
+    end
+
+    raise "unicorn boot timed out after #{timeout} seconds"
+  end
+
+  def pid_gone?(pid)
+    # Worker termination should take less than a second. That makes 10
+    # seconds a generous timeout.
+    10.times do
+      begin
+        Process.kill(0, pid)
+      rescue Errno::ESRCH
+        return true
+      end
+
+      sleep 1
+    end
+
+    false
+  end
+end
diff --git a/spec/unicorn/unicorn_spec.rb b/spec/unicorn/unicorn_spec.rb
deleted file mode 100644
index a4cf479a339..00000000000
--- a/spec/unicorn/unicorn_spec.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'fileutils'
-
-require 'excon'
-
-require 'spec_helper'
-
-describe 'Unicorn' do
-  before(:all) do
-    config_lines = File.read('config/unicorn.rb.example').split("\n")
-
-    # Remove these because they make setup harder.
-    config_lines = config_lines.reject do |line|
-      %w[
-        working_directory
-        worker_processes
-        listen
-        pid
-        stderr_path
-        stdout_path
-      ].any? { |prefix| line.start_with?(prefix) }
-    end
-
-    config_lines << "working_directory '#{Rails.root}'"
-
-    # We want to have exactly 1 worker process because that makes it
-    # predictable which process will handle our requests.
-    config_lines << 'worker_processes 1'
-
-    @socket_path = File.join(Dir.pwd, 'tmp/tests/unicorn.socket')
-    config_lines << "listen '#{@socket_path}'"
-
-    ready_file = 'tmp/tests/unicorn-worker-ready'
-    FileUtils.rm_f(ready_file)
-    after_fork_index = config_lines.index { |l| l.start_with?('after_fork') }
-    config_lines.insert(after_fork_index + 1, "File.write('#{ready_file}', Process.pid)")
-
-    config_path = 'tmp/tests/unicorn.rb'
-    File.write(config_path, config_lines.join("\n") + "\n")
-
-    rackup_path = 'tmp/tests/config.ru'
-    File.write(rackup_path, <<~EOS)
-      app =
-        proc do |env|
-          if env['REQUEST_METHOD'] == 'GET'
-            [200, {}, [Process.pid]]
-          else
-            Process.kill(env['QUERY_STRING'], Process.pid)
-            [200, {}, ['Bye!']]
-          end
-        end
-
-      run app
-    EOS
-
-    cmd = %W[unicorn -E test -c #{config_path} #{rackup_path}]
-    @unicorn_master_pid = spawn(*cmd)
-    wait_unicorn_boot!(@unicorn_master_pid, ready_file)
-    WebMock.allow_net_connect!
-  end
-
-  %w[SIGQUIT SIGTERM SIGKILL].each do |signal|
-    it "has a worker that self-terminates on signal #{signal}" do
-      response = Excon.get('unix://', socket: @socket_path)
-      expect(response.status).to eq(200)
-
-      worker_pid = response.body.to_i
-      expect(worker_pid).to be > 0
-
-      begin
-        Excon.post("unix://?#{signal}", socket: @socket_path)
-      rescue Excon::Error::Socket
-        # The connection may be closed abruptly
-      end
-
-      expect(pid_gone?(worker_pid)).to eq(true)
-    end
-  end
-
-  after(:all) do
-    WebMock.disable_net_connect!(allow_localhost: true)
-    Process.kill('TERM', @unicorn_master_pid)
-  end
-
-  def wait_unicorn_boot!(master_pid, ready_file)
-    # We have seen the boot timeout after 2 minutes in CI so let's set it to 5 minutes.
-    timeout = 5 * 60
-    timeout.times do
-      return if File.exist?(ready_file)
-
-      pid = Process.waitpid(master_pid, Process::WNOHANG)
-      raise "unicorn failed to boot: #{$?}" unless pid.nil?
-
-      sleep 1
-    end
-
-    raise "unicorn boot timed out after #{timeout} seconds"
-  end
-
-  def pid_gone?(pid)
-    # Worker termination should take less than a second. That makes 10
-    # seconds a generous timeout.
-    10.times do
-      begin
-        Process.kill(0, pid)
-      rescue Errno::ESRCH
-        return true
-      end
-
-      sleep 1
-    end
-
-    false
-  end
-end
-- 
cgit v1.2.3


From aa73ef5b16851ba69c5198f98683bf1200656bd5 Mon Sep 17 00:00:00 2001
From: James Ramsay <james@jramsay.com.au>
Date: Wed, 24 Oct 2018 14:27:40 -0400
Subject: Add title to commit links in list view

The short commit message may be truncated making the truncated
portion unreadable. The title of the link should be the commit message
so that the commit message is shown when hovering the commit message
anchor.

Closes gitlab-org/gitlab-ce#42673
---
 app/views/projects/tree/_tree_commit_column.html.haml  | 2 +-
 changelogs/unreleased/jramsay-42673-commit-tooltip.yml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/jramsay-42673-commit-tooltip.yml

diff --git a/app/views/projects/tree/_tree_commit_column.html.haml b/app/views/projects/tree/_tree_commit_column.html.haml
index 406dccb74fb..e37fd7624be 100644
--- a/app/views/projects/tree/_tree_commit_column.html.haml
+++ b/app/views/projects/tree/_tree_commit_column.html.haml
@@ -1,2 +1,2 @@
 %span.str-truncated
-  = link_to_html commit.redacted_full_title_html, project_commit_path(@project, commit.id), class: 'tree-commit-link'
+  = link_to_html commit.redacted_full_title_html, project_commit_path(@project, commit.id), title: commit.redacted_full_title_html, class: 'tree-commit-link'
diff --git a/changelogs/unreleased/jramsay-42673-commit-tooltip.yml b/changelogs/unreleased/jramsay-42673-commit-tooltip.yml
new file mode 100644
index 00000000000..083cd1a54a0
--- /dev/null
+++ b/changelogs/unreleased/jramsay-42673-commit-tooltip.yml
@@ -0,0 +1,5 @@
+---
+title: Add commit message to commit tree anchor title
+merge_request: 22585
+author:
+type: fixed
-- 
cgit v1.2.3


From dd2e91cc7832db66615a466956e6c8aa0cd0fba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= <matteeyah@gmail.com>
Date: Thu, 25 Oct 2018 19:55:19 +0200
Subject: Cache pipeline status only for specific sha

---
 lib/gitlab/cache/ci/project_pipeline_status.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/gitlab/cache/ci/project_pipeline_status.rb b/lib/gitlab/cache/ci/project_pipeline_status.rb
index b369b9e7600..99fe7d3a252 100644
--- a/lib/gitlab/cache/ci/project_pipeline_status.rb
+++ b/lib/gitlab/cache/ci/project_pipeline_status.rb
@@ -41,8 +41,8 @@ module Gitlab
           end
         end
 
-        def self.cache_key_for_project(project)
-          "#{Gitlab::Redis::Cache::CACHE_NAMESPACE}:projects/#{project.id}/pipeline_status"
+        def self.cache_key_for_project(project, cache_sha = project.commit&.sha)
+          "#{Gitlab::Redis::Cache::CACHE_NAMESPACE}:projects/#{project.id}/pipeline_status/#{cache_sha}"
         end
 
         def self.update_for_pipeline(pipeline)
@@ -84,9 +84,7 @@ module Gitlab
         def load_from_project
           return unless commit
 
-          self.sha = commit.sha
-          self.status = commit.status
-          self.ref = project.default_branch
+          self.sha, self.status, self.ref = commit.sha, commit.status, project.default_branch
         end
 
         # We only cache the status for the HEAD commit of a project
@@ -104,6 +102,8 @@ module Gitlab
         def load_from_cache
           Gitlab::Redis::Cache.with do |redis|
             self.sha, self.status, self.ref = redis.hmget(cache_key, :sha, :status, :ref)
+
+            self.status = nil if self.status.empty?
           end
         end
 
-- 
cgit v1.2.3


From 75cf72344f373dfdb36bb501c0c980519ed61576 Mon Sep 17 00:00:00 2001
From: Cindy Pallares <cindy@gitlab.com>
Date: Wed, 24 Oct 2018 11:55:50 -0500
Subject: Use gitlab_environment for ldap rake task

---
 .../unreleased/52993-ldap-rename_provider-rake-task-broken.yml       | 5 +++++
 lib/tasks/gitlab/ldap.rake                                           | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/52993-ldap-rename_provider-rake-task-broken.yml

diff --git a/changelogs/unreleased/52993-ldap-rename_provider-rake-task-broken.yml b/changelogs/unreleased/52993-ldap-rename_provider-rake-task-broken.yml
new file mode 100644
index 00000000000..ca78f9a392e
--- /dev/null
+++ b/changelogs/unreleased/52993-ldap-rename_provider-rake-task-broken.yml
@@ -0,0 +1,5 @@
+---
+title: Use gitlab_environment for ldap rake task
+merge_request: 22582
+author:
+type: fixed
diff --git a/lib/tasks/gitlab/ldap.rake b/lib/tasks/gitlab/ldap.rake
index c66a2a263dc..0459de27c96 100644
--- a/lib/tasks/gitlab/ldap.rake
+++ b/lib/tasks/gitlab/ldap.rake
@@ -1,7 +1,7 @@
 namespace :gitlab do
   namespace :ldap do
     desc 'GitLab | LDAP | Rename provider'
-    task :rename_provider, [:old_provider, :new_provider] => :environment  do |_, args|
+    task :rename_provider, [:old_provider, :new_provider] => :gitlab_environment do |_, args|
       old_provider = args[:old_provider] ||
         prompt('What is the old provider? Ex. \'ldapmain\': '.color(:blue))
       new_provider = args[:new_provider] ||
-- 
cgit v1.2.3


From a85c8e346f0844b0bc8079e03f942f4c53776efa Mon Sep 17 00:00:00 2001
From: Mark Lapierre <mlapierre@gitlab.com>
Date: Thu, 25 Oct 2018 11:49:33 -0400
Subject: Re-enable debug logging of Git commands and output

---
 qa/qa/git/repository.rb        | 8 ++------
 qa/qa/runtime/logger.rb        | 4 +++-
 qa/spec/page/logging_spec.rb   | 6 ++++++
 qa/spec/runtime/logger_spec.rb | 6 ++++++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/qa/qa/git/repository.rb b/qa/qa/git/repository.rb
index c6a8891d398..27a88534258 100644
--- a/qa/qa/git/repository.rb
+++ b/qa/qa/git/repository.rb
@@ -113,21 +113,17 @@ module QA
 
       attr_reader :uri, :username, :password, :known_hosts_file, :private_key_file
 
-      def debug?
-        Runtime::Env.respond_to?(:verbose?) && Runtime::Env.verbose?
-      end
-
       def ssh_key_set?
         !private_key_file.nil?
       end
 
       def run(command_str)
         command = [env_vars, command_str, '2>&1'].compact.join(' ')
-        warn "DEBUG: command=[#{command}]" if debug?
+        Runtime::Logger.debug "Git: command=[#{command}]"
 
         output, _ = Open3.capture2(command)
         output = output.chomp.gsub(/\s+$/, '')
-        warn "DEBUG: output=[#{output}]" if debug?
+        Runtime::Logger.debug "Git: output=[#{output}]"
 
         output
       end
diff --git a/qa/qa/runtime/logger.rb b/qa/qa/runtime/logger.rb
index 3baa24de0ec..7311615ea2d 100644
--- a/qa/qa/runtime/logger.rb
+++ b/qa/qa/runtime/logger.rb
@@ -10,11 +10,13 @@ module QA
       def_delegators :logger, :debug, :info, :error, :warn, :fatal, :unknown
 
       singleton_class.module_eval do
+        attr_writer :logger
+
         def logger
           return @logger if @logger
 
           @logger = ::Logger.new Runtime::Env.log_destination
-          @logger.level = ::Logger::DEBUG
+          @logger.level = Runtime::Env.debug? ? ::Logger::DEBUG : ::Logger::ERROR
           @logger
         end
       end
diff --git a/qa/spec/page/logging_spec.rb b/qa/spec/page/logging_spec.rb
index 9f17de4edbf..9d56353062b 100644
--- a/qa/spec/page/logging_spec.rb
+++ b/qa/spec/page/logging_spec.rb
@@ -3,9 +3,15 @@
 require 'capybara/dsl'
 
 describe QA::Support::Page::Logging do
+  include Support::StubENV
+
   let(:page) { double().as_null_object }
 
   before do
+    logger = Logger.new $stdout
+    logger.level = ::Logger::DEBUG
+    QA::Runtime::Logger.logger = logger
+
     allow(Capybara).to receive(:current_session).and_return(page)
     allow(page).to receive(:current_url).and_return('http://current-url')
     allow(page).to receive(:has_css?).with(any_args).and_return(true)
diff --git a/qa/spec/runtime/logger_spec.rb b/qa/spec/runtime/logger_spec.rb
index 794e1f9bfe6..44be3381bff 100644
--- a/qa/spec/runtime/logger_spec.rb
+++ b/qa/spec/runtime/logger_spec.rb
@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 describe QA::Runtime::Logger do
+  before do
+    logger = Logger.new $stdout
+    logger.level = ::Logger::DEBUG
+    described_class.logger = logger
+  end
+
   it 'logs debug' do
     expect { described_class.debug('test') }.to output(/DEBUG -- : test/).to_stdout_from_any_process
   end
-- 
cgit v1.2.3


From 51518019645ad514b98951df0bd30ecb898786aa Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 25 Oct 2018 20:29:24 +0000
Subject: Always use `attribute` to define the product

---
 qa/qa.rb                                           |   1 -
 qa/qa/factory/README.md                            | 369 ++++++++++-----------
 qa/qa/factory/base.rb                              |  79 +++--
 qa/qa/factory/dependency.rb                        |  28 --
 qa/qa/factory/product.rb                           |  33 +-
 qa/qa/factory/repository/project_push.rb           |  11 +-
 qa/qa/factory/repository/wiki_push.rb              |  10 +-
 qa/qa/factory/resource/branch.rb                   |  10 +-
 qa/qa/factory/resource/deploy_key.rb               |  22 +-
 qa/qa/factory/resource/deploy_token.rb             |  20 +-
 qa/qa/factory/resource/file.rb                     |   8 +-
 qa/qa/factory/resource/fork.rb                     |  25 +-
 qa/qa/factory/resource/group.rb                    |   8 +-
 qa/qa/factory/resource/issue.rb                    |  17 +-
 qa/qa/factory/resource/kubernetes_cluster.rb       |  19 +-
 qa/qa/factory/resource/label.rb                    |  16 +-
 qa/qa/factory/resource/merge_request.rb            |  42 ++-
 qa/qa/factory/resource/merge_request_from_fork.rb  |  21 +-
 qa/qa/factory/resource/personal_access_token.rb    |   8 +-
 qa/qa/factory/resource/project.rb                  |  29 +-
 .../resource/project_imported_from_github.rb       |   8 +-
 qa/qa/factory/resource/project_milestone.rb        |  15 +-
 qa/qa/factory/resource/runner.rb                   |  10 +-
 qa/qa/factory/resource/sandbox.rb                  |   8 +-
 qa/qa/factory/resource/secret_variable.rb          |  10 +-
 qa/qa/factory/resource/ssh_key.rb                  |  12 +-
 qa/qa/factory/resource/user.rb                     |  11 +-
 qa/qa/factory/resource/wiki.rb                     |   8 +-
 qa/qa/factory/settings/hashed_storage.rb           |   8 +-
 qa/qa/runtime/logger.rb                            |   2 +-
 .../create_project_with_auto_devops_spec.rb        |   4 +-
 qa/spec/factory/base_spec.rb                       | 143 +++++---
 qa/spec/factory/dependency_spec.rb                 |  79 -----
 qa/spec/factory/product_spec.rb                    |  66 +---
 34 files changed, 540 insertions(+), 620 deletions(-)
 delete mode 100644 qa/qa/factory/dependency.rb
 delete mode 100644 qa/spec/factory/dependency_spec.rb

diff --git a/qa/qa.rb b/qa/qa.rb
index 36a37dbb270..f760dd972a7 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -39,7 +39,6 @@ module QA
   module Factory
     autoload :ApiFabricator, 'qa/factory/api_fabricator'
     autoload :Base, 'qa/factory/base'
-    autoload :Dependency, 'qa/factory/dependency'
     autoload :Product, 'qa/factory/product'
 
     module Resource
diff --git a/qa/qa/factory/README.md b/qa/qa/factory/README.md
index 10140e39510..cfce096ab39 100644
--- a/qa/qa/factory/README.md
+++ b/qa/qa/factory/README.md
@@ -26,11 +26,7 @@ module QA
   module Factory
     module Resource
       class Shirt < Factory::Base
-        attr_accessor :name, :size
-
-        def initialize(name)
-          @name = name
-        end
+        attr_accessor :name
 
         def fabricate!
           Page::Dashboard::Index.perform do |dashboard_index|
@@ -64,21 +60,10 @@ module QA
   module Factory
     module Resource
       class Shirt < Factory::Base
-        attr_accessor :name, :size
-
-        def initialize(name)
-          @name = name
-        end
+        attr_accessor :name
 
         def fabricate!
-          Page::Dashboard::Index.perform do |dashboard_index|
-            dashboard_index.go_to_new_shirt
-          end
-
-          Page::Shirt::New.perform do |shirt_new|
-            shirt_new.set_name(name)
-            shirt_new.create_shirt!
-          end
+          # ... same as before
         end
 
         def api_get_path
@@ -103,33 +88,69 @@ end
 The [`Project` factory](./resource/project.rb) is a good real example of Browser
 UI and API implementations.
 
-### Define dependencies
+### Define attributes
+
+After the resource is fabricated, we would like to access the attributes on
+the resource. We define the attributes with `attribute` method. Suppose
+we want to access the name on the resource, we could change `attr_accessor`
+to `attribute`:
+
+```ruby
+module QA
+  module Factory
+    module Resource
+      class Shirt < Factory::Base
+        attribute :name
 
-A resource may need an other resource to exist first. For instance, a project
+        # ... same as before
+      end
+    end
+  end
+end
+```
+
+The difference between `attr_accessor` and `attribute` is that by using
+`attribute` it can also be accessed from the product:
+
+```ruby
+shirt =
+  QA::Factory::Resource::Shirt.fabricate! do |resource|
+    resource.name = "GitLab QA"
+  end
+
+shirt.name # => "GitLab QA"
+```
+
+In the above example, if we use `attr_accessor :name` then `shirt.name` won't
+be available. On the other hand, using `attribute :name` will allow you to use
+`shirt.name`, so most of the time you'll want to use `attribute` instead of
+`attr_accessor` unless we clearly don't need it for the product.
+
+#### Resource attributes
+
+A resource may need another resource to exist first. For instance, a project
 needs a group to be created in.
 
-To define a dependency, you can use the `dependency` DSL method.
-The first argument is a factory class, then you should pass `as: <name>` to give
-a name to the dependency.
-That will allow access to the dependency from your resource object's methods.
-You would usually use it in `#fabricate!`, `#api_get_path`, `#api_post_path`,
-`#api_post_body`.
+To define a resource attribute, you can use the `attribute` method with a
+block using the other factory to fabricate the resource.
 
-Let's take the `Shirt` factory, and add a `project` dependency to it:
+That will allow access to the other resource from your resource object's
+methods. You would usually use it in `#fabricate!`, `#api_get_path`,
+`#api_post_path`, `#api_post_body`.
+
+Let's take the `Shirt` factory, and add a `project` attribute to it:
 
 ```ruby
 module QA
   module Factory
     module Resource
       class Shirt < Factory::Base
-        attr_accessor :name, :size
+        attribute :name
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-to-create-a-shirt'
-        end
-
-        def initialize(name)
-          @name = name
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-to-create-a-shirt'
+          end
         end
 
         def fabricate!
@@ -164,19 +185,19 @@ module QA
 end
 ```
 
-**Note that dependencies are always built via the API fabrication method if
-supported by their factories.**
+**Note that all the attributes are lazily constructed. This means if you want
+a specific attribute to be fabricated first, you'll need to call the
+attribute method first even if you're not using it.**
 
-### Define attributes on the created resource
+#### Product data attributes
 
 Once created, you may want to populate a resource with attributes that can be
 found in the Web page, or in the API response.
 For instance, once you create a project, you may want to store its repository
 SSH URL as an attribute.
 
-To define an attribute, you can use the `product` DSL method.
-The first argument is the attribute name, then you should define a name for the
-dependency to be accessible from your resource object's methods.
+Again we could use the `attribute` method with a block, using a page object
+to retrieve the data on the page.
 
 Let's take the `Shirt` factory, and define a `:brand` attribute:
 
@@ -185,22 +206,74 @@ module QA
   module Factory
     module Resource
       class Shirt < Factory::Base
-        attr_accessor :name, :size
+        attribute :name
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-to-create-a-shirt'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-to-create-a-shirt'
+          end
         end
 
         # Attribute populated from the Browser UI (using the block)
-        product :brand do
+        attribute :brand do
           Page::Shirt::Show.perform do |shirt_show|
             shirt_show.fetch_brand_from_page
           end
         end
 
-        def initialize(name)
-          @name = name
-        end
+        # ... same as before
+      end
+    end
+  end
+end
+```
+
+**Note again that all the attributes are lazily constructed. This means if
+you call `shirt.brand` after moving to the other page, it'll not properly
+retrieve the data because we're no longer on the expected page.**
+
+Consider this:
+
+```ruby
+shirt =
+  QA::Factory::Resource::Shirt.fabricate! do |resource|
+    resource.name = "GitLab QA"
+  end
+
+shirt.project.visit!
+
+shirt.brand # => FAIL!
+```
+
+The above example will fail because now we're on the project page, trying to
+construct the brand data from the shirt page, however we moved to the project
+page already. There are two ways to solve this, one is that we could try to
+retrieve the brand before visiting the project again:
+
+```ruby
+shirt =
+  QA::Factory::Resource::Shirt.fabricate! do |resource|
+    resource.name = "GitLab QA"
+  end
+
+shirt.brand # => OK!
+
+shirt.project.visit!
+
+shirt.brand # => OK!
+```
+
+The attribute will be stored in the instance therefore all the following calls
+will be fine, using the data previously constructed. If we think that this
+might be too brittle, we could eagerly construct the data right before
+ending fabrication:
+
+```ruby
+module QA
+  module Factory
+    module Resource
+      class Shirt < Factory::Base
+        # ... same as before
 
         def fabricate!
           project.visit!
@@ -213,20 +286,8 @@ module QA
             shirt_new.set_name(name)
             shirt_new.create_shirt!
           end
-        end
 
-        def api_get_path
-          "/project/#{project.path}/shirt/#{name}"
-        end
-
-        def api_post_path
-          "/project/#{project.path}/shirts"
-        end
-
-        def api_post_body
-          {
-            name: name
-          }
+          brand # Eagerly construct the data
         end
       end
     end
@@ -234,74 +295,48 @@ module QA
 end
 ```
 
-#### Inherit a factory's attribute
+This will make sure we construct the data right after we created the shirt.
+The drawback for this will become we're forced to construct the data even
+if we don't really need to use it.
 
-Sometimes, you want a resource to inherit its factory attributes. For instance,
-it could be useful to pass the `size` attribute from the `Shirt` factory to the
-created resource.
-You can do that by defining `product :attribute_name` without a block.
-
-Let's take the `Shirt` factory, and define a `:name` and a `:size` attributes:
+Alternatively, we could just make sure we're on the right page before
+constructing the brand data:
 
 ```ruby
 module QA
   module Factory
     module Resource
       class Shirt < Factory::Base
-        attr_accessor :name, :size
-
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-to-create-a-shirt'
-        end
+        attribute :name
 
-        # Attribute from the Browser UI (using the block)
-        product :brand do
-          Page::Shirt::Show.perform do |shirt_show|
-            shirt_show.fetch_brand_from_page
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-to-create-a-shirt'
           end
         end
 
-        # Attribute inherited from the Shirt factory if present,
-        # or a QA::Factory::Product::NoValueError is raised otherwise
-        product :name
-        product :size
-
-        def initialize(name)
-          @name = name
-        end
-
-        def fabricate!
-          project.visit!
-
-          Page::Project::Show.perform do |project_show|
-            project_show.go_to_new_shirt
-          end
+        # Attribute populated from the Browser UI (using the block)
+        attribute :brand do
+          back_url = current_url
+          visit!
 
-          Page::Shirt::New.perform do |shirt_new|
-            shirt_new.set_name(name)
-            shirt_new.create_shirt!
+          Page::Shirt::Show.perform do |shirt_show|
+            shirt_show.fetch_brand_from_page
           end
-        end
 
-        def api_get_path
-          "/project/#{project.path}/shirt/#{name}"
+          visit(back_url)
         end
 
-        def api_post_path
-          "/project/#{project.path}/shirts"
-        end
-
-        def api_post_body
-          {
-            name: name
-          }
-        end
+        # ... same as before
       end
     end
   end
 end
 ```
 
+This will make sure it's on the shirt page before constructing brand, and
+move back to the previous page to avoid breaking the state.
+
 #### Define an attribute based on an API response
 
 Sometimes, you want to define a resource attribute based on the API response
@@ -311,7 +346,6 @@ the API returns
 ```ruby
 {
   brand: 'a-brand-new-brand',
-  size: 'extra-small',
   style: 't-shirt',
   materials: [[:cotton, 80], [:polyamide, 20]]
 }
@@ -320,18 +354,6 @@ the API returns
 you may want to store `style` as-is in the resource, and fetch the first value
 of the first `materials` item in a `main_fabric` attribute.
 
-For both attributes, you will need to define an inherited attribute, as shown
-in "Inherit a factory's attribute" above, but in the case of `main_fabric`, you
-will need to implement the
-`#transform_api_resource` method to first populate the `:main_fabric` key in the
-API response so that it can be used later to automatically populate the
-attribute on your resource.
-
-If an attribute can only be retrieved from the API response, you should define
-a block to give it a default value, otherwise you could get a
-`QA::Factory::Product::NoValueError` when creating your resource via the
-Browser UI.
-
 Let's take the `Shirt` factory, and define a `:style` and a `:main_fabric`
 attributes:
 
@@ -340,69 +362,21 @@ module QA
   module Factory
     module Resource
       class Shirt < Factory::Base
-        attr_accessor :name, :size
+        # ... same as before
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-to-create-a-shirt'
-        end
-
-        # Attribute fetched from the API response if present,
-        # or from the Browser UI otherwise (using the block)
-        product :brand do
-          Page::Shirt::Show.perform do |shirt_show|
-            shirt_show.fetch_brand_from_page
-          end
-        end
-
-        # Attribute fetched from the API response if present,
-        # or from the Shirt factory if present,
-        # or a QA::Factory::Product::NoValueError is raised otherwise
-        product :name
-        product :size
-        product :style do
-          'unknown'
-        end
-        product :main_fabric do
-          'unknown'
-        end
-
-        def initialize(name)
-          @name = name
-        end
-
-        def fabricate!
-          project.visit!
-
-          Page::Project::Show.perform do |project_show|
-            project_show.go_to_new_shirt
-          end
-
-          Page::Shirt::New.perform do |shirt_new|
-            shirt_new.set_name(name)
-            shirt_new.create_shirt!
-          end
-        end
+        # Attribute from the Shirt factory if present,
+        # or fetched from the API response if present,
+        # or a QA::Factory::Base::NoValueError is raised otherwise
+        attribute :style
 
-        def api_get_path
-          "/project/#{project.path}/shirt/#{name}"
+        # If the attribute from the Shirt factory is not present,
+        # and if the API does not contain this field, this block will be
+        # used to construct the value based on the API response.
+        attribute :main_fabric do
+          api_response.&dig(:materials, 0, 0)
         end
 
-        def api_post_path
-          "/project/#{project.path}/shirts"
-        end
-
-        def api_post_body
-          {
-            name: name
-          }
-        end
-
-        private
-
-        def transform_api_resource(api_response)
-          api_response[:main_fabric] = api_response[:materials][0][0]
-          api_response
-        end
+        # ... same as before
       end
     end
   end
@@ -411,11 +385,10 @@ end
 
 **Notes on attributes precedence:**
 
+- attributes from the factory have the highest precedence
 - attributes from the API response take precedence over attributes from the
-  Browser UI
-- attributes from the Browser UI take precedence over attributes from the
-  factory (i.e inherited)
-- attributes without a value will raise a `QA::Factory::Product::NoValueError` error
+  block (usually from Browser UI)
+- attributes without a value will raise a `QA::Factory::Base::NoValueError` error
 
 ## Creating resources in your tests
 
@@ -428,42 +401,40 @@ Here is an example that will use the API fabrication method under the hood since
 it's supported by the `Shirt` factory:
 
 ```ruby
-my_shirt = Factory::Resource::Shirt.fabricate!('my-shirt') do |shirt|
-  shirt.size = 'small'
+my_shirt = Factory::Resource::Shirt.fabricate! do |shirt|
+  shirt.name = 'my-shirt'
 end
 
+expect(page).to have_text(my_shirt.name) # => "my-shirt" from the factory's attribute
 expect(page).to have_text(my_shirt.brand) # => "a-brand-new-brand" from the API response
-expect(page).to have_text(my_shirt.name) # => "my-shirt" from the inherited factory's attribute
-expect(page).to have_text(my_shirt.size) # => "extra-small" from the API response
 expect(page).to have_text(my_shirt.style) # => "t-shirt" from the API response
-expect(page).to have_text(my_shirt.main_fabric) # => "cotton" from the (transformed) API response
+expect(page).to have_text(my_shirt.main_fabric) # => "cotton" from the API response via the block
 ```
 
-If you explicitely want to use the Browser UI fabrication method, you can call
+If you explicitly want to use the Browser UI fabrication method, you can call
 the `.fabricate_via_browser_ui!` method instead:
 
 ```ruby
-my_shirt = Factory::Resource::Shirt.fabricate_via_browser_ui!('my-shirt') do |shirt|
-  shirt.size = 'small'
+my_shirt = Factory::Resource::Shirt.fabricate_via_browser_ui! do |shirt|
+  shirt.name = 'my-shirt'
 end
 
-expect(page).to have_text(my_shirt.brand) # => the brand name fetched from the `Page::Shirt::Show` page
-expect(page).to have_text(my_shirt.name) # => "my-shirt" from the inherited factory's attribute
-expect(page).to have_text(my_shirt.size) # => "small" from the inherited factory's attribute
-expect(page).to have_text(my_shirt.style) # => "unknown" from the attribute block
-expect(page).to have_text(my_shirt.main_fabric) # => "unknown" from the attribute block
+expect(page).to have_text(my_shirt.name) # => "my-shirt" from the factory's attribute
+expect(page).to have_text(my_shirt.brand) # => the brand name fetched from the `Page::Shirt::Show` page via the block
+expect(page).to have_text(my_shirt.style) # => QA::Factory::Base::NoValueError will be raised because no API response nor a block is provided
+expect(page).to have_text(my_shirt.main_fabric) # => QA::Factory::Base::NoValueError will be raised because no API response and the block didn't provide a value (because it's also based on the API response)
 ```
 
-You can also explicitely use the API fabrication method, by calling the
+You can also explicitly use the API fabrication method, by calling the
 `.fabricate_via_api!` method:
 
 ```ruby
-my_shirt = Factory::Resource::Shirt.fabricate_via_api!('my-shirt') do |shirt|
-  shirt.size = 'small'
+my_shirt = Factory::Resource::Shirt.fabricate_via_api! do |shirt|
+  shirt.name = 'my-shirt'
 end
 ```
 
-In this case, the result will be similar to calling `Factory::Resource::Shirt.fabricate!('my-shirt')`.
+In this case, the result will be similar to calling `Factory::Resource::Shirt.fabricate!`.
 
 ## Where to ask for help?
 
diff --git a/qa/qa/factory/base.rb b/qa/qa/factory/base.rb
index e1dc23d350d..e82e16f9415 100644
--- a/qa/qa/factory/base.rb
+++ b/qa/qa/factory/base.rb
@@ -10,13 +10,42 @@ module QA
       include ApiFabricator
       extend Capybara::DSL
 
-      def_delegators :evaluator, :dependency, :dependencies
-      def_delegators :evaluator, :product, :attributes
+      NoValueError = Class.new(RuntimeError)
+
+      def_delegators :evaluator, :attribute
 
       def fabricate!(*_args)
         raise NotImplementedError
       end
 
+      def visit!
+        visit(web_url)
+      end
+
+      private
+
+      def populate_attribute(name, block)
+        value = attribute_value(name, block)
+
+        raise NoValueError, "No value was computed for product #{name} of factory #{self.class.name}." unless value
+
+        value
+      end
+
+      def attribute_value(name, block)
+        api_value = api_resource&.dig(name)
+
+        if api_value && block
+          log_having_both_api_result_and_block(name, api_value)
+        end
+
+        api_value || (block && instance_exec(&block))
+      end
+
+      def log_having_both_api_result_and_block(name, api_value)
+        QA::Runtime::Logger.info "<#{self.class}> Attribute #{name.inspect} has both API response `#{api_value}` and a block. API response will be picked. Block will be ignored."
+      end
+
       def self.fabricate!(*args, &prepare_block)
         fabricate_via_api!(*args, &prepare_block)
       rescue NotImplementedError
@@ -52,13 +81,10 @@ module QA
       def self.do_fabricate!(factory:, prepare_block:, parents: [])
         prepare_block.call(factory) if prepare_block
 
-        dependencies.each do |signature|
-          Factory::Dependency.new(factory, signature).build!(parents: parents + [self])
-        end
-
         resource_web_url = yield
+        factory.web_url = resource_web_url
 
-        Factory::Product.populate!(factory, resource_web_url)
+        Factory::Product.new(factory)
       end
       private_class_method :do_fabricate!
 
@@ -85,31 +111,40 @@ module QA
       end
       private_class_method :evaluator
 
-      class DSL
-        attr_reader :dependencies, :attributes
+      def self.dynamic_attributes
+        const_get(:DynamicAttributes)
+      rescue NameError
+        mod = const_set(:DynamicAttributes, Module.new)
+
+        include mod
+
+        mod
+      end
 
+      def self.attributes_names
+        dynamic_attributes.instance_methods(false).sort.grep_v(/=$/)
+      end
+
+      class DSL
         def initialize(base)
           @base = base
-          @dependencies = []
-          @attributes = []
         end
 
-        def dependency(factory, as:, &block)
-          as.tap do |name|
-            @base.class_eval { attr_accessor name }
+        def attribute(name, &block)
+          @base.dynamic_attributes.module_eval do
+            attr_writer(name)
 
-            Dependency::Signature.new(name, factory, block).tap do |signature|
-              @dependencies << signature
+            define_method(name) do
+              instance_variable_get("@#{name}") ||
+                instance_variable_set(
+                  "@#{name}",
+                  populate_attribute(name, block))
             end
           end
         end
-
-        def product(attribute, &block)
-          Product::Attribute.new(attribute, block).tap do |signature|
-            @attributes << signature
-          end
-        end
       end
+
+      attribute :web_url
     end
   end
 end
diff --git a/qa/qa/factory/dependency.rb b/qa/qa/factory/dependency.rb
deleted file mode 100644
index 655e2677db0..00000000000
--- a/qa/qa/factory/dependency.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-module QA
-  module Factory
-    class Dependency
-      Signature = Struct.new(:name, :factory, :block)
-
-      def initialize(caller_factory, dependency_signature)
-        @caller_factory = caller_factory
-        @dependency_signature = dependency_signature
-      end
-
-      def overridden?
-        !!@caller_factory.public_send(@dependency_signature.name)
-      end
-
-      def build!(parents: [])
-        return if overridden?
-
-        dependency = @dependency_signature.factory.fabricate!(parents: parents) do |factory|
-          @dependency_signature.block&.call(factory, @caller_factory)
-        end
-
-        dependency.tap do |dependency|
-          @caller_factory.public_send("#{@dependency_signature.name}=", dependency)
-        end
-      end
-    end
-  end
-end
diff --git a/qa/qa/factory/product.rb b/qa/qa/factory/product.rb
index 17fe908eaa2..34df0bda8e5 100644
--- a/qa/qa/factory/product.rb
+++ b/qa/qa/factory/product.rb
@@ -5,46 +5,31 @@ module QA
     class Product
       include Capybara::DSL
 
-      NoValueError = Class.new(RuntimeError)
+      attr_reader :factory
 
-      attr_reader :factory, :web_url
-
-      Attribute = Struct.new(:name, :block)
-
-      def initialize(factory, web_url)
+      def initialize(factory)
         @factory = factory
-        @web_url = web_url
 
-        populate_attributes!
+        define_attributes
       end
 
       def visit!
         visit(web_url)
       end
 
-      def self.populate!(factory, web_url)
-        new(factory, web_url)
+      def populate(*attributes)
+        attributes.each(&method(:public_send))
       end
 
       private
 
-      def populate_attributes!
-        factory.class.attributes.each do |attribute|
-          instance_exec(factory, attribute.block) do |factory, block|
-            value = attribute_value(attribute, block)
-
-            raise NoValueError, "No value was computed for product #{attribute.name} of factory #{factory.class.name}." unless value
-
-            define_singleton_method(attribute.name) { value }
+      def define_attributes
+        factory.class.attributes_names.each do |name|
+          define_singleton_method(name) do
+            factory.public_send(name)
           end
         end
       end
-
-      def attribute_value(attribute, block)
-        factory.api_resource&.dig(attribute.name) ||
-          (block && block.call(factory)) ||
-          (factory.respond_to?(attribute.name) && factory.public_send(attribute.name))
-      end
     end
   end
 end
diff --git a/qa/qa/factory/repository/project_push.rb b/qa/qa/factory/repository/project_push.rb
index 6f878396f0e..a9dfbc0a783 100644
--- a/qa/qa/factory/repository/project_push.rb
+++ b/qa/qa/factory/repository/project_push.rb
@@ -2,13 +2,14 @@ module QA
   module Factory
     module Repository
       class ProjectPush < Factory::Repository::Push
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-with-code'
-          project.description = 'Project with repository'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-with-code'
+            resource.description = 'Project with repository'
+          end
         end
 
-        product :output
-        product :project
+        attribute :output
 
         def initialize
           @file_name = 'file.txt'
diff --git a/qa/qa/factory/repository/wiki_push.rb b/qa/qa/factory/repository/wiki_push.rb
index ecc6cc18c88..25b6ffe8323 100644
--- a/qa/qa/factory/repository/wiki_push.rb
+++ b/qa/qa/factory/repository/wiki_push.rb
@@ -2,10 +2,12 @@ module QA
   module Factory
     module Repository
       class WikiPush < Factory::Repository::Push
-        dependency Factory::Resource::Wiki, as: :wiki do |wiki|
-          wiki.title = 'Home'
-          wiki.content = '# My First Wiki Content'
-          wiki.message = 'Update home'
+        attribute :wiki do
+          Factory::Resource::Wiki.fabricate! do |resource|
+            resource.title = 'Home'
+            resource.content = '# My First Wiki Content'
+            resource.message = 'Update home'
+          end
         end
 
         def initialize
diff --git a/qa/qa/factory/resource/branch.rb b/qa/qa/factory/resource/branch.rb
index f3b52565d17..b05d1e252ec 100644
--- a/qa/qa/factory/resource/branch.rb
+++ b/qa/qa/factory/resource/branch.rb
@@ -5,8 +5,10 @@ module QA
         attr_accessor :project, :branch_name,
                       :allow_to_push, :allow_to_merge, :protected
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'protected-branch-project'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'protected-branch-project'
+          end
         end
 
         def initialize
@@ -43,9 +45,7 @@ module QA
           # to `allow_to_push` variable.
           return branch unless @protected
 
-          Page::Project::Menu.act do
-            click_repository_settings
-          end
+          Page::Project::Menu.perform(&:click_repository_settings)
 
           Page::Project::Settings::Repository.perform do |setting|
             setting.expand_protected_branches do |page|
diff --git a/qa/qa/factory/resource/deploy_key.rb b/qa/qa/factory/resource/deploy_key.rb
index 4c53c500c27..aea99c9f80d 100644
--- a/qa/qa/factory/resource/deploy_key.rb
+++ b/qa/qa/factory/resource/deploy_key.rb
@@ -4,11 +4,11 @@ module QA
       class DeployKey < Factory::Base
         attr_accessor :title, :key
 
-        product :fingerprint do |resource|
-          Page::Project::Settings::Repository.act do
-            expand_deploy_keys do |key|
-              key_offset = key.key_titles.index do |title|
-                title.text == resource.title
+        attribute :fingerprint do
+          Page::Project::Settings::Repository.perform do |setting|
+            setting.expand_deploy_keys do |key|
+              key_offset = key.key_titles.index do |key_title|
+                key_title.text == title
               end
 
               key.key_fingerprints[key_offset].text
@@ -16,17 +16,17 @@ module QA
           end
         end
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-to-deploy'
-          project.description = 'project for adding deploy key test'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-to-deploy'
+            resource.description = 'project for adding deploy key test'
+          end
         end
 
         def fabricate!
           project.visit!
 
-          Page::Project::Menu.act do
-            click_repository_settings
-          end
+          Page::Project::Menu.perform(&:click_repository_settings)
 
           Page::Project::Settings::Repository.perform do |setting|
             setting.expand_deploy_keys do |page|
diff --git a/qa/qa/factory/resource/deploy_token.rb b/qa/qa/factory/resource/deploy_token.rb
index 159f79ac50b..68e98f0aa01 100644
--- a/qa/qa/factory/resource/deploy_token.rb
+++ b/qa/qa/factory/resource/deploy_token.rb
@@ -4,25 +4,27 @@ module QA
       class DeployToken < Factory::Base
         attr_accessor :name, :expires_at
 
-        product :username do |resource|
-          Page::Project::Settings::Repository.act do
-            expand_deploy_tokens do |token|
+        attribute :username do
+          Page::Project::Settings::Repository.perform do |page|
+            page.expand_deploy_tokens do |token|
               token.token_username
             end
           end
         end
 
-        product :password do |password|
-          Page::Project::Settings::Repository.act do
-            expand_deploy_tokens do |token|
+        attribute :password do
+          Page::Project::Settings::Repository.perform do |page|
+            page.expand_deploy_tokens do |token|
               token.token_password
             end
           end
         end
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-to-deploy'
-          project.description = 'project for adding deploy token test'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-to-deploy'
+            resource.description = 'project for adding deploy token test'
+          end
         end
 
         def fabricate!
diff --git a/qa/qa/factory/resource/file.rb b/qa/qa/factory/resource/file.rb
index f8dea06d361..1148876c2d3 100644
--- a/qa/qa/factory/resource/file.rb
+++ b/qa/qa/factory/resource/file.rb
@@ -8,8 +8,10 @@ module QA
                       :content,
                       :commit_message
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-with-new-file'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-with-new-file'
+          end
         end
 
         def initialize
@@ -21,7 +23,7 @@ module QA
         def fabricate!
           project.visit!
 
-          Page::Project::Show.act { create_new_file! }
+          Page::Project::Show.perform(&:create_new_file!)
 
           Page::File::Form.perform do |page|
             page.add_name(@name)
diff --git a/qa/qa/factory/resource/fork.rb b/qa/qa/factory/resource/fork.rb
index 6e2a668df64..0fac4377040 100644
--- a/qa/qa/factory/resource/fork.rb
+++ b/qa/qa/factory/resource/fork.rb
@@ -2,17 +2,19 @@ module QA
   module Factory
     module Resource
       class Fork < Factory::Base
-        dependency Factory::Repository::ProjectPush, as: :push
+        attribute :push do
+          Factory::Repository::ProjectPush.fabricate!
+        end
 
-        dependency Factory::Resource::User, as: :user do |user|
-          if Runtime::Env.forker?
-            user.username = Runtime::Env.forker_username
-            user.password = Runtime::Env.forker_password
+        attribute :user do
+          Factory::Resource::User.fabricate! do |resource|
+            if Runtime::Env.forker?
+              resource.username = Runtime::Env.forker_username
+              resource.password = Runtime::Env.forker_password
+            end
           end
         end
 
-        product :user
-
         def visit_project_with_retry
           # The user intermittently fails to stay signed in after visiting the
           # project page. The new user is registered and then signs in and a
@@ -48,15 +50,20 @@ module QA
         end
 
         def fabricate!
+          push
+          user
+
           visit_project_with_retry
 
-          Page::Project::Show.act { fork_project }
+          Page::Project::Show.perform(&:fork_project)
 
           Page::Project::Fork::New.perform do |fork_new|
             fork_new.choose_namespace(user.name)
           end
 
-          Page::Layout::Banner.act { has_notice?('The project was successfully forked.') }
+          Page::Layout::Banner.perform do |page|
+            page.has_notice?('The project was successfully forked.')
+          end
         end
       end
     end
diff --git a/qa/qa/factory/resource/group.rb b/qa/qa/factory/resource/group.rb
index 2688328df92..45e49da86f9 100644
--- a/qa/qa/factory/resource/group.rb
+++ b/qa/qa/factory/resource/group.rb
@@ -4,12 +4,12 @@ module QA
       class Group < Factory::Base
         attr_accessor :path, :description
 
-        dependency Factory::Resource::Sandbox, as: :sandbox
-
-        product :id do
-          true # We don't retrieve the Group ID when using the Browser UI
+        attribute :sandbox do
+          Factory::Resource::Sandbox.fabricate!
         end
 
+        attribute :id
+
         def initialize
           @path = Runtime::Namespace.name
           @description = "QA test run at #{Runtime::Namespace.time}"
diff --git a/qa/qa/factory/resource/issue.rb b/qa/qa/factory/resource/issue.rb
index 9b444cb0bf1..3a28e0d5aa6 100644
--- a/qa/qa/factory/resource/issue.rb
+++ b/qa/qa/factory/resource/issue.rb
@@ -2,22 +2,21 @@ module QA
   module Factory
     module Resource
       class Issue < Factory::Base
-        attr_accessor :title, :description, :project
+        attr_writer :description
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-for-issues'
-          project.description = 'project for adding issues'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-for-issues'
+            resource.description = 'project for adding issues'
+          end
         end
 
-        product :project
-        product :title
+        attribute :title
 
         def fabricate!
           project.visit!
 
-          Page::Project::Show.act do
-            go_to_new_issue
-          end
+          Page::Project::Show.perform(&:go_to_new_issue)
 
           Page::Project::Issue::New.perform do |page|
             page.add_title(@title)
diff --git a/qa/qa/factory/resource/kubernetes_cluster.rb b/qa/qa/factory/resource/kubernetes_cluster.rb
index cdee35c54e3..aac6864f42f 100644
--- a/qa/qa/factory/resource/kubernetes_cluster.rb
+++ b/qa/qa/factory/resource/kubernetes_cluster.rb
@@ -7,24 +7,21 @@ module QA
         attr_writer :project, :cluster,
           :install_helm_tiller, :install_ingress, :install_prometheus, :install_runner
 
-        product :ingress_ip do
-          Page::Project::Operations::Kubernetes::Show.perform do |page|
-            page.ingress_ip
-          end
+        attribute :ingress_ip do
+          Page::Project::Operations::Kubernetes::Show.perform(&:ingress_ip)
         end
 
         def fabricate!
           @project.visit!
 
-          Page::Project::Menu.act { click_operations_kubernetes }
+          Page::Project::Menu.perform(
+            &:click_operations_kubernetes)
 
-          Page::Project::Operations::Kubernetes::Index.perform do |page|
-            page.add_kubernetes_cluster
-          end
+          Page::Project::Operations::Kubernetes::Index.perform(
+            &:add_kubernetes_cluster)
 
-          Page::Project::Operations::Kubernetes::Add.perform do |page|
-            page.add_existing_cluster
-          end
+          Page::Project::Operations::Kubernetes::Add.perform(
+            &:add_existing_cluster)
 
           Page::Project::Operations::Kubernetes::AddExisting.perform do |page|
             page.set_cluster_name(@cluster.cluster_name)
diff --git a/qa/qa/factory/resource/label.rb b/qa/qa/factory/resource/label.rb
index 4080f15bf66..32bc519b48c 100644
--- a/qa/qa/factory/resource/label.rb
+++ b/qa/qa/factory/resource/label.rb
@@ -4,14 +4,14 @@ module QA
   module Factory
     module Resource
       class Label < Factory::Base
-        attr_accessor :title,
-                      :description,
-                      :color
+        attr_accessor :description, :color
 
-        product(:title) { |factory| factory.title }
+        attribute :title
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-with-label'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-with-label'
+          end
         end
 
         def initialize
@@ -23,8 +23,8 @@ module QA
         def fabricate!
           project.visit!
 
-          Page::Project::Menu.act { go_to_labels }
-          Page::Label::Index.act { go_to_new_label }
+          Page::Project::Menu.perform(&:go_to_labels)
+          Page::Label::Index.perform(&:go_to_new_label)
 
           Page::Label::New.perform do |page|
             page.fill_title(@title)
diff --git a/qa/qa/factory/resource/merge_request.rb b/qa/qa/factory/resource/merge_request.rb
index d30da8a3db0..92b8bdf4a21 100644
--- a/qa/qa/factory/resource/merge_request.rb
+++ b/qa/qa/factory/resource/merge_request.rb
@@ -12,27 +12,33 @@ module QA
                       :milestone,
                       :labels
 
-        product :project
-        product :source_branch
+        attribute :source_branch
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-with-merge-request'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-with-merge-request'
+          end
         end
 
-        dependency Factory::Repository::ProjectPush, as: :target do |push, factory|
-          factory.project.visit!
-          push.project = factory.project
-          push.branch_name = 'master'
-          push.remote_branch = factory.target_branch
+        attribute :target do
+          project.visit!
+
+          Factory::Repository::ProjectPush.fabricate! do |resource|
+            resource.project = project
+            resource.branch_name = 'master'
+            resource.remote_branch = target_branch
+          end
         end
 
-        dependency Factory::Repository::ProjectPush, as: :source do |push, factory|
-          push.project = factory.project
-          push.branch_name = factory.target_branch
-          push.remote_branch = factory.source_branch
-          push.new_branch = false
-          push.file_name = "added_file.txt"
-          push.file_content = "File Added"
+        attribute :source do
+          Factory::Repository::ProjectPush.fabricate! do |resource|
+            resource.project = project
+            resource.branch_name = target_branch
+            resource.remote_branch = source_branch
+            resource.new_branch = false
+            resource.file_name = "added_file.txt"
+            resource.file_content = "File Added"
+          end
         end
 
         def initialize
@@ -46,8 +52,10 @@ module QA
         end
 
         def fabricate!
+          target
+          source
           project.visit!
-          Page::Project::Show.act { new_merge_request }
+          Page::Project::Show.perform(&:new_merge_request)
           Page::MergeRequest::New.perform do |page|
             page.fill_title(@title)
             page.fill_description(@description)
diff --git a/qa/qa/factory/resource/merge_request_from_fork.rb b/qa/qa/factory/resource/merge_request_from_fork.rb
index 6caaf65f673..fbe062539b9 100644
--- a/qa/qa/factory/resource/merge_request_from_fork.rb
+++ b/qa/qa/factory/resource/merge_request_from_fork.rb
@@ -4,19 +4,24 @@ module QA
       class MergeRequestFromFork < MergeRequest
         attr_accessor :fork_branch
 
-        dependency Factory::Resource::Fork, as: :fork
+        attribute :fork do
+          Factory::Resource::Fork.fabricate!
+        end
 
-        dependency Factory::Repository::ProjectPush, as: :push do |push, factory|
-          push.project = factory.fork
-          push.branch_name = factory.fork_branch
-          push.file_name = 'file2.txt'
-          push.user = factory.fork.user
+        attribute :push do
+          Factory::Repository::ProjectPush.fabricate! do |resource|
+            resource.project = fork
+            resource.branch_name = fork_branch
+            resource.file_name = 'file2.txt'
+            resource.user = fork.user
+          end
         end
 
         def fabricate!
+          push
           fork.visit!
-          Page::Project::Show.act { new_merge_request }
-          Page::MergeRequest::New.act { create_merge_request }
+          Page::Project::Show.perform(&:new_merge_request)
+          Page::MergeRequest::New.perform(&:create_merge_request)
         end
       end
     end
diff --git a/qa/qa/factory/resource/personal_access_token.rb b/qa/qa/factory/resource/personal_access_token.rb
index 166054cfcdc..ceb0f1c3d75 100644
--- a/qa/qa/factory/resource/personal_access_token.rb
+++ b/qa/qa/factory/resource/personal_access_token.rb
@@ -7,13 +7,13 @@ module QA
       class PersonalAccessToken < Factory::Base
         attr_accessor :name
 
-        product :access_token do
-          Page::Profile::PersonalAccessTokens.act { created_access_token }
+        attribute :access_token do
+          Page::Profile::PersonalAccessTokens.perform(&:created_access_token)
         end
 
         def fabricate!
-          Page::Main::Menu.act { go_to_profile_settings }
-          Page::Profile::Menu.act { click_access_tokens }
+          Page::Main::Menu.perform(&:go_to_profile_settings)
+          Page::Profile::Menu.perform(&:click_access_tokens)
 
           Page::Profile::PersonalAccessTokens.perform do |page|
             page.fill_token_name(name || 'api-test-token')
diff --git a/qa/qa/factory/resource/project.rb b/qa/qa/factory/resource/project.rb
index 105e42b23ec..f691ae5a342 100644
--- a/qa/qa/factory/resource/project.rb
+++ b/qa/qa/factory/resource/project.rb
@@ -4,25 +4,24 @@ module QA
   module Factory
     module Resource
       class Project < Factory::Base
-        attr_accessor :description
-        attr_reader :name
+        attribute :name
+        attribute :description
 
-        dependency Factory::Resource::Group, as: :group
-
-        product :group
-        product :name
+        attribute :group do
+          Factory::Resource::Group.fabricate!
+        end
 
-        product :repository_ssh_location do
-          Page::Project::Show.act do
-            choose_repository_clone_ssh
-            repository_location
+        attribute :repository_ssh_location do
+          Page::Project::Show.perform do |page|
+            page.choose_repository_clone_ssh
+            page.repository_location
           end
         end
 
-        product :repository_http_location do
-          Page::Project::Show.act do
-            choose_repository_clone_http
-            repository_location
+        attribute :repository_http_location do
+          Page::Project::Show.perform do |page|
+            page.choose_repository_clone_http
+            page.repository_location
           end
         end
 
@@ -37,7 +36,7 @@ module QA
         def fabricate!
           group.visit!
 
-          Page::Group::Show.act { go_to_new_project }
+          Page::Group::Show.perform(&:go_to_new_project)
 
           Page::Project::New.perform do |page|
             page.choose_test_namespace
diff --git a/qa/qa/factory/resource/project_imported_from_github.rb b/qa/qa/factory/resource/project_imported_from_github.rb
index a45e7fee03b..f62092ae122 100644
--- a/qa/qa/factory/resource/project_imported_from_github.rb
+++ b/qa/qa/factory/resource/project_imported_from_github.rb
@@ -6,14 +6,16 @@ module QA
       class ProjectImportedFromGithub < Resource::Project
         attr_writer :personal_access_token, :github_repository_path
 
-        dependency Factory::Resource::Group, as: :group
+        attribute :group do
+          Factory::Resource::Group.fabricate!
+        end
 
-        product :name
+        attribute :name
 
         def fabricate!
           group.visit!
 
-          Page::Group::Show.act { go_to_new_project }
+          Page::Group::Show.perform(&:go_to_new_project)
 
           Page::Project::New.perform do |page|
             page.go_to_import_project
diff --git a/qa/qa/factory/resource/project_milestone.rb b/qa/qa/factory/resource/project_milestone.rb
index 35383842142..cfda58dc103 100644
--- a/qa/qa/factory/resource/project_milestone.rb
+++ b/qa/qa/factory/resource/project_milestone.rb
@@ -3,11 +3,12 @@ module QA
     module Resource
       class ProjectMilestone < Factory::Base
         attr_accessor :description
-        attr_reader :title
 
-        dependency Factory::Resource::Project, as: :project
+        attribute :project do
+          Factory::Resource::Project.fabricate!
+        end
 
-        product :title
+        attribute :title
 
         def title=(title)
           @title = "#{title}-#{SecureRandom.hex(4)}"
@@ -17,12 +18,12 @@ module QA
         def fabricate!
           project.visit!
 
-          Page::Project::Menu.act do
-            click_issues
-            click_milestones
+          Page::Project::Menu.perform do |page|
+            page.click_issues
+            page.click_milestones
           end
 
-          Page::Project::Milestone::Index.act { click_new_milestone }
+          Page::Project::Milestone::Index.perform(&:click_new_milestone)
 
           Page::Project::Milestone::New.perform do |milestone_new|
             milestone_new.set_title(@title)
diff --git a/qa/qa/factory/resource/runner.rb b/qa/qa/factory/resource/runner.rb
index 7ac65fe6913..7108db1e55a 100644
--- a/qa/qa/factory/resource/runner.rb
+++ b/qa/qa/factory/resource/runner.rb
@@ -6,9 +6,11 @@ module QA
       class Runner < Factory::Base
         attr_writer :name, :tags, :image
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-with-ci-cd'
-          project.description = 'Project with CI/CD Pipelines'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-with-ci-cd'
+            resource.description = 'Project with CI/CD Pipelines'
+          end
         end
 
         def name
@@ -26,7 +28,7 @@ module QA
         def fabricate!
           project.visit!
 
-          Page::Project::Menu.act { click_ci_cd_settings }
+          Page::Project::Menu.perform(&:click_ci_cd_settings)
 
           Service::Runner.new(name).tap do |runner|
             Page::Project::Settings::CICD.perform do |settings|
diff --git a/qa/qa/factory/resource/sandbox.rb b/qa/qa/factory/resource/sandbox.rb
index e592f4e0dd2..56bcda9e2f3 100644
--- a/qa/qa/factory/resource/sandbox.rb
+++ b/qa/qa/factory/resource/sandbox.rb
@@ -8,17 +8,15 @@ module QA
       class Sandbox < Factory::Base
         attr_reader :path
 
-        product :id do
-          true # We don't retrieve the Group ID when using the Browser UI
-        end
-        product :path
+        attribute :id
+        attribute :path
 
         def initialize
           @path = Runtime::Namespace.sandbox_name
         end
 
         def fabricate!
-          Page::Main::Menu.act { go_to_groups }
+          Page::Main::Menu.perform(&:go_to_groups)
 
           Page::Dashboard::Groups.perform do |page|
             if page.has_group?(path)
diff --git a/qa/qa/factory/resource/secret_variable.rb b/qa/qa/factory/resource/secret_variable.rb
index 4084a7fc2cd..24ba3408810 100644
--- a/qa/qa/factory/resource/secret_variable.rb
+++ b/qa/qa/factory/resource/secret_variable.rb
@@ -4,15 +4,17 @@ module QA
       class SecretVariable < Factory::Base
         attr_accessor :key, :value
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-with-secret-variables'
-          project.description = 'project for adding secret variable test'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-with-secret-variables'
+            resource.description = 'project for adding secret variable test'
+          end
         end
 
         def fabricate!
           project.visit!
 
-          Page::Project::Menu.act { click_ci_cd_settings }
+          Page::Project::Menu.perform(&:click_ci_cd_settings)
 
           Page::Project::Settings::CICD.perform do |setting|
             setting.expand_secret_variables do |page|
diff --git a/qa/qa/factory/resource/ssh_key.rb b/qa/qa/factory/resource/ssh_key.rb
index a512d071dd4..a48a93fbe65 100644
--- a/qa/qa/factory/resource/ssh_key.rb
+++ b/qa/qa/factory/resource/ssh_key.rb
@@ -6,21 +6,19 @@ module QA
       class SSHKey < Factory::Base
         extend Forwardable
 
-        attr_accessor :title
-        attr_reader :private_key, :public_key, :fingerprint
         def_delegators :key, :private_key, :public_key, :fingerprint
 
-        product :private_key
-        product :title
-        product :fingerprint
+        attribute :private_key
+        attribute :title
+        attribute :fingerprint
 
         def key
           @key ||= Runtime::Key::RSA.new
         end
 
         def fabricate!
-          Page::Main::Menu.act { go_to_profile_settings }
-          Page::Profile::Menu.act { click_ssh_keys }
+          Page::Main::Menu.perform(&:go_to_profile_settings)
+          Page::Profile::Menu.perform(&:click_ssh_keys)
 
           Page::Profile::SSHKeys.perform do |page|
             page.add_key(public_key, title)
diff --git a/qa/qa/factory/resource/user.rb b/qa/qa/factory/resource/user.rb
index 36edf787b64..6e6f46f7a95 100644
--- a/qa/qa/factory/resource/user.rb
+++ b/qa/qa/factory/resource/user.rb
@@ -5,7 +5,6 @@ module QA
     module Resource
       class User < Factory::Base
         attr_reader :unique_id
-        attr_writer :username, :password, :name, :email
 
         def initialize
           @unique_id = SecureRandom.hex(8)
@@ -31,14 +30,14 @@ module QA
           defined?(@username) && defined?(@password)
         end
 
-        product :name
-        product :username
-        product :email
-        product :password
+        attribute :name
+        attribute :username
+        attribute :email
+        attribute :password
 
         def fabricate!
           # Don't try to log-out if we're not logged-in
-          if Page::Main::Menu.act { has_personal_area?(wait: 0) }
+          if Page::Main::Menu.perform { |p| p.has_personal_area?(wait: 0) }
             Page::Main::Menu.perform { |main| main.sign_out }
           end
 
diff --git a/qa/qa/factory/resource/wiki.rb b/qa/qa/factory/resource/wiki.rb
index d697433736e..769f394e85c 100644
--- a/qa/qa/factory/resource/wiki.rb
+++ b/qa/qa/factory/resource/wiki.rb
@@ -4,9 +4,11 @@ module QA
       class Wiki < Factory::Base
         attr_accessor :title, :content, :message
 
-        dependency Factory::Resource::Project, as: :project do |project|
-          project.name = 'project-for-wikis'
-          project.description = 'project for adding wikis'
+        attribute :project do
+          Factory::Resource::Project.fabricate! do |resource|
+            resource.name = 'project-for-wikis'
+            resource.description = 'project for adding wikis'
+          end
         end
 
         def fabricate!
diff --git a/qa/qa/factory/settings/hashed_storage.rb b/qa/qa/factory/settings/hashed_storage.rb
index 5e8f883e25f..4e32382f910 100644
--- a/qa/qa/factory/settings/hashed_storage.rb
+++ b/qa/qa/factory/settings/hashed_storage.rb
@@ -5,9 +5,9 @@ module QA
         def fabricate!(*traits)
           raise ArgumentError unless traits.include?(:enabled)
 
-          Page::Main::Login.act { sign_in_using_credentials }
-          Page::Main::Menu.act { go_to_admin_area }
-          Page::Admin::Menu.act { go_to_repository_settings }
+          Page::Main::Login.perform(&:sign_in_using_credentials)
+          Page::Main::Menu.perform(&:go_to_admin_area)
+          Page::Admin::Menu.perform(&:go_to_repository_settings)
 
           Page::Admin::Settings::Repository.perform do |setting|
             setting.expand_repository_storage do |page|
@@ -16,7 +16,7 @@ module QA
             end
           end
 
-          QA::Page::Main::Menu.act { sign_out }
+          QA::Page::Main::Menu.perform(&:sign_out)
         end
       end
     end
diff --git a/qa/qa/runtime/logger.rb b/qa/qa/runtime/logger.rb
index 3baa24de0ec..83b10e73ad9 100644
--- a/qa/qa/runtime/logger.rb
+++ b/qa/qa/runtime/logger.rb
@@ -7,7 +7,7 @@ module QA
     module Logger
       extend SingleForwardable
 
-      def_delegators :logger, :debug, :info, :error, :warn, :fatal, :unknown
+      def_delegators :logger, :debug, :info, :warn, :error, :fatal, :unknown
 
       singleton_class.module_eval do
         def logger
diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
index c98ede25b68..40cae0793dd 100644
--- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
+++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb
@@ -49,11 +49,13 @@ module QA
               cluster.install_prometheus = true
               cluster.install_runner = true
             end
+            kubernetes_cluster.populate(:ingress_ip)
 
             project.visit!
             Page::Project::Menu.act { click_ci_cd_settings }
             Page::Project::Settings::CICD.perform do |p|
-              p.enable_auto_devops_with_domain("#{kubernetes_cluster.ingress_ip}.nip.io")
+              p.enable_auto_devops_with_domain(
+                "#{kubernetes_cluster.ingress_ip}.nip.io")
             end
 
             project.visit!
diff --git a/qa/spec/factory/base_spec.rb b/qa/spec/factory/base_spec.rb
index 229f93a1041..d7b92052894 100644
--- a/qa/spec/factory/base_spec.rb
+++ b/qa/spec/factory/base_spec.rb
@@ -19,7 +19,7 @@ describe QA::Factory::Base do
     before do
       allow(subject).to receive(:current_url).and_return(product_location)
       allow(subject).to receive(:new).and_return(factory)
-      allow(QA::Factory::Product).to receive(:populate!).with(factory, product_location).and_return(product)
+      allow(QA::Factory::Product).to receive(:new).with(factory).and_return(product)
     end
   end
 
@@ -115,73 +115,134 @@ describe QA::Factory::Base do
     end
   end
 
-  describe '.dependency' do
-    let(:dependency) { spy('dependency') }
+  shared_context 'simple factory' do
+    subject do
+      Class.new(QA::Factory::Base) do
+        attribute :test do
+          'block'
+        end
 
-    before do
-      stub_const('Some::MyDependency', dependency)
-    end
+        attribute :no_block
 
-    subject do
-      Class.new(described_class) do
-        dependency Some::MyDependency, as: :mydep do |factory|
-          factory.something!
+        def fabricate!
+          'any'
+        end
+
+        def self.current_url
+          'http://stub'
         end
       end
     end
 
-    it 'appends a new dependency and accessors' do
-      expect(subject.dependencies).to be_one
+    let(:factory) { subject.new }
+  end
+
+  describe '.attribute' do
+    include_context 'simple factory'
+
+    it 'appends new product attribute' do
+      expect(subject.attributes_names).to eq([:no_block, :test, :web_url])
     end
 
-    it 'defines dependency accessors' do
-      expect(subject.new).to respond_to :mydep, :mydep=
+    context 'when the product attribute is populated via a block' do
+      it 'returns a fabrication product and defines factory attributes as its methods' do
+        result = subject.fabricate!(factory: factory)
+
+        expect(result).to be_a(QA::Factory::Product)
+        expect(result.test).to eq('block')
+      end
     end
 
-    describe 'dependencies fabrication' do
-      let(:dependency) { double('dependency') }
-      let(:instance) { spy('instance') }
+    context 'when the product attribute is populated via the api' do
+      let(:api_resource) { { no_block: 'api' } }
+
+      before do
+        expect(factory).to receive(:api_resource).and_return(api_resource)
+      end
+
+      it 'returns a fabrication product and defines factory attributes as its methods' do
+        result = subject.fabricate!(factory: factory)
+
+        expect(result).to be_a(QA::Factory::Product)
+        expect(result.no_block).to eq('api')
+      end
+
+      context 'when the attribute also has a block in the factory' do
+        let(:api_resource) { { test: 'api_with_block' } }
+
+        before do
+          allow(QA::Runtime::Logger).to receive(:info)
+        end
+
+        it 'returns the api value and emits an INFO log entry' do
+          result = subject.fabricate!(factory: factory)
 
-      subject do
-        Class.new(described_class) do
-          dependency Some::MyDependency, as: :mydep
+          expect(result).to be_a(QA::Factory::Product)
+          expect(result.test).to eq('api_with_block')
+          expect(QA::Runtime::Logger)
+            .to have_received(:info).with(/api_with_block/)
         end
       end
+    end
 
+    context 'when the product attribute is populated via a factory attribute' do
       before do
-        stub_const('Some::MyDependency', dependency)
+        factory.test = 'value'
+      end
+
+      it 'returns a fabrication product and defines factory attributes as its methods' do
+        result = subject.fabricate!(factory: factory)
+
+        expect(result).to be_a(QA::Factory::Product)
+        expect(result.test).to eq('value')
+      end
 
-        allow(subject).to receive(:new).and_return(instance)
-        allow(subject).to receive(:current_url).and_return(product_location)
-        allow(instance).to receive(:mydep).and_return(nil)
-        expect(QA::Factory::Product).to receive(:populate!)
+      context 'when the api also has such response' do
+        before do
+          allow(factory).to receive(:api_resource).and_return({ test: 'api' })
+        end
+
+        it 'returns the factory attribute for the product' do
+          result = subject.fabricate!(factory: factory)
+
+          expect(result).to be_a(QA::Factory::Product)
+          expect(result.test).to eq('value')
+        end
       end
+    end
 
-      it 'builds all dependencies first' do
-        expect(dependency).to receive(:fabricate!).once
+    context 'when the product attribute has no value' do
+      it 'raises an error because no values could be found' do
+        result = subject.fabricate!(factory: factory)
 
-        subject.fabricate!
+        expect { result.no_block }
+          .to raise_error(described_class::NoValueError, "No value was computed for product no_block of factory #{factory.class.name}.")
       end
     end
   end
 
-  describe '.product' do
-    include_context 'fabrication context'
+  describe '#web_url' do
+    include_context 'simple factory'
 
-    subject do
-      Class.new(described_class) do
-        def fabricate!
-          "any"
-        end
+    it 'sets #web_url to #current_url after fabrication' do
+      subject.fabricate!(factory: factory)
 
-        product :token
-      end
+      expect(factory.web_url).to eq(subject.current_url)
+    end
+  end
+
+  describe '#visit!' do
+    include_context 'simple factory'
+
+    before do
+      allow(factory).to receive(:visit)
     end
 
-    it 'appends new product attribute' do
-      expect(subject.attributes).to be_one
-      expect(subject.attributes[0]).to be_a(QA::Factory::Product::Attribute)
-      expect(subject.attributes[0].name).to eq(:token)
+    it 'calls #visit with the underlying #web_url' do
+      factory.web_url = subject.current_url
+      factory.visit!
+
+      expect(factory).to have_received(:visit).with(subject.current_url)
     end
   end
 end
diff --git a/qa/spec/factory/dependency_spec.rb b/qa/spec/factory/dependency_spec.rb
deleted file mode 100644
index 657beddffb1..00000000000
--- a/qa/spec/factory/dependency_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-describe QA::Factory::Dependency do
-  let(:dependency) { spy('dependency' ) }
-  let(:factory) { spy('factory') }
-  let(:block) { spy('block') }
-
-  let(:signature) do
-    double('signature', name: :mydep, factory: dependency, block: block)
-  end
-
-  subject do
-    described_class.new(factory, signature)
-  end
-
-  describe '#overridden?' do
-    it 'returns true if factory has overridden dependency' do
-      allow(factory).to receive(:mydep).and_return('something')
-
-      expect(subject).to be_overridden
-    end
-
-    it 'returns false if dependency has not been overridden' do
-      allow(factory).to receive(:mydep).and_return(nil)
-
-      expect(subject).not_to be_overridden
-    end
-  end
-
-  describe '#build!' do
-    context 'when dependency has been overridden' do
-      before do
-        allow(subject).to receive(:overridden?).and_return(true)
-      end
-
-      it 'does not fabricate dependency' do
-        subject.build!
-
-        expect(dependency).not_to have_received(:fabricate!)
-      end
-    end
-
-    context 'when dependency has not been overridden' do
-      before do
-        allow(subject).to receive(:overridden?).and_return(false)
-      end
-
-      it 'fabricates dependency' do
-        subject.build!
-
-        expect(dependency).to have_received(:fabricate!)
-      end
-
-      it 'sets product in the factory' do
-        subject.build!
-
-        expect(factory).to have_received(:mydep=).with(dependency)
-      end
-
-      it 'calls given block with dependency factory and caller factory' do
-        expect(dependency).to receive(:fabricate!).and_yield(dependency)
-
-        subject.build!
-
-        expect(block).to have_received(:call).with(dependency, factory)
-      end
-
-      context 'with no block given' do
-        let(:signature) do
-          double('signature', name: :mydep, factory: dependency, block: nil)
-        end
-
-        it 'does not error' do
-          subject.build!
-
-          expect(dependency).to have_received(:fabricate!)
-        end
-      end
-    end
-  end
-end
diff --git a/qa/spec/factory/product_spec.rb b/qa/spec/factory/product_spec.rb
index 43b1d93d769..5b6eaa13e9c 100644
--- a/qa/spec/factory/product_spec.rb
+++ b/qa/spec/factory/product_spec.rb
@@ -1,73 +1,21 @@
 describe QA::Factory::Product do
   let(:factory) do
     Class.new(QA::Factory::Base) do
-      def foo
-        'bar'
+      attribute :test do
+        'block'
       end
+
+      attribute :no_block
     end.new
   end
 
   let(:product) { spy('product') }
   let(:product_location) { 'http://product_location' }
 
-  subject { described_class.new(factory, product_location) }
-
-  describe '.populate!' do
-    before do
-      expect(factory.class).to receive(:attributes).and_return(attributes)
-    end
-
-    context 'when the product attribute is populated via a block' do
-      let(:attributes) do
-        [QA::Factory::Product::Attribute.new(:test, proc { 'returned' })]
-      end
-
-      it 'returns a fabrication product and defines factory attributes as its methods' do
-        result = described_class.populate!(factory, product_location)
-
-        expect(result).to be_a(described_class)
-        expect(result.test).to eq('returned')
-      end
-    end
-
-    context 'when the product attribute is populated via the api' do
-      let(:attributes) do
-        [QA::Factory::Product::Attribute.new(:test)]
-      end
-
-      it 'returns a fabrication product and defines factory attributes as its methods' do
-        expect(factory).to receive(:api_resource).and_return({ test: 'returned' })
-
-        result = described_class.populate!(factory, product_location)
+  subject { described_class.new(factory) }
 
-        expect(result).to be_a(described_class)
-        expect(result.test).to eq('returned')
-      end
-    end
-
-    context 'when the product attribute is populated via a factory attribute' do
-      let(:attributes) do
-        [QA::Factory::Product::Attribute.new(:foo)]
-      end
-
-      it 'returns a fabrication product and defines factory attributes as its methods' do
-        result = described_class.populate!(factory, product_location)
-
-        expect(result).to be_a(described_class)
-        expect(result.foo).to eq('bar')
-      end
-    end
-
-    context 'when the product attribute has no value' do
-      let(:attributes) do
-        [QA::Factory::Product::Attribute.new(:bar)]
-      end
-
-      it 'returns a fabrication product and defines factory attributes as its methods' do
-        expect { described_class.populate!(factory, product_location) }
-          .to raise_error(described_class::NoValueError, "No value was computed for product bar of factory #{factory.class.name}.")
-      end
-    end
+  before do
+    factory.web_url = product_location
   end
 
   describe '.visit!' do
-- 
cgit v1.2.3


From 2864c1eeb89fdc57cc7e11c8f842322abdd6fe3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= <matteeyah@gmail.com>
Date: Thu, 25 Oct 2018 23:14:47 +0200
Subject: Add CHANGELOG entry

---
 ...-pipeline-status-cache-for-_project-after-disabling-pipelines.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/52780-stale-pipeline-status-cache-for-_project-after-disabling-pipelines.yml

diff --git a/changelogs/unreleased/52780-stale-pipeline-status-cache-for-_project-after-disabling-pipelines.yml b/changelogs/unreleased/52780-stale-pipeline-status-cache-for-_project-after-disabling-pipelines.yml
new file mode 100644
index 00000000000..7586d7995b7
--- /dev/null
+++ b/changelogs/unreleased/52780-stale-pipeline-status-cache-for-_project-after-disabling-pipelines.yml
@@ -0,0 +1,5 @@
+---
+title: Cache pipeline status per SHA.
+merge_request: 22589
+author:
+type: fixed
-- 
cgit v1.2.3


From e40f8f27a1ad56d55b321a2891675bd85c440147 Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Fri, 26 Oct 2018 11:09:48 +1100
Subject: Update other links

---
 app/controllers/concerns/creates_commit.rb                    |  2 +-
 app/helpers/compare_helper.rb                                 |  2 +-
 app/helpers/merge_requests_helper.rb                          |  4 ++--
 app/views/projects/merge_requests/creations/_diffs.html.haml  |  1 +
 config/routes/project.rb                                      |  2 +-
 spec/controllers/projects/blob_controller_spec.rb             |  2 +-
 .../user_allows_commits_from_memebers_who_can_merge_spec.rb   |  2 +-
 spec/features/merge_request/user_sees_merge_widget_spec.rb    |  2 +-
 .../features/merge_request/user_sees_wip_help_message_spec.rb |  4 ++--
 .../merge_request/user_selects_branches_for_new_mr_spec.rb    | 11 ++++++-----
 spec/features/merge_request/user_uses_quick_actions_spec.rb   |  2 +-
 .../merge_requests/user_squashes_merge_request_spec.rb        |  4 ++--
 spec/features/projects/merge_request_button_spec.rb           |  8 ++++----
 .../features/creatable_merge_request_shared_examples.rb       |  2 +-
 14 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index b3777fd2b0f..f644702cbdb 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -86,10 +86,10 @@ module CreatesCommit
   def new_merge_request_path
     project_new_merge_request_path(
       @project_to_commit_into,
+      merge_request_source_branch: @branch_name,
       merge_request: {
         source_project_id: @project_to_commit_into.id,
         target_project_id: @project.id,
-        source_branch: @branch_name,
         target_branch: @start_branch
       }
     )
diff --git a/app/helpers/compare_helper.rb b/app/helpers/compare_helper.rb
index 9ece8b0bc5b..57e397f6ca0 100644
--- a/app/helpers/compare_helper.rb
+++ b/app/helpers/compare_helper.rb
@@ -13,8 +13,8 @@ module CompareHelper
   def create_mr_path(from = params[:from], to = params[:to], project = @project)
     project_new_merge_request_path(
       project,
+      merge_request_source_branch: to,
       merge_request: {
-        source_branch: to,
         target_branch: from
       }
     )
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 23d7aa427bb..8f549bfce73 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -11,10 +11,10 @@ module MergeRequestsHelper
 
   def new_mr_from_push_event(event, target_project)
     {
+      merge_request_source_branch: event.branch_name,
       merge_request: {
         source_project_id: event.project.id,
         target_project_id: target_project.id,
-        source_branch: event.branch_name,
         target_branch: target_project.repository.root_ref
       }
     }
@@ -51,10 +51,10 @@ module MergeRequestsHelper
   def mr_change_branches_path(merge_request)
     project_new_merge_request_path(
       @project,
+      merge_request_source_branch: merge_request.source_branch,
       merge_request: {
         source_project_id: merge_request.source_project_id,
         target_project_id: merge_request.target_project_id,
-        source_branch: merge_request.source_branch,
         target_branch: merge_request.target_branch
       },
       change_branches: true
diff --git a/app/views/projects/merge_requests/creations/_diffs.html.haml b/app/views/projects/merge_requests/creations/_diffs.html.haml
index 5b70e894b39..16afcc516b3 100644
--- a/app/views/projects/merge_requests/creations/_diffs.html.haml
+++ b/app/views/projects/merge_requests/creations/_diffs.html.haml
@@ -1,3 +1,4 @@
+= @merge_request.inspect
 - if @merge_request.can_be_created
   = render "projects/diffs/diffs", diffs: @diffs, environment: @environment, show_whitespace_toggle: false
 - else
diff --git a/config/routes/project.rb b/config/routes/project.rb
index e621f5eb8dd..e8a55b58656 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -149,7 +149,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       scope path: 'merge_requests', controller: 'merge_requests/creations' do
         post '', action: :create, as: nil
 
-        scope path: 'new', as: :new_merge_request do
+        scope path: 'new/(:merge_request_source_branch)', as: :new_merge_request do
           scope constraints: { format: nil }, action: :new do
             get :diffs, defaults: { tab: 'diffs' }
             get :pipelines, defaults: { tab: 'pipelines' }
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb
index 28f7e4634a5..64b589a6d83 100644
--- a/spec/controllers/projects/blob_controller_spec.rb
+++ b/spec/controllers/projects/blob_controller_spec.rb
@@ -331,10 +331,10 @@ describe Projects::BlobController do
           expect(response).to redirect_to(
             project_new_merge_request_path(
               forked_project,
+              merge_request_source_branch: "fork-test-1",
               merge_request: {
                 source_project_id: forked_project.id,
                 target_project_id: project.id,
-                source_branch: "fork-test-1",
                 target_branch: "master"
               }
             )
diff --git a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
index 0ccab5b2fac..a124c99ecc8 100644
--- a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
+++ b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
@@ -9,10 +9,10 @@ describe 'create a merge request, allowing commits from members who can merge to
   def visit_new_merge_request
     visit project_new_merge_request_path(
       source_project,
+      merge_request_source_branch: 'fix',
       merge_request: {
         source_project_id: source_project.id,
         target_project_id: target_project.id,
-        source_branch: 'fix',
         target_branch: 'master'
       })
   end
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb
index f15129759de..6541555adde 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -20,10 +20,10 @@ describe 'Merge request > User sees merge widget', :js do
     before do
       visit project_new_merge_request_path(
         project,
+        merge_request_source_branch: 'feature',
         merge_request: {
           source_project_id: project.id,
           target_project_id: project.id,
-          source_branch: 'feature',
           target_branch: 'master'
         })
     end
diff --git a/spec/features/merge_request/user_sees_wip_help_message_spec.rb b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
index 92cc73ddf1f..6dfc819fe8a 100644
--- a/spec/features/merge_request/user_sees_wip_help_message_spec.rb
+++ b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
@@ -13,10 +13,10 @@ describe 'Merge request > User sees WIP help message' do
     it 'shows a specific WIP hint' do
       visit project_new_merge_request_path(
         project,
+        merge_request_source_branch: 'wip',
         merge_request: {
           source_project_id: project.id,
           target_project_id: project.id,
-          source_branch: 'wip',
           target_branch: 'master'
         })
 
@@ -32,10 +32,10 @@ describe 'Merge request > User sees WIP help message' do
     it 'shows the regular WIP message' do
       visit project_new_merge_request_path(
         project,
+        merge_request_source_branch: 'fix',
         merge_request: {
           source_project_id: project.id,
           target_project_id: project.id,
-          source_branch: 'fix',
           target_branch: 'master'
         })
 
diff --git a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
index ae41cf90576..147544740dc 100644
--- a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
+++ b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
@@ -109,13 +109,13 @@ describe 'Merge request > User selects branches for new MR', :js do
   end
 
   it 'populates source branch button' do
-    visit project_new_merge_request_path(project, change_branches: true, merge_request: { target_branch: 'master', source_branch: 'fix' })
+    visit project_new_merge_request_path(project, change_branches: true, merge_request_source_branch: 'fix', merge_request: { target_branch: 'master' })
 
     expect(find('.js-source-branch')).to have_content('fix')
   end
 
   it 'allows to change the diff view' do
-    visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: 'fix' })
+    visit project_new_merge_request_path(project, merge_request_source_branch: 'fix', merge_request: { target_branch: 'master' })
 
     click_link 'Changes'
 
@@ -131,7 +131,7 @@ describe 'Merge request > User selects branches for new MR', :js do
   end
 
   it 'does not allow non-existing branches' do
-    visit project_new_merge_request_path(project, merge_request: { target_branch: 'non-exist-target', source_branch: 'non-exist-source' })
+    visit project_new_merge_request_path(project, merge_request_source_branch: 'non-exist-source', merge_request: { target_branch: 'non-exist-target' })
 
     expect(page).to have_content('The form contains the following errors')
     expect(page).to have_content('Source branch "non-exist-source" does not exist')
@@ -140,7 +140,7 @@ describe 'Merge request > User selects branches for new MR', :js do
 
   context 'when a branch contains commits that both delete and add the same image' do
     it 'renders the diff successfully' do
-      visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: 'deleted-image-test' })
+      visit project_new_merge_request_path(project, merge_request_source_branch: 'deleted-image-test', merge_request: { target_branch: 'master' })
 
       click_link "Changes"
 
@@ -165,7 +165,8 @@ describe 'Merge request > User selects branches for new MR', :js do
     it 'shows pipelines for a new merge request' do
       visit project_new_merge_request_path(
         project,
-        merge_request: { target_branch: 'master', source_branch: 'fix' })
+        merge_request_source_branch: 'fix',
+        merge_request: { target_branch: 'master' })
 
       page.within('.merge-request') do
         click_link 'Pipelines'
diff --git a/spec/features/merge_request/user_uses_quick_actions_spec.rb b/spec/features/merge_request/user_uses_quick_actions_spec.rb
index b81478a481f..6e681185e1f 100644
--- a/spec/features/merge_request/user_uses_quick_actions_spec.rb
+++ b/spec/features/merge_request/user_uses_quick_actions_spec.rb
@@ -144,7 +144,7 @@ describe 'Merge request > User uses quick actions', :js do
 
     describe '/target_branch command in merge request' do
       let(:another_project) { create(:project, :public, :repository) }
-      let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } }
+      let(:new_url_opts) { { merge_request_source_branch: 'feature' } }
 
       before do
         another_project.add_maintainer(user)
diff --git a/spec/features/merge_requests/user_squashes_merge_request_spec.rb b/spec/features/merge_requests/user_squashes_merge_request_spec.rb
index ec1153b7f7f..8ecdec491b8 100644
--- a/spec/features/merge_requests/user_squashes_merge_request_spec.rb
+++ b/spec/features/merge_requests/user_squashes_merge_request_spec.rb
@@ -65,7 +65,7 @@ describe 'User squashes a merge request', :js do
 
   context 'when squash is enabled on merge request creation' do
     before do
-      visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch })
+      visit project_new_merge_request_path(project, merge_request_source_branch: source_branch, merge_request: { target_branch: 'master' })
       check 'merge_request[squash]'
       click_on 'Submit merge request'
       wait_for_requests
@@ -95,7 +95,7 @@ describe 'User squashes a merge request', :js do
 
   context 'when squash is not enabled on merge request creation' do
     before do
-      visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch })
+      visit project_new_merge_request_path(project, merge_request_source_branch: source_branch, merge_request: { target_branch: 'master' })
       click_on 'Submit merge request'
       wait_for_requests
     end
diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb
index 69561b4d733..4be31511ceb 100644
--- a/spec/features/projects/merge_request_button_spec.rb
+++ b/spec/features/projects/merge_request_button_spec.rb
@@ -22,8 +22,8 @@ describe 'Merge Request button' do
 
       it 'shows Create merge request button' do
         href = project_new_merge_request_path(project,
-                                              merge_request: { source_branch: 'feature',
-                                                               target_branch: 'master' })
+                                              merge_request_source_branch: 'feature',
+                                              merge_request: { target_branch: 'master' })
 
         visit url
 
@@ -77,8 +77,8 @@ describe 'Merge Request button' do
 
         it 'shows Create merge request button' do
           href = project_new_merge_request_path(forked_project,
-                                                merge_request: { source_branch: 'feature',
-                                                                 target_branch: 'master' })
+                                                merge_request_source_branch: 'feature',
+                                                merge_request: { target_branch: 'master' })
 
           visit fork_url
 
diff --git a/spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb b/spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb
index 7038a366144..9373de5aeab 100644
--- a/spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb
+++ b/spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb
@@ -17,10 +17,10 @@ RSpec.shared_examples 'a creatable merge request' do
     sign_in(user)
     visit project_new_merge_request_path(
       target_project,
+      merge_request_source_branch: 'fix',
       merge_request: {
         source_project_id: source_project.id,
         target_project_id: target_project.id,
-        source_branch: 'fix',
         target_branch: 'master'
       })
   end
-- 
cgit v1.2.3


From 54db08f2f367e8b1e2100adf6496f3589f77d920 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Wed, 24 Oct 2018 14:01:43 +0800
Subject: Fix project selector to show only projects with issues

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

diff --git a/app/assets/javascripts/boards/components/project_select.vue b/app/assets/javascripts/boards/components/project_select.vue
index 4e8fe16160a..427a0868b0c 100644
--- a/app/assets/javascripts/boards/components/project_select.vue
+++ b/app/assets/javascripts/boards/components/project_select.vue
@@ -46,7 +46,7 @@ export default {
       selectable: true,
       data: (term, callback) => {
         this.loading = true;
-        return Api.groupProjects(this.groupId, term, {}, projects => {
+        return Api.groupProjects(this.groupId, term, {with_issues_enabled: true}, projects => {
           this.loading = false;
           callback(projects);
         });
-- 
cgit v1.2.3


From 11ba5ccd54c04aacbdb6785500875cabf84e1a0c Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Wed, 24 Oct 2018 14:02:22 +0800
Subject: Always show new issue in Open list

---
 app/views/shared/boards/components/_board.html.haml | 15 +++++++--------
 spec/features/boards/new_issue_spec.rb              | 10 ++++++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml
index e26f5260e5b..b79a1b17154 100644
--- a/app/views/shared/boards/components/_board.html.haml
+++ b/app/views/shared/boards/components/_board.html.haml
@@ -39,14 +39,13 @@
             {{ list.issuesSize }}
           = render_if_exists "shared/boards/components/list_weight"
 
-        - if can?(current_user, :admin_list, current_board_parent)
-          %button.issue-count-badge-add-button.btn.btn-sm.btn-default.ml-1.has-tooltip.js-no-trigger-collapse{ type: "button",
-            "@click" => "showNewIssueForm",
-            "v-if" => 'list.type !== "closed"',
-            "aria-label" => _("New issue"),
-            "title" => _("New issue"),
-            data: { placement: "top", container: "body" } }
-            = icon("plus", class: "js-no-trigger-collapse")
+        %button.issue-count-badge-add-button.btn.btn-sm.btn-default.ml-1.has-tooltip.js-no-trigger-collapse{ type: "button",
+          "@click" => "showNewIssueForm",
+          "v-if" => 'list.type == "backlog" || (!disabled && list.type !== "closed")',
+          "aria-label" => _("New issue"),
+          "title" => _("New issue"),
+          data: { placement: "top", container: "body" } }
+          = icon("plus", class: "js-no-trigger-collapse")
 
     %board-list{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"',
       ":list" => "list",
diff --git a/spec/features/boards/new_issue_spec.rb b/spec/features/boards/new_issue_spec.rb
index 0bf1ecbc433..164442a47f5 100644
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
@@ -94,8 +94,14 @@ describe 'Issue Boards new issue', :js do
       wait_for_requests
     end
 
-    it 'does not display new issue button' do
-      expect(page).to have_selector('.issue-count-badge-add-button', count: 0)
+    it 'displays new issue button in open list' do
+      expect(first('.board')).to have_selector('.issue-count-badge-add-button', count: 1)
+    end
+
+    it 'does not display new issue button in label list' do
+      page.within('.board:nth-child(2)') do
+        expect(page).not_to have_selector('.issue-count-badge-add-button')
+      end
     end
   end
 end
-- 
cgit v1.2.3


From 5b27e2dbda5f35a7d2fca0462349ddbad67bd04c Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Wed, 24 Oct 2018 16:29:10 +0800
Subject: Add changelog entry

---
 changelogs/unreleased/52545-guest-create-issue-in-group-board.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/52545-guest-create-issue-in-group-board.yml

diff --git a/changelogs/unreleased/52545-guest-create-issue-in-group-board.yml b/changelogs/unreleased/52545-guest-create-issue-in-group-board.yml
new file mode 100644
index 00000000000..5701e44eb32
--- /dev/null
+++ b/changelogs/unreleased/52545-guest-create-issue-in-group-board.yml
@@ -0,0 +1,5 @@
+---
+title: Always show new issue button in boards' Open list
+merge_request: 22557
+author: Heinrich Lee Yu
+type: fixed
-- 
cgit v1.2.3


From 6dda85927d88461506e7255f5ba49bdeac33699e Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Wed, 24 Oct 2018 17:58:34 +0800
Subject: Update boards issue creation authorization

---
 app/controllers/concerns/boards_responses.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/controllers/concerns/boards_responses.rb b/app/controllers/concerns/boards_responses.rb
index b7e4f9b81f1..e6c54e688b6 100644
--- a/app/controllers/concerns/boards_responses.rb
+++ b/app/controllers/concerns/boards_responses.rb
@@ -50,7 +50,14 @@ module BoardsResponses
   end
 
   def authorize_create_issue
-    authorize_action_for!(project, :admin_issue)
+    board = board_parent.boards.find(issue_params[:board_id])
+    list = board.lists.find(issue_params[:list_id])
+
+    if list.backlog?
+      authorize_action_for!(project, :create_issue)
+    else
+      authorize_action_for!(project, :admin_issue)
+    end
   end
 
   def authorize_admin_list
-- 
cgit v1.2.3


From 2ba71571de1147e6b5e6e6f8c14b05d07c6050c2 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Thu, 25 Oct 2018 11:38:02 +0800
Subject: Simplify query and add tests for authorization change

---
 app/controllers/concerns/boards_responses.rb      | 10 +++-------
 spec/controllers/boards/issues_controller_spec.rb | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/controllers/concerns/boards_responses.rb b/app/controllers/concerns/boards_responses.rb
index e6c54e688b6..3cdf4ddf8bb 100644
--- a/app/controllers/concerns/boards_responses.rb
+++ b/app/controllers/concerns/boards_responses.rb
@@ -50,14 +50,10 @@ module BoardsResponses
   end
 
   def authorize_create_issue
-    board = board_parent.boards.find(issue_params[:board_id])
-    list = board.lists.find(issue_params[:list_id])
+    list = List.find(issue_params[:list_id])
+    action = list.backlog? ? :create_issue : :admin_issue
 
-    if list.backlog?
-      authorize_action_for!(project, :create_issue)
-    else
-      authorize_action_for!(project, :admin_issue)
-    end
+    authorize_action_for!(project, action)
   end
 
   def authorize_admin_list
diff --git a/spec/controllers/boards/issues_controller_spec.rb b/spec/controllers/boards/issues_controller_spec.rb
index c365988a100..98946e4287b 100644
--- a/spec/controllers/boards/issues_controller_spec.rb
+++ b/spec/controllers/boards/issues_controller_spec.rb
@@ -208,11 +208,22 @@ describe Boards::IssuesController do
       end
     end
 
-    context 'with unauthorized user' do
-      it 'returns a forbidden 403 response' do
-        create_issue user: guest, board: board, list: list1, title: 'New issue'
+    context 'with guest user' do
+      context 'in open list' do
+        it 'returns a successful 200 response' do
+          open_list = board.lists.create(list_type: :backlog)
+          create_issue user: guest, board: board, list: open_list, title: 'New issue'
 
-        expect(response).to have_gitlab_http_status(403)
+          expect(response).to have_gitlab_http_status(200)
+        end
+      end
+
+      context 'in label list' do
+        it 'returns a forbidden 403 response' do
+          create_issue user: guest, board: board, list: list1, title: 'New issue'
+
+          expect(response).to have_gitlab_http_status(403)
+        end
       end
     end
 
-- 
cgit v1.2.3


From 227e30f7feb2072407a231a762835bf8d5103129 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Thu, 25 Oct 2018 15:02:28 +0800
Subject: Issues API: Add None/Any option to assignee_id

---
 app/finders/issuable_finder.rb     | 35 +++++++++++++++++++++++------------
 app/finders/issues_finder.rb       |  9 +++++----
 lib/api/issues.rb                  |  6 +++++-
 spec/finders/issues_finder_spec.rb | 18 +++++++++++++++++-
 spec/requests/api/issues_spec.rb   | 15 +++++++++++++++
 5 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 8abfe0c4c17..ec4472de0c4 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -14,7 +14,7 @@
 #     project_id: integer
 #     milestone_title: string
 #     author_id: integer
-#     assignee_id: integer
+#     assignee_id: integer or 'None' or 'Any'
 #     search: string
 #     label_name: string
 #     sort: string
@@ -34,6 +34,11 @@ class IssuableFinder
 
   requires_cross_project_access unless: -> { project? }
 
+  # This is used as a common filter for None / Any
+  FILTER_NONE = 'None'.freeze
+  FILTER_ANY = 'Any'.freeze
+
+  # This is accepted as a deprecated filter and is also used in unassigning users
   NONE = '0'.freeze
 
   attr_accessor :current_user, :params
@@ -236,16 +241,20 @@ class IssuableFinder
   # rubocop: enable CodeReuse/ActiveRecord
 
   def assignee_id?
-    params[:assignee_id].present? && params[:assignee_id].to_s != NONE
+    params[:assignee_id].present?
   end
 
   def assignee_username?
-    params[:assignee_username].present? && params[:assignee_username].to_s != NONE
+    params[:assignee_username].present?
   end
 
-  def no_assignee?
+  def filter_by_no_assignee?
     # Assignee_id takes precedence over assignee_username
-    params[:assignee_id].to_s == NONE || params[:assignee_username].to_s == NONE
+    [NONE, FILTER_NONE].include?(params[:assignee_id].to_s) || params[:assignee_username].to_s == NONE
+  end
+
+  def filter_by_any_assignee?
+    params[:assignee_id].to_s == FILTER_ANY
   end
 
   # rubocop: disable CodeReuse/ActiveRecord
@@ -399,15 +408,17 @@ class IssuableFinder
 
   # rubocop: disable CodeReuse/ActiveRecord
   def by_assignee(items)
-    if assignee
-      items = items.where(assignee_id: assignee.id)
-    elsif no_assignee?
-      items = items.where(assignee_id: nil)
+    if filter_by_no_assignee?
+      items.where(assignee_id: nil)
+    elsif filter_by_any_assignee?
+      items.where('assignee_id IS NOT NULL')
+    elsif assignee
+      items.where(assignee_id: assignee.id)
     elsif assignee_id? || assignee_username? # assignee not found
-      items = items.none
+      items.none
+    else
+      items
     end
-
-    items
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
diff --git a/app/finders/issues_finder.rb b/app/finders/issues_finder.rb
index abdc47b9866..4a95eb44417 100644
--- a/app/finders/issues_finder.rb
+++ b/app/finders/issues_finder.rb
@@ -135,12 +135,13 @@ class IssuesFinder < IssuableFinder
     current_user.blank?
   end
 
-  # rubocop: disable CodeReuse/ActiveRecord
   def by_assignee(items)
-    if assignee
-      items.assigned_to(assignee)
-    elsif no_assignee?
+    if filter_by_no_assignee?
       items.unassigned
+    elsif filter_by_any_assignee?
+      items.assigned
+    elsif assignee
+      items.assigned_to(assignee)
     elsif assignee_id? || assignee_username? # assignee not found
       items.none
     else
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 25d78053c88..89232212bc7 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -40,7 +40,11 @@ module API
         optional :updated_after, type: DateTime, desc: 'Return issues updated after the specified time'
         optional :updated_before, type: DateTime, desc: 'Return issues updated before the specified time'
         optional :author_id, type: Integer, desc: 'Return issues which are authored by the user with the given ID'
-        optional :assignee_id, type: Integer, desc: 'Return issues which are assigned to the user with the given ID'
+        optional :assignee_id, types: [Integer, String],
+                               values: -> (v) {
+                                 v.is_a?(Integer) or [IssuableFinder::FILTER_NONE, IssuableFinder::FILTER_ANY].include?(v)
+                               },
+                               desc: 'Return issues which are assigned to the user with the given ID'
         optional :scope, type: String, values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all],
                          desc: 'Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`'
         optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 0689c843104..7f4f613b406 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -59,11 +59,27 @@ describe IssuesFinder do
       context 'filtering by no assignee' do
         let(:params) { { assignee_id: 0 } }
 
-        it 'returns issues not assign to any assignee' do
+        it 'returns issues not assigned to any assignee' do
           expect(issues).to contain_exactly(issue4)
         end
       end
 
+      context 'filtering by no assignee' do
+        let(:params) { { assignee_id: 'None' } }
+
+        it 'returns issues not assigned to any assignee' do
+          expect(issues).to contain_exactly(issue4)
+        end
+      end
+
+      context 'filtering by any assignee' do
+        let(:params) { { assignee_id: 'Any' } }
+
+        it 'returns issues assigned to any assignee' do
+          expect(issues).to contain_exactly(issue1, issue2, issue3)
+        end
+      end
+
       context 'filtering by group_id' do
         let(:params) { { group_id: group.id } }
 
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 9f6cf12f9a7..090e8eac768 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -178,6 +178,21 @@ describe API::Issues do
         expect(first_issue['id']).to eq(issue2.id)
       end
 
+      it 'returns issues with no assignee' do
+        issue2 = create(:issue, author: user2, project: project)
+
+        get api('/issues', user), assignee_id: 'None', scope: 'all'
+
+        expect_paginated_array_response(size: 1)
+        expect(first_issue['id']).to eq(issue2.id)
+      end
+
+      it 'returns issues with any assignee' do
+        get api('/issues', user), assignee_id: 'Any', scope: 'all'
+
+        expect_paginated_array_response(size: 3)
+      end
+
       it 'returns issues reacted by the authenticated user by the given emoji' do
         issue2 = create(:issue, project: project, author: user, assignees: [user])
         award_emoji = create(:award_emoji, awardable: issue2, user: user2, name: 'star')
-- 
cgit v1.2.3


From 006631f8823c1dfe43cc7b9ed7e47a11a3d3809c Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Thu, 25 Oct 2018 17:19:12 +0800
Subject: Apply similar change to MRs API

---
 app/finders/issues_finder.rb             |  1 +
 lib/api/issues.rb                        |  2 +-
 lib/api/merge_requests.rb                |  6 +++++-
 spec/requests/api/issues_spec.rb         |  3 +++
 spec/requests/api/merge_requests_spec.rb | 17 +++++++++++++++++
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/finders/issues_finder.rb b/app/finders/issues_finder.rb
index 4a95eb44417..cee57a83df4 100644
--- a/app/finders/issues_finder.rb
+++ b/app/finders/issues_finder.rb
@@ -135,6 +135,7 @@ class IssuesFinder < IssuableFinder
     current_user.blank?
   end
 
+  # rubocop: disable CodeReuse/ActiveRecord
   def by_assignee(items)
     if filter_by_no_assignee?
       items.unassigned
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 89232212bc7..d863a37238c 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -42,7 +42,7 @@ module API
         optional :author_id, type: Integer, desc: 'Return issues which are authored by the user with the given ID'
         optional :assignee_id, types: [Integer, String],
                                values: -> (v) {
-                                 v.is_a?(Integer) or [IssuableFinder::FILTER_NONE, IssuableFinder::FILTER_ANY].include?(v)
+                                 v.is_a?(Integer) || [IssuableFinder::FILTER_NONE, IssuableFinder::FILTER_ANY].include?(v)
                                },
                                desc: 'Return issues which are assigned to the user with the given ID'
         optional :scope, type: String, values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all],
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 440d94ae186..5f209228105 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -89,7 +89,11 @@ module API
         optional :updated_before, type: DateTime, desc: 'Return merge requests updated before the specified time'
         optional :view, type: String, values: %w[simple], desc: 'If simple, returns the `iid`, URL, title, description, and basic state of merge request'
         optional :author_id, type: Integer, desc: 'Return merge requests which are authored by the user with the given ID'
-        optional :assignee_id, type: Integer, desc: 'Return merge requests which are assigned to the user with the given ID'
+        optional :assignee_id, types: [Integer, String],
+                               values: -> (v) {
+                                 v.is_a?(Integer) || [IssuableFinder::FILTER_NONE, IssuableFinder::FILTER_ANY].include?(v)
+                               },
+                               desc: 'Return merge requests which are assigned to the user with the given ID'
         optional :scope, type: String, values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all],
                          desc: 'Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`'
         optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
diff --git a/spec/requests/api/issues_spec.rb b/spec/requests/api/issues_spec.rb
index 090e8eac768..9cda39a569b 100644
--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -188,6 +188,9 @@ describe API::Issues do
       end
 
       it 'returns issues with any assignee' do
+        # This issue without assignee should not be returned
+        create(:issue, author: user2, project: project)
+
         get api('/issues', user), assignee_id: 'Any', scope: 'all'
 
         expect_paginated_array_response(size: 3)
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 07d19e3ad29..e4e0ca285e0 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -143,6 +143,23 @@ describe API::MergeRequests do
         expect_response_ordered_exactly(merge_request3)
       end
 
+      it 'returns an array of merge requests with no assignee' do
+        merge_request3 = create(:merge_request, :simple, author: user, source_project: project2, target_project: project2, source_branch: 'other-branch')
+
+        get api('/merge_requests', user), assignee_id: 'None', scope: :all
+
+        expect_response_ordered_exactly(merge_request3)
+      end
+
+      it 'returns an array of merge requests with any assignee' do
+        # This MR with no assignee should not be returned
+        create(:merge_request, :simple, author: user, source_project: project2, target_project: project2, source_branch: 'other-branch')
+
+        get api('/merge_requests', user), assignee_id: 'Any', scope: :all
+
+        expect_response_contain_exactly(merge_request, merge_request2, merge_request_closed, merge_request_merged, merge_request_locked)
+      end
+
       it 'returns an array of merge requests assigned to me' do
         merge_request3 = create(:merge_request, :simple, author: user, assignee: user2, source_project: project2, target_project: project2, source_branch: 'other-branch')
 
-- 
cgit v1.2.3


From 31d333081023442828f07f80b52305472366834c Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Thu, 25 Oct 2018 16:54:21 +0800
Subject: Add documentation

---
 doc/api/issues.md         | 6 +++---
 doc/api/merge_requests.md | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/api/issues.md b/doc/api/issues.md
index cc1d6834a20..57e861bc62e 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -40,7 +40,7 @@ GET /issues?my_reaction_emoji=star
 | `milestone`         | string           | no         | The milestone title. `No+Milestone` lists all issues with no milestone. `Any+Milestone` lists all issues that have an assigned milestone            |
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`. Defaults to `created_by_me`<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id`. Combine with `scope=all` or `scope=assigned_to_me`. _([Introduced][ce-13004] in GitLab 9.5)_          |
-| `assignee_id`       | integer          | no         | Return issues assigned to the given user `id` _([Introduced][ce-13004] in GitLab 9.5)_                                                              |
+| `assignee_id`       | integer          | no         | Return issues assigned to the given user `id`. `None` returns unassigned issues. `Any` returns issues with an assignee. _([Introduced][ce-13004] in GitLab 9.5)_ |
 | `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji` _([Introduced][ce-14016] in GitLab 10.0)_                                      |
 | `iids[]`            | Array[integer]   | no         | Return only the issues having the given `iid`                                                                                                       |
 | `order_by`          | string           | no         | Return issues ordered by `created_at` or `updated_at` fields. Default is `created_at`                                                               |
@@ -154,7 +154,7 @@ GET /groups/:id/issues?my_reaction_emoji=star
 | `milestone`         | string           | no         | The milestone title. `No+Milestone` lists all issues with no milestone                                                                                                           |
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id` _([Introduced][ce-13004] in GitLab 9.5)_                                         |
-| `assignee_id`       | integer          | no         | Return issues assigned to the given user `id` _([Introduced][ce-13004] in GitLab 9.5)_                                        |
+| `assignee_id`       | integer          | no         | Return issues assigned to the given user `id`. `None` returns unassigned issues. `Any` returns issues with an assignee. _([Introduced][ce-13004] in GitLab 9.5)_ |
 | `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji` _([Introduced][ce-14016] in GitLab 10.0)_                |
 | `order_by`          | string           | no         | Return issues ordered by `created_at` or `updated_at` fields. Default is `created_at`                                         |
 | `sort`              | string           | no         | Return issues sorted in `asc` or `desc` order. Default is `desc`                                                              |
@@ -268,7 +268,7 @@ GET /projects/:id/issues?my_reaction_emoji=star
 | `milestone`         | string           | no         | The milestone title. `No+Milestone` lists all issues with no milestone                                                                                                           |
 | `scope`             | string           | no         | Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13004] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer          | no         | Return issues created by the given user `id` _([Introduced][ce-13004] in GitLab 9.5)_                                         |
-| `assignee_id`       | integer          | no         | Return issues assigned to the given user `id` _([Introduced][ce-13004] in GitLab 9.5)_                                        |
+| `assignee_id`       | integer          | no         | Return issues assigned to the given user `id`. `None` returns unassigned issues. `Any` returns issues with an assignee. _([Introduced][ce-13004] in GitLab 9.5)_ |
 | `my_reaction_emoji` | string           | no         | Return issues reacted by the authenticated user by the given `emoji` _([Introduced][ce-14016] in GitLab 10.0)_                |
 | `order_by`          | string           | no         | Return issues ordered by `created_at` or `updated_at` fields. Default is `created_at`                                         |
 | `sort`              | string           | no         | Return issues sorted in `asc` or `desc` order. Default is `desc`                                                              |
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 862ee398a84..0291b7e00c2 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -42,7 +42,7 @@ Parameters:
 | `updated_before`    | datetime | no       | Return merge requests updated on or before the given time                                                              |
 | `scope`             | string   | no       | Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`. Defaults to `created_by_me`<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead. |
 | `author_id`         | integer  | no       | Returns merge requests created by the given user `id`. Combine with `scope=all` or `scope=assigned_to_me`              |
-| `assignee_id`       | integer  | no       | Returns merge requests assigned to the given user `id`                                                                 |
+| `assignee_id`       | integer  | no       | Returns merge requests assigned to the given user `id`. `None` returns unassigned merge requests. `Any` returns merge requests with an assignee. |
 | `my_reaction_emoji` | string   | no       | Return merge requests reacted by the authenticated user by the given `emoji` _([Introduced][ce-14016] in GitLab 10.0)_ |
 | `source_branch`     | string   | no       | Return merge requests with the given source branch                                                                     |
 | `target_branch`     | string   | no       | Return merge requests with the given target branch                                                                     |
@@ -166,7 +166,7 @@ Parameters:
 | `updated_before`    | datetime       | no       | Return merge requests updated on or before the given time                                                                      |
 | `scope`             | string         | no       | Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br> For versions before 11.0, use the now deprecated `created-by-me` or `assigned-to-me` scopes instead.<br> _([Introduced][ce-13060] in GitLab 9.5. [Changed to snake_case][ce-18935] in GitLab 11.0)_ |
 | `author_id`         | integer        | no       | Returns merge requests created by the given user `id` _([Introduced][ce-13060] in GitLab 9.5)_                                 |
-| `assignee_id`       | integer        | no       | Returns merge requests assigned to the given user `id` _([Introduced][ce-13060] in GitLab 9.5)_                                |
+| `assignee_id`       | integer        | no       | Returns merge requests assigned to the given user `id`. `None` returns unassigned merge requests. `Any` returns merge requests with an assignee. _([Introduced][ce-13060] in GitLab 9.5)_ |
 | `my_reaction_emoji` | string         | no       | Return merge requests reacted by the authenticated user by the given `emoji` _([Introduced][ce-14016] in GitLab 10.0)_         |
 | `source_branch`     | string   | no       | Return merge requests with the given source branch                                                                     |
 | `target_branch`     | string   | no       | Return merge requests with the given target branch                                                                     |
@@ -279,7 +279,7 @@ Parameters:
 | `updated_before`    | datetime       | no       | Return merge requests updated on or before the given time                                                                      |
 | `scope`             | string         | no       | Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`.<br>                                     |
 | `author_id`         | integer        | no       | Returns merge requests created by the given user `id` _([Introduced][ce-13060] in GitLab 9.5)_                                 |
-| `assignee_id`       | integer        | no       | Returns merge requests assigned to the given user `id` _([Introduced][ce-13060] in GitLab 9.5)_                                |
+| `assignee_id`       | integer        | no       | Returns merge requests assigned to the given user `id`. `None` returns unassigned merge requests. `Any` returns merge requests with an assignee. _([Introduced][ce-13060] in GitLab 9.5)_ |
 | `my_reaction_emoji` | string         | no       | Return merge requests reacted by the authenticated user by the given `emoji` _([Introduced][ce-14016] in GitLab 10.0)_         |
 | `source_branch`     | string   | no       | Return merge requests with the given source branch                                                                     |
 | `target_branch`     | string   | no       | Return merge requests with the given target branch                                                                     |
-- 
cgit v1.2.3


From d4e26636e72ef150a6f4446558c4d24d3bf21e69 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Thu, 25 Oct 2018 17:27:21 +0800
Subject: Add changelog entry

---
 changelogs/unreleased/52384-api-filter-assignee-none-any.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/52384-api-filter-assignee-none-any.yml

diff --git a/changelogs/unreleased/52384-api-filter-assignee-none-any.yml b/changelogs/unreleased/52384-api-filter-assignee-none-any.yml
new file mode 100644
index 00000000000..9acec04d946
--- /dev/null
+++ b/changelogs/unreleased/52384-api-filter-assignee-none-any.yml
@@ -0,0 +1,5 @@
+---
+title: Add None/Any option for assignee_id in Issues and Merge Requests API
+merge_request: 22598
+author: Heinrich Lee Yu
+type: added
-- 
cgit v1.2.3


From bf1ed85a9d6a932a99d0a5fdf70e72ea36c2600c Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Thu, 25 Oct 2018 22:20:06 +0800
Subject: Refactor api validator to separate class

---
 lib/api/helpers/custom_validators.rb           | 13 ++++++
 lib/api/issues.rb                              |  5 +--
 lib/api/merge_requests.rb                      |  5 +--
 spec/lib/api/helpers/custom_validators_spec.rb | 62 ++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 spec/lib/api/helpers/custom_validators_spec.rb

diff --git a/lib/api/helpers/custom_validators.rb b/lib/api/helpers/custom_validators.rb
index 23b1cd1ad45..e4af75f1971 100644
--- a/lib/api/helpers/custom_validators.rb
+++ b/lib/api/helpers/custom_validators.rb
@@ -10,8 +10,21 @@ module API
           raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: message(:absence)
         end
       end
+
+      class IntegerNoneAny < Grape::Validations::Base
+        def validate_param!(attr_name, params)
+          value = params[attr_name]
+
+          return if value.is_a?(Integer) ||
+              [IssuableFinder::FILTER_NONE, IssuableFinder::FILTER_ANY].include?(value)
+
+          raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)],
+                                               message: "should be an integer, 'None' or 'Any'"
+        end
+      end
     end
   end
 end
 
 Grape::Validations.register_validator(:absence, ::API::Helpers::CustomValidators::Absence)
+Grape::Validations.register_validator(:integer_none_any, ::API::Helpers::CustomValidators::IntegerNoneAny)
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index d863a37238c..405fc30a2ed 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -40,10 +40,7 @@ module API
         optional :updated_after, type: DateTime, desc: 'Return issues updated after the specified time'
         optional :updated_before, type: DateTime, desc: 'Return issues updated before the specified time'
         optional :author_id, type: Integer, desc: 'Return issues which are authored by the user with the given ID'
-        optional :assignee_id, types: [Integer, String],
-                               values: -> (v) {
-                                 v.is_a?(Integer) || [IssuableFinder::FILTER_NONE, IssuableFinder::FILTER_ANY].include?(v)
-                               },
+        optional :assignee_id, types: [Integer, String], integer_none_any: true,
                                desc: 'Return issues which are assigned to the user with the given ID'
         optional :scope, type: String, values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all],
                          desc: 'Return issues for the given scope: `created_by_me`, `assigned_to_me` or `all`'
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 5f209228105..a617efaaa4c 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -89,10 +89,7 @@ module API
         optional :updated_before, type: DateTime, desc: 'Return merge requests updated before the specified time'
         optional :view, type: String, values: %w[simple], desc: 'If simple, returns the `iid`, URL, title, description, and basic state of merge request'
         optional :author_id, type: Integer, desc: 'Return merge requests which are authored by the user with the given ID'
-        optional :assignee_id, types: [Integer, String],
-                               values: -> (v) {
-                                 v.is_a?(Integer) || [IssuableFinder::FILTER_NONE, IssuableFinder::FILTER_ANY].include?(v)
-                               },
+        optional :assignee_id, types: [Integer, String], integer_none_any: true,
                                desc: 'Return merge requests which are assigned to the user with the given ID'
         optional :scope, type: String, values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all],
                          desc: 'Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`'
diff --git a/spec/lib/api/helpers/custom_validators_spec.rb b/spec/lib/api/helpers/custom_validators_spec.rb
new file mode 100644
index 00000000000..810d05c479c
--- /dev/null
+++ b/spec/lib/api/helpers/custom_validators_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe API::Helpers::CustomValidators do
+  let(:scope) do
+    Struct.new(:opts) do
+      def full_name(attr_name)
+        attr_name
+      end
+    end
+  end
+
+  describe API::Helpers::CustomValidators::Absence do
+    subject do
+      described_class.new(['test'], {}, false, scope.new)
+    end
+
+    context 'empty param' do
+      it 'does not raise a validation error' do
+        expect_no_validation_error({})
+      end
+    end
+
+    context 'invalid parameters' do
+      it 'should raise a validation error' do
+        expect_validation_error({ 'test' => 'some_value' })
+      end
+    end
+  end
+
+  describe API::Helpers::CustomValidators::IntegerNoneAny do
+    subject do
+      described_class.new(['test'], {}, false, scope.new)
+    end
+
+    context 'valid parameters' do
+      it 'does not raise a validation error' do
+        expect_no_validation_error({ 'test' => 2 })
+        expect_no_validation_error({ 'test' => 100 })
+        expect_no_validation_error({ 'test' => 'None' })
+        expect_no_validation_error({ 'test' => 'Any' })
+      end
+    end
+
+    context 'invalid parameters' do
+      it 'should raise a validation error' do
+        expect_validation_error({ 'test' => 'some_other_string' })
+      end
+    end
+  end
+
+  def expect_no_validation_error(params)
+    expect { validate_test_param!(params) }.not_to raise_error
+  end
+
+  def expect_validation_error(params)
+    expect { validate_test_param!(params) }.to raise_error(Grape::Exceptions::Validation)
+  end
+
+  def validate_test_param!(params)
+    subject.validate_param!('test', params)
+  end
+end
-- 
cgit v1.2.3


From e0f0c29b0cfe3c0c97191eeb96eae1299f3983d1 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Fri, 26 Oct 2018 10:47:14 +0800
Subject: Support lowercase none / any

---
 app/finders/issuable_finder.rb                 |  8 ++++----
 lib/api/helpers/custom_validators.rb           |  2 +-
 spec/finders/issues_finder_spec.rb             | 18 ++++++++++++++----
 spec/lib/api/helpers/custom_validators_spec.rb |  2 ++
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index ec4472de0c4..eb3d2498830 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -35,8 +35,8 @@ class IssuableFinder
   requires_cross_project_access unless: -> { project? }
 
   # This is used as a common filter for None / Any
-  FILTER_NONE = 'None'.freeze
-  FILTER_ANY = 'Any'.freeze
+  FILTER_NONE = 'none'.freeze
+  FILTER_ANY = 'any'.freeze
 
   # This is accepted as a deprecated filter and is also used in unassigning users
   NONE = '0'.freeze
@@ -250,11 +250,11 @@ class IssuableFinder
 
   def filter_by_no_assignee?
     # Assignee_id takes precedence over assignee_username
-    [NONE, FILTER_NONE].include?(params[:assignee_id].to_s) || params[:assignee_username].to_s == NONE
+    [NONE, FILTER_NONE].include?(params[:assignee_id].to_s.downcase) || params[:assignee_username].to_s == NONE
   end
 
   def filter_by_any_assignee?
-    params[:assignee_id].to_s == FILTER_ANY
+    params[:assignee_id].to_s.downcase == FILTER_ANY
   end
 
   # rubocop: disable CodeReuse/ActiveRecord
diff --git a/lib/api/helpers/custom_validators.rb b/lib/api/helpers/custom_validators.rb
index e4af75f1971..1058f4e8a5e 100644
--- a/lib/api/helpers/custom_validators.rb
+++ b/lib/api/helpers/custom_validators.rb
@@ -16,7 +16,7 @@ module API
           value = params[attr_name]
 
           return if value.is_a?(Integer) ||
-              [IssuableFinder::FILTER_NONE, IssuableFinder::FILTER_ANY].include?(value)
+              [IssuableFinder::FILTER_NONE, IssuableFinder::FILTER_ANY].include?(value.to_s.downcase)
 
           raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)],
                                                message: "should be an integer, 'None' or 'Any'"
diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 7f4f613b406..2f164ffa8b0 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -57,17 +57,21 @@ describe IssuesFinder do
       end
 
       context 'filtering by no assignee' do
-        let(:params) { { assignee_id: 0 } }
+        let(:params) { { assignee_id: 'None' } }
 
         it 'returns issues not assigned to any assignee' do
           expect(issues).to contain_exactly(issue4)
         end
-      end
 
-      context 'filtering by no assignee' do
-        let(:params) { { assignee_id: 'None' } }
+        it 'returns issues not assigned to any assignee' do
+          params[:assignee_id] = 0
+
+          expect(issues).to contain_exactly(issue4)
+        end
 
         it 'returns issues not assigned to any assignee' do
+          params[:assignee_id] = 'none'
+
           expect(issues).to contain_exactly(issue4)
         end
       end
@@ -78,6 +82,12 @@ describe IssuesFinder do
         it 'returns issues assigned to any assignee' do
           expect(issues).to contain_exactly(issue1, issue2, issue3)
         end
+
+        it 'returns issues assigned to any assignee' do
+          params[:assignee_id] = 'any'
+
+          expect(issues).to contain_exactly(issue1, issue2, issue3)
+        end
       end
 
       context 'filtering by group_id' do
diff --git a/spec/lib/api/helpers/custom_validators_spec.rb b/spec/lib/api/helpers/custom_validators_spec.rb
index 810d05c479c..41e6fb47b11 100644
--- a/spec/lib/api/helpers/custom_validators_spec.rb
+++ b/spec/lib/api/helpers/custom_validators_spec.rb
@@ -38,6 +38,8 @@ describe API::Helpers::CustomValidators do
         expect_no_validation_error({ 'test' => 100 })
         expect_no_validation_error({ 'test' => 'None' })
         expect_no_validation_error({ 'test' => 'Any' })
+        expect_no_validation_error({ 'test' => 'none' })
+        expect_no_validation_error({ 'test' => 'any' })
       end
     end
 
-- 
cgit v1.2.3


From 4fc53067f0d6e135b6e71654c79ae0db672eee4c Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Fri, 26 Oct 2018 14:09:41 +1100
Subject: Fix specs

---
 config/routes/project.rb                                    | 2 +-
 spec/features/dashboard/projects_spec.rb                    | 8 +++++---
 spec/features/projects/files/user_creates_directory_spec.rb | 5 ++---
 spec/features/projects/files/user_creates_files_spec.rb     | 4 ++--
 spec/features/projects/files/user_deletes_files_spec.rb     | 2 +-
 spec/features/projects/files/user_edits_files_spec.rb       | 6 +++---
 spec/features/projects/files/user_replaces_files_spec.rb    | 2 +-
 spec/features/projects/files/user_uploads_files_spec.rb     | 4 ++--
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/config/routes/project.rb b/config/routes/project.rb
index e8a55b58656..166750f14b3 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -163,7 +163,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           get :diff_for_path
           get :branch_from
           get :branch_to
-          get '(:merge_request_source_branch)', action: :new
+          get '', action: :new
         end
       end
 
diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb
index 975b7944741..0a24c5e906a 100644
--- a/spec/features/dashboard/projects_spec.rb
+++ b/spec/features/dashboard/projects_spec.rb
@@ -147,10 +147,12 @@ describe 'Dashboard Projects' do
   end
 
   context 'last push widget', :use_clean_rails_memory_store_caching do
+    let(:ref) { "feature" }
+
     before do
       event = create(:push_event, project: project, author: user)
 
-      create(:push_event_payload, event: event, ref: 'feature', action: :created)
+      create(:push_event_payload, event: event, ref: ref, action: :created)
 
       Users::LastPushEventService.new(user).cache_last_push_event(event)
 
@@ -165,9 +167,9 @@ describe 'Dashboard Projects' do
       end
 
       expect(page).to have_selector('.merge-request-form')
-      expect(current_path).to eq project_new_merge_request_path(project)
+      expect(current_path).to eq project_new_merge_request_path(project, merge_request_source_branch: ref)
       expect(find('#merge_request_target_project_id', visible: false).value).to eq project.id.to_s
-      expect(find('input#merge_request_source_branch', visible: false).value).to eq 'feature'
+      expect(find('input#merge_request_source_branch', visible: false).value).to eq ref
       expect(find('input#merge_request_target_branch', visible: false).value).to eq 'master'
     end
   end
diff --git a/spec/features/projects/files/user_creates_directory_spec.rb b/spec/features/projects/files/user_creates_directory_spec.rb
index 847b5f0860f..6f620dff82b 100644
--- a/spec/features/projects/files/user_creates_directory_spec.rb
+++ b/spec/features/projects/files/user_creates_directory_spec.rb
@@ -57,7 +57,7 @@ describe 'Projects > Files > User creates a directory', :js do
       expect(page).to have_content('From new-feature into master')
       expect(page).to have_content('Add new directory')
 
-      expect(current_path).to eq(project_new_merge_request_path(project))
+      expect(current_path).to eq(project_new_merge_request_path(project, merge_request_source_branch: "new-feature"))
     end
   end
 
@@ -80,8 +80,7 @@ describe 'Projects > Files > User creates a directory', :js do
       click_button('Create directory')
 
       fork = user.fork_of(project2.reload)
-
-      expect(current_path).to eq(project_new_merge_request_path(fork))
+      expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
     end
   end
 end
diff --git a/spec/features/projects/files/user_creates_files_spec.rb b/spec/features/projects/files/user_creates_files_spec.rb
index d4dda43c823..d9df4b50621 100644
--- a/spec/features/projects/files/user_creates_files_spec.rb
+++ b/spec/features/projects/files/user_creates_files_spec.rb
@@ -144,7 +144,7 @@ describe 'Projects > Files > User creates files' do
         fill_in(:branch_name, with: 'new_branch_name', visible: true)
         click_button('Commit changes')
 
-        expect(current_path).to eq(project_new_merge_request_path(project))
+        expect(current_path).to eq(project_new_merge_request_path(project, merge_request_source_branch: "new_branch_name"))
 
         click_link('Changes')
 
@@ -182,7 +182,7 @@ describe 'Projects > Files > User creates files' do
 
         fork = user.fork_of(project2.reload)
 
-        expect(current_path).to eq(project_new_merge_request_path(fork))
+        expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
         expect(page).to have_content('New commit message')
       end
     end
diff --git a/spec/features/projects/files/user_deletes_files_spec.rb b/spec/features/projects/files/user_deletes_files_spec.rb
index 614b11fa5c8..faf11ee9dd8 100644
--- a/spec/features/projects/files/user_deletes_files_spec.rb
+++ b/spec/features/projects/files/user_deletes_files_spec.rb
@@ -63,7 +63,7 @@ describe 'Projects > Files > User deletes files', :js do
 
       fork = user.fork_of(project2.reload)
 
-      expect(current_path).to eq(project_new_merge_request_path(fork))
+      expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
       expect(page).to have_content('New commit message')
     end
   end
diff --git a/spec/features/projects/files/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb
index 9eb65ec159c..c6b2aaea906 100644
--- a/spec/features/projects/files/user_edits_files_spec.rb
+++ b/spec/features/projects/files/user_edits_files_spec.rb
@@ -86,7 +86,7 @@ describe 'Projects > Files > User edits files', :js do
       fill_in(:branch_name, with: 'new_branch_name', visible: true)
       click_button('Commit changes')
 
-      expect(current_path).to eq(project_new_merge_request_path(project))
+      expect(current_path).to eq(project_new_merge_request_path(project, merge_request_source_branch: "new_branch_name"))
 
       click_link('Changes')
 
@@ -155,7 +155,7 @@ describe 'Projects > Files > User edits files', :js do
 
       fork = user.fork_of(project2.reload)
 
-      expect(current_path).to eq(project_new_merge_request_path(fork))
+      expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
 
       wait_for_requests
 
@@ -183,7 +183,7 @@ describe 'Projects > Files > User edits files', :js do
 
         fork = user.fork_of(project2)
 
-        expect(current_path).to eq(project_new_merge_request_path(fork))
+        expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
 
         wait_for_requests
 
diff --git a/spec/features/projects/files/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb
index e3da28d73c3..09feb315465 100644
--- a/spec/features/projects/files/user_replaces_files_spec.rb
+++ b/spec/features/projects/files/user_replaces_files_spec.rb
@@ -78,7 +78,7 @@ describe 'Projects > Files > User replaces files', :js do
 
       fork = user.fork_of(project2.reload)
 
-      expect(current_path).to eq(project_new_merge_request_path(fork))
+      expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "undefined"))
 
       click_link('Changes')
 
diff --git a/spec/features/projects/files/user_uploads_files_spec.rb b/spec/features/projects/files/user_uploads_files_spec.rb
index af3fc528a20..92df8303f46 100644
--- a/spec/features/projects/files/user_uploads_files_spec.rb
+++ b/spec/features/projects/files/user_uploads_files_spec.rb
@@ -36,7 +36,7 @@ describe 'Projects > Files > User uploads files' do
       click_button('Upload file')
 
       expect(page).to have_content('New commit message')
-      expect(current_path).to eq(project_new_merge_request_path(project))
+      expect(current_path).to eq(project_new_merge_request_path(project, merge_request_source_branch: "new_branch_name"))
 
       click_link('Changes')
       find("a[data-action='diffs']", text: 'Changes').click
@@ -92,7 +92,7 @@ describe 'Projects > Files > User uploads files' do
 
       fork = user.fork_of(project2.reload)
 
-      expect(current_path).to eq(project_new_merge_request_path(fork))
+      expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "undefined"))
 
       find("a[data-action='diffs']", text: 'Changes').click
 
-- 
cgit v1.2.3


From fdb46c55ee52542c6147f24363087185891e0703 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Fri, 26 Oct 2018 10:24:30 +0800
Subject: Extract complex condition to computed prop

---
 app/assets/javascripts/boards/components/board.js   | 3 +++
 app/views/shared/boards/components/_board.html.haml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/boards/components/board.js b/app/assets/javascripts/boards/components/board.js
index 75477ebb3b3..623cda5679a 100644
--- a/app/assets/javascripts/boards/components/board.js
+++ b/app/assets/javascripts/boards/components/board.js
@@ -53,6 +53,9 @@ export default Vue.extend({
       const { issuesSize } = this.list;
       return `${n__('%d issue', '%d issues', issuesSize)}`;
     },
+    isNewIssueShown() {
+      return this.list.type === 'backlog' || (!this.disabled && this.list.type !== 'closed');
+    }
   },
   watch: {
     filter: {
diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml
index b79a1b17154..c6c5cadc3f5 100644
--- a/app/views/shared/boards/components/_board.html.haml
+++ b/app/views/shared/boards/components/_board.html.haml
@@ -41,7 +41,7 @@
 
         %button.issue-count-badge-add-button.btn.btn-sm.btn-default.ml-1.has-tooltip.js-no-trigger-collapse{ type: "button",
           "@click" => "showNewIssueForm",
-          "v-if" => 'list.type == "backlog" || (!disabled && list.type !== "closed")',
+          "v-if" => "isNewIssueShown",
           "aria-label" => _("New issue"),
           "title" => _("New issue"),
           data: { placement: "top", container: "body" } }
-- 
cgit v1.2.3


From 1581f75fb511fed171e8105c1a0811561a2f2dcc Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Mon, 15 Oct 2018 21:59:00 +0800
Subject: Put EE routes in EE files under EE directories

---
 .rubocop.yml                        |  1 +
 config/initializers/routing_draw.rb |  8 ++------
 config/routes/admin.rb              |  2 ++
 config/routes/group.rb              |  3 ++-
 doc/development/ee_features.md      | 21 +++++++++++++++------
 lib/gitlab/patch/draw_route.rb      | 21 +++++++++++++++++++++
 6 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 lib/gitlab/patch/draw_route.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 0f4018326a1..5d2c5c7cf49 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -76,6 +76,7 @@ Naming/FileName:
     - 'qa/qa/specs/**/*'
     - 'qa/bin/*'
     - 'config/**/*'
+    - 'ee/config/**/*'
     - 'lib/generators/**/*'
     - 'locale/unfound_translations.rb'
     - 'ee/locale/unfound_translations.rb'
diff --git a/config/initializers/routing_draw.rb b/config/initializers/routing_draw.rb
index 25003cf0239..f0f74954eef 100644
--- a/config/initializers/routing_draw.rb
+++ b/config/initializers/routing_draw.rb
@@ -1,7 +1,3 @@
 # Adds draw method into Rails routing
-# It allows us to keep routing splitted into files
-class ActionDispatch::Routing::Mapper
-  def draw(routes_name)
-    instance_eval(File.read(Rails.root.join("config/routes/#{routes_name}.rb")))
-  end
-end
+# It allows us to keep routing split into files
+ActionDispatch::Routing::Mapper.prepend Gitlab::Patch::DrawRoute
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index fb29c4748c1..af333bdc748 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -71,6 +71,7 @@ namespace :admin do
   resource :logs, only: [:show]
   resource :health_check, controller: 'health_check', only: [:show]
   resource :background_jobs, controller: 'background_jobs', only: [:show]
+
   resource :system_info, controller: 'system_info', only: [:show]
   resources :requests_profiles, only: [:index, :show], param: :name, constraints: { name: /.+\.html/ }
 
@@ -104,6 +105,7 @@ namespace :admin do
 
   resource :application_settings, only: [:show, :update] do
     resources :services, only: [:index, :edit, :update]
+
     get :usage_data
     put :reset_registration_token
     put :reset_health_check_token
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 602bbe837cf..2328b50b760 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 resources :groups, only: [:index, :new, :create] do
   post :preview_markdown
 end
@@ -63,7 +65,6 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
       end
     end
 
-    # On CE only index and show actions are needed
     resources :boards, only: [:index, :show]
 
     resources :runners, only: [:index, :edit, :update, :destroy, :show] do
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index f9e6efa2c30..2415373f2d1 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -171,7 +171,7 @@ There are a few gotchas with it:
       class Base
         def execute
           return unless enabled?
-  
+
           # ...
           # ...
         end
@@ -185,12 +185,12 @@ There are a few gotchas with it:
       class Base
         def execute
           return unless enabled?
-  
+
           do_something
         end
-  
+
         private
-  
+
         def do_something
           # ...
           # ...
@@ -204,14 +204,14 @@ There are a few gotchas with it:
     ```ruby
       module EE::Base
         extend ::Gitlab::Utils::Override
-  
+
         override :do_something
         def do_something
           # Follow the above pattern to call super and extend it
         end
       end
     ```
-  
+
     This would require updating CE first, or make sure this is back ported to CE.
 
 When prepending, place them in the `ee/` specific sub-directory, and
@@ -332,6 +332,15 @@ full implementation details.
 [ce-mr-full-private]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12373
 [ee-mr-full-private]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2199
 
+### Code in `config/routes`
+
+When we add `draw :admin` in `config/routes.rb`, the application will also
+load the file located in `config/routes/admin.rb`, and also
+`ee/config/routes/admin.rb` if the file exists.
+
+So if we want to extend a particular route file, just add the same file
+located in `ee/config/routes`.
+
 ### Code in `app/controllers/`
 
 In controllers, the most common type of conflict is with `before_action` that
diff --git a/lib/gitlab/patch/draw_route.rb b/lib/gitlab/patch/draw_route.rb
new file mode 100644
index 00000000000..4396e811a8c
--- /dev/null
+++ b/lib/gitlab/patch/draw_route.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# We're patching `ActionDispatch::Routing::Mapper` in
+# config/initializers/routing_draw.rb
+module Gitlab
+  module Patch
+    module DrawRoute
+      def draw(routes_name)
+        instance_eval(File.read(Rails.root.join("config/routes/#{routes_name}.rb")))
+
+        draw_ee(routes_name)
+      end
+
+      def draw_ee(routes_name)
+        path = Rails.root.join("ee/config/routes/#{routes_name}.rb")
+
+        instance_eval(File.read(path)) if File.exist?(path)
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From f1701c0fec096184a5908df65187573209dd6254 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Wed, 17 Oct 2018 21:29:39 +0800
Subject: Make it possible to add EE only route

And if it cannot find any routes, raise an error
---
 doc/development/ee_features.md | 15 ++++++++++-----
 lib/gitlab/patch/draw_route.rb | 20 ++++++++++++++++----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index 2415373f2d1..bad9909ed43 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -334,12 +334,17 @@ full implementation details.
 
 ### Code in `config/routes`
 
-When we add `draw :admin` in `config/routes.rb`, the application will also
-load the file located in `config/routes/admin.rb`, and also
-`ee/config/routes/admin.rb` if the file exists.
+When we add `draw :admin` in `config/routes.rb`, the application will try to
+load the file located in `config/routes/admin.rb`, and also try to load the
+file located in `ee/config/routes/admin.rb`.
 
-So if we want to extend a particular route file, just add the same file
-located in `ee/config/routes`.
+It should at least load one file, at most two files. If it cannot find any
+files, an error will be raised.
+
+This means if we want to extend a particular CE route file, just add the same
+file located in `ee/config/routes`. If we want to add an EE only route, we
+could still use `draw :ee_only` and add `ee/config/routes/ee_only.rb` without
+adding `config/routes/ee_only.rb`.
 
 ### Code in `app/controllers/`
 
diff --git a/lib/gitlab/patch/draw_route.rb b/lib/gitlab/patch/draw_route.rb
index 4396e811a8c..f8ae6f7afc0 100644
--- a/lib/gitlab/patch/draw_route.rb
+++ b/lib/gitlab/patch/draw_route.rb
@@ -5,16 +5,28 @@
 module Gitlab
   module Patch
     module DrawRoute
+      RoutesNotFound = Class.new(StandardError)
+
       def draw(routes_name)
-        instance_eval(File.read(Rails.root.join("config/routes/#{routes_name}.rb")))
+        draw_ce(routes_name) | draw_ee(routes_name) ||
+          raise(RoutesNotFound.new("Cannot find #{routes_name}"))
+      end
 
-        draw_ee(routes_name)
+      def draw_ce(routes_name)
+        draw_route(Rails.root.join("config/routes/#{routes_name}.rb"))
       end
 
       def draw_ee(routes_name)
-        path = Rails.root.join("ee/config/routes/#{routes_name}.rb")
+        draw_route(Rails.root.join("ee/config/routes/#{routes_name}.rb"))
+      end
 
-        instance_eval(File.read(path)) if File.exist?(path)
+      def draw_route(path)
+        if File.exist?(path)
+          instance_eval(File.read(path))
+          true
+        else
+          false
+        end
       end
     end
   end
-- 
cgit v1.2.3


From 52fa309e86d1bafc6b8a986d8bd74fd906b1ebc9 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 18 Oct 2018 00:55:42 +0800
Subject: Extract EE only oauth routes and add tests

---
 config/routes.rb                         |  2 ++
 lib/gitlab/patch/draw_route.rb           |  8 ++++++--
 spec/lib/gitlab/patch/draw_route_spec.rb | 30 ++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 spec/lib/gitlab/patch/draw_route_spec.rb

diff --git a/config/routes.rb b/config/routes.rb
index c081ca9672a..8723a928cc3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -34,6 +34,8 @@ Rails.application.routes.draw do
     match '*all', via: [:get, :post], to: proc { [404, {}, ['']] }
   end
 
+  draw :oauth
+
   use_doorkeeper_openid_connect
 
   # Autocomplete
diff --git a/lib/gitlab/patch/draw_route.rb b/lib/gitlab/patch/draw_route.rb
index f8ae6f7afc0..c7a0b49a948 100644
--- a/lib/gitlab/patch/draw_route.rb
+++ b/lib/gitlab/patch/draw_route.rb
@@ -13,11 +13,15 @@ module Gitlab
       end
 
       def draw_ce(routes_name)
-        draw_route(Rails.root.join("config/routes/#{routes_name}.rb"))
+        draw_route(route_path("config/routes/#{routes_name}.rb"))
       end
 
       def draw_ee(routes_name)
-        draw_route(Rails.root.join("ee/config/routes/#{routes_name}.rb"))
+        draw_route(route_path("ee/config/routes/#{routes_name}.rb"))
+      end
+
+      def route_path(routes_name)
+        Rails.root.join(routes_name)
       end
 
       def draw_route(path)
diff --git a/spec/lib/gitlab/patch/draw_route_spec.rb b/spec/lib/gitlab/patch/draw_route_spec.rb
new file mode 100644
index 00000000000..4009b903dc3
--- /dev/null
+++ b/spec/lib/gitlab/patch/draw_route_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'fast_spec_helper'
+
+describe Gitlab::Patch::DrawRoute do
+  subject do
+    Class.new do
+      include Gitlab::Patch::DrawRoute
+
+      def route_path(route_name)
+        File.expand_path("../../../../#{route_name}", __dir__)
+      end
+    end.new
+  end
+
+  before do
+    allow(subject).to receive(:instance_eval)
+  end
+
+  it 'evaluates CE only route' do
+    subject.draw(:help)
+
+    expect(subject).to have_received(:instance_eval)
+      .with(File.read(subject.route_path('config/routes/help.rb')))
+      .once
+
+    expect(subject).to have_received(:instance_eval)
+      .once
+  end
+end
-- 
cgit v1.2.3


From d045df3da882fa8bcd0424df096cec0c61b1eaff Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 23 Oct 2018 20:48:02 +0800
Subject: Allow CE do nothing if route doesn't exist

---
 doc/development/ee_features.md | 9 +++++----
 lib/gitlab/patch/draw_route.rb | 4 ++--
 spec/fast_spec_helper.rb       | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md
index bad9909ed43..b6f053ff0e9 100644
--- a/doc/development/ee_features.md
+++ b/doc/development/ee_features.md
@@ -338,13 +338,14 @@ When we add `draw :admin` in `config/routes.rb`, the application will try to
 load the file located in `config/routes/admin.rb`, and also try to load the
 file located in `ee/config/routes/admin.rb`.
 
-It should at least load one file, at most two files. If it cannot find any
-files, an error will be raised.
+In EE, it should at least load one file, at most two files. If it cannot find
+any files, an error will be raised. In CE, since we don't know if there will
+be an EE route, it will not raise any errors even if it cannot find anything.
 
 This means if we want to extend a particular CE route file, just add the same
 file located in `ee/config/routes`. If we want to add an EE only route, we
-could still use `draw :ee_only` and add `ee/config/routes/ee_only.rb` without
-adding `config/routes/ee_only.rb`.
+could still put `draw :ee_only` in both CE and EE, and add
+`ee/config/routes/ee_only.rb` in EE, similar to `render_if_exists`.
 
 ### Code in `app/controllers/`
 
diff --git a/lib/gitlab/patch/draw_route.rb b/lib/gitlab/patch/draw_route.rb
index c7a0b49a948..1192274cafa 100644
--- a/lib/gitlab/patch/draw_route.rb
+++ b/lib/gitlab/patch/draw_route.rb
@@ -16,8 +16,8 @@ module Gitlab
         draw_route(route_path("config/routes/#{routes_name}.rb"))
       end
 
-      def draw_ee(routes_name)
-        draw_route(route_path("ee/config/routes/#{routes_name}.rb"))
+      def draw_ee(_)
+        true
       end
 
       def route_path(routes_name)
diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index 134eb25e4b1..fe475e1f7a0 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -8,3 +8,4 @@ require_relative 'support/rspec'
 require 'active_support/all'
 
 ActiveSupport::Dependencies.autoload_paths << 'lib'
+ActiveSupport::Dependencies.autoload_paths << 'ee/lib'
-- 
cgit v1.2.3


From 06d5ff58580d2ea8305c789f6eb2a4be52e4e1a8 Mon Sep 17 00:00:00 2001
From: Lukas Schneider <schneiderlukas99@gmx.at>
Date: Fri, 26 Oct 2018 06:58:31 +0000
Subject: Update README.md

---
 doc/ci/yaml/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 4b2a6ccc7e4..981aa101dd3 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -474,6 +474,7 @@ docker build:
     changes:
       - Dockerfile
       - docker/scripts/*
+      - dockerfiles/**/*
 ```
 
 In the scenario above, if you are pushing multiple commits to GitLab to an
@@ -482,6 +483,7 @@ one of the commits contains changes to either:
 
 - The `Dockerfile` file.
 - Any of the files inside `docker/scripts/` directory.
+- Any of the files and subfolders inside `dockerfiles` directory.
 
 CAUTION: **Warning:**
 There are some caveats when using this feature with new branches and tags. See
-- 
cgit v1.2.3


From 6a5e4f6373b46ac382b961f5b4e70d490902b870 Mon Sep 17 00:00:00 2001
From: "piumn.l" <piumnl@foxmail.com>
Date: Fri, 26 Oct 2018 07:42:54 +0000
Subject: `Create a new tag` json Missing a comma

---
 doc/api/tags.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/tags.md b/doc/api/tags.md
index f2a3f9f28d2..826900ca518 100644
--- a/doc/api/tags.md
+++ b/doc/api/tags.md
@@ -134,7 +134,7 @@ Parameters:
     "description": "Amazing release. Wow"
   },
   "name": "v1.0.0",
-  "target: "2695effb5807a22ff3d138d593fd856244e155e7",
+  "target": "2695effb5807a22ff3d138d593fd856244e155e7",
   "message": null
 }
 ```
-- 
cgit v1.2.3


From 2953fb12f8021ad76bcd50e17c018b22cba5314f Mon Sep 17 00:00:00 2001
From: Jacques Erasmus <jerasmus@gitlab.com>
Date: Fri, 26 Oct 2018 07:46:48 +0000
Subject: Fix inaccessible dropdown for code-less projects

---
 app/views/shared/notifications/_button.html.haml                     | 4 ++--
 .../51306-fix-inaccessible-dropdown-for-codeless-projects.yml        | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/51306-fix-inaccessible-dropdown-for-codeless-projects.yml

diff --git a/app/views/shared/notifications/_button.html.haml b/app/views/shared/notifications/_button.html.haml
index 09ddf732ada..f6c7ca70ebd 100644
--- a/app/views/shared/notifications/_button.html.haml
+++ b/app/views/shared/notifications/_button.html.haml
@@ -9,11 +9,11 @@
             %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } }
               = icon("bell", class: "js-notification-loading")
               = notification_title(notification_setting.level)
-            %button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } }
+            %button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
               = icon('caret-down')
               .sr-only Toggle dropdown
           - else
-            %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), display: 'static' } }
+            %button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
               = icon("bell", class: "js-notification-loading")
               = notification_title(notification_setting.level)
               = icon("caret-down")
diff --git a/changelogs/unreleased/51306-fix-inaccessible-dropdown-for-codeless-projects.yml b/changelogs/unreleased/51306-fix-inaccessible-dropdown-for-codeless-projects.yml
new file mode 100644
index 00000000000..13e3bb66430
--- /dev/null
+++ b/changelogs/unreleased/51306-fix-inaccessible-dropdown-for-codeless-projects.yml
@@ -0,0 +1,5 @@
+---
+title: Fix inaccessible dropdown for code-less projects
+merge_request: 22137
+author:
+type: other
-- 
cgit v1.2.3


From 1cc093011f43ca228f441f4228010ba2e0e2eeaf Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 26 Oct 2018 07:49:01 +0000
Subject: Fix stage dropdown rendering only in English

---
 app/assets/javascripts/jobs/components/sidebar.vue         | 11 ++++++-----
 app/assets/javascripts/jobs/components/stages_dropdown.vue |  1 -
 app/assets/javascripts/jobs/store/mutations.js             |  2 +-
 app/assets/javascripts/jobs/store/state.js                 |  4 +---
 changelogs/unreleased/53133-jobs-list.yml                  |  5 +++++
 spec/javascripts/jobs/components/sidebar_spec.js           |  5 +++--
 spec/javascripts/jobs/store/mutations_spec.js              |  4 ++--
 7 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 changelogs/unreleased/53133-jobs-list.yml

diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue
index 906769ee6a2..28a02230d89 100644
--- a/app/assets/javascripts/jobs/components/sidebar.vue
+++ b/app/assets/javascripts/jobs/components/sidebar.vue
@@ -31,7 +31,7 @@ export default {
     },
   },
   computed: {
-    ...mapState(['job', 'stages', 'jobs', 'selectedStage']),
+    ...mapState(['job', 'stages', 'jobs', 'selectedStage', 'isLoadingStages']),
     coverage() {
       return `${this.job.coverage}%`;
     },
@@ -59,10 +59,10 @@ export default {
         return '';
       }
 
-    let t = this.job.metadata.timeout_human_readable;
-    if (this.job.metadata.timeout_source !== '') {
-      t += ` (from ${this.job.metadata.timeout_source})`;
-    }
+      let t = this.job.metadata.timeout_human_readable;
+      if (this.job.metadata.timeout_source !== '') {
+        t += ` (from ${this.job.metadata.timeout_source})`;
+      }
 
       return t;
     },
@@ -270,6 +270,7 @@ export default {
         />
 
         <stages-dropdown
+          v-if="!isLoadingStages"
           :stages="stages"
           :pipeline="job.pipeline"
           :selected-stage="selectedStage"
diff --git a/app/assets/javascripts/jobs/components/stages_dropdown.vue b/app/assets/javascripts/jobs/components/stages_dropdown.vue
index e5e1d56e287..dc26b246d71 100644
--- a/app/assets/javascripts/jobs/components/stages_dropdown.vue
+++ b/app/assets/javascripts/jobs/components/stages_dropdown.vue
@@ -22,7 +22,6 @@ export default {
       required: true,
     },
   },
-
   computed: {
     hasRef() {
       return !_.isEmpty(this.pipeline.ref);
diff --git a/app/assets/javascripts/jobs/store/mutations.js b/app/assets/javascripts/jobs/store/mutations.js
index 4195d787f12..cd440d21c1f 100644
--- a/app/assets/javascripts/jobs/store/mutations.js
+++ b/app/assets/javascripts/jobs/store/mutations.js
@@ -71,7 +71,7 @@ export default {
      * after the first request,
      * and we do not want to hijack that
      */
-    if (state.selectedStage === 'More' && job.stage) {
+    if (state.selectedStage === '' && job.stage) {
       state.selectedStage = job.stage;
     }
   },
diff --git a/app/assets/javascripts/jobs/store/state.js b/app/assets/javascripts/jobs/store/state.js
index 0eb269ca38f..04825187c99 100644
--- a/app/assets/javascripts/jobs/store/state.js
+++ b/app/assets/javascripts/jobs/store/state.js
@@ -1,5 +1,3 @@
-import { __ } from '~/locale';
-
 export default () => ({
   jobEndpoint: null,
   traceEndpoint: null,
@@ -29,7 +27,7 @@ export default () => ({
   // sidebar dropdown & list of jobs
   isLoadingStages: false,
   isLoadingJobs: false,
-  selectedStage: __('More'),
+  selectedStage: '',
   stages: [],
   jobs: [],
 });
diff --git a/changelogs/unreleased/53133-jobs-list.yml b/changelogs/unreleased/53133-jobs-list.yml
new file mode 100644
index 00000000000..2e13edc0e76
--- /dev/null
+++ b/changelogs/unreleased/53133-jobs-list.yml
@@ -0,0 +1,5 @@
+---
+title: Fix stage dropdown not rendering in different languages
+merge_request: 22604
+author:
+type: other
diff --git a/spec/javascripts/jobs/components/sidebar_spec.js b/spec/javascripts/jobs/components/sidebar_spec.js
index 460a2e1b5da..424092d2d88 100644
--- a/spec/javascripts/jobs/components/sidebar_spec.js
+++ b/spec/javascripts/jobs/components/sidebar_spec.js
@@ -140,10 +140,11 @@ describe('Sidebar details block', () => {
     });
 
     describe('while fetching stages', () => {
-      it('renders dropdown with More label', () => {
+      it('it does not render dropdown', () => {
+        store.dispatch('requestStages');
         vm = mountComponentWithStore(SidebarComponent, { store });
 
-        expect(vm.$el.querySelector('.js-selected-stage').textContent.trim()).toEqual('More');
+        expect(vm.$el.querySelector('.js-selected-stage')).toBeNull();
       });
     });
 
diff --git a/spec/javascripts/jobs/store/mutations_spec.js b/spec/javascripts/jobs/store/mutations_spec.js
index 4230a7c42cf..d7908efcf13 100644
--- a/spec/javascripts/jobs/store/mutations_spec.js
+++ b/spec/javascripts/jobs/store/mutations_spec.js
@@ -124,8 +124,8 @@ describe('Jobs Store Mutations', () => {
       expect(stateCopy.job).toEqual({ id: 1312321 });
     });
 
-    it('sets selectedStage when the selectedStage is More', () => {
-      expect(stateCopy.selectedStage).toEqual('More');
+    it('sets selectedStage when the selectedStage is empty', () => {
+      expect(stateCopy.selectedStage).toEqual('');
       mutations[types.RECEIVE_JOB_SUCCESS](stateCopy, { id: 1312321, stage: 'deploy' });
 
       expect(stateCopy.selectedStage).toEqual('deploy');
-- 
cgit v1.2.3


From 0c9ad4826a79fa6d1cbbf8c4b1e12af9e4443515 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 26 Oct 2018 08:01:28 +0000
Subject: Support backward compatibility when introduce new failure reason

---
 app/models/commit_status.rb                                      | 2 +-
 .../unreleased/avoid-lock-when-introduce-new-failure-reason.yml  | 5 +++++
 lib/api/runner.rb                                                | 3 +--
 spec/requests/api/runner_spec.rb                                 | 9 +++++++++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/avoid-lock-when-introduce-new-failure-reason.yml

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 06507345fe8..344f091c872 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -109,7 +109,7 @@ class CommitStatus < ActiveRecord::Base
 
     before_transition any => :failed do |commit_status, transition|
       failure_reason = transition.args.first
-      commit_status.failure_reason = failure_reason
+      commit_status.failure_reason = CommitStatus.failure_reasons[failure_reason]
     end
 
     after_transition do |commit_status, transition|
diff --git a/changelogs/unreleased/avoid-lock-when-introduce-new-failure-reason.yml b/changelogs/unreleased/avoid-lock-when-introduce-new-failure-reason.yml
new file mode 100644
index 00000000000..30b9ae032d4
--- /dev/null
+++ b/changelogs/unreleased/avoid-lock-when-introduce-new-failure-reason.yml
@@ -0,0 +1,5 @@
+---
+title: Support backward compatibility when introduce new failure reason
+merge_request: 22566
+author:
+type: changed
diff --git a/lib/api/runner.rb b/lib/api/runner.rb
index d8768a54986..2f15f3a7d76 100644
--- a/lib/api/runner.rb
+++ b/lib/api/runner.rb
@@ -142,8 +142,7 @@ module API
         requires :id, type: Integer, desc: %q(Job's ID)
         optional :trace, type: String, desc: %q(Job's full trace)
         optional :state, type: String, desc: %q(Job's status: success, failed)
-        optional :failure_reason, type: String, values: CommitStatus.failure_reasons.keys,
-                                  desc: %q(Job's failure_reason)
+        optional :failure_reason, type: String, desc: %q(Job's failure_reason)
       end
       put '/:id' do
         job = authenticate_job!
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 43ceb332cfb..c0d5a3ad74b 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -797,6 +797,15 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
 
           it { expect(job).to be_runner_system_failure }
         end
+
+        context 'when failure_reason is unrecognized value' do
+          before do
+            update_job(state: 'failed', failure_reason: 'what_is_this')
+            job.reload
+          end
+
+          it { expect(job).to be_unknown_failure }
+        end
       end
 
       context 'when trace is given' do
-- 
cgit v1.2.3


From 41fe3fdfc39092e63a3fe1ae9b323e5204c2bdce Mon Sep 17 00:00:00 2001
From: Tiago Botelho <tiagonbotelho@hotmail.com>
Date: Fri, 26 Oct 2018 09:50:44 +0100
Subject: Reverts commits_check message

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

diff --git a/lib/gitlab/checks/change_access.rb b/lib/gitlab/checks/change_access.rb
index 28ec6beb7e0..074afe9c412 100644
--- a/lib/gitlab/checks/change_access.rb
+++ b/lib/gitlab/checks/change_access.rb
@@ -28,7 +28,7 @@ module Gitlab
         protected_tag_checks: "Checking if you are creating, updating or deleting a protected tag...",
         lfs_objects_exist_check: "Scanning repository for blobs stored in LFS and verifying their files have been uploaded to GitLab...",
         commits_check_file_paths_validation: "Validating commits' file paths...",
-        commits_check: "Validating commits..." # different message in EE
+        commits_check: "Validating commit contents..."
       }.freeze
 
       attr_reader :user_access, :project, :skip_authorization, :skip_lfs_integrity_check, :protocol, :oldrev, :newrev, :ref, :branch_name, :tag_name, :logger
-- 
cgit v1.2.3


From c6c17f1ca636f879c245133cffeae531a7d3df55 Mon Sep 17 00:00:00 2001
From: Tiago Botelho <tiagonbotelho@hotmail.com>
Date: Fri, 26 Oct 2018 10:18:34 +0100
Subject: Bumps GitLab Shell version

---
 GITLAB_SHELL_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index 9da0a092a0d..6da4de57dc6 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1 @@
-8.4.0
\ No newline at end of file
+8.4.1
-- 
cgit v1.2.3


From 84e441d808744fe084a81939e187e98ead23d7a8 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Fri, 26 Oct 2018 18:42:57 +0800
Subject: Make it clear that we intent to use | over ||

---
 lib/gitlab/patch/draw_route.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/patch/draw_route.rb b/lib/gitlab/patch/draw_route.rb
index 1192274cafa..b00244a6e04 100644
--- a/lib/gitlab/patch/draw_route.rb
+++ b/lib/gitlab/patch/draw_route.rb
@@ -8,8 +8,9 @@ module Gitlab
       RoutesNotFound = Class.new(StandardError)
 
       def draw(routes_name)
-        draw_ce(routes_name) | draw_ee(routes_name) ||
-          raise(RoutesNotFound.new("Cannot find #{routes_name}"))
+        drawn_any = draw_ce(routes_name) | draw_ee(routes_name)
+
+        drawn_any || raise(RoutesNotFound.new("Cannot find #{routes_name}"))
       end
 
       def draw_ce(routes_name)
-- 
cgit v1.2.3


From 3b70cf69188b9906098df5bd984e9337f16e1080 Mon Sep 17 00:00:00 2001
From: Eagllus <rvanzon@gitlab.com>
Date: Fri, 26 Oct 2018 13:43:28 +0200
Subject: Update MR based on Sean's feedback

---
 app/controllers/dashboard/milestones_controller.rb |  2 +-
 changelogs/unreleased/rz_fix_milestone_count.yml   |  2 +-
 spec/models/milestone_spec.rb                      | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb
index 8252a0f2511..3802aa5f40f 100644
--- a/app/controllers/dashboard/milestones_controller.rb
+++ b/app/controllers/dashboard/milestones_controller.rb
@@ -10,7 +10,7 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
   def index
     respond_to do |format|
       format.html do
-        @milestone_states = Milestone.states_count(@projects, @groups)
+        @milestone_states = Milestone.states_count(@projects.select(:id), @groups.select(:id))
         @milestones = Kaminari.paginate_array(milestones).page(params[:page])
       end
       format.json do
diff --git a/changelogs/unreleased/rz_fix_milestone_count.yml b/changelogs/unreleased/rz_fix_milestone_count.yml
index f85cfe48b2d..1013b88e0bc 100644
--- a/changelogs/unreleased/rz_fix_milestone_count.yml
+++ b/changelogs/unreleased/rz_fix_milestone_count.yml
@@ -1,5 +1,5 @@
 ---
 title: Fixing count on Milestones
 merge_request: 21446
-author: eagllus
+author:
 type: fixed
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 651f0540824..d11eb46159e 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -351,12 +351,12 @@ describe Milestone do
 
   describe '.states_count' do
     context 'when the projects have milestones' do
-      let(:project_1) { create(:project) }
-      let(:project_2) { create(:project) }
-      let(:group_1) { create(:group) }
-      let(:group_2) { create(:group) }
-
       before do
+        project_1 = create(:project)
+        project_2 = create(:project)
+        group_1 = create(:group)
+        group_2 = create(:group)
+
         create(:active_milestone, title: 'Active Group Milestone', project: project_1)
         create(:closed_milestone, title: 'Closed Group Milestone', project: project_1)
         create(:active_milestone, title: 'Active Group Milestone', project: project_2)
-- 
cgit v1.2.3


From 2f5c551f8b0e5f28f0c0e2266af63960e4253933 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Thu, 25 Oct 2018 17:55:17 +0800
Subject: Add None/Any options for assignee in search bar

---
 .../issuable_filtered_search_token_keys.js              |   7 ++++++-
 app/views/shared/issuable/_search_bar.html.haml         |   7 +++++--
 doc/user/search/img/issues_filter_none_any.png          | Bin 0 -> 27717 bytes
 doc/user/search/index.md                                |  10 ++++++++++
 locale/gitlab.pot                                       |   3 ---
 .../issues/filtered_search/dropdown_assignee_spec.rb    |  12 ++++++++++--
 6 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 doc/user/search/img/issues_filter_none_any.png

diff --git a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
index b70125c80ca..e22f542b7bf 100644
--- a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
+++ b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
@@ -58,10 +58,15 @@ export const alternativeTokenKeys = [
 
 export const conditions = [
   {
-    url: 'assignee_id=0',
+    url: 'assignee_id=None',
     tokenKey: 'assignee',
     value: 'none',
   },
+  {
+    url: 'assignee_id=Any',
+    tokenKey: 'assignee',
+    value: 'any',
+  },
   {
     url: 'milestone_title=No+Milestone',
     tokenKey: 'milestone',
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml
index cb45928d9a5..1d876cc4a5d 100644
--- a/app/views/shared/issuable/_search_bar.html.haml
+++ b/app/views/shared/issuable/_search_bar.html.haml
@@ -61,7 +61,10 @@
               %ul{ data: { dropdown: true } }
                 %li.filter-dropdown-item{ data: { value: 'none' } }
                   %button.btn.btn-link{ type: 'button' }
-                    = _('No Assignee')
+                    = _('None')
+                %li.filter-dropdown-item{ data: { value: 'any' } }
+                  %button.btn.btn-link{ type: 'button' }
+                    = _('Any')
                 %li.divider.droplab-item-ignore
                 - if current_user
                   = render 'shared/issuable/user_dropdown_item',
@@ -81,7 +84,7 @@
                 %li.filter-dropdown-item{ data: { value: 'upcoming' } }
                   %button.btn.btn-link{ type: 'button' }
                     = _('Upcoming')
-                %li.filter-dropdown-item{ 'data-value' => 'started' }
+                %li.filter-dropdown-item{ data: { value: 'started' } }
                   %button.btn.btn-link{ type: 'button' }
                     = _('Started')
                 %li.divider.droplab-item-ignore
diff --git a/doc/user/search/img/issues_filter_none_any.png b/doc/user/search/img/issues_filter_none_any.png
new file mode 100644
index 00000000000..9682fc55315
Binary files /dev/null and b/doc/user/search/img/issues_filter_none_any.png differ
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index 4f1b96b775c..3f9d07dacaa 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -40,6 +40,16 @@ The same process is valid for merge requests. Navigate to your project's **Merge
 and click **Search or filter results...**. Merge requests can be filtered by author, assignee,
 milestone, and label.
 
+### Filtering by **None** / **Any**
+
+Some filter fields like milestone and assignee, allow you to filter by **None** or **Any**.
+
+![filter by none any](img/issues_filter_none_any.png)
+
+Selecting **None** returns results that have an empty value for that field. E.g.: no milestone, no assignee.
+
+Selecting **Any** does the opposite. It returns results that have a non-empty value for that field.
+
 ### Searching for specific terms
 
 You can filter issues and merge requests by specific terms included in titles or descriptions.
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 26270595c6a..463a58fff7c 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -4030,9 +4030,6 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-msgid "No Assignee"
-msgstr ""
-
 msgid "No Label"
 msgstr ""
 
diff --git a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
index d011d2545bb..e910fb54d23 100644
--- a/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
+++ b/spec/features/issues/filtered_search/dropdown_assignee_spec.rb
@@ -156,13 +156,21 @@ describe 'Dropdown assignee', :js do
       expect_filtered_search_input_empty
     end
 
-    it 'selects `no assignee`' do
-      find('#js-dropdown-assignee .filter-dropdown-item', text: 'No Assignee').click
+    it 'selects `None`' do
+      find('#js-dropdown-assignee .filter-dropdown-item', text: 'None').click
 
       expect(page).to have_css(js_dropdown_assignee, visible: false)
       expect_tokens([assignee_token('none')])
       expect_filtered_search_input_empty
     end
+
+    it 'selects `Any`' do
+      find('#js-dropdown-assignee .filter-dropdown-item', text: 'Any').click
+
+      expect(page).to have_css(js_dropdown_assignee, visible: false)
+      expect_tokens([assignee_token('any')])
+      expect_filtered_search_input_empty
+    end
   end
 
   describe 'selecting from dropdown without Ajax call' do
-- 
cgit v1.2.3


From 6060d529ed1c48eede7de7fcbf615f7b80f0d545 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Thu, 25 Oct 2018 17:59:57 +0800
Subject: Add changelog

---
 changelogs/unreleased/52383-ui-filter-assignee-none-any.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changelogs/unreleased/52383-ui-filter-assignee-none-any.yml

diff --git a/changelogs/unreleased/52383-ui-filter-assignee-none-any.yml b/changelogs/unreleased/52383-ui-filter-assignee-none-any.yml
new file mode 100644
index 00000000000..adf153f33ce
--- /dev/null
+++ b/changelogs/unreleased/52383-ui-filter-assignee-none-any.yml
@@ -0,0 +1,5 @@
+---
+title: Add None/Any option for assignee_id in search bar
+merge_request: 22599
+author: Heinrich Lee Yu
+type: added
-- 
cgit v1.2.3


From ea05f66575f3717a2285e59638d142ccc8ed1887 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <hleeyu@gmail.com>
Date: Thu, 25 Oct 2018 20:07:25 +0800
Subject: Fix tests

---
 spec/features/boards/modal_filter_spec.rb                  | 2 +-
 spec/features/issues/filtered_search/visual_tokens_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/features/boards/modal_filter_spec.rb b/spec/features/boards/modal_filter_spec.rb
index 615223a2a88..2cdd3f55b50 100644
--- a/spec/features/boards/modal_filter_spec.rb
+++ b/spec/features/boards/modal_filter_spec.rb
@@ -106,7 +106,7 @@ describe 'Issue Boards add issue modal filtering', :js do
 
     it 'filters by unassigned' do
       set_filter('assignee')
-      click_filter_link('No Assignee')
+      click_filter_link('None')
       submit_filter
 
       page.within('.add-issues-modal') do
diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb
index 6ac7ccd00f7..1e1dd5691ab 100644
--- a/spec/features/issues/filtered_search/visual_tokens_spec.rb
+++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb
@@ -118,7 +118,7 @@ describe 'Visual tokens', :js do
 
     describe 'selecting static option from dropdown' do
       before do
-        find("#js-dropdown-assignee").find('.filter-dropdown-item', text: 'No Assignee').click
+        find("#js-dropdown-assignee").find('.filter-dropdown-item', text: 'None').click
       end
 
       it 'changes value in visual token' do
-- 
cgit v1.2.3


From 7aeab58f4861144fcc1d334907cb1b465c645001 Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Fri, 26 Oct 2018 12:49:16 +0000
Subject: Automatically navigate to last board visited

---
 app/controllers/groups/boards_controller.rb        | 18 ++++++
 app/controllers/projects/boards_controller.rb      | 20 ++++++-
 app/models/board_group_recent_visit.rb             | 25 +++++++++
 app/models/board_project_recent_visit.rb           | 25 +++++++++
 app/services/boards/visits/create_service.rb       | 17 ++++++
 app/services/boards/visits/latest_service.rb       | 17 ++++++
 ...utomatically-navigate-to-last-board-visited.yml |  5 ++
 ...010235606_create_board_project_recent_visits.rb | 19 +++++++
 ...81016152238_create_board_group_recent_visits.rb | 20 +++++++
 db/schema.rb                                       | 34 +++++++++++-
 doc/user/project/issue_board.md                    |  3 +
 spec/controllers/groups/boards_controller_spec.rb  | 58 +++++++++++++++++++-
 .../controllers/projects/boards_controller_spec.rb | 56 ++++++++++++++++++-
 spec/factories/board_group_recent_visit.rb         |  9 +++
 spec/factories/board_project_recent_visit.rb       |  9 +++
 spec/models/board_group_recent_visit_spec.rb       | 64 ++++++++++++++++++++++
 spec/models/board_project_recent_visit_spec.rb     | 64 ++++++++++++++++++++++
 spec/services/boards/visits/create_service_spec.rb | 53 ++++++++++++++++++
 spec/services/boards/visits/latest_service_spec.rb | 47 ++++++++++++++++
 19 files changed, 558 insertions(+), 5 deletions(-)
 create mode 100644 app/models/board_group_recent_visit.rb
 create mode 100644 app/models/board_project_recent_visit.rb
 create mode 100644 app/services/boards/visits/create_service.rb
 create mode 100644 app/services/boards/visits/latest_service.rb
 create mode 100644 changelogs/unreleased/bw-automatically-navigate-to-last-board-visited.yml
 create mode 100644 db/migrate/20181010235606_create_board_project_recent_visits.rb
 create mode 100644 db/migrate/20181016152238_create_board_group_recent_visits.rb
 create mode 100644 spec/factories/board_group_recent_visit.rb
 create mode 100644 spec/factories/board_project_recent_visit.rb
 create mode 100644 spec/models/board_group_recent_visit_spec.rb
 create mode 100644 spec/models/board_project_recent_visit_spec.rb
 create mode 100644 spec/services/boards/visits/create_service_spec.rb
 create mode 100644 spec/services/boards/visits/latest_service_spec.rb

diff --git a/app/controllers/groups/boards_controller.rb b/app/controllers/groups/boards_controller.rb
index 8d259b4052e..cdc6f53df8e 100644
--- a/app/controllers/groups/boards_controller.rb
+++ b/app/controllers/groups/boards_controller.rb
@@ -5,6 +5,7 @@ class Groups::BoardsController < Groups::ApplicationController
 
   before_action :assign_endpoint_vars
   before_action :boards, only: :index
+  before_action :redirect_to_recent_board, only: :index
 
   def index
     respond_with_boards
@@ -13,6 +14,9 @@ class Groups::BoardsController < Groups::ApplicationController
   def show
     @board = boards.find(params[:id])
 
+    # add/update the board in the recent visited table
+    Boards::Visits::CreateService.new(@board.group, current_user).execute(@board) if request.format.html?
+
     respond_with_board
   end
 
@@ -31,4 +35,18 @@ class Groups::BoardsController < Groups::ApplicationController
   def serialize_as_json(resource)
     resource.as_json(only: [:id])
   end
+
+  def includes_board?(board_id)
+    boards.any? { |board| board.id == board_id }
+  end
+
+  def redirect_to_recent_board
+    return if request.format.json?
+
+    recently_visited = Boards::Visits::LatestService.new(group, current_user).execute
+
+    if recently_visited && includes_board?(recently_visited.board_id)
+      redirect_to(group_board_path(id: recently_visited.board_id), status: :found)
+    end
+  end
 end
diff --git a/app/controllers/projects/boards_controller.rb b/app/controllers/projects/boards_controller.rb
index 77b818347c7..8189b5d182a 100644
--- a/app/controllers/projects/boards_controller.rb
+++ b/app/controllers/projects/boards_controller.rb
@@ -8,6 +8,7 @@ class Projects::BoardsController < Projects::ApplicationController
   before_action :authorize_read_board!, only: [:index, :show]
   before_action :boards, only: :index
   before_action :assign_endpoint_vars
+  before_action :redirect_to_recent_board, only: :index
 
   def index
     respond_with_boards
@@ -16,6 +17,9 @@ class Projects::BoardsController < Projects::ApplicationController
   def show
     @board = boards.find(params[:id])
 
+    # add/update the board in the recent visited table
+    Boards::Visits::CreateService.new(@board.project, current_user).execute(@board) if request.format.html?
+
     respond_with_board
   end
 
@@ -33,10 +37,24 @@ class Projects::BoardsController < Projects::ApplicationController
   end
 
   def authorize_read_board!
-    return access_denied! unless can?(current_user, :read_board, project)
+    access_denied! unless can?(current_user, :read_board, project)
   end
 
   def serialize_as_json(resource)
     resource.as_json(only: [:id])
   end
+
+  def includes_board?(board_id)
+    boards.any? { |board| board.id == board_id }
+  end
+
+  def redirect_to_recent_board
+    return if request.format.json?
+
+    recently_visited = Boards::Visits::LatestService.new(project, current_user).execute
+
+    if recently_visited && includes_board?(recently_visited.board_id)
+      redirect_to(namespace_project_board_path(id: recently_visited.board_id), status: :found)
+    end
+  end
 end
diff --git a/app/models/board_group_recent_visit.rb b/app/models/board_group_recent_visit.rb
new file mode 100644
index 00000000000..92abbb67222
--- /dev/null
+++ b/app/models/board_group_recent_visit.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Tracks which boards in a specific group a user has visited
+class BoardGroupRecentVisit < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :group
+  belongs_to :board
+
+  validates :user,  presence: true
+  validates :group, presence: true
+  validates :board, presence: true
+
+  scope :by_user_group, -> (user, group) { where(user: user, group: group).order(:updated_at) }
+
+  def self.visited!(user, board)
+    visit = find_or_create_by(user: user, group: board.group, board: board)
+    visit.touch if visit.updated_at < Time.now
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def self.latest(user, group)
+    by_user_group(user, group).last
+  end
+end
diff --git a/app/models/board_project_recent_visit.rb b/app/models/board_project_recent_visit.rb
new file mode 100644
index 00000000000..7cffff906d8
--- /dev/null
+++ b/app/models/board_project_recent_visit.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# Tracks which boards in a specific project a user has visited
+class BoardProjectRecentVisit < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :project
+  belongs_to :board
+
+  validates :user,    presence: true
+  validates :project, presence: true
+  validates :board,   presence: true
+
+  scope :by_user_project, -> (user, project) { where(user: user, project: project).order(:updated_at) }
+
+  def self.visited!(user, board)
+    visit = find_or_create_by(user: user, project: board.project, board: board)
+    visit.touch if visit.updated_at < Time.now
+  rescue ActiveRecord::RecordNotUnique
+    retry
+  end
+
+  def self.latest(user, project)
+    by_user_project(user, project).last
+  end
+end
diff --git a/app/services/boards/visits/create_service.rb b/app/services/boards/visits/create_service.rb
new file mode 100644
index 00000000000..e2adf755511
--- /dev/null
+++ b/app/services/boards/visits/create_service.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Boards
+  module Visits
+    class CreateService < Boards::BaseService
+      def execute(board)
+        return unless current_user && Gitlab::Database.read_write?
+
+        if parent.is_a?(Group)
+          BoardGroupRecentVisit.visited!(current_user, board)
+        else
+          BoardProjectRecentVisit.visited!(current_user, board)
+        end
+      end
+    end
+  end
+end
diff --git a/app/services/boards/visits/latest_service.rb b/app/services/boards/visits/latest_service.rb
new file mode 100644
index 00000000000..9e4c77a6317
--- /dev/null
+++ b/app/services/boards/visits/latest_service.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Boards
+  module Visits
+    class LatestService < Boards::BaseService
+      def execute
+        return nil unless current_user
+
+        if parent.is_a?(Group)
+          BoardGroupRecentVisit.latest(current_user, parent)
+        else
+          BoardProjectRecentVisit.latest(current_user, parent)
+        end
+      end
+    end
+  end
+end
diff --git a/changelogs/unreleased/bw-automatically-navigate-to-last-board-visited.yml b/changelogs/unreleased/bw-automatically-navigate-to-last-board-visited.yml
new file mode 100644
index 00000000000..836b9aa21c5
--- /dev/null
+++ b/changelogs/unreleased/bw-automatically-navigate-to-last-board-visited.yml
@@ -0,0 +1,5 @@
+---
+title: Automatically navigate to last board visited
+merge_request: 22430
+author:
+type: changed
diff --git a/db/migrate/20181010235606_create_board_project_recent_visits.rb b/db/migrate/20181010235606_create_board_project_recent_visits.rb
new file mode 100644
index 00000000000..426f41e202a
--- /dev/null
+++ b/db/migrate/20181010235606_create_board_project_recent_visits.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class CreateBoardProjectRecentVisits < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    create_table :board_project_recent_visits, id: :bigserial do |t|
+      t.timestamps_with_timezone null: false
+
+      t.references :user, index: true, foreign_key: { on_delete: :cascade }
+      t.references :project, index: true, foreign_key: { on_delete: :cascade }
+      t.references :board, index: true, foreign_key: { on_delete: :cascade }
+    end
+
+    add_index :board_project_recent_visits, [:user_id, :project_id, :board_id], unique: true, name: 'index_board_project_recent_visits_on_user_project_and_board'
+  end
+end
diff --git a/db/migrate/20181016152238_create_board_group_recent_visits.rb b/db/migrate/20181016152238_create_board_group_recent_visits.rb
new file mode 100644
index 00000000000..1e55dc8658e
--- /dev/null
+++ b/db/migrate/20181016152238_create_board_group_recent_visits.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class CreateBoardGroupRecentVisits < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    create_table :board_group_recent_visits, id: :bigserial do |t|
+      t.timestamps_with_timezone null: false
+
+      t.references :user, index: true, foreign_key: { on_delete: :cascade }
+      t.references :board, index: true, foreign_key: { on_delete: :cascade }
+      t.references :group, references: :namespace, column: :group_id, index: true
+      t.foreign_key :namespaces, column: :group_id, on_delete: :cascade
+    end
+
+    add_index :board_group_recent_visits, [:user_id, :group_id, :board_id], unique: true, name: 'index_board_group_recent_visits_on_user_group_and_board'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ddfccbba678..7a75aafd7b0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181013005024) do
+ActiveRecord::Schema.define(version: 20181016152238) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -204,6 +204,32 @@ ActiveRecord::Schema.define(version: 20181013005024) do
   add_index "badges", ["group_id"], name: "index_badges_on_group_id", using: :btree
   add_index "badges", ["project_id"], name: "index_badges_on_project_id", using: :btree
 
+  create_table "board_group_recent_visits", id: :bigserial, force: :cascade do |t|
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.integer "user_id"
+    t.integer "board_id"
+    t.integer "group_id"
+  end
+
+  add_index "board_group_recent_visits", ["board_id"], name: "index_board_group_recent_visits_on_board_id", using: :btree
+  add_index "board_group_recent_visits", ["group_id"], name: "index_board_group_recent_visits_on_group_id", using: :btree
+  add_index "board_group_recent_visits", ["user_id", "group_id", "board_id"], name: "index_board_group_recent_visits_on_user_group_and_board", unique: true, using: :btree
+  add_index "board_group_recent_visits", ["user_id"], name: "index_board_group_recent_visits_on_user_id", using: :btree
+
+  create_table "board_project_recent_visits", id: :bigserial, force: :cascade do |t|
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.integer "user_id"
+    t.integer "project_id"
+    t.integer "board_id"
+  end
+
+  add_index "board_project_recent_visits", ["board_id"], name: "index_board_project_recent_visits_on_board_id", using: :btree
+  add_index "board_project_recent_visits", ["project_id"], name: "index_board_project_recent_visits_on_project_id", using: :btree
+  add_index "board_project_recent_visits", ["user_id", "project_id", "board_id"], name: "index_board_project_recent_visits_on_user_project_and_board", unique: true, using: :btree
+  add_index "board_project_recent_visits", ["user_id"], name: "index_board_project_recent_visits_on_user_id", using: :btree
+
   create_table "boards", force: :cascade do |t|
     t.integer "project_id"
     t.datetime "created_at", null: false
@@ -2306,6 +2332,12 @@ ActiveRecord::Schema.define(version: 20181013005024) do
   add_foreign_key "application_settings", "users", column: "usage_stats_set_by_user_id", name: "fk_964370041d", on_delete: :nullify
   add_foreign_key "badges", "namespaces", column: "group_id", on_delete: :cascade
   add_foreign_key "badges", "projects", on_delete: :cascade
+  add_foreign_key "board_group_recent_visits", "boards", on_delete: :cascade
+  add_foreign_key "board_group_recent_visits", "namespaces", column: "group_id", on_delete: :cascade
+  add_foreign_key "board_group_recent_visits", "users", on_delete: :cascade
+  add_foreign_key "board_project_recent_visits", "boards", on_delete: :cascade
+  add_foreign_key "board_project_recent_visits", "projects", on_delete: :cascade
+  add_foreign_key "board_project_recent_visits", "users", on_delete: :cascade
   add_foreign_key "boards", "namespaces", column: "group_id", on_delete: :cascade
   add_foreign_key "boards", "projects", name: "fk_f15266b5f9", on_delete: :cascade
   add_foreign_key "chat_teams", "namespaces", on_delete: :cascade
diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md
index 464fa5987c1..f5ea350a58f 100644
--- a/doc/user/project/issue_board.md
+++ b/doc/user/project/issue_board.md
@@ -176,6 +176,9 @@ Clicking on the current board name in the upper left corner will reveal a
 menu from where you can create another Issue Board and rename or delete the
 existing one.
 
+Clicking on the main issue board link will take you to the last board
+you visited.
+
 NOTE: **Note:**
 The Multiple Issue Boards feature is available for
 **projects in GitLab Starter Edition** and for **groups in GitLab Premium Edition**.
diff --git a/spec/controllers/groups/boards_controller_spec.rb b/spec/controllers/groups/boards_controller_spec.rb
index bf41aa0706f..d1d08391164 100644
--- a/spec/controllers/groups/boards_controller_spec.rb
+++ b/spec/controllers/groups/boards_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Groups::BoardsController do
   let(:group) { create(:group) }
-  let(:user)    { create(:user) }
+  let(:user)  { create(:user) }
 
   before do
     group.add_maintainer(user)
@@ -22,6 +22,27 @@ describe Groups::BoardsController do
         expect(response.content_type).to eq 'text/html'
       end
 
+      it 'redirects to latest visited board' do
+        board = create(:board, group: group)
+        create(:board_group_recent_visit, group: board.group, board: board, user: user)
+
+        list_boards
+
+        expect(response).to redirect_to(group_board_path(id: board.id))
+      end
+
+      it 'renders template if visited board is not found' do
+        visited = double
+
+        allow(visited).to receive(:board_id).and_return(12)
+        allow_any_instance_of(Boards::Visits::LatestService).to receive(:execute).and_return(visited)
+
+        list_boards
+
+        expect(response).to render_template :index
+        expect(response.content_type).to eq 'text/html'
+      end
+
       context 'with unauthorized user' do
         before do
           allow(Ability).to receive(:allowed?).with(user, :read_cross_project, :global).and_return(true)
@@ -35,12 +56,30 @@ describe Groups::BoardsController do
           expect(response.content_type).to eq 'text/html'
         end
       end
+
+      context 'when user is signed out' do
+        let(:group) { create(:group, :public) }
+
+        it 'renders template' do
+          sign_out(user)
+
+          board = create(:board, group: group)
+          create(:board_group_recent_visit, group: board.group, board: board, user: user)
+
+          list_boards
+
+          expect(response).to render_template :index
+          expect(response.content_type).to eq 'text/html'
+        end
+      end
     end
 
     context 'when format is JSON' do
       it 'return an array with one group board' do
         create(:board, group: group)
 
+        expect(Boards::Visits::LatestService).not_to receive(:new)
+
         list_boards format: :json
 
         parsed_response = JSON.parse(response.body)
@@ -74,7 +113,7 @@ describe Groups::BoardsController do
 
     context 'when format is HTML' do
       it 'renders template' do
-        read_board board: board
+        expect { read_board board: board }.to change(BoardGroupRecentVisit, :count).by(1)
 
         expect(response).to render_template :show
         expect(response.content_type).to eq 'text/html'
@@ -93,10 +132,25 @@ describe Groups::BoardsController do
           expect(response.content_type).to eq 'text/html'
         end
       end
+
+      context 'when user is signed out' do
+        let(:group) { create(:group, :public) }
+
+        it 'does not save visit' do
+          sign_out(user)
+
+          expect { read_board board: board }.to change(BoardGroupRecentVisit, :count).by(0)
+
+          expect(response).to render_template :show
+          expect(response.content_type).to eq 'text/html'
+        end
+      end
     end
 
     context 'when format is JSON' do
       it 'returns project board' do
+        expect(Boards::Visits::CreateService).not_to receive(:new)
+
         read_board board: board, format: :json
 
         expect(response).to match_response_schema('board')
diff --git a/spec/controllers/projects/boards_controller_spec.rb b/spec/controllers/projects/boards_controller_spec.rb
index 096efc1c7b2..667eaa5e34f 100644
--- a/spec/controllers/projects/boards_controller_spec.rb
+++ b/spec/controllers/projects/boards_controller_spec.rb
@@ -28,6 +28,27 @@ describe Projects::BoardsController do
         expect(response.content_type).to eq 'text/html'
       end
 
+      it 'redirects to latest visited board' do
+        board = create(:board, project: project)
+        create(:board_project_recent_visit, project: board.project, board: board, user: user)
+
+        list_boards
+
+        expect(response).to redirect_to(namespace_project_board_path(id: board.id))
+      end
+
+      it 'renders template if visited board is not found' do
+        visited = double
+
+        allow(visited).to receive(:board_id).and_return(12)
+        allow_any_instance_of(Boards::Visits::LatestService).to receive(:execute).and_return(visited)
+
+        list_boards
+
+        expect(response).to render_template :index
+        expect(response.content_type).to eq 'text/html'
+      end
+
       context 'with unauthorized user' do
         before do
           allow(Ability).to receive(:allowed?).with(user, :read_project, project).and_return(true)
@@ -41,12 +62,30 @@ describe Projects::BoardsController do
           expect(response.content_type).to eq 'text/html'
         end
       end
+
+      context 'when user is signed out' do
+        let(:project) { create(:project, :public) }
+
+        it 'renders template' do
+          sign_out(user)
+
+          board = create(:board, project: project)
+          create(:board_project_recent_visit, project: board.project, board: board, user: user)
+
+          list_boards
+
+          expect(response).to render_template :index
+          expect(response.content_type).to eq 'text/html'
+        end
+      end
     end
 
     context 'when format is JSON' do
       it 'returns a list of project boards' do
         create_list(:board, 2, project: project)
 
+        expect(Boards::Visits::LatestService).not_to receive(:new)
+
         list_boards format: :json
 
         parsed_response = JSON.parse(response.body)
@@ -98,7 +137,7 @@ describe Projects::BoardsController do
 
     context 'when format is HTML' do
       it 'renders template' do
-        read_board board: board
+        expect { read_board board: board }.to change(BoardProjectRecentVisit, :count).by(1)
 
         expect(response).to render_template :show
         expect(response.content_type).to eq 'text/html'
@@ -117,10 +156,25 @@ describe Projects::BoardsController do
           expect(response.content_type).to eq 'text/html'
         end
       end
+
+      context 'when user is signed out' do
+        let(:project) { create(:project, :public) }
+
+        it 'does not save visit' do
+          sign_out(user)
+
+          expect { read_board board: board }.to change(BoardProjectRecentVisit, :count).by(0)
+
+          expect(response).to render_template :show
+          expect(response.content_type).to eq 'text/html'
+        end
+      end
     end
 
     context 'when format is JSON' do
       it 'returns project board' do
+        expect(Boards::Visits::CreateService).not_to receive(:new)
+
         read_board board: board, format: :json
 
         expect(response).to match_response_schema('board')
diff --git a/spec/factories/board_group_recent_visit.rb b/spec/factories/board_group_recent_visit.rb
new file mode 100644
index 00000000000..97ad5d6d068
--- /dev/null
+++ b/spec/factories/board_group_recent_visit.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :board_group_recent_visit do
+    user
+    group
+    board
+  end
+end
diff --git a/spec/factories/board_project_recent_visit.rb b/spec/factories/board_project_recent_visit.rb
new file mode 100644
index 00000000000..49ae4d7b391
--- /dev/null
+++ b/spec/factories/board_project_recent_visit.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :board_project_recent_visit do
+    user
+    project
+    board
+  end
+end
diff --git a/spec/models/board_group_recent_visit_spec.rb b/spec/models/board_group_recent_visit_spec.rb
new file mode 100644
index 00000000000..59ad4e5417e
--- /dev/null
+++ b/spec/models/board_group_recent_visit_spec.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe BoardGroupRecentVisit do
+  let(:user)  { create(:user) }
+  let(:group) { create(:group) }
+  let(:board) { create(:board, group: group) }
+
+  describe 'relationships' do
+    it { is_expected.to belong_to(:user) }
+    it { is_expected.to belong_to(:group) }
+    it { is_expected.to belong_to(:board) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:user) }
+    it { is_expected.to validate_presence_of(:group) }
+    it { is_expected.to validate_presence_of(:board) }
+  end
+
+  describe '#visited' do
+    it 'creates a visit if one does not exists' do
+      expect { described_class.visited!(user, board) }.to change(described_class, :count).by(1)
+    end
+
+    shared_examples 'was visited previously' do
+      let!(:visit) { create :board_group_recent_visit, group: board.group, board: board, user: user, updated_at: 7.days.ago }
+
+      it 'updates the timestamp' do
+        Timecop.freeze do
+          described_class.visited!(user, board)
+
+          expect(described_class.count).to eq 1
+          expect(described_class.first.updated_at).to be_like_time(Time.zone.now)
+        end
+      end
+    end
+
+    it_behaves_like 'was visited previously'
+
+    context 'when we try to create a visit that is not unique' do
+      before do
+        expect(described_class).to receive(:find_or_create_by).and_raise(ActiveRecord::RecordNotUnique, 'record not unique')
+        expect(described_class).to receive(:find_or_create_by).and_return(visit)
+      end
+
+      it_behaves_like 'was visited previously'
+    end
+  end
+
+  describe '#latest' do
+    it 'returns the most recent visited' do
+      board2 = create(:board, group: group)
+      board3 = create(:board, group: group)
+
+      create :board_group_recent_visit, group: board.group, board: board, user: user, updated_at: 7.days.ago
+      create :board_group_recent_visit, group: board2.group, board: board2, user: user, updated_at: 5.days.ago
+      recent = create :board_group_recent_visit, group: board3.group, board: board3, user: user, updated_at: 1.day.ago
+
+      expect(described_class.latest(user, group)).to eq recent
+    end
+  end
+end
diff --git a/spec/models/board_project_recent_visit_spec.rb b/spec/models/board_project_recent_visit_spec.rb
new file mode 100644
index 00000000000..275581945fa
--- /dev/null
+++ b/spec/models/board_project_recent_visit_spec.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe BoardProjectRecentVisit do
+  let(:user)    { create(:user) }
+  let(:project) { create(:project) }
+  let(:board)   { create(:board, project: project) }
+
+  describe 'relationships' do
+    it { is_expected.to belong_to(:user) }
+    it { is_expected.to belong_to(:project) }
+    it { is_expected.to belong_to(:board) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:user) }
+    it { is_expected.to validate_presence_of(:project) }
+    it { is_expected.to validate_presence_of(:board) }
+  end
+
+  describe '#visited' do
+    it 'creates a visit if one does not exists' do
+      expect { described_class.visited!(user, board) }.to change(described_class, :count).by(1)
+    end
+
+    shared_examples 'was visited previously' do
+      let!(:visit) { create :board_project_recent_visit, project: board.project, board: board, user: user, updated_at: 7.days.ago }
+
+      it 'updates the timestamp' do
+        Timecop.freeze do
+          described_class.visited!(user, board)
+
+          expect(described_class.count).to eq 1
+          expect(described_class.first.updated_at).to be_like_time(Time.zone.now)
+        end
+      end
+    end
+
+    it_behaves_like 'was visited previously'
+
+    context 'when we try to create a visit that is not unique' do
+      before do
+        expect(described_class).to receive(:find_or_create_by).and_raise(ActiveRecord::RecordNotUnique, 'record not unique')
+        expect(described_class).to receive(:find_or_create_by).and_return(visit)
+      end
+
+      it_behaves_like 'was visited previously'
+    end
+  end
+
+  describe '#latest' do
+    it 'returns the most recent visited' do
+      board2 = create(:board, project: project)
+      board3 = create(:board, project: project)
+
+      create :board_project_recent_visit, project: board.project, board: board, user: user, updated_at: 7.days.ago
+      create :board_project_recent_visit, project: board2.project, board: board2, user: user, updated_at: 5.days.ago
+      recent = create :board_project_recent_visit, project: board3.project, board: board3, user: user, updated_at: 1.day.ago
+
+      expect(described_class.latest(user, project)).to eq recent
+    end
+  end
+end
diff --git a/spec/services/boards/visits/create_service_spec.rb b/spec/services/boards/visits/create_service_spec.rb
new file mode 100644
index 00000000000..6baf7ac9deb
--- /dev/null
+++ b/spec/services/boards/visits/create_service_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Boards::Visits::CreateService do
+  describe '#execute' do
+    let(:user) { create(:user) }
+
+    context 'when a project board' do
+      let(:project)       { create(:project) }
+      let(:project_board) { create(:board, project: project) }
+
+      subject(:service) { described_class.new(project_board.parent, user) }
+
+      it 'returns nil when there is no user' do
+        service.current_user = nil
+
+        expect(service.execute(project_board)).to eq nil
+      end
+
+      it 'returns nil when database is read only' do
+        allow(Gitlab::Database).to receive(:read_only?) { true }
+
+        expect(service.execute(project_board)).to eq nil
+      end
+
+      it 'records the visit' do
+        expect(BoardProjectRecentVisit).to receive(:visited!).once
+
+        service.execute(project_board)
+      end
+    end
+
+    context 'when a group board' do
+      let(:group)       { create(:group) }
+      let(:group_board) { create(:board, group: group) }
+
+      subject(:service) { described_class.new(group_board.parent, user) }
+
+      it 'returns nil when there is no user' do
+        service.current_user = nil
+
+        expect(service.execute(group_board)).to eq nil
+      end
+
+      it 'records the visit' do
+        expect(BoardGroupRecentVisit).to receive(:visited!).once
+
+        service.execute(group_board)
+      end
+    end
+  end
+end
diff --git a/spec/services/boards/visits/latest_service_spec.rb b/spec/services/boards/visits/latest_service_spec.rb
new file mode 100644
index 00000000000..e55d599e2cc
--- /dev/null
+++ b/spec/services/boards/visits/latest_service_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Boards::Visits::LatestService do
+  describe '#execute' do
+    let(:user) { create(:user) }
+
+    context 'when a project board' do
+      let(:project)       { create(:project) }
+      let(:project_board) { create(:board, project: project) }
+
+      subject(:service) { described_class.new(project_board.parent, user) }
+
+      it 'returns nil when there is no user' do
+        service.current_user = nil
+
+        expect(service.execute).to eq nil
+      end
+
+      it 'queries for most recent visit' do
+        expect(BoardProjectRecentVisit).to receive(:latest).once
+
+        service.execute
+      end
+    end
+
+    context 'when a group board' do
+      let(:group)       { create(:group) }
+      let(:group_board) { create(:board, group: group) }
+
+      subject(:service) { described_class.new(group_board.parent, user) }
+
+      it 'returns nil when there is no user' do
+        service.current_user = nil
+
+        expect(service.execute).to eq nil
+      end
+
+      it 'queries for most recent visit' do
+        expect(BoardGroupRecentVisit).to receive(:latest).once
+
+        service.execute
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From 0079fa19ce493da761a07f3dca2a3caf0a2476d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= <matteeyah@gmail.com>
Date: Fri, 26 Oct 2018 14:53:04 +0200
Subject: Remove cache_sha parameter

---
 lib/gitlab/cache/ci/project_pipeline_status.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/cache/ci/project_pipeline_status.rb b/lib/gitlab/cache/ci/project_pipeline_status.rb
index 99fe7d3a252..dfbb83f7bb9 100644
--- a/lib/gitlab/cache/ci/project_pipeline_status.rb
+++ b/lib/gitlab/cache/ci/project_pipeline_status.rb
@@ -41,8 +41,8 @@ module Gitlab
           end
         end
 
-        def self.cache_key_for_project(project, cache_sha = project.commit&.sha)
-          "#{Gitlab::Redis::Cache::CACHE_NAMESPACE}:projects/#{project.id}/pipeline_status/#{cache_sha}"
+        def self.cache_key_for_project(project)
+          "#{Gitlab::Redis::Cache::CACHE_NAMESPACE}:projects/#{project.id}/pipeline_status/#{project.commit&.sha}"
         end
 
         def self.update_for_pipeline(pipeline)
-- 
cgit v1.2.3


From ac4d838a0a5ba5c0a9428d5a8041666008af21d8 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 24 Oct 2018 10:14:16 +0100
Subject: Extract EE-specific lines from MRs controller

Move access checks to their own method so they can be overridden, and
port an EE-only method to exist in CE too, with an EE-specific override.
---
 app/controllers/projects/merge_requests_controller.rb | 14 +++++++++++++-
 app/services/merge_requests/merge_service.rb          |  5 +++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 757b03d0b0e..94cd4f1fe9a 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -168,7 +168,9 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   end
 
   def merge
-    return access_denied! unless @merge_request.can_be_merged_by?(current_user)
+    access_check_result = merge_access_check
+
+    return access_check_result if access_check_result
 
     status = merge!
 
@@ -256,6 +258,12 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
       return :failed
     end
 
+    merge_service = ::MergeRequests::MergeService.new(@project, current_user, merge_params)
+
+    unless merge_service.hooks_validation_pass?(@merge_request)
+      return :hook_validation_error
+    end
+
     return :sha_mismatch if params[:sha] != @merge_request.diff_head_sha
 
     @merge_request.update(merge_error: nil, squash: merge_params.fetch(:squash, false))
@@ -318,6 +326,10 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
     access_denied! unless access_check
   end
 
+  def merge_access_check
+    access_denied! unless @merge_request.can_be_merged_by?(current_user)
+  end
+
   def whitelist_query_limiting
     # Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/42441
     Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42438')
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb
index fb44f809c41..70a67baa01c 100644
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -49,6 +49,11 @@ module MergeRequests
       end
     end
 
+    # Overridden in EE.
+    def hooks_validation_pass?(_merge_request)
+      true
+    end
+
     private
 
     def error_check!
-- 
cgit v1.2.3


From 79ec24da6fd591da9343b4928b28475a414d9859 Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Fri, 26 Oct 2018 14:49:28 +0000
Subject: Update content of visible tooltips

---
 .../javascripts/vue_shared/directives/tooltip.js   |  8 +++++
 .../vue_shared/directives/tooltip_spec.js          | 39 +++++++++++++++++-----
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/directives/tooltip.js b/app/assets/javascripts/vue_shared/directives/tooltip.js
index 4f2412ce520..549d27e96d9 100644
--- a/app/assets/javascripts/vue_shared/directives/tooltip.js
+++ b/app/assets/javascripts/vue_shared/directives/tooltip.js
@@ -9,6 +9,14 @@ export default {
 
   componentUpdated(el) {
     $(el).tooltip('_fixTitle');
+
+    // update visible tooltips
+    const tooltipInstance = $(el).data('bs.tooltip');
+    const tip = tooltipInstance.getTipElement();
+    tooltipInstance.setElementContent(
+      $(tip.querySelectorAll('.tooltip-inner')),
+      tooltipInstance.getTitle(),
+    );
   },
 
   unbind(el) {
diff --git a/spec/javascripts/vue_shared/directives/tooltip_spec.js b/spec/javascripts/vue_shared/directives/tooltip_spec.js
index 305d2fd5af4..1d516a280b0 100644
--- a/spec/javascripts/vue_shared/directives/tooltip_spec.js
+++ b/spec/javascripts/vue_shared/directives/tooltip_spec.js
@@ -13,24 +13,45 @@ describe('Tooltip directive', () => {
 
   describe('with a single tooltip', () => {
     beforeEach(() => {
-      const SomeComponent = Vue.extend({
+      setFixtures('<div id="dummy-element"></div>');
+      vm = new Vue({
+        el: '#dummy-element',
         directives: {
           tooltip,
         },
-        template: `
-          <div
-            v-tooltip
-            title="foo">
-          </div>
-        `,
+        data() {
+          return {
+            tooltip: 'some text',
+          };
+        },
+        template: '<div v-tooltip :title="tooltip"></div>',
       });
-
-      vm = new SomeComponent().$mount();
     });
 
     it('should have tooltip plugin applied', () => {
       expect($(vm.$el).data('bs.tooltip')).toBeDefined();
     });
+
+    it('displays the title as tooltip', () => {
+      $(vm.$el).tooltip('show');
+      const tooltipElement = document.querySelector('.tooltip-inner');
+
+      expect(tooltipElement.innerText).toContain('some text');
+    });
+
+    it('updates a visible tooltip', done => {
+      $(vm.$el).tooltip('show');
+      const tooltipElement = document.querySelector('.tooltip-inner');
+
+      vm.tooltip = 'other text';
+
+      Vue.nextTick()
+        .then(() => {
+          expect(tooltipElement).toContainText('other text');
+          done();
+        })
+        .catch(done.fail);
+    });
   });
 
   describe('with multiple tooltips', () => {
-- 
cgit v1.2.3


From f47c742f71c3cfe490c2246b225d3bdee096cf79 Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Fri, 26 Oct 2018 10:06:21 -0500
Subject: Update issue board documentation based on feedback

---
 doc/user/project/issue_board.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md
index f5ea350a58f..9e2434c02ec 100644
--- a/doc/user/project/issue_board.md
+++ b/doc/user/project/issue_board.md
@@ -176,8 +176,8 @@ Clicking on the current board name in the upper left corner will reveal a
 menu from where you can create another Issue Board and rename or delete the
 existing one.
 
-Clicking on the main issue board link will take you to the last board
-you visited.
+When you're revisiting an issue board in a project or group with multiple boards, 
+GitLab will automatically load the last board you visited.
 
 NOTE: **Note:**
 The Multiple Issue Boards feature is available for
-- 
cgit v1.2.3


From ff89680330584d9f589486605eae721a7566aef7 Mon Sep 17 00:00:00 2001
From: "J.D. Bean" <jonathandbean@gmail.com>
Date: Fri, 26 Oct 2018 15:12:14 +0000
Subject: Feature/add license to project API

---
 ...27231-add-license-data-to-projects-endpoint.yml |  5 +++
 doc/api/projects.md                                | 49 ++++++++++++++++++++++
 lib/api/entities.rb                                | 23 ++++++++--
 lib/api/projects.rb                                |  9 +++-
 spec/requests/api/projects_spec.rb                 | 38 +++++++++++++++++
 5 files changed, 119 insertions(+), 5 deletions(-)
 create mode 100644 changelogs/unreleased/27231-add-license-data-to-projects-endpoint.yml

diff --git a/changelogs/unreleased/27231-add-license-data-to-projects-endpoint.yml b/changelogs/unreleased/27231-add-license-data-to-projects-endpoint.yml
new file mode 100644
index 00000000000..f5ed6ccf6df
--- /dev/null
+++ b/changelogs/unreleased/27231-add-license-data-to-projects-endpoint.yml
@@ -0,0 +1,5 @@
+---
+title: Add license data to projects endpoint
+merge_request: 21606
+author: J.D. Bean (@jdbean)
+type: added
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 947e7db9c52..961241f31e1 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -451,6 +451,7 @@ GET /projects/:id
 | --------- | ---- | -------- | ----------- |
 | `id` | integer/string | yes | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
 | `statistics` | boolean | no | Include project statistics |
+| `license` | boolean | no | Include project license data |
 | `with_custom_attributes` | boolean | no | Include [custom attributes](custom_attributes.md) in response (admins only) |
 
 ```json
@@ -508,6 +509,14 @@ GET /projects/:id
   },
   "archived": false,
   "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE",
+  "license": {
+    "key": "lgpl-3.0",
+    "name": "GNU Lesser General Public License v3.0",
+    "nickname": "GNU LGPLv3",
+    "html_url": "http://choosealicense.com/licenses/lgpl-3.0/",
+    "source_url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
+  },
   "shared_runners_enabled": true,
   "forks_count": 0,
   "star_count": 0,
@@ -572,6 +581,14 @@ If the project is a fork, and you provide a valid token to authenticate, the
       "http_url_to_repo":"https://gitlab.com/gitlab-org/gitlab-ce.git",
       "web_url":"https://gitlab.com/gitlab-org/gitlab-ce",
       "avatar_url":"https://assets.gitlab-static.net/uploads/-/system/project/avatar/13083/logo-extra-whitespace.png",
+      "license_url": "https://gitlab.com/gitlab-org/gitlab-ce/blob/master/LICENSE",
+      "license": {
+        "key": "mit",
+        "name": "MIT License",
+        "nickname": null,
+        "html_url": "http://choosealicense.com/licenses/mit/",
+        "source_url": "https://opensource.org/licenses/MIT",
+      },
       "star_count":3812,
       "forks_count":3561,
       "last_activity_at":"2018-01-02T11:40:26.570Z",
@@ -905,6 +922,14 @@ Example response:
   "import_status": "none",
   "archived": true,
   "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE",
+  "license": {
+    "key": "lgpl-3.0",
+    "name": "GNU Lesser General Public License v3.0",
+    "nickname": "GNU LGPLv3",
+    "html_url": "http://choosealicense.com/licenses/lgpl-3.0/",
+    "source_url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
+  },
   "shared_runners_enabled": true,
   "forks_count": 0,
   "star_count": 1,
@@ -983,6 +1008,14 @@ Example response:
   "import_status": "none",
   "archived": true,
   "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE",
+  "license": {
+    "key": "lgpl-3.0",
+    "name": "GNU Lesser General Public License v3.0",
+    "nickname": "GNU LGPLv3",
+    "html_url": "http://choosealicense.com/licenses/lgpl-3.0/",
+    "source_url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
+  },
   "shared_runners_enabled": true,
   "forks_count": 0,
   "star_count": 0,
@@ -1101,6 +1134,14 @@ Example response:
   },
   "archived": true,
   "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE",
+  "license": {
+    "key": "lgpl-3.0",
+    "name": "GNU Lesser General Public License v3.0",
+    "nickname": "GNU LGPLv3",
+    "html_url": "http://choosealicense.com/licenses/lgpl-3.0/",
+    "source_url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
+  },
   "shared_runners_enabled": true,
   "forks_count": 0,
   "star_count": 0,
@@ -1197,6 +1238,14 @@ Example response:
   },
   "archived": false,
   "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE",
+  "license": {
+    "key": "lgpl-3.0",
+    "name": "GNU Lesser General Public License v3.0",
+    "nickname": "GNU LGPLv3",
+    "html_url": "http://choosealicense.com/licenses/lgpl-3.0/",
+    "source_url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
+  },
   "shared_runners_enabled": true,
   "forks_count": 0,
   "star_count": 0,
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 18c30723d73..9f7be27b047 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -160,13 +160,27 @@ module API
         # (fixed in https://github.com/rails/rails/pull/25976).
         project.tags.map(&:name).sort
       end
+
       expose :ssh_url_to_repo, :http_url_to_repo, :web_url, :readme_url
+
+      expose :license_url, if: :license do |project|
+        license = project.repository.license_blob
+
+        if license
+          Gitlab::Routing.url_helpers.project_blob_url(project, File.join(project.default_branch, license.path))
+        end
+      end
+
+      expose :license, with: 'API::Entities::LicenseBasic', if: :license do |project|
+        project.repository.license
+      end
+
       expose :avatar_url do |project, options|
         project.avatar_url(only_path: false)
       end
+
       expose :star_count, :forks_count
       expose :last_activity_at
-
       expose :namespace, using: 'API::Entities::NamespaceBasic'
       expose :custom_attributes, using: 'API::Entities::CustomAttribute', if: :with_custom_attributes
 
@@ -1208,11 +1222,14 @@ module API
       expose :deployable,  using: Entities::Job
     end
 
-    class License < Grape::Entity
+    class LicenseBasic < Grape::Entity
       expose :key, :name, :nickname
-      expose :popular?, as: :popular
       expose :url, as: :html_url
       expose(:source_url) { |license| license.meta['source'] }
+    end
+
+    class License < LicenseBasic
+      expose :popular?, as: :popular
       expose(:description) { |license| license.meta['description'] }
       expose(:conditions) { |license| license.meta['conditions'] }
       expose(:permissions) { |license| license.meta['permissions'] }
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index ae2d327e45b..0a914f9012e 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -114,7 +114,8 @@ module API
         options = options.reverse_merge(
           with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails,
           statistics: params[:statistics],
-          current_user: current_user
+          current_user: current_user,
+          license: false
         )
         options[:with] = Entities::BasicProjectDetails if params[:simple]
 
@@ -230,13 +231,17 @@ module API
       params do
         use :statistics_params
         use :with_custom_attributes
+
+        optional :license, type: Boolean, default: false,
+                           desc: 'Include project license data'
       end
       get ":id" do
         options = {
           with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails,
           current_user: current_user,
           user_can_admin_project: can?(current_user, :admin_project, user_project),
-          statistics: params[:statistics]
+          statistics: params[:statistics],
+          license: params[:license]
         }
 
         project, options = with_custom_attributes(user_project, options)
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 22e5a7c7174..62b6a3ce42e 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -200,6 +200,24 @@ describe API::Projects do
         expect(json_response.first).to include 'statistics'
       end
 
+      it "does not include license by default" do
+        get api('/projects', user)
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+        expect(json_response.first).not_to include('license', 'license_url')
+      end
+
+      it "does not include license if requested" do
+        get api('/projects', user), license: true
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(response).to include_pagination_headers
+        expect(json_response).to be_an Array
+        expect(json_response.first).not_to include('license', 'license_url')
+      end
+
       context 'when external issue tracker is enabled' do
         let!(:jira_service) { create(:jira_service, project: project) }
 
@@ -994,6 +1012,26 @@ describe API::Projects do
         })
       end
 
+      it "does not include license fields by default" do
+        get api("/projects/#{project.id}", user)
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response).not_to include('license', 'license_url')
+      end
+
+      it 'includes license fields when requested' do
+        get api("/projects/#{project.id}", user), license: true
+
+        expect(response).to have_gitlab_http_status(200)
+        expect(json_response['license']).to eq({
+          'key' => project.repository.license.key,
+          'name' => project.repository.license.name,
+          'nickname' => project.repository.license.nickname,
+          'html_url' => project.repository.license.url,
+          'source_url' => project.repository.license.meta['source']
+        })
+      end
+
       it "does not include statistics by default" do
         get api("/projects/#{project.id}", user)
 
-- 
cgit v1.2.3


From df17f355289fa8606941768c06952b01ca0ccb7e Mon Sep 17 00:00:00 2001
From: Mark Lapierre <mlapierre@gitlab.com>
Date: Fri, 26 Oct 2018 15:17:54 +0000
Subject: Update review apps testing guide

Review Apps are now deployed automatically.
Note that if auth fails you might need to stop and redeploy the app.
---
 doc/development/testing_guide/review_apps.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/development/testing_guide/review_apps.md b/doc/development/testing_guide/review_apps.md
index 25c6371f3d7..4292a17bfa5 100644
--- a/doc/development/testing_guide/review_apps.md
+++ b/doc/development/testing_guide/review_apps.md
@@ -1,15 +1,13 @@
 # Review apps
 
-We currently have review apps available as a manual job in EE pipelines. Here is
-[the first implementation](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6259).
-
-That said, [the Quality team is working](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6665)
-on making Review Apps automatically deployed by each pipeline, both in CE and EE.
+Review Apps are automatically deployed by each pipeline, both in 
+[CE](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22010) and
+[EE](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6665).
 
 ## How does it work?
 
-1. On every EE [pipeline][gitlab-pipeline] during the `test` stage, you can
-  start the [`review` job][review-job]
+1. On every [pipeline][gitlab-pipeline] during the `test` stage, the 
+  [`review` job][review-job] is automatically started.
 1. The `review` job [triggers a pipeline][cng-pipeline] in the
   [`CNG-mirror`][cng-mirror] [^1] project
 1. The `CNG-mirror` pipeline creates the Docker images of each component (e.g. `gitlab-rails-ee`,
@@ -39,6 +37,9 @@ on making Review Apps automatically deployed by each pipeline, both in CE and EE
   review app manually, and is also started by GitLab once a branch is deleted
 - [TBD] Review apps are cleaned up regularly using a pipeline schedule that runs
   the [`scripts/review_apps/automated_cleanup.rb`][automated_cleanup.rb] script
+- If you're unable to log in using the `root` username and password the 
+  deployment may have failed. Stop the review app via the `stop_review` 
+  manual job and then retry the `review` job to redeploy the review app.
 
 [^1]: We use the `CNG-mirror` project so that the `CNG`, (**C**loud **N**ative **G**itLab), project's registry is
   not overloaded with a lot of transient Docker images.
-- 
cgit v1.2.3


From 8270be8a674b5ddc92dde9580974ae4265f3b4e1 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <pleitzen@gitlab.com>
Date: Fri, 26 Oct 2018 15:31:04 +0000
Subject: Resolve "No longer require a deploy to start Prometheus monitoring"

---
 .../monitoring/components/dashboard.vue            |  8 +++--
 app/models/environment.rb                          |  2 +-
 ...ire-a-deploy-to-start-prometheus-monitoring.yml |  5 +++
 spec/javascripts/monitoring/dashboard_spec.js      | 16 +++++++++
 spec/models/environment_spec.rb                    | 41 +++-------------------
 5 files changed, 32 insertions(+), 40 deletions(-)
 create mode 100644 changelogs/unreleased/45068-no-longer-require-a-deploy-to-start-prometheus-monitoring.yml

diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue
index 67338aa96c3..98182d92c2f 100644
--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -149,7 +149,7 @@ export default {
           .catch(() => Flash(s__('Metrics|There was an error getting deployment information.'))),
         this.service
           .getEnvironmentsData()
-          .then((data) => this.store.storeEnvironmentsData(data))
+          .then(data => this.store.storeEnvironmentsData(data))
           .catch(() => Flash(s__('Metrics|There was an error getting environments information.'))),
       ])
         .then(() => {
@@ -157,6 +157,7 @@ export default {
             this.state = 'noData';
             return;
           }
+
           this.showEmptyState = false;
         })
         .then(this.resize)
@@ -195,7 +196,10 @@ export default {
             name="chevron-down"
           />
         </button>
-        <div class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up">
+        <div 
+          v-if="store.environmentsData.length > 0"  
+          class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up"
+        >
           <ul>
             <li
               v-for="environment in store.environmentsData"
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 0816c395185..1c31c01eb9f 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -149,7 +149,7 @@ class Environment < ActiveRecord::Base
   end
 
   def has_metrics?
-    prometheus_adapter&.can_query? && available? && last_deployment.present?
+    prometheus_adapter&.can_query? && available?
   end
 
   def metrics
diff --git a/changelogs/unreleased/45068-no-longer-require-a-deploy-to-start-prometheus-monitoring.yml b/changelogs/unreleased/45068-no-longer-require-a-deploy-to-start-prometheus-monitoring.yml
new file mode 100644
index 00000000000..6a305099dde
--- /dev/null
+++ b/changelogs/unreleased/45068-no-longer-require-a-deploy-to-start-prometheus-monitoring.yml
@@ -0,0 +1,5 @@
+---
+title: No longer require a deploy to start Prometheus monitoring
+merge_request: 22401
+author:
+type: changed
diff --git a/spec/javascripts/monitoring/dashboard_spec.js b/spec/javascripts/monitoring/dashboard_spec.js
index a3477c5f8c6..565b87de248 100644
--- a/spec/javascripts/monitoring/dashboard_spec.js
+++ b/spec/javascripts/monitoring/dashboard_spec.js
@@ -113,6 +113,22 @@ describe('Dashboard', () => {
       });
     });
 
+    it('hides the dropdown list when there is no environments', done => {
+      const component = new DashboardComponent({
+        el: document.querySelector('.prometheus-graphs'),
+        propsData: { ...propsData, hasMetrics: true, showPanels: false },
+      });
+
+      component.store.storeEnvironmentsData([]);
+
+      setTimeout(() => {
+        const dropdownMenuEnvironments = component.$el.querySelectorAll('.dropdown-menu ul');
+
+        expect(dropdownMenuEnvironments.length).toEqual(0);
+        done();
+      });
+    });
+
     it('renders the dropdown with a single is-active element', done => {
       const component = new DashboardComponent({
         el: document.querySelector('.prometheus-graphs'),
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index c65e0b81451..1de95d881a7 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -334,7 +334,7 @@ describe Environment do
   describe '#has_terminals?' do
     subject { environment.has_terminals? }
 
-    context 'when the enviroment is available' do
+    context 'when the environment is available' do
       context 'with a deployment service' do
         shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
           context 'and a deployment' do
@@ -447,7 +447,7 @@ describe Environment do
   describe '#has_metrics?' do
     subject { environment.has_metrics? }
 
-    context 'when the enviroment is available' do
+    context 'when the environment is available' do
       context 'with a deployment service' do
         let(:project) { create(:prometheus_project) }
 
@@ -456,8 +456,8 @@ describe Environment do
           it { is_expected.to be_truthy }
         end
 
-        context 'but no deployments' do
-          it { is_expected.to be_falsy }
+        context 'and no deployments' do
+          it { is_expected.to be_truthy }
         end
       end
 
@@ -504,39 +504,6 @@ describe Environment do
     end
   end
 
-  describe '#has_metrics?' do
-    subject { environment.has_metrics? }
-
-    context 'when the enviroment is available' do
-      context 'with a deployment service' do
-        let(:project) { create(:prometheus_project) }
-
-        context 'and a deployment' do
-          let!(:deployment) { create(:deployment, environment: environment) }
-          it { is_expected.to be_truthy }
-        end
-
-        context 'but no deployments' do
-          it { is_expected.to be_falsy }
-        end
-      end
-
-      context 'without a monitoring service' do
-        it { is_expected.to be_falsy }
-      end
-    end
-
-    context 'when the environment is unavailable' do
-      let(:project) { create(:prometheus_project) }
-
-      before do
-        environment.stop
-      end
-
-      it { is_expected.to be_falsy }
-    end
-  end
-
   describe '#additional_metrics' do
     let(:project) { create(:prometheus_project) }
     subject { environment.additional_metrics }
-- 
cgit v1.2.3


From 71e6928367b4f21a7cbfd4aff773814b61739ade Mon Sep 17 00:00:00 2001
From: danielgruesso <dgruesso@gitlab.com>
Date: Fri, 26 Oct 2018 12:09:26 -0400
Subject: relocate runbooks folder under clusters

---
 doc/topics/runbooks/index.md                | 36 ---------------------
 doc/user/project/clusters/runbooks/index.md | 49 +++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 36 deletions(-)
 delete mode 100644 doc/topics/runbooks/index.md
 create mode 100644 doc/user/project/clusters/runbooks/index.md

diff --git a/doc/topics/runbooks/index.md b/doc/topics/runbooks/index.md
deleted file mode 100644
index f55d2868f20..00000000000
--- a/doc/topics/runbooks/index.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Runbooks
-
-Runbooks are a collection of documented procedures that explain how to 
-carry out a particular process, be it starting, stopping, debugging, 
-or troubleshooting a particular system.
-
-## Overview
-
-Historically, runbooks took the form of a decision tree or a detailed 
-step-by-step guide depending on the condition or system. 
-
-Modern implementations have introduced the concept of an "executable 
-runbooks", where along with a well define process, operators can execute 
-code blocks or database queries against a given environment.
-
-## Nurtch Executable Runbooks
-
-> [Introduced][ce-45912] in GitLab 11.4.
-
-The JupyterHub app offered via GitLab’s Kubernetes integration now ships 
-with Nurtch’s Rubix library, providing a simple way to create DevOps 
-runbooks. A sample runbook is provided, showcasing common operations.
-
-The below video provides an overview of how this is acomplished in GitLab.
-
-<iframe width="560" height="315" src="https://www.youtube.com/embed/Q_OqHIIUPjE" 
-frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
-
-## Requirements
-
-To create an executable runbook, you will need:
-
-1. **Kubernetes Cluster** - 
-1. **Helm Tiller** - 
-1. **Ingress** -
-1. **JupyterHub** -
\ No newline at end of file
diff --git a/doc/user/project/clusters/runbooks/index.md b/doc/user/project/clusters/runbooks/index.md
new file mode 100644
index 00000000000..9dea0379c99
--- /dev/null
+++ b/doc/user/project/clusters/runbooks/index.md
@@ -0,0 +1,49 @@
+# Runbooks
+
+Runbooks are a collection of documented procedures that explain how to 
+carry out a particular process, be it starting, stopping, debugging, 
+or troubleshooting a particular system.
+
+## Overview
+
+Historically, runbooks took the form of a decision tree or a detailed 
+step-by-step guide depending on the condition or system. 
+
+Modern implementations have introduced the concept of an "executable 
+runbooks", where along with a well define process, operators can execute 
+code blocks or database queries against a given environment.
+
+## Nurtch Executable Runbooks
+
+> [Introduced](ce-45912) in GitLab 11.4.
+
+The JupyterHub app offered via GitLab’s Kubernetes integration now ships 
+with Nurtch’s Rubix library, providing a simple way to create DevOps 
+runbooks. A sample runbook is provided, showcasing common operations.
+
+**<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
+Watch this [video](https://www.youtube.com/watch?v=Q_OqHIIUPjE)
+for an overview of how this is acomplished in GitLab!**
+
+## Requirements
+
+To create an executable runbook, you will need:
+
+1. **Kubernetes** - A Kubernetes cluster is required to deploy the rest of the applications. 
+    The simplest way to get started is to add a cluster using [GitLab's GKE integration](https://docs.gitlab.com/ee/user/project/clusters/#adding-and-creating-a-new-gke-cluster-via-gitlab).
+1. **Helm Tiller** - Helm is a package manager for Kubernetes and is required to install 
+    all the other applications. It is installed in its own pod inside the cluster which 
+    can run the helm CLI in a safe environment.
+1. **Ingress** - Ingress can provide load balancing, SSL termination, and name-based 
+    virtual hosting. It acts as a web proxy for your applications.
+1. **JupyterHub** - JupyterHub is a multi-user service for managing notebooks across 
+    a team. Jupyter Notebooks provide a web-based interactive programming environment 
+    used for data analysis, visualization, and machine learning.
+
+## Nurtch
+
+Nurtch is the company behind the [Rubix library](https://github.com/Nurtch/rubix). Rubix is 
+an open-source python library that makes it easy to perform common DevOps tasks inside Jupyter Notebooks. 
+Tasks such as plotting Cloudwatch metrics and rolling your ECS/Kubernetes app are simplified 
+down to a couple of lines of code. Check the [Nurtch Documentation](http://docs.nurtch.com/en/latest) 
+for more information.
\ No newline at end of file
-- 
cgit v1.2.3


From 7921e7d2555ca2a49cc15648e2054a3c13f166a2 Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Fri, 26 Oct 2018 19:14:13 +0300
Subject: Truncate milestone title on collapsed sidebar

---
 app/views/shared/issuable/_sidebar.html.haml                         | 2 +-
 .../unreleased/gt-truncate-milestone-title-on-collapsed-sidebar.yml  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/gt-truncate-milestone-title-on-collapsed-sidebar.yml

diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index 10ffe8dd37f..5295e656ab0 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -24,7 +24,7 @@
       .block.milestone
         .sidebar-collapsed-icon.has-tooltip{ title: milestone_tooltip_title(issuable.milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } }
           = icon('clock-o', 'aria-hidden': 'true')
-          %span.milestone-title
+          %span.milestone-title.collapse-truncated-title
             - if issuable.milestone
               = issuable.milestone.title
             - else
diff --git a/changelogs/unreleased/gt-truncate-milestone-title-on-collapsed-sidebar.yml b/changelogs/unreleased/gt-truncate-milestone-title-on-collapsed-sidebar.yml
new file mode 100644
index 00000000000..ca3b99e73ab
--- /dev/null
+++ b/changelogs/unreleased/gt-truncate-milestone-title-on-collapsed-sidebar.yml
@@ -0,0 +1,5 @@
+---
+title: Truncate milestone title on collapsed sidebar
+merge_request: 22624
+author: George Tsiolis
+type: changed
-- 
cgit v1.2.3


From db80db793f43f9b4367730fc9b95c1925807f999 Mon Sep 17 00:00:00 2001
From: Jasper Maes <jaspermaes.jm@gmail.com>
Date: Fri, 26 Oct 2018 18:19:28 +0200
Subject: Replace deprecated uniq on a Relation with distinct

---
 app/models/milestone.rb                          | 2 +-
 app/models/user.rb                               | 2 +-
 app/services/delete_merged_branches_service.rb   | 4 ++--
 app/services/labels/transfer_service.rb          | 2 +-
 changelogs/unreleased/rails5-deprecated-uniq.yml | 5 +++++
 lib/gitlab/contributions_calendar.rb             | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/rails5-deprecated-uniq.yml

diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index 892a680f221..9efdee7b795 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -145,7 +145,7 @@ class Milestone < ActiveRecord::Base
   end
 
   def participants
-    User.joins(assigned_issues: :milestone).where("milestones.id = ?", id).uniq
+    User.joins(assigned_issues: :milestone).where("milestones.id = ?", id).distinct
   end
 
   def self.sort_by_attribute(method)
diff --git a/app/models/user.rb b/app/models/user.rb
index ca7fc3b058f..383b8f13d6b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1138,7 +1138,7 @@ class User < ActiveRecord::Base
     events = Event.select(:project_id)
       .contributions.where(author_id: self)
       .where("created_at > ?", Time.now - 1.year)
-      .uniq
+      .distinct
       .reorder(nil)
 
     Project.where(id: events)
diff --git a/app/services/delete_merged_branches_service.rb b/app/services/delete_merged_branches_service.rb
index ced87a1c37a..80de897e94b 100644
--- a/app/services/delete_merged_branches_service.rb
+++ b/app/services/delete_merged_branches_service.rb
@@ -24,8 +24,8 @@ class DeleteMergedBranchesService < BaseService
   # rubocop: disable CodeReuse/ActiveRecord
   def merge_request_branch_names
     # reorder(nil) is necessary for SELECT DISTINCT because default scope adds an ORDER BY
-    source_names = project.origin_merge_requests.opened.reorder(nil).uniq.pluck(:source_branch)
-    target_names = project.merge_requests.opened.reorder(nil).uniq.pluck(:target_branch)
+    source_names = project.origin_merge_requests.opened.reorder(nil).distinct.pluck(:source_branch)
+    target_names = project.merge_requests.opened.reorder(nil).distinct.pluck(:target_branch)
     (source_names + target_names).uniq
   end
   # rubocop: enable CodeReuse/ActiveRecord
diff --git a/app/services/labels/transfer_service.rb b/app/services/labels/transfer_service.rb
index 52360f775dc..9cbc9fef529 100644
--- a/app/services/labels/transfer_service.rb
+++ b/app/services/labels/transfer_service.rb
@@ -40,7 +40,7 @@ module Labels
           group_labels_applied_to_merge_requests
         ])
         .reorder(nil)
-        .uniq
+        .distinct
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
diff --git a/changelogs/unreleased/rails5-deprecated-uniq.yml b/changelogs/unreleased/rails5-deprecated-uniq.yml
new file mode 100644
index 00000000000..69a169100f0
--- /dev/null
+++ b/changelogs/unreleased/rails5-deprecated-uniq.yml
@@ -0,0 +1,5 @@
+---
+title: Replace deprecated uniq on a Relation with distinct
+merge_request: 22625
+author: Jasper Maes
+type: other
diff --git a/lib/gitlab/contributions_calendar.rb b/lib/gitlab/contributions_calendar.rb
index c819bffdfd6..5ed6427072a 100644
--- a/lib/gitlab/contributions_calendar.rb
+++ b/lib/gitlab/contributions_calendar.rb
@@ -73,7 +73,7 @@ module Gitlab
       # re-running the contributed projects query in each union is expensive, so
       # use IN(project_ids...) instead. It's the intersection of two users so
       # the list will be (relatively) short
-      @contributed_project_ids ||= projects.uniq.pluck(:id)
+      @contributed_project_ids ||= projects.distinct.pluck(:id)
       authed_projects = Project.where(id: @contributed_project_ids)
         .with_feature_available_for_user(feature, current_user)
         .reorder(nil)
-- 
cgit v1.2.3


From 66fc35f76bf6cb8c05dc0ba65211e70a36ccd073 Mon Sep 17 00:00:00 2001
From: Daniel Gruesso <dgruesso@gitlab.com>
Date: Fri, 26 Oct 2018 16:41:06 +0000
Subject: update runbooks link

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

diff --git a/doc/README.md b/doc/README.md
index f6c1a4f1d88..20fcd2e1724 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -165,7 +165,7 @@ configuration. Then customize everything from buildpacks to CI/CD.
 - [Deployment of Helm, Ingress, and Prometheus on Kubernetes](user/project/clusters/index.md#installing-applications)
 - [Protected variables](ci/variables/README.md#protected-variables)
 - [Easy creation of Kubernetes clusters on GKE](user/project/clusters/index.md#adding-and-creating-a-new-gke-cluster-via-gitlab)
-- [Executable Runbooks](topics/runbooks/index.md)
+- [Executable Runbooks](user/project/clusters/runbooks/index.md)
 
 ### Monitor
 
-- 
cgit v1.2.3


From 8883f6e18762612522b21ff4e0ea7d7de708a005 Mon Sep 17 00:00:00 2001
From: Daniel Gruesso <dgruesso@gitlab.com>
Date: Fri, 26 Oct 2018 16:42:57 +0000
Subject: update issue link

---
 doc/user/project/clusters/runbooks/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/user/project/clusters/runbooks/index.md b/doc/user/project/clusters/runbooks/index.md
index 173cf8b066b..3b81e439119 100644
--- a/doc/user/project/clusters/runbooks/index.md
+++ b/doc/user/project/clusters/runbooks/index.md
@@ -15,7 +15,7 @@ code blocks or database queries against a given environment.
 
 ## Nurtch Executable Runbooks
 
-> [Introduced](ce-45912) in GitLab 11.4.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/45912) in GitLab 11.4.
 
 The JupyterHub app offered via GitLab’s Kubernetes integration now ships 
 with Nurtch’s Rubix library, providing a simple way to create DevOps 
-- 
cgit v1.2.3


From 601702624f6ac4f34b922067f325265b14adc201 Mon Sep 17 00:00:00 2001
From: Daniel Gruesso <dgruesso@gitlab.com>
Date: Fri, 26 Oct 2018 16:53:52 +0000
Subject: remove duplicate section for enabling at project level

---
 doc/topics/autodevops/index.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 4d4832184e2..2799e8f6f22 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -246,12 +246,6 @@ There is also a feature flag to enable Auto DevOps to a percentage of projects
 which can be enabled from the console with
 `Feature.get(:force_autodevops_on_by_default).enable_percentage_of_actors(10)`.
 
-### Disable Auto DevOps at the project level
-
-1. Go to your project's **Settings > CI/CD > Auto DevOps**.
-1. Uncheck the **Default to Auto DevOps pipeline** checkbox.
-1. Click **Save changes** for the changes to take effect.
-
 ### Deployment strategy
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/38542) in GitLab 11.0.
-- 
cgit v1.2.3


From 77cfdb0aead31e3f3ceb7208b8bd39a88bc13f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= <matteeyah@gmail.com>
Date: Fri, 26 Oct 2018 20:06:34 +0200
Subject: Add test for caching nil status

---
 spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb b/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
index 4d5081b0a75..e5999a1c509 100644
--- a/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
+++ b/spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
@@ -282,6 +282,21 @@ describe Gitlab::Cache::Ci::ProjectPipelineStatus, :clean_gitlab_redis_cache do
         expect(pipeline_status.status).to eq(status)
         expect(pipeline_status.ref).to eq(ref)
       end
+
+      context 'when status is empty string' do
+        before do
+          Gitlab::Redis::Cache.with do |redis|
+            redis.mapped_hmset(cache_key,
+                               { sha: sha, status: '', ref: ref })
+          end
+        end
+
+        it 'reads the status as nil' do
+          pipeline_status.load_from_cache
+
+          expect(pipeline_status.status).to eq(nil)
+        end
+      end
     end
 
     describe '#has_cache?' do
-- 
cgit v1.2.3


From c8e0f9d25cfa5121f31878c478db013e8c7ef478 Mon Sep 17 00:00:00 2001
From: Daniel Gruesso <dgruesso@gitlab.com>
Date: Fri, 26 Oct 2018 20:32:35 +0000
Subject: Clarify project-level enable/disable

---
 doc/topics/autodevops/index.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 2799e8f6f22..96e788666a1 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -225,10 +225,11 @@ Auto DevOps at the project level.
 
 ### Enabling/disabling Auto DevOps at the project-level
 
-1. Check that your project doesn't have a `.gitlab-ci.yml`, or if one exists, remove it.
+If enabling, check that your project doesn't have a `.gitlab-ci.yml`, or if one exists, remove it.
+
 1. Go to your project's **Settings > CI/CD > Auto DevOps**.
-1. Check the **Default to Auto DevOps pipeline** checkbox.
-1. Optionally, but recommended, add in the [base domain](#auto-devops-base-domain)
+1. Toggle the **Default to Auto DevOps pipeline** checkbox (checked to enable, unchecked to disable)
+1. When enabling, it's optional but recommended to add in the [base domain](#auto-devops-base-domain)
    that will be used by Auto DevOps to [deploy your application](#auto-deploy)
    and choose the [deployment strategy](#deployment-strategy).
 1. Click **Save changes** for the changes to take effect.
-- 
cgit v1.2.3


From 72ff187c36bc73bddb349269f08f8fb46eab2676 Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Sat, 27 Oct 2018 12:04:47 +1100
Subject: Revert _diffs.html.haml

---
 app/views/projects/merge_requests/creations/_diffs.html.haml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/projects/merge_requests/creations/_diffs.html.haml b/app/views/projects/merge_requests/creations/_diffs.html.haml
index 16afcc516b3..5b70e894b39 100644
--- a/app/views/projects/merge_requests/creations/_diffs.html.haml
+++ b/app/views/projects/merge_requests/creations/_diffs.html.haml
@@ -1,4 +1,3 @@
-= @merge_request.inspect
 - if @merge_request.can_be_created
   = render "projects/diffs/diffs", diffs: @diffs, environment: @environment, show_whitespace_toggle: false
 - else
-- 
cgit v1.2.3


From 8415e994a277c4377901f09997d35fc3ab766384 Mon Sep 17 00:00:00 2001
From: Peter Leitzen <pleitzen@gitlab.com>
Date: Sat, 27 Oct 2018 14:41:49 +0200
Subject: Backport CE route changes for Ops Dashboard in EE

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

diff --git a/config/routes.rb b/config/routes.rb
index 8723a928cc3..37c7f98ec98 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -80,6 +80,7 @@ Rails.application.routes.draw do
     get 'ide' => 'ide#index'
     get 'ide/*vueroute' => 'ide#index', format: false
 
+    draw :operations
     draw :instance_statistics
   end
 
-- 
cgit v1.2.3


From 04e516d486173a0b35ac71f55c552327bed10d88 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <takninnovationresearch@gmail.com>
Date: Sun, 28 Oct 2018 22:48:41 +0900
Subject: Update moment to 2.22.2

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
---
 changelogs/unreleased/53273-update-moment-to-2-22-2.yml | 5 +++++
 yarn.lock                                               | 7 +------
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/53273-update-moment-to-2-22-2.yml

diff --git a/changelogs/unreleased/53273-update-moment-to-2-22-2.yml b/changelogs/unreleased/53273-update-moment-to-2-22-2.yml
new file mode 100644
index 00000000000..a6b40466927
--- /dev/null
+++ b/changelogs/unreleased/53273-update-moment-to-2-22-2.yml
@@ -0,0 +1,5 @@
+---
+title: Update moment to 2.22.2
+merge_request: 22648
+author: Takuya Noguchi
+type: security
diff --git a/yarn.lock b/yarn.lock
index 5da401c1d43..57901d50c2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5502,12 +5502,7 @@ mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
   dependencies:
     minimist "0.0.8"
 
-moment@2.x:
-  version "2.19.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe"
-  integrity sha512-Rf6jiHPEfxp9+dlzxPTmRHbvoFXsh2L/U8hOupUMpnuecHQmI6cF6lUbJl3QqKPko1u6ujO+FxtcajLVfLpAtA==
-
-moment@^2.21.0:
+moment@2.x, moment@^2.21.0:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
   integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=
-- 
cgit v1.2.3


From 4611a59968c65d1eda83af6c33bb844d9610fa12 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Sun, 28 Oct 2018 18:31:08 +0000
Subject: Add failure reason for execution timeout

---
 app/models/commit_status.rb                                      | 3 ++-
 app/presenters/commit_status_presenter.rb                        | 3 ++-
 .../unreleased/add-failure-reason-for-execution-timeout.yml      | 5 +++++
 lib/gitlab/ci/status/build/failed.rb                             | 3 ++-
 spec/requests/api/runner_spec.rb                                 | 9 +++++++++
 5 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/add-failure-reason-for-execution-timeout.yml

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 344f091c872..7d36f9982ab 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -50,7 +50,8 @@ class CommitStatus < ActiveRecord::Base
     runner_system_failure: 4,
     missing_dependency_failure: 5,
     runner_unsupported: 6,
-    stale_schedule: 7
+    stale_schedule: 7,
+    job_execution_timeout: 8
   }
 
   ##
diff --git a/app/presenters/commit_status_presenter.rb b/app/presenters/commit_status_presenter.rb
index 29eaad759bb..a866e76df5a 100644
--- a/app/presenters/commit_status_presenter.rb
+++ b/app/presenters/commit_status_presenter.rb
@@ -9,7 +9,8 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
     runner_system_failure: 'There has been a runner system failure, please try again',
     missing_dependency_failure: 'There has been a missing dependency failure',
     runner_unsupported: 'Your runner is outdated, please upgrade your runner',
-    stale_schedule: 'Delayed job could not be executed by some reason, please try again'
+    stale_schedule: 'Delayed job could not be executed by some reason, please try again',
+    job_execution_timeout: 'The script exceeded the maximum execution time set for the job'
   }.freeze
 
   private_constant :CALLOUT_FAILURE_MESSAGES
diff --git a/changelogs/unreleased/add-failure-reason-for-execution-timeout.yml b/changelogs/unreleased/add-failure-reason-for-execution-timeout.yml
new file mode 100644
index 00000000000..c8488cbf200
--- /dev/null
+++ b/changelogs/unreleased/add-failure-reason-for-execution-timeout.yml
@@ -0,0 +1,5 @@
+---
+title: Add failure reason for execution timeout
+merge_request: 22224
+author:
+type: changed
diff --git a/lib/gitlab/ci/status/build/failed.rb b/lib/gitlab/ci/status/build/failed.rb
index 50b0d044265..4babc23a495 100644
--- a/lib/gitlab/ci/status/build/failed.rb
+++ b/lib/gitlab/ci/status/build/failed.rb
@@ -11,7 +11,8 @@ module Gitlab
             runner_system_failure: 'runner system failure',
             missing_dependency_failure: 'missing dependency failure',
             runner_unsupported: 'unsupported runner',
-            stale_schedule: 'stale schedule'
+            stale_schedule: 'stale schedule',
+            job_execution_timeout: 'job execution timeout'
           }.freeze
 
           private_constant :REASONS
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index c0d5a3ad74b..909703a8d47 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -806,6 +806,15 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
 
           it { expect(job).to be_unknown_failure }
         end
+
+        context 'when failure_reason is job_execution_timeout' do
+          before do
+            update_job(state: 'failed', failure_reason: 'job_execution_timeout')
+            job.reload
+          end
+
+          it { expect(job).to be_job_execution_timeout }
+        end
       end
 
       context 'when trace is given' do
-- 
cgit v1.2.3


From 0e15eec86d83cbdfefe17966bf5c02e4d419a34d Mon Sep 17 00:00:00 2001
From: Thong Kuah <tkuah@gitlab.com>
Date: Mon, 15 Oct 2018 09:42:29 +1300
Subject: Associate clusters model to groups

Even though we currently only should have one group for a cluster, we
allow the flexibility to associate to other groups in the future.

This also matches the runner <=> groups association.

- Adds Cluster#first_group, aliased to Cluster#group. For the
conceivable future, a cluster will have at most one group.

- Prevent mixing of group and project clusters. If project type
clusters, it should only have projects assigned.  Similarly with groups.

- Default cluster_type to :project_type. As it's very small table we can
set default and null: false in one release.
---
 app/models/clusters/cluster.rb                     | 28 +++++++++
 app/models/clusters/group.rb                       | 10 ++++
 app/models/concerns/deployment_platform.rb         |  1 +
 app/models/group.rb                                |  3 +
 app/services/clusters/create_service.rb            |  4 +-
 .../unreleased/34758-create-group-clusters.yml     |  5 ++
 db/migrate/20181014203236_create_cluster_groups.rb | 17 ++++++
 .../20181017001059_add_cluster_type_to_clusters.rb | 18 ++++++
 db/schema.rb                                       | 13 ++++-
 spec/factories/clusters/clusters.rb                | 15 +++++
 spec/models/clusters/cluster_spec.rb               | 67 ++++++++++++++++++++++
 spec/models/clusters/group_spec.rb                 |  8 +++
 spec/models/group_spec.rb                          |  2 +
 13 files changed, 188 insertions(+), 3 deletions(-)
 create mode 100644 app/models/clusters/group.rb
 create mode 100644 changelogs/unreleased/34758-create-group-clusters.yml
 create mode 100644 db/migrate/20181014203236_create_cluster_groups.rb
 create mode 100644 db/migrate/20181017001059_add_cluster_type_to_clusters.rb
 create mode 100644 spec/models/clusters/group_spec.rb

diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 95efecfc41d..222e4217e67 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -20,6 +20,12 @@ module Clusters
     has_many :cluster_projects, class_name: 'Clusters::Project'
     has_many :projects, through: :cluster_projects, class_name: '::Project'
 
+    has_many :cluster_groups, class_name: 'Clusters::Group'
+    has_many :groups, through: :cluster_groups, class_name: '::Group'
+
+    has_one :cluster_group, -> { order(id: :desc) }, class_name: 'Clusters::Group'
+    has_one :group, through: :cluster_group, class_name: '::Group'
+
     # we force autosave to happen when we save `Cluster` model
     has_one :provider_gcp, class_name: 'Clusters::Providers::Gcp', autosave: true
 
@@ -38,8 +44,12 @@ module Clusters
     accepts_nested_attributes_for :platform_kubernetes, update_only: true
 
     validates :name, cluster_name: true
+    validates :cluster_type, presence: true
     validate :restrict_modification, on: :update
 
+    validate :no_groups, unless: :group_type?
+    validate :no_projects, unless: :project_type?
+
     delegate :status, to: :provider, allow_nil: true
     delegate :status_reason, to: :provider, allow_nil: true
     delegate :on_creation?, to: :provider, allow_nil: true
@@ -50,6 +60,12 @@ module Clusters
     delegate :available?, to: :application_ingress, prefix: true, allow_nil: true
     delegate :available?, to: :application_prometheus, prefix: true, allow_nil: true
 
+    enum cluster_type: {
+      instance_type: 1,
+      group_type: 2,
+      project_type: 3
+    }
+
     enum platform_type: {
       kubernetes: 1
     }
@@ -122,5 +138,17 @@ module Clusters
 
       true
     end
+
+    def no_groups
+      if groups.any?
+        errors.add(:cluster, 'cannot have groups assigned')
+      end
+    end
+
+    def no_projects
+      if projects.any?
+        errors.add(:cluster, 'cannot have projects assigned')
+      end
+    end
   end
 end
diff --git a/app/models/clusters/group.rb b/app/models/clusters/group.rb
new file mode 100644
index 00000000000..2b08a9e47f0
--- /dev/null
+++ b/app/models/clusters/group.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Clusters
+  class Group < ActiveRecord::Base
+    self.table_name = 'cluster_groups'
+
+    belongs_to :cluster, class_name: 'Clusters::Cluster'
+    belongs_to :group, class_name: '::Group'
+  end
+end
diff --git a/app/models/concerns/deployment_platform.rb b/app/models/concerns/deployment_platform.rb
index 91052013592..e57a3383544 100644
--- a/app/models/concerns/deployment_platform.rb
+++ b/app/models/concerns/deployment_platform.rb
@@ -42,6 +42,7 @@ module DeploymentPlatform
     {
       name: 'kubernetes-template',
       projects: [self],
+      cluster_type: :project_type,
       provider_type: :user,
       platform_type: :kubernetes,
       platform_kubernetes_attributes: platform_kubernetes_attributes_from_service_template
diff --git a/app/models/group.rb b/app/models/group.rb
index 612c546ca57..c67479110c9 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -41,6 +41,9 @@ class Group < Namespace
   has_many :boards
   has_many :badges, class_name: 'GroupBadge'
 
+  has_many :cluster_groups, class_name: 'Clusters::Group'
+  has_many :clusters, through: :cluster_groups, class_name: 'Clusters::Cluster'
+
   has_many :todos
 
   accepts_nested_attributes_for :variables, allow_destroy: true
diff --git a/app/services/clusters/create_service.rb b/app/services/clusters/create_service.rb
index c6e955800af..cd843b8ffa8 100644
--- a/app/services/clusters/create_service.rb
+++ b/app/services/clusters/create_service.rb
@@ -9,9 +9,9 @@ module Clusters
     end
 
     def execute(project:, access_token: nil)
-      raise ArgumentError.new(_('Instance does not support multiple Kubernetes clusters')) unless can_create_cluster?(project)
+      raise ArgumentError, _('Instance does not support multiple Kubernetes clusters') unless can_create_cluster?(project)
 
-      cluster_params = params.merge(user: current_user, projects: [project])
+      cluster_params = params.merge(user: current_user, cluster_type: :project_type, projects: [project])
       cluster_params[:provider_gcp_attributes].try do |provider|
         provider[:access_token] = access_token
       end
diff --git a/changelogs/unreleased/34758-create-group-clusters.yml b/changelogs/unreleased/34758-create-group-clusters.yml
new file mode 100644
index 00000000000..50efde3cac3
--- /dev/null
+++ b/changelogs/unreleased/34758-create-group-clusters.yml
@@ -0,0 +1,5 @@
+---
+title: Adds model and migrations to enable group level clusters
+merge_request: 22307
+author:
+type: other
diff --git a/db/migrate/20181014203236_create_cluster_groups.rb b/db/migrate/20181014203236_create_cluster_groups.rb
new file mode 100644
index 00000000000..69382d5c851
--- /dev/null
+++ b/db/migrate/20181014203236_create_cluster_groups.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateClusterGroups < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    create_table :cluster_groups do |t|
+      t.references :cluster, null: false, foreign_key: { on_delete: :cascade }
+      t.references :group, null: false, index: true
+
+      t.index [:cluster_id, :group_id], unique: true
+      t.foreign_key :namespaces, column: :group_id, on_delete: :cascade
+    end
+  end
+end
diff --git a/db/migrate/20181017001059_add_cluster_type_to_clusters.rb b/db/migrate/20181017001059_add_cluster_type_to_clusters.rb
new file mode 100644
index 00000000000..191e7eb4fb3
--- /dev/null
+++ b/db/migrate/20181017001059_add_cluster_type_to_clusters.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddClusterTypeToClusters < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  PROJECT_CLUSTER_TYPE = 3
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default(:clusters, :cluster_type, :smallint, default: PROJECT_CLUSTER_TYPE)
+  end
+
+  def down
+    remove_column(:clusters, :cluster_type)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7a75aafd7b0..a36399cb37e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181016152238) do
+ActiveRecord::Schema.define(version: 20181017001059) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -599,6 +599,14 @@ ActiveRecord::Schema.define(version: 20181016152238) do
 
   add_index "ci_variables", ["project_id", "key", "environment_scope"], name: "index_ci_variables_on_project_id_and_key_and_environment_scope", unique: true, using: :btree
 
+  create_table "cluster_groups", force: :cascade do |t|
+    t.integer "cluster_id", null: false
+    t.integer "group_id", null: false
+  end
+
+  add_index "cluster_groups", ["cluster_id", "group_id"], name: "index_cluster_groups_on_cluster_id_and_group_id", unique: true, using: :btree
+  add_index "cluster_groups", ["group_id"], name: "index_cluster_groups_on_group_id", using: :btree
+
   create_table "cluster_platforms_kubernetes", force: :cascade do |t|
     t.integer "cluster_id", null: false
     t.datetime_with_timezone "created_at", null: false
@@ -654,6 +662,7 @@ ActiveRecord::Schema.define(version: 20181016152238) do
     t.boolean "enabled", default: true
     t.string "name", null: false
     t.string "environment_scope", default: "*", null: false
+    t.integer "cluster_type", limit: 2, default: 3, null: false
   end
 
   add_index "clusters", ["enabled"], name: "index_clusters_on_enabled", using: :btree
@@ -2372,6 +2381,8 @@ ActiveRecord::Schema.define(version: 20181016152238) do
   add_foreign_key "ci_triggers", "projects", name: "fk_e3e63f966e", on_delete: :cascade
   add_foreign_key "ci_triggers", "users", column: "owner_id", name: "fk_e8e10d1964", on_delete: :cascade
   add_foreign_key "ci_variables", "projects", name: "fk_ada5eb64b3", on_delete: :cascade
+  add_foreign_key "cluster_groups", "clusters", on_delete: :cascade
+  add_foreign_key "cluster_groups", "namespaces", column: "group_id", on_delete: :cascade
   add_foreign_key "cluster_platforms_kubernetes", "clusters", on_delete: :cascade
   add_foreign_key "cluster_projects", "clusters", on_delete: :cascade
   add_foreign_key "cluster_projects", "projects", on_delete: :cascade
diff --git a/spec/factories/clusters/clusters.rb b/spec/factories/clusters/clusters.rb
index bbeba8ce8b9..c9f5d0a813e 100644
--- a/spec/factories/clusters/clusters.rb
+++ b/spec/factories/clusters/clusters.rb
@@ -2,13 +2,28 @@ FactoryBot.define do
   factory :cluster, class: Clusters::Cluster do
     user
     name 'test-cluster'
+    cluster_type :project_type
+
+    trait :instance do
+      cluster_type { Clusters::Cluster.cluster_types[:instance_type] }
+    end
 
     trait :project do
+      cluster_type { Clusters::Cluster.cluster_types[:project_type] }
+
       before(:create) do |cluster, evaluator|
         cluster.projects << create(:project, :repository)
       end
     end
 
+    trait :group do
+      cluster_type { Clusters::Cluster.cluster_types[:group_type] }
+
+      before(:create) do |cluster, evalutor|
+        cluster.groups << create(:group)
+      end
+    end
+
     trait :provided_by_user do
       provider_type :user
       platform_type :kubernetes
diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb
index f5c4b0b66ae..c245e8df815 100644
--- a/spec/models/clusters/cluster_spec.rb
+++ b/spec/models/clusters/cluster_spec.rb
@@ -4,7 +4,10 @@ require 'spec_helper'
 
 describe Clusters::Cluster do
   it { is_expected.to belong_to(:user) }
+  it { is_expected.to have_many(:cluster_projects) }
   it { is_expected.to have_many(:projects) }
+  it { is_expected.to have_many(:cluster_groups) }
+  it { is_expected.to have_many(:groups) }
   it { is_expected.to have_one(:provider_gcp) }
   it { is_expected.to have_one(:platform_kubernetes) }
   it { is_expected.to have_one(:application_helm) }
@@ -178,6 +181,53 @@ describe Clusters::Cluster do
         it { expect(cluster.update(enabled: false)).to be_truthy }
       end
     end
+
+    describe 'cluster_type validations' do
+      let(:instance_cluster) { create(:cluster, :instance) }
+      let(:group_cluster) { create(:cluster, :group) }
+      let(:project_cluster) { create(:cluster, :project) }
+
+      it 'validates presence' do
+        cluster = build(:cluster, :project, cluster_type: nil)
+
+        expect(cluster).not_to be_valid
+        expect(cluster.errors.full_messages).to include("Cluster type can't be blank")
+      end
+
+      context 'project_type cluster' do
+        it 'does not allow setting group' do
+          project_cluster.groups << build(:group)
+
+          expect(project_cluster).not_to be_valid
+          expect(project_cluster.errors.full_messages).to include('Cluster cannot have groups assigned')
+        end
+      end
+
+      context 'group_type cluster' do
+        it 'does not allow setting project' do
+          group_cluster.projects << build(:project)
+
+          expect(group_cluster).not_to be_valid
+          expect(group_cluster.errors.full_messages).to include('Cluster cannot have projects assigned')
+        end
+      end
+
+      context 'instance_type cluster' do
+        it 'does not allow setting group' do
+          instance_cluster.groups << build(:group)
+
+          expect(instance_cluster).not_to be_valid
+          expect(instance_cluster.errors.full_messages).to include('Cluster cannot have groups assigned')
+        end
+
+        it 'does not allow setting project' do
+          instance_cluster.projects << build(:project)
+
+          expect(instance_cluster).not_to be_valid
+          expect(instance_cluster.errors.full_messages).to include('Cluster cannot have projects assigned')
+        end
+      end
+    end
   end
 
   describe '#provider' do
@@ -229,6 +279,23 @@ describe Clusters::Cluster do
     end
   end
 
+  describe '#group' do
+    subject { cluster.group }
+
+    context 'when cluster belongs to a group' do
+      let(:cluster) { create(:cluster, :group) }
+      let(:group) { cluster.groups.first }
+
+      it { is_expected.to eq(group) }
+    end
+
+    context 'when cluster does not belong to any group' do
+      let(:cluster) { create(:cluster) }
+
+      it { is_expected.to be_nil }
+    end
+  end
+
   describe '#applications' do
     set(:cluster) { create(:cluster) }
 
diff --git a/spec/models/clusters/group_spec.rb b/spec/models/clusters/group_spec.rb
new file mode 100644
index 00000000000..ba145342cb8
--- /dev/null
+++ b/spec/models/clusters/group_spec.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Clusters::Group do
+  it { is_expected.to belong_to(:cluster) }
+  it { is_expected.to belong_to(:group) }
+end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 1bf8f89e126..571b160d901 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -19,6 +19,8 @@ describe Group do
     it { is_expected.to have_one(:chat_team) }
     it { is_expected.to have_many(:custom_attributes).class_name('GroupCustomAttribute') }
     it { is_expected.to have_many(:badges).class_name('GroupBadge') }
+    it { is_expected.to have_many(:cluster_groups).class_name('Clusters::Group') }
+    it { is_expected.to have_many(:clusters).class_name('Clusters::Cluster') }
 
     describe '#members & #requesters' do
       let(:requester) { create(:user) }
-- 
cgit v1.2.3


From 7fb30b4cc4994022e55460e6905996212859cfb6 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 28 Oct 2018 23:57:20 -0700
Subject: Upgrade whitequark/parser to 2.5.3.0

This squelches the following warning:

warning: parser/current is loading parser/ruby24, which recognizes
warning: 2.4.4-compliant syntax, but you are running 2.4.5.
warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri.
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e533b564d15..72fd7d679d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -547,7 +547,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.0.0)
     parallel (1.12.1)
-    parser (2.5.1.2)
+    parser (2.5.3.0)
       ast (~> 2.4.0)
     parslet (1.8.2)
     peek (1.0.1)
-- 
cgit v1.2.3


From 8861885773df0172f33518497cc5b01afc954c7e Mon Sep 17 00:00:00 2001
From: Kushal Pandya <kushal@gitlab.com>
Date: Mon, 29 Oct 2018 13:31:50 +0530
Subject: Update tooltip for when no date is present, port back EE changes

---
 .../components/sidebar/collapsed_calendar_icon.vue | 16 ++++++++
 .../sidebar/collapsed_grouped_date_picker.vue      | 44 ++++++++++++----------
 locale/gitlab.pot                                  |  6 +++
 .../sidebar/collapsed_grouped_date_picker_spec.js  | 22 +++--------
 4 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon.vue b/app/assets/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon.vue
index 7f1eb6bcec4..11fac3bb12c 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon.vue
@@ -1,6 +1,11 @@
 <script>
+  import tooltip from '~/vue_shared/directives/tooltip';
+
   export default {
     name: 'CollapsedCalendarIcon',
+    directives: {
+      tooltip,
+    },
     props: {
       containerClass: {
         type: String,
@@ -17,6 +22,11 @@
         required: false,
         default: true,
       },
+      tooltipText: {
+        type: String,
+        required: false,
+        default: '',
+      },
     },
     methods: {
       click() {
@@ -28,7 +38,13 @@
 
 <template>
   <div
+    v-tooltip
     :class="containerClass"
+    :title="tooltipText"
+    data-container="body"
+    data-placement="left"
+    data-html="true"
+    data-boundary="viewport"
     @click="click"
   >
     <i
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue b/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue
index dac438a702d..6e7194ccc9e 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue
@@ -1,25 +1,23 @@
 <script>
-  import { dateInWords } from '../../../lib/utils/datetime_utility';
-  import toggleSidebar from './toggle_sidebar.vue';
+  import { __ } from '~/locale';
+  import timeagoMixin from '~/vue_shared/mixins/timeago';
+  import { dateInWords, timeFor } from '~/lib/utils/datetime_utility';
   import collapsedCalendarIcon from './collapsed_calendar_icon.vue';
 
   export default {
     name: 'SidebarCollapsedGroupedDatePicker',
     components: {
-      toggleSidebar,
       collapsedCalendarIcon,
     },
+    mixins: [
+      timeagoMixin,
+    ],
     props: {
       collapsed: {
         type: Boolean,
         required: false,
         default: true,
       },
-      showToggleSidebar: {
-        type: Boolean,
-        required: false,
-        default: false,
-      },
       minDate: {
         type: Date,
         required: false,
@@ -51,7 +49,7 @@
       },
       iconClass() {
         const disabledClass = this.disableClickableIcons ? 'disabled' : '';
-        return `block sidebar-collapsed-icon calendar-icon ${disabledClass}`;
+        return `sidebar-collapsed-icon calendar-icon ${disabledClass}`;
       },
     },
     methods: {
@@ -63,7 +61,21 @@
         const dateWords = dateInWords(date, true);
         const parsedDateWords = dateWords ? dateWords.replace(',', '') : dateWords;
 
-        return date ? parsedDateWords : 'None';
+        return date ? parsedDateWords : __('None');
+      },
+      tooltipText(dateType = 'min') {
+        const defaultText = dateType === 'min' ? __('Start date') : __('Due date');
+        const date = this[`${dateType}Date`];
+        const timeAgo = dateType === 'min' ? this.timeFormated(date) : timeFor(date);
+        const dateText = date ? [
+          this.dateText(dateType),
+          `(${timeAgo})`,
+        ].join(' ') : '';
+
+        if (date) {
+          return [defaultText, dateText].join('<br />');
+        }
+        return __('Start and due date');
       },
     },
   };
@@ -71,18 +83,10 @@
 
 <template>
   <div class="block sidebar-grouped-item">
-    <div
-      v-if="showToggleSidebar"
-      class="issuable-sidebar-header"
-    >
-      <toggle-sidebar
-        :collapsed="collapsed"
-        @toggle="toggleSidebar"
-      />
-    </div>
     <collapsed-calendar-icon
       v-if="showMinDateBlock"
       :container-class="iconClass"
+      :tooltip-text="tooltipText('min')"
       @click="toggleSidebar"
     >
       <span class="sidebar-collapsed-value">
@@ -99,7 +103,7 @@
     <collapsed-calendar-icon
       v-if="maxDate"
       :container-class="iconClass"
-      :show-icon="!minDate"
+      :tooltip-text="tooltipText('max')"
       @click="toggleSidebar"
     >
       <span class="sidebar-collapsed-value">
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 26270595c6a..86dcc1a99b9 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5784,6 +5784,12 @@ msgstr ""
 msgid "Start a %{new_merge_request} with these changes"
 msgstr ""
 
+msgid "Start and due date"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
 msgid "Start the Runner!"
 msgstr ""
 
diff --git a/spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js b/spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
index 026a0c7ea09..3483b7d387d 100644
--- a/spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
+++ b/spec/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js
@@ -11,16 +11,6 @@ describe('collapsedGroupedDatePicker', () => {
     });
   });
 
-  it('should render toggle sidebar if showToggleSidebar', (done) => {
-    expect(vm.$el.querySelector('.issuable-sidebar-header')).toBeDefined();
-
-    vm.showToggleSidebar = false;
-    Vue.nextTick(() => {
-      expect(vm.$el.querySelector('.issuable-sidebar-header')).toBeNull();
-      done();
-    });
-  });
-
   describe('toggleCollapse events', () => {
     beforeEach((done) => {
       spyOn(vm, 'toggleSidebar');
@@ -28,12 +18,6 @@ describe('collapsedGroupedDatePicker', () => {
       Vue.nextTick(done);
     });
 
-    it('should emit when sidebar is toggled', () => {
-      vm.$el.querySelector('.gutter-toggle').click();
-
-      expect(vm.toggleSidebar).toHaveBeenCalled();
-    });
-
     it('should emit when collapsed-calendar-icon is clicked', () => {
       vm.$el.querySelector('.sidebar-collapsed-icon').click();
 
@@ -92,5 +76,11 @@ describe('collapsedGroupedDatePicker', () => {
       expect(icons.length).toEqual(1);
       expect(icons[0].innerText.trim()).toEqual('None');
     });
+
+    it('should have tooltip as `Start and due date`', () => {
+      const icons = vm.$el.querySelectorAll('.sidebar-collapsed-icon');
+
+      expect(icons[0].dataset.originalTitle).toBe('Start and due date');
+    });
   });
 });
-- 
cgit v1.2.3


From dadc046d3a5c797294330bcd26acdadac069c9cc Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <acaiazza@gitlab.com>
Date: Mon, 29 Oct 2018 11:34:41 +0000
Subject: post merge pipeline and environments status

---
 .../components/deployment.vue                      |  15 +-
 .../vue_merge_request_widget/mr_widget_options.vue |  95 ++++++++---
 .../services/mr_widget_service.js                  |   8 +-
 .../stores/mr_widget_store.js                      |   2 +
 .../projects/merge_requests_controller.rb          |  12 +-
 app/models/deployment.rb                           |   4 +
 app/models/environment_status.rb                   |  41 ++++-
 app/models/merge_request.rb                        |   6 +
 app/serializers/environment_status_entity.rb       |   1 +
 app/serializers/merge_request_widget_entity.rb     |   1 +
 changelogs/unreleased/ac-post-merge-pipeline.yml   |   5 +
 locale/gitlab.pot                                  |  15 ++
 .../projects/merge_requests_controller_spec.rb     |  51 +++++-
 .../user_sees_deployment_widget_spec.rb            |  19 +--
 .../merge_request/user_sees_merge_widget_spec.rb   |  11 +-
 .../api/schemas/entities/merge_request_widget.json |   1 +
 .../vue_mr_widget/components/deployment_spec.js    | 142 +++++++++-------
 .../vue_mr_widget/mr_widget_options_spec.js        | 188 ++++++++++++++++++++-
 spec/models/environment_status_spec.rb             |  32 +++-
 spec/models/merge_request_spec.rb                  |  20 +++
 spec/serializers/environment_status_entity_spec.rb |   3 +-
 .../merge_request_widget_entity_spec.rb            |  34 ++++
 22 files changed, 588 insertions(+), 118 deletions(-)
 create mode 100644 changelogs/unreleased/ac-post-merge-pipeline.yml

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
index 6c87287a4c4..5e7a35e9396 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue
@@ -2,6 +2,7 @@
 import Icon from '~/vue_shared/components/icon.vue';
 import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
 import FilteredSearchDropdown from '~/vue_shared/components/filtered_search_dropdown.vue';
+import { __ } from '~/locale';
 import timeagoMixin from '../../vue_shared/mixins/timeago';
 import tooltip from '../../vue_shared/directives/tooltip';
 import LoadingButton from '../../vue_shared/components/loading_button.vue';
@@ -31,6 +32,11 @@ export default {
       required: true,
     },
   },
+  deployedTextMap: {
+    running: __('Deploying to'),
+    success: __('Deployed to'),
+    failed: __('Failed to deploy to'),
+  },
   data() {
     const features = window.gon.features || {};
     return {
@@ -54,10 +60,13 @@ export default {
     hasMetrics() {
       return !!this.deployment.metrics_url;
     },
+    deployedText() {
+      return this.$options.deployedTextMap[this.deployment.status];
+    },
   },
   methods: {
     stopEnvironment() {
-      const msg = 'Are you sure you want to stop this environment?';
+      const msg = __('Are you sure you want to stop this environment?');
       const isConfirmed = confirm(msg); // eslint-disable-line
 
       if (isConfirmed) {
@@ -87,10 +96,10 @@ export default {
     <div class="ci-widget media">
       <div class="media-body">
         <div class="deploy-body">
-          <div class="deployment-info">
+          <div class="js-deployment-info deployment-info">
             <template v-if="hasDeploymentMeta">
               <span>
-                Deployed to
+                {{ deployedText }}
               </span>
               <tooltip-on-truncate
                 :title="deployment.name"
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
index 5d9f7cebcf2..a5c69d2bc7a 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
@@ -1,4 +1,6 @@
 <script>
+import _ from 'underscore';
+import { __ } from '~/locale';
 import Project from '~/pages/projects/project';
 import SmartInterval from '~/smart_interval';
 import createFlash from '../flash';
@@ -80,6 +82,7 @@ export default {
     const service = this.createService(store);
     return {
       mr: store,
+      state: store.state,
       service,
     };
   },
@@ -103,6 +106,17 @@ export default {
         (!this.mr.isNothingToMergeState && !this.mr.isMergedState)
       );
     },
+    shouldRenderMergedPipeline() {
+      return this.mr.state === 'merged' && !_.isEmpty(this.mr.mergePipeline);
+    },
+  },
+  watch: {
+    state(newVal, oldVal) {
+      if (newVal !== oldVal && this.shouldRenderMergedPipeline) {
+        // init polling
+        this.initPostMergeDeploymentsPolling();
+      }
+    }
   },
   created() {
     this.initPolling();
@@ -112,11 +126,19 @@ export default {
   mounted() {
     this.setFaviconHelper();
     this.initDeploymentsPolling();
+
+    if (this.shouldRenderMergedPipeline) {
+      this.initPostMergeDeploymentsPolling();
+    }
   },
   beforeDestroy() {
     eventHub.$off('mr.discussion.updated', this.checkStatus);
     this.pollingInterval.destroy();
     this.deploymentsInterval.destroy();
+
+    if (this.postMergeDeploymentsInterval) {
+      this.postMergeDeploymentsInterval.destroy();
+    }
   },
   methods: {
     createService(store) {
@@ -146,7 +168,13 @@ export default {
             cb.call(null, data);
           }
         })
-        .catch(() => createFlash('Something went wrong. Please try again.'));
+        .catch(() => createFlash(__('Something went wrong. Please try again.')));
+    },
+    setFaviconHelper() {
+      if (this.mr.ciStatusFaviconPath) {
+        return setFaviconOverlay(this.mr.ciStatusFaviconPath);
+      }
+      return Promise.resolve();
     },
     initPolling() {
       this.pollingInterval = new SmartInterval({
@@ -158,8 +186,14 @@ export default {
       });
     },
     initDeploymentsPolling() {
-      this.deploymentsInterval = new SmartInterval({
-        callback: this.fetchDeployments,
+      this.deploymentsInterval = this.deploymentsPoll(this.fetchPreMergeDeployments);
+    },
+    initPostMergeDeploymentsPolling() {
+      this.postMergeDeploymentsInterval = this.deploymentsPoll(this.fetchPostMergeDeployments);
+    },
+    deploymentsPoll(callback) {
+      return new SmartInterval({
+        callback,
         startingInterval: 30000,
         maxInterval: 120000,
         hiddenInterval: 240000,
@@ -167,26 +201,29 @@ export default {
         immediateExecution: true,
       });
     },
-    setFaviconHelper() {
-      if (this.mr.ciStatusFaviconPath) {
-        return setFaviconOverlay(this.mr.ciStatusFaviconPath);
-      }
-      return Promise.resolve();
+    fetchDeployments(target) {
+      return this.service.fetchDeployments(target);
     },
-    fetchDeployments() {
-      return this.service
-        .fetchDeployments()
-        .then(res => res.data)
-        .then(data => {
+    fetchPreMergeDeployments() {
+      return this.fetchDeployments()
+        .then(({ data }) => {
           if (data.length) {
             this.mr.deployments = data;
           }
         })
-        .catch(() => {
-          createFlash(
-            'Something went wrong while fetching the environments for this merge request. Please try again.',
-          );
-        });
+        .catch(() => this.throwDeploymentsError());
+    },
+    fetchPostMergeDeployments(){
+      return this.fetchDeployments('merge_commit')
+        .then(({ data }) => {
+          if (data.length) {
+            this.mr.postMergeDeployments = data;
+          }
+        })
+      .catch(() => this.throwDeploymentsError());
+    },
+    throwDeploymentsError() {
+      createFlash(__('Something went wrong while fetching the environments for this merge request. Please try again.'));
     },
     fetchActionsContent() {
       this.service
@@ -199,7 +236,7 @@ export default {
             Project.initRefSwitcher();
           }
         })
-        .catch(() => createFlash('Something went wrong. Please try again.'));
+        .catch(() => createFlash(__('Something went wrong. Please try again.')));
     },
     handleNotification(data) {
       if (data.ci_status === this.mr.ciStatus) return;
@@ -267,7 +304,8 @@ export default {
     />
     <deployment
       v-for="deployment in mr.deployments"
-      :key="deployment.id"
+      :key="`pre-merge-deploy-${deployment.id}`"
+      class="js-pre-merge-deploy"
       :deployment="deployment"
     />
     <div class="mr-section-container">
@@ -308,5 +346,22 @@ export default {
         <mr-widget-merge-help />
       </div>
     </div>
+
+    <template v-if="shouldRenderMergedPipeline">
+      <mr-widget-pipeline
+        class="js-post-merge-pipeline prepend-top-default"
+        :pipeline="mr.mergePipeline"
+        :ci-status="mr.ciStatus"
+        :has-ci="mr.hasCI"
+        :source-branch="mr.targetBranch"
+        :source-branch-link="mr.targetBranch"
+      />
+      <deployment
+        v-for="postMergeDeployment in mr.postMergeDeployments"
+        :key="`post-merge-deploy-${postMergeDeployment.id}`"
+        :deployment="postMergeDeployment"
+        class="js-post-deployment"
+      />
+    </template>
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js b/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js
index fecbfec2214..bf5b85b2ae6 100644
--- a/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js
+++ b/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js
@@ -21,8 +21,12 @@ export default class MRWidgetService {
     return axios.delete(this.endpoints.sourceBranchPath);
   }
 
-  fetchDeployments() {
-    return axios.get(this.endpoints.ciEnvironmentsStatusPath);
+  fetchDeployments(targetParam) {
+    return axios.get(this.endpoints.ciEnvironmentsStatusPath, {
+      params: {
+        environment_target: targetParam
+      }
+    });
   }
 
   poll() {
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index e6655914700..a0c008e7314 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -32,7 +32,9 @@ export default class MergeRequestStore {
     this.commitsCount = data.commits_count;
     this.divergedCommitsCount = data.diverged_commits_count;
     this.pipeline = data.pipeline || {};
+    this.mergePipeline = data.merge_pipeline || {};
     this.deployments = this.deployments || data.deployments || [];
+    this.postMergeDeployments = this.postMergeDeployments || [];
     this.initRebase(data);
 
     if (data.issues_links) {
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 757b03d0b0e..614722fd60d 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -201,9 +201,11 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   end
 
   def ci_environments_status
-    environments = @merge_request.environments_for(current_user).map do |environment|
-      EnvironmentStatus.new(environment, @merge_request)
-    end
+    environments = if ci_environments_status_on_merge_result?
+                     EnvironmentStatus.after_merge_request(@merge_request, current_user)
+                   else
+                     EnvironmentStatus.for_merge_request(@merge_request, current_user)
+                   end
 
     render json: EnvironmentStatusSerializer.new(current_user: current_user).represent(environments)
   end
@@ -241,6 +243,10 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
 
   private
 
+  def ci_environments_status_on_merge_result?
+    params[:environment_target] == 'merge_commit'
+  end
+
   def target_branch_missing?
     @merge_request.has_no_commits? && !@merge_request.target_branch_exists?
   end
diff --git a/app/models/deployment.rb b/app/models/deployment.rb
index 62dc0f2cbeb..ee5b96e7454 100644
--- a/app/models/deployment.rb
+++ b/app/models/deployment.rb
@@ -127,6 +127,10 @@ class Deployment < ActiveRecord::Base
     metrics&.merge(deployment_time: created_at.to_i) || {}
   end
 
+  def status
+    'success'
+  end
+
   private
 
   def prometheus_adapter
diff --git a/app/models/environment_status.rb b/app/models/environment_status.rb
index 5ff3acc0e58..a84871f7253 100644
--- a/app/models/environment_status.rb
+++ b/app/models/environment_status.rb
@@ -3,21 +3,33 @@
 class EnvironmentStatus
   include Gitlab::Utils::StrongMemoize
 
-  attr_reader :environment, :merge_request
+  attr_reader :environment, :merge_request, :sha
 
   delegate :id, to: :environment
   delegate :name, to: :environment
   delegate :project, to: :environment
   delegate :deployed_at, to: :deployment, allow_nil: true
+  delegate :status, to: :deployment
 
-  def initialize(environment, merge_request)
+  def self.for_merge_request(mr, user)
+    build_environments_status(mr, user, mr.head_pipeline)
+  end
+
+  def self.after_merge_request(mr, user)
+    return [] unless mr.merged?
+
+    build_environments_status(mr, user, mr.merge_pipeline)
+  end
+
+  def initialize(environment, merge_request, sha)
     @environment = environment
     @merge_request = merge_request
+    @sha = sha
   end
 
   def deployment
     strong_memoize(:deployment) do
-      environment.first_deployment_for(merge_request.diff_head_sha)
+      environment.first_deployment_for(sha)
     end
   end
 
@@ -26,10 +38,9 @@ class EnvironmentStatus
   end
 
   def changes
-    sha = merge_request.diff_head_sha
     return [] if project.route_map_for(sha).nil?
 
-    changed_files.map { |file| build_change(file, sha) }.compact
+    changed_files.map { |file| build_change(file) }.compact
   end
 
   def changed_files
@@ -41,7 +52,7 @@ class EnvironmentStatus
 
   PAGE_EXTENSIONS = /\A\.(s?html?|php|asp|cgi|pl)\z/i.freeze
 
-  def build_change(file, sha)
+  def build_change(file)
     public_path = project.public_path_for_source_path(file.new_path, sha)
     return if public_path.nil?
 
@@ -53,4 +64,22 @@ class EnvironmentStatus
       external_url: environment.external_url_for(file.new_path, sha)
     }
   end
+
+  def self.build_environments_status(mr, user, pipeline)
+    return [] unless pipeline.present?
+
+    find_environments(user, pipeline).map do |environment|
+      EnvironmentStatus.new(environment, mr, pipeline.sha)
+    end
+  end
+  private_class_method :build_environments_status
+
+  def self.find_environments(user, pipeline)
+    env_ids = Deployment.where(deployable: pipeline.builds).select(:environment_id)
+
+    Environment.available.where(id: env_ids).select do |environment|
+      Ability.allowed?(user, :read_environment, environment)
+    end
+  end
+  private_class_method :find_environments
 end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 6559f94a696..7eef08aa6a3 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -204,6 +204,12 @@ class MergeRequest < ActiveRecord::Base
     head_pipeline&.sha == diff_head_sha ? head_pipeline : nil
   end
 
+  def merge_pipeline
+    return unless merged?
+
+    target_project.pipeline_for(target_branch, merge_commit_sha)
+  end
+
   # Pattern used to extract `!123` merge request references from text
   #
   # This pattern supports cross-project references.
diff --git a/app/serializers/environment_status_entity.rb b/app/serializers/environment_status_entity.rb
index 3dfa4f204c9..f87cc894d2f 100644
--- a/app/serializers/environment_status_entity.rb
+++ b/app/serializers/environment_status_entity.rb
@@ -5,6 +5,7 @@ class EnvironmentStatusEntity < Grape::Entity
 
   expose :id
   expose :name
+  expose :status
 
   expose :url do |es|
     project_environment_path(es.project, es.environment)
diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb
index 9ec24f799ef..f33a1654d5e 100644
--- a/app/serializers/merge_request_widget_entity.rb
+++ b/app/serializers/merge_request_widget_entity.rb
@@ -55,6 +55,7 @@ class MergeRequestWidgetEntity < IssuableEntity
 
   expose :merge_commit_message
   expose :actual_head_pipeline, with: PipelineDetailsEntity, as: :pipeline
+  expose :merge_pipeline, with: PipelineDetailsEntity, if: ->(mr, _) { mr.merged? && can?(request.current_user, :read_pipeline, mr.target_project)}
 
   # Booleans
   expose :merge_ongoing?, as: :merge_ongoing
diff --git a/changelogs/unreleased/ac-post-merge-pipeline.yml b/changelogs/unreleased/ac-post-merge-pipeline.yml
new file mode 100644
index 00000000000..08322c9cb8a
--- /dev/null
+++ b/changelogs/unreleased/ac-post-merge-pipeline.yml
@@ -0,0 +1,5 @@
+---
+title: Show post-merge pipeline in merge request page
+merge_request: 22292
+author:
+type: added
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 463a58fff7c..7f7b44800c7 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -648,6 +648,9 @@ msgstr ""
 msgid "Are you sure you want to reset the health check token?"
 msgstr ""
 
+msgid "Are you sure you want to stop this environment?"
+msgstr ""
+
 msgid "Are you sure?"
 msgstr ""
 
@@ -2324,6 +2327,12 @@ msgstr ""
 msgid "DeployTokens|Your new project deploy token has been created."
 msgstr ""
 
+msgid "Deployed to"
+msgstr ""
+
+msgid "Deploying to"
+msgstr ""
+
 msgid "Deprioritize label"
 msgstr ""
 
@@ -2750,6 +2759,9 @@ msgstr ""
 msgid "Failed to check related branches."
 msgstr ""
 
+msgid "Failed to deploy to"
+msgstr ""
+
 msgid "Failed to load emoji list."
 msgstr ""
 
@@ -5604,6 +5616,9 @@ msgstr ""
 msgid "Something went wrong while fetching comments. Please try again."
 msgstr ""
 
+msgid "Something went wrong while fetching the environments for this merge request. Please try again."
+msgstr ""
+
 msgid "Something went wrong while fetching the projects."
 msgstr ""
 
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index dcfd6c05200..7b0459e0325 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -749,13 +749,15 @@ describe Projects::MergeRequestsController do
 
   describe 'GET ci_environments_status' do
     context 'the environment is from a forked project' do
-      let!(:forked)      { fork_project(project, user, repository: true) }
-      let!(:environment) { create(:environment, project: forked) }
-      let!(:deployment)  { create(:deployment, environment: environment, sha: forked.commit.id, ref: 'master') }
-      let(:admin)        { create(:admin) }
+      let(:forked)      { fork_project(project, user, repository: true) }
+      let(:sha)         { forked.commit.sha }
+      let(:environment) { create(:environment, project: forked) }
+      let(:pipeline)    { create(:ci_pipeline, sha: sha, project: forked) }
+      let(:build)       { create(:ci_build, pipeline: pipeline) }
+      let!(:deployment) { create(:deployment, environment: environment, sha: sha, ref: 'master', deployable: build) }
 
       let(:merge_request) do
-        create(:merge_request, source_project: forked, target_project: project)
+        create(:merge_request, source_project: forked, target_project: project, target_branch: 'master', head_pipeline: pipeline)
       end
 
       it 'links to the environment on that project' do
@@ -764,6 +766,35 @@ describe Projects::MergeRequestsController do
         expect(json_response.first['url']).to match /#{forked.full_path}/
       end
 
+      context "when environment_target is 'merge_commit'" do
+        it 'returns nothing' do
+          get_ci_environments_status(environment_target: 'merge_commit')
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(json_response).to be_empty
+        end
+
+        context 'when is merged' do
+          let(:source_environment)  { create(:environment, project: project) }
+          let(:merge_commit_sha)    { project.repository.merge(user, forked.commit.id, merge_request, "merged in test") }
+          let(:post_merge_pipeline) { create(:ci_pipeline, sha: merge_commit_sha, project: project) }
+          let(:post_merge_build)    { create(:ci_build, pipeline: post_merge_pipeline) }
+          let!(:source_deployment)  { create(:deployment, environment: source_environment, sha: merge_commit_sha, ref: 'master', deployable: post_merge_build) }
+
+          before do
+            merge_request.update!(merge_commit_sha: merge_commit_sha)
+            merge_request.mark_as_merged!
+          end
+
+          it 'returns the enviroment on the source project' do
+            get_ci_environments_status(environment_target: 'merge_commit')
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(json_response.first['url']).to match /#{project.full_path}/
+          end
+        end
+      end
+
       # we're trying to reduce the overall number of queries for this method.
       # set a hard limit for now. https://gitlab.com/gitlab-org/gitlab-ce/issues/52287
       it 'keeps queries in check' do
@@ -772,11 +803,15 @@ describe Projects::MergeRequestsController do
         expect(control_count).to be <= 137
       end
 
-      def get_ci_environments_status
-        get :ci_environments_status,
+      def get_ci_environments_status(extra_params = {})
+        params = {
           namespace_id: merge_request.project.namespace.to_param,
           project_id: merge_request.project,
-          id: merge_request.iid, format: 'json'
+          id: merge_request.iid,
+          format: 'json'
+        }
+
+        get :ci_environments_status, params.merge(extra_params)
       end
     end
   end
diff --git a/spec/features/merge_request/user_sees_deployment_widget_spec.rb b/spec/features/merge_request/user_sees_deployment_widget_spec.rb
index f744d7941f5..a298ead43db 100644
--- a/spec/features/merge_request/user_sees_deployment_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_deployment_widget_spec.rb
@@ -3,15 +3,19 @@ require 'rails_helper'
 describe 'Merge request > User sees deployment widget', :js do
   describe 'when deployed to an environment' do
     let(:user) { create(:user) }
-    let(:project) { merge_request.target_project }
-    let(:merge_request) { create(:merge_request, :merged) }
+    let(:project) { create(:project, :repository) }
+    let(:merge_request) { create(:merge_request, :merged, source_project: project) }
     let(:environment) { create(:environment, project: project) }
     let(:role) { :developer }
-    let(:sha) { project.commit('master').id }
-    let!(:deployment) { create(:deployment, environment: environment, sha: sha) }
+    let(:ref) { merge_request.target_branch }
+    let(:sha) { project.commit(ref).id }
+    let(:pipeline) { create(:ci_pipeline_without_jobs, sha: sha, project: project, ref: ref) }
+    let(:build)    { create(:ci_build, :success, pipeline: pipeline) }
+    let!(:deployment) { create(:deployment, environment: environment, sha: sha, ref: ref, deployable: build) }
     let!(:manual) { }
 
     before do
+      merge_request.update!(merge_commit_sha: sha)
       project.add_user(user, role)
       sign_in(user)
       visit project_merge_request_path(project, merge_request)
@@ -26,15 +30,10 @@ describe 'Merge request > User sees deployment widget', :js do
     end
 
     context 'with stop action' do
-      let(:pipeline) { create(:ci_pipeline, project: project) }
-      let(:build) { create(:ci_build, pipeline: pipeline) }
       let(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') }
-      let(:deployment) do
-        create(:deployment, environment: environment, ref: merge_request.target_branch,
-                            sha: sha, deployable: build, on_stop: 'close_app')
-      end
 
       before do
+        deployment.update!(on_stop: manual.name)
         wait_for_requests
       end
 
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb
index f15129759de..4e5699f9571 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -40,21 +40,26 @@ describe 'Merge request > User sees merge widget', :js do
 
   context 'view merge request' do
     let!(:environment) { create(:environment, project: project) }
+    let(:sha)          { project.commit(merge_request.source_branch).sha }
+    let(:pipeline)     { create(:ci_pipeline_without_jobs, status: 'success', sha: sha, project: project, ref: merge_request.source_branch) }
+    let(:build)        { create(:ci_build, :success, pipeline: pipeline) }
 
     let!(:deployment) do
       create(:deployment, environment: environment,
-                          ref: 'feature',
-                          sha: merge_request.diff_head_sha)
+                          ref: merge_request.source_branch,
+                          deployable: build,
+                          sha: sha)
     end
 
     before do
+      merge_request.update!(head_pipeline: pipeline)
       visit project_merge_request_path(project, merge_request)
     end
 
     it 'shows environments link' do
       wait_for_requests
 
-      page.within('.mr-widget-heading') do
+      page.within('.js-pre-merge-deploy') do
         expect(page).to have_content("Deployed to #{environment.name}")
         expect(find('.js-deploy-url')[:href]).to include(environment.formatted_external_url)
       end
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json
index c40977bc4ee..35971d564d5 100644
--- a/spec/fixtures/api/schemas/entities/merge_request_widget.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json
@@ -46,6 +46,7 @@
     "diff_head_commit_short_id": { "type": ["string", "null"] },
     "merge_commit_message": { "type": ["string", "null"] },
     "pipeline": { "type": ["object", "null"] },
+    "merge_pipeline": { "type": ["object", "null"] },
     "work_in_progress": { "type": "boolean" },
     "source_branch_exists": { "type": "boolean" },
     "mergeable_discussions_state": { "type": "boolean" },
diff --git a/spec/javascripts/vue_mr_widget/components/deployment_spec.js b/spec/javascripts/vue_mr_widget/components/deployment_spec.js
index ce850bc621e..d26ffa4b4a6 100644
--- a/spec/javascripts/vue_mr_widget/components/deployment_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/deployment_spec.js
@@ -2,54 +2,48 @@ import Vue from 'vue';
 import deploymentComponent from '~/vue_merge_request_widget/components/deployment.vue';
 import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
 import { getTimeago } from '~/lib/utils/datetime_utility';
+import mountComponent from '../../helpers/vue_mount_component_helper';
 
-const deploymentMockData = {
-  id: 15,
-  name: 'review/diplo',
-  url: '/root/acets-review-apps/environments/15',
-  stop_url: '/root/acets-review-apps/environments/15/stop',
-  metrics_url: '/root/acets-review-apps/environments/15/deployments/1/metrics',
-  metrics_monitoring_url: '/root/acets-review-apps/environments/15/metrics',
-  external_url: 'http://diplo.',
-  external_url_formatted: 'diplo.',
-  deployed_at: '2017-03-22T22:44:42.258Z',
-  deployed_at_formatted: 'Mar 22, 2017 10:44pm',
-  changes: [
-    {
-      path: 'index.html',
-      external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/index.html',
-    },
-    {
-      path: 'imgs/gallery.html',
-      external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/imgs/gallery.html',
-    },
-    {
-      path: 'about/',
-      external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/about/',
-    },
-  ],
-};
-const createComponent = () => {
+describe('Deployment component', () => {
   const Component = Vue.extend(deploymentComponent);
+  const deploymentMockData = {
+    id: 15,
+    name: 'review/diplo',
+    url: '/root/review-apps/environments/15',
+    stop_url: '/root/review-apps/environments/15/stop',
+    metrics_url: '/root/review-apps/environments/15/deployments/1/metrics',
+    metrics_monitoring_url: '/root/review-apps/environments/15/metrics',
+    external_url: 'http://gitlab.com.',
+    external_url_formatted: 'gitlab',
+    deployed_at: '2017-03-22T22:44:42.258Z',
+    deployed_at_formatted: 'Mar 22, 2017 10:44pm',
+    changes: [
+      {
+        path: 'index.html',
+        external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/index.html',
+      },
+      {
+        path: 'imgs/gallery.html',
+        external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/imgs/gallery.html',
+      },
+      {
+        path: 'about/',
+        external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/about/',
+      },
+    ],
+  };
 
-  return new Component({
-    el: document.createElement('div'),
-    propsData: { deployment: { ...deploymentMockData } },
-  });
-};
-
-describe('Deployment component', () => {
   let vm;
 
-  beforeEach(() => {
-    vm = createComponent();
-  });
-
   afterEach(() => {
     vm.$destroy();
   });
 
-  describe('computed', () => {
+  describe('', () => {
+    beforeEach(() => {
+      vm = mountComponent(Component, { deployment: { ...deploymentMockData } });
+    });
+
     describe('deployTimeago', () => {
       it('return formatted date', () => {
         const readable = getTimeago().format(deploymentMockData.deployed_at);
@@ -111,9 +105,7 @@ describe('Deployment component', () => {
         expect(vm.hasDeploymentMeta).toEqual(false);
       });
     });
-  });
 
-  describe('methods', () => {
     describe('stopEnvironment', () => {
       const url = '/foo/bar';
       const returnPromise = () =>
@@ -152,42 +144,33 @@ describe('Deployment component', () => {
         expect(MRWidgetService.stopEnvironment).not.toHaveBeenCalled();
       });
     });
-  });
-
-  describe('template', () => {
-    let el;
-
-    beforeEach(() => {
-      vm = createComponent(deploymentMockData);
-      el = vm.$el;
-    });
 
     it('renders deployment name', () => {
-      expect(el.querySelector('.js-deploy-meta').getAttribute('href')).toEqual(
+      expect(vm.$el.querySelector('.js-deploy-meta').getAttribute('href')).toEqual(
         deploymentMockData.url,
       );
 
-      expect(el.querySelector('.js-deploy-meta').innerText).toContain(deploymentMockData.name);
+      expect(vm.$el.querySelector('.js-deploy-meta').innerText).toContain(deploymentMockData.name);
     });
 
     it('renders external URL', () => {
-      expect(el.querySelector('.js-deploy-url').getAttribute('href')).toEqual(
+      expect(vm.$el.querySelector('.js-deploy-url').getAttribute('href')).toEqual(
         deploymentMockData.external_url,
       );
 
-      expect(el.querySelector('.js-deploy-url').innerText).toContain('View app');
+      expect(vm.$el.querySelector('.js-deploy-url').innerText).toContain('View app');
     });
 
     it('renders stop button', () => {
-      expect(el.querySelector('.btn')).not.toBeNull();
+      expect(vm.$el.querySelector('.btn')).not.toBeNull();
     });
 
     it('renders deployment time', () => {
-      expect(el.querySelector('.js-deploy-time').innerText).toContain(vm.deployTimeago);
+      expect(vm.$el.querySelector('.js-deploy-time').innerText).toContain(vm.deployTimeago);
     });
 
     it('renders metrics component', () => {
-      expect(el.querySelector('.js-mr-memory-usage')).not.toBeNull();
+      expect(vm.$el.querySelector('.js-mr-memory-usage')).not.toBeNull();
     });
   });
 
@@ -196,8 +179,7 @@ describe('Deployment component', () => {
       window.gon = window.gon || {};
       window.gon.features = window.gon.features || {};
       window.gon.features.ciEnvironmentsStatusChanges = true;
-
-      vm = createComponent(deploymentMockData);
+      vm = mountComponent(Component, { deployment: { ...deploymentMockData } });
     });
 
     afterEach(() => {
@@ -216,7 +198,7 @@ describe('Deployment component', () => {
       window.gon.features = window.gon.features || {};
       window.gon.features.ciEnvironmentsStatusChanges = false;
 
-      vm = createComponent(deploymentMockData);
+      vm = mountComponent(Component, { deployment: { ...deploymentMockData } });
     });
 
     afterEach(() => {
@@ -228,4 +210,44 @@ describe('Deployment component', () => {
       expect(vm.$el.querySelector('.js-deploy-url-feature-flag')).not.toBeNull();
     });
   });
+
+  describe('deployment status', () => {
+    describe('running', () => {
+      beforeEach(() => {
+        vm = mountComponent(Component, {
+          deployment: Object.assign({}, deploymentMockData, { status: 'running' }),
+        });
+      });
+
+      it('renders information about running deployment', () => {
+        expect(vm.$el.querySelector('.js-deployment-info').textContent).toContain('Deploying to');
+      });
+    });
+
+    describe('success', () => {
+      beforeEach(() => {
+        vm = mountComponent(Component, {
+          deployment: Object.assign({}, deploymentMockData, { status: 'success' }),
+        });
+      });
+
+      it('renders information about finished deployment', () => {
+        expect(vm.$el.querySelector('.js-deployment-info').textContent).toContain('Deployed to');
+      });
+    });
+
+    describe('failed', () => {
+      beforeEach(() => {
+        vm = mountComponent(Component, {
+          deployment: Object.assign({}, deploymentMockData, { status: 'failed' }),
+        });
+      });
+
+      it('renders information about finished deployment', () => {
+        expect(vm.$el.querySelector('.js-deployment-info').textContent).toContain(
+          'Failed to deploy to',
+        );
+      });
+    });
+  });
 });
diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
index d1a064b9f4d..27b6c91e154 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -189,7 +189,7 @@ describe('mrWidgetOptions', () => {
       it('should fetch deployments', done => {
         spyOn(vm.service, 'fetchDeployments').and.returnValue(returnPromise([{ id: 1 }]));
 
-        vm.fetchDeployments();
+        vm.fetchPreMergeDeployments();
 
         setTimeout(() => {
           expect(vm.service.fetchDeployments).toHaveBeenCalled();
@@ -454,6 +454,7 @@ describe('mrWidgetOptions', () => {
       deployed_at: '2017-03-22T22:44:42.258Z',
       deployed_at_formatted: 'Mar 22, 2017 10:44pm',
       changes,
+      status: 'success'
     };
 
     beforeEach(done => {
@@ -486,4 +487,189 @@ describe('mrWidgetOptions', () => {
       ).toEqual(changes.length);
     });
   });
+
+  describe('pipeline for target branch after merge', () => {
+    describe('with information for target branch pipeline', () => {
+      beforeEach(done => {
+        vm.mr.state = 'merged';
+        vm.mr.mergePipeline = {
+          id: 127,
+          user: {
+            id: 1,
+            name: 'Administrator',
+            username: 'root',
+            state: 'active',
+            avatar_url: null,
+            web_url: 'http://localhost:3000/root',
+            status_tooltip_html: null,
+            path: '/root',
+          },
+          active: true,
+          coverage: null,
+          source: 'push',
+          created_at: '2018-10-22T11:41:35.186Z',
+          updated_at: '2018-10-22T11:41:35.433Z',
+          path: '/root/ci-web-terminal/pipelines/127',
+          flags: {
+            latest: true,
+            stuck: true,
+            auto_devops: false,
+            yaml_errors: false,
+            retryable: false,
+            cancelable: true,
+            failure_reason: false,
+          },
+          details: {
+            status: {
+              icon: 'status_pending',
+              text: 'pending',
+              label: 'pending',
+              group: 'pending',
+              tooltip: 'pending',
+              has_details: true,
+              details_path: '/root/ci-web-terminal/pipelines/127',
+              illustration: null,
+              favicon:
+                '/assets/ci_favicons/favicon_status_pending-5bdf338420e5221ca24353b6bff1c9367189588750632e9a871b7af09ff6a2ae.png',
+            },
+            duration: null,
+            finished_at: null,
+            stages: [
+              {
+                name: 'test',
+                title: 'test: pending',
+                status: {
+                  icon: 'status_pending',
+                  text: 'pending',
+                  label: 'pending',
+                  group: 'pending',
+                  tooltip: 'pending',
+                  has_details: true,
+                  details_path: '/root/ci-web-terminal/pipelines/127#test',
+                  illustration: null,
+                  favicon:
+                    '/assets/ci_favicons/favicon_status_pending-5bdf338420e5221ca24353b6bff1c9367189588750632e9a871b7af09ff6a2ae.png',
+                },
+                path: '/root/ci-web-terminal/pipelines/127#test',
+                dropdown_path: '/root/ci-web-terminal/pipelines/127/stage.json?stage=test',
+              },
+            ],
+            artifacts: [],
+            manual_actions: [],
+            scheduled_actions: [],
+          },
+          ref: {
+            name: 'master',
+            path: '/root/ci-web-terminal/commits/master',
+            tag: false,
+            branch: true,
+          },
+          commit: {
+            id: 'aa1939133d373c94879becb79d91828a892ee319',
+            short_id: 'aa193913',
+            title: "Merge branch 'master-test' into 'master'",
+            created_at: '2018-10-22T11:41:33.000Z',
+            parent_ids: [
+              '4622f4dd792468993003caf2e3be978798cbe096',
+              '76598df914cdfe87132d0c3c40f80db9fa9396a4',
+            ],
+            message:
+              "Merge branch 'master-test' into 'master'\n\nUpdate .gitlab-ci.yml\n\nSee merge request root/ci-web-terminal!1",
+            author_name: 'Administrator',
+            author_email: 'admin@example.com',
+            authored_date: '2018-10-22T11:41:33.000Z',
+            committer_name: 'Administrator',
+            committer_email: 'admin@example.com',
+            committed_date: '2018-10-22T11:41:33.000Z',
+            author: {
+              id: 1,
+              name: 'Administrator',
+              username: 'root',
+              state: 'active',
+              avatar_url: null,
+              web_url: 'http://localhost:3000/root',
+              status_tooltip_html: null,
+              path: '/root',
+            },
+            author_gravatar_url: null,
+            commit_url:
+              'http://localhost:3000/root/ci-web-terminal/commit/aa1939133d373c94879becb79d91828a892ee319',
+            commit_path: '/root/ci-web-terminal/commit/aa1939133d373c94879becb79d91828a892ee319',
+          },
+          cancel_path: '/root/ci-web-terminal/pipelines/127/cancel',
+        };
+        vm.$nextTick(done);
+      });
+
+      it('renders pipeline block', () => {
+        expect(vm.$el.querySelector('.js-post-merge-pipeline')).not.toBeNull();
+      });
+
+      describe('with post merge deployments', () => {
+        beforeEach(done => {
+          vm.mr.postMergeDeployments = [{
+            id: 15,
+            name: 'review/diplo',
+            url: '/root/acets-review-apps/environments/15',
+            stop_url: '/root/acets-review-apps/environments/15/stop',
+            metrics_url: '/root/acets-review-apps/environments/15/deployments/1/metrics',
+            metrics_monitoring_url: '/root/acets-review-apps/environments/15/metrics',
+            external_url: 'http://diplo.',
+            external_url_formatted: 'diplo.',
+            deployed_at: '2017-03-22T22:44:42.258Z',
+            deployed_at_formatted: 'Mar 22, 2017 10:44pm',
+            changes: [
+              {
+                path: 'index.html',
+                external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/index.html',
+              },
+              {
+                path: 'imgs/gallery.html',
+                external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/imgs/gallery.html',
+              },
+              {
+                path: 'about/',
+                external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/about/',
+              },
+            ],
+            status: 'success'
+          }];
+
+          vm.$nextTick(done);
+        });
+
+        it('renders post deployment information', () => {
+          expect(vm.$el.querySelector('.js-post-deployment')).not.toBeNull();
+        });
+      });
+    });
+
+    describe('without information for target branch pipeline', () => {
+      beforeEach(done => {
+        vm.mr.state = 'merged';
+
+        vm.$nextTick(done);
+      });
+
+      it('does not render pipeline block', () => {
+        expect(vm.$el.querySelector('.js-post-merge-pipeline')).toBeNull();
+      });
+    });
+
+    describe('when state is not merged', () => {
+      beforeEach(done => {
+        vm.mr.state = 'archived';
+
+        vm.$nextTick(done);
+      });
+
+      it('does not render pipeline block', () => {
+        expect(vm.$el.querySelector('.js-post-merge-pipeline')).toBeNull();
+      });
+
+      it('does not render post deployment information', () => {
+        expect(vm.$el.querySelector('.js-post-deployment')).toBeNull();
+      });
+    });
+  });
 });
diff --git a/spec/models/environment_status_spec.rb b/spec/models/environment_status_spec.rb
index f2eb263c98c..e7805d52d75 100644
--- a/spec/models/environment_status_spec.rb
+++ b/spec/models/environment_status_spec.rb
@@ -5,13 +5,15 @@ describe EnvironmentStatus do
   let(:environment)   { deployment.environment}
   let(:project)       { deployment.project }
   let(:merge_request) { create(:merge_request, :deployed_review_app, deployment: deployment) }
+  let(:sha)           { deployment.sha }
 
-  subject(:environment_status) { described_class.new(environment, merge_request) }
+  subject(:environment_status) { described_class.new(environment, merge_request, sha) }
 
   it { is_expected.to delegate_method(:id).to(:environment) }
   it { is_expected.to delegate_method(:name).to(:environment) }
   it { is_expected.to delegate_method(:project).to(:environment) }
   it { is_expected.to delegate_method(:deployed_at).to(:deployment).as(:created_at) }
+  it { is_expected.to delegate_method(:status).to(:deployment) }
 
   describe '#project' do
     subject { environment_status.project }
@@ -58,4 +60,32 @@ describe EnvironmentStatus do
       )
     end
   end
+
+  describe '.for_merge_request' do
+    let(:admin)    { create(:admin) }
+    let(:pipeline) { create(:ci_pipeline, sha: sha) }
+
+    it 'is based on merge_request.head_pipeline' do
+      expect(merge_request).to receive(:head_pipeline).and_return(pipeline)
+      expect(merge_request).not_to receive(:merge_pipeline)
+
+      described_class.for_merge_request(merge_request, admin)
+    end
+  end
+
+  describe '.after_merge_request' do
+    let(:admin)    { create(:admin) }
+    let(:pipeline) { create(:ci_pipeline, sha: sha) }
+
+    before do
+      merge_request.mark_as_merged!
+    end
+
+    it 'is based on merge_request.merge_pipeline' do
+      expect(merge_request).to receive(:merge_pipeline).and_return(pipeline)
+      expect(merge_request).not_to receive(:head_pipeline)
+
+      described_class.after_merge_request(merge_request, admin)
+    end
+  end
 end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 666d7e69f89..c8943f2d86f 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1058,6 +1058,26 @@ describe MergeRequest do
     end
   end
 
+  describe '#merge_pipeline' do
+    it 'returns nil when not merged' do
+      expect(subject.merge_pipeline).to be_nil
+    end
+
+    context 'when the MR is merged' do
+      let(:sha)      { subject.target_project.commit.id }
+      let(:pipeline) { create(:ci_empty_pipeline, sha: sha, ref: subject.target_branch, project: subject.target_project) }
+
+      before do
+        subject.mark_as_merged!
+        subject.update_attribute(:merge_commit_sha, pipeline.sha)
+      end
+
+      it 'returns the post-merge pipeline' do
+        expect(subject.merge_pipeline).to eq(pipeline)
+      end
+    end
+  end
+
   describe '#has_ci?' do
     let(:merge_request) { build_stubbed(:merge_request) }
 
diff --git a/spec/serializers/environment_status_entity_spec.rb b/spec/serializers/environment_status_entity_spec.rb
index 6894c65d639..1b4d8b70aa6 100644
--- a/spec/serializers/environment_status_entity_spec.rb
+++ b/spec/serializers/environment_status_entity_spec.rb
@@ -9,7 +9,7 @@ describe EnvironmentStatusEntity do
   let(:project)       { deployment.project }
   let(:merge_request) { create(:merge_request, :deployed_review_app, deployment: deployment) }
 
-  let(:environment_status) { EnvironmentStatus.new(environment, merge_request) }
+  let(:environment_status) { EnvironmentStatus.new(environment, merge_request, merge_request.diff_head_sha) }
   let(:entity)             { described_class.new(environment_status, request: request) }
 
   subject { entity.as_json }
@@ -26,6 +26,7 @@ describe EnvironmentStatusEntity do
   it { is_expected.to include(:deployed_at) }
   it { is_expected.to include(:deployed_at_formatted) }
   it { is_expected.to include(:changes) }
+  it { is_expected.to include(:status) }
 
   it { is_expected.not_to include(:stop_url) }
   it { is_expected.not_to include(:metrics_url) }
diff --git a/spec/serializers/merge_request_widget_entity_spec.rb b/spec/serializers/merge_request_widget_entity_spec.rb
index 5bf8aa7f23f..561421d5ac8 100644
--- a/spec/serializers/merge_request_widget_entity_spec.rb
+++ b/spec/serializers/merge_request_widget_entity_spec.rb
@@ -52,6 +52,40 @@ describe MergeRequestWidgetEntity do
     end
   end
 
+  describe 'merge_pipeline' do
+    it 'returns nil' do
+      expect(subject[:merge_pipeline]).to be_nil
+    end
+
+    context 'when is merged' do
+      let(:resource) { create(:merged_merge_request, source_project: project, merge_commit_sha: project.commit.id) }
+      let(:pipeline) { create(:ci_empty_pipeline, project: project, ref: resource.target_branch, sha: resource.merge_commit_sha) }
+
+      before do
+        project.add_maintainer(user)
+      end
+
+      it 'returns merge_pipeline' do
+        pipeline.reload
+        pipeline_payload = PipelineDetailsEntity
+                             .represent(pipeline, request: request)
+                             .as_json
+
+        expect(subject[:merge_pipeline]).to eq(pipeline_payload)
+      end
+
+      context 'when user cannot read pipelines on target project' do
+        before do
+          project.add_guest(user)
+        end
+
+        it 'returns nil' do
+          expect(subject[:merge_pipeline]).to be_nil
+        end
+      end
+    end
+  end
+
   describe 'metrics' do
     context 'when metrics record exists with merged data' do
       before do
-- 
cgit v1.2.3


From d5b93ba08ad7842b02f2e44360a66b8846a5280c Mon Sep 17 00:00:00 2001
From: Lyle Kozloff <lkozloff@gitlab.com>
Date: Mon, 29 Oct 2018 12:32:55 +0000
Subject: adds warning against Postgres across NFS

---
 doc/administration/high_availability/nfs.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index 96803746637..481eb692674 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -61,7 +61,7 @@ on an Linux NFS server, do the following:
 
 2. Restart the NFS server process. For example, on CentOS run `service nfs restart`.
 
-## AWS Elastic File System
+## Avoid using AWS's Elastic File System (EFS)
 
 GitLab strongly recommends against using AWS Elastic File System (EFS).
 Our support team will not be able to assist on performance issues related to
@@ -78,6 +78,23 @@ stored on a local volume.
 For more details on another person's experience with EFS, see
 [Amazon's Elastic File System: Burst Credits](https://rawkode.com/2017/04/16/amazons-elastic-file-system-burst-credits/)
 
+## Avoid using PostgreSQL with NFS
+
+GitLab strongly recommends against running your PostgreSQL database
+across NFS. The GitLab support team will not be able to assist on performance issues related to
+this configuration.
+
+Additionally, this configuration is specifically warned against in the
+[Postgres Documentation](https://www.postgresql.org/docs/current/static/creating-cluster.html#CREATING-CLUSTER-NFS):
+
+>PostgreSQL does nothing special for NFS file systems, meaning it assumes NFS behaves exactly like 
+>locally-connected drives. If the client or server NFS implementation does not provide standard file 
+>system semantics, this can cause reliability problems. Specifically, delayed (asynchronous) writes 
+>to the NFS server can cause data corruption problems.
+
+For supported database architecture, please see our documentation on 
+[Configuring a Database for GitLab HA](https://docs.gitlab.com/ee/administration/high_availability/database.html).
+
 ## NFS Client mount options
 
 Below is an example of an NFS mount point defined in `/etc/fstab` we use on
-- 
cgit v1.2.3


From 9a25cfc80b21b8f0d43309c0c3f3fe674a6c1e7f Mon Sep 17 00:00:00 2001
From: Andrew Newdigate <andrew@gitlab.com>
Date: Mon, 29 Oct 2018 13:44:09 +0000
Subject: Fix open-ended params for api_json.log

---
 changelogs/unreleased/53155-structured-logs-params-array.yml  |  5 +++++
 doc/administration/logs.md                                    |  2 +-
 lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb | 10 +++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/53155-structured-logs-params-array.yml

diff --git a/changelogs/unreleased/53155-structured-logs-params-array.yml b/changelogs/unreleased/53155-structured-logs-params-array.yml
new file mode 100644
index 00000000000..4d4f68a5c84
--- /dev/null
+++ b/changelogs/unreleased/53155-structured-logs-params-array.yml
@@ -0,0 +1,5 @@
+---
+title: Use key-value pair arrays for API query parameter logging instead of hashes
+merge_request: 22623
+author:
+type: other
diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index 0e41a38b7e2..038e043281c 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -84,7 +84,7 @@ Introduced in GitLab 10.0, this file lives in
 It helps you see requests made directly to the API. For example:
 
 ```json
-{"time":"2017-10-10T12:30:11.579Z","severity":"INFO","duration":16.84,"db":1.57,"view":15.27,"status":200,"method":"POST","path":"/api/v4/internal/allowed","params":{"action":"git-upload-pack","changes":"_any","gl_repository":null,"project":"root/foobar.git","protocol":"ssh","env":"{}","key_id":"[FILTERED]","secret_token":"[FILTERED]"},"host":"127.0.0.1","ip":"127.0.0.1","ua":"Ruby"}
+{"time":"2018-10-29T12:49:42.123Z","severity":"INFO","duration":709.08,"db":14.59,"view":694.49,"status":200,"method":"GET","path":"/api/v4/projects","params":[{"key":"action","value":"git-upload-pack"},{"key":"changes","value":"_any"},{"key":"key_id","value":"secret"},{"key":"secret_token","value":"[FILTERED]"}],"host":"localhost","ip":"::1","ua":"Ruby","route":"/api/:version/projects","user_id":1,"username":"root","queue_duration":100.31,"gitaly_calls":30}
 ```
 
 This entry above shows an access to an internal endpoint to check whether an
diff --git a/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb b/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb
index 0014ce2689b..41004408dec 100644
--- a/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb
+++ b/lib/gitlab/grape_logging/formatters/lograge_with_timestamp.rb
@@ -6,7 +6,7 @@ module Gitlab
 
         def call(severity, datetime, _, data)
           time = data.delete :time
-          data[:params] = utf8_encode_values(data[:params]) if data.has_key?(:params)
+          data[:params] = process_params(data)
 
           attributes = {
             time: datetime.utc.iso8601(3),
@@ -20,6 +20,14 @@ module Gitlab
 
         private
 
+        def process_params(data)
+          return [] unless data.has_key?(:params)
+
+          data[:params]
+            .each_pair
+            .map { |k, v| { key: k, value: utf8_encode_values(v) } }
+        end
+
         def utf8_encode_values(data)
           case data
           when Hash
-- 
cgit v1.2.3


From 0acdd3d3dd7b8207e8dcdee269e9cc9894d6f199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Tue, 23 Oct 2018 10:38:10 +0000
Subject: Rename 'sast_container' licensed feature

---
 lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index 6fa59e41d20..db48b187e5e 100644
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -210,7 +210,7 @@ container_scanning:
     refs:
       - branches
     variables:
-      - $GITLAB_FEATURES =~ /\bsast_container\b/
+      - $GITLAB_FEATURES =~ /\bcontainer_scanning\b/
   except:
     variables:
       - $CONTAINER_SCANNING_DISABLED
-- 
cgit v1.2.3


From 1c4eedd52c52185da5e0091391943756ca67d6c3 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <takninnovationresearch@gmail.com>
Date: Mon, 29 Oct 2018 14:58:16 +0000
Subject: Remove all tables from Pipeline page when there is no job for the
 Pipeline

---
 .../javascripts/ide/components/pipelines/list.vue  |  2 +-
 app/views/projects/pipelines/_with_tabs.html.haml  | 33 +++++-------
 app/views/projects/pipelines/show.html.haml        | 10 +++-
 .../unreleased/45669-table-in-jobs-on-pipeline.yml |  5 ++
 locale/gitlab.pot                                  |  6 +--
 spec/features/commits_spec.rb                      | 60 ++++++++++++----------
 6 files changed, 64 insertions(+), 52 deletions(-)
 create mode 100644 changelogs/unreleased/45669-table-in-jobs-on-pipeline.yml

diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue
index 0a2681b7a1e..b670b0355b7 100644
--- a/app/assets/javascripts/ide/components/pipelines/list.vue
+++ b/app/assets/javascripts/ide/components/pipelines/list.vue
@@ -25,7 +25,7 @@ export default {
     ...mapState('pipelines', ['isLoadingPipeline', 'latestPipeline', 'stages', 'isLoadingJobs']),
     ciLintText() {
       return sprintf(
-        __('You can also test your .gitlab-ci.yml in the %{linkStart}Lint%{linkEnd}'),
+        __('You can test your .gitlab-ci.yml in %{linkStart}CI Lint%{linkEnd}.'),
         {
           linkStart: `<a href="${_.escape(this.currentProject.web_url)}/-/ci/lint">`,
           linkEnd: '</a>',
diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml
index c63ff070f70..95bba47802c 100644
--- a/app/views/projects/pipelines/_with_tabs.html.haml
+++ b/app/views/projects/pipelines/_with_tabs.html.haml
@@ -19,30 +19,23 @@
     #js-pipeline-graph-vue
 
   #js-tab-builds.tab-pane
-    - if pipeline.yaml_errors.present?
-      .bs-callout.bs-callout-danger
-        %h4 Found errors in your .gitlab-ci.yml:
-        %ul
-          - pipeline.yaml_errors.split(",").each do |error|
-            %li= error
-        You can also test your .gitlab-ci.yml in the #{link_to "Lint", project_ci_lint_path(@project)}
+    - if pipeline.legacy_stages.present?
+      .table-holder.pipeline-holder
+        %table.table.ci-table.pipeline
+          %thead
+            %tr
+              %th Status
+              %th Job ID
+              %th Name
+              %th
+              %th Coverage
+              %th
+          = render partial: "projects/stage/stage", collection: pipeline.legacy_stages, as: :stage
 
-    - if pipeline.project.builds_enabled? && !pipeline.ci_yaml_file
+    - elsif pipeline.project.builds_enabled? && !pipeline.ci_yaml_file
       .bs-callout.bs-callout-warning
         \.gitlab-ci.yml not found in this commit
 
-    .table-holder.pipeline-holder
-      %table.table.ci-table.pipeline
-        %thead
-          %tr
-            %th Status
-            %th Job ID
-            %th Name
-            %th
-            %th Coverage
-            %th
-        = render partial: "projects/stage/stage", collection: pipeline.legacy_stages, as: :stage
-
   - if @pipeline.failed_builds.present?
     #js-tab-failures.build-failures.tab-pane.build-page
       %table.table.responsive-table.ci-table.responsive-table-sm-rounded
diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml
index ff0ed3ed30d..193d437dad1 100644
--- a/app/views/projects/pipelines/show.html.haml
+++ b/app/views/projects/pipelines/show.html.haml
@@ -9,6 +9,14 @@
   - if @pipeline.commit.present?
     = render "projects/pipelines/info", commit: @pipeline.commit
 
-  = render "projects/pipelines/with_tabs", pipeline: @pipeline
+  - if @pipeline.builds.empty? && @pipeline.yaml_errors.present?
+    .bs-callout.bs-callout-danger
+      %h4 Found errors in your .gitlab-ci.yml:
+      %ul
+        - @pipeline.yaml_errors.split(",").each do |error|
+          %li= error
+      You can test your .gitlab-ci.yml in #{link_to "CI Lint", project_ci_lint_path(@project)}.
+  - else
+    = render "projects/pipelines/with_tabs", pipeline: @pipeline
 
 .js-pipeline-details-vue{ data: { endpoint: project_pipeline_path(@project, @pipeline, format: :json) } }
diff --git a/changelogs/unreleased/45669-table-in-jobs-on-pipeline.yml b/changelogs/unreleased/45669-table-in-jobs-on-pipeline.yml
new file mode 100644
index 00000000000..97052d01b24
--- /dev/null
+++ b/changelogs/unreleased/45669-table-in-jobs-on-pipeline.yml
@@ -0,0 +1,5 @@
+---
+title: Hide all tables on Pipeline when no Jobs for the Pipeline
+merge_request: 18540
+author: Takuya Noguchi
+type: fixed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f2a23f25acf..23afc6b245b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7014,9 +7014,6 @@ msgstr ""
 msgid "You can also star a label to make it a priority label."
 msgstr ""
 
-msgid "You can also test your .gitlab-ci.yml in the %{linkStart}Lint%{linkEnd}"
-msgstr ""
-
 msgid "You can easily contribute to them by requesting to join these groups."
 msgstr ""
 
@@ -7038,6 +7035,9 @@ msgstr ""
 msgid "You can set up jobs to only use Runners with specific tags. Separate tags with commas."
 msgstr ""
 
+msgid "You can test your .gitlab-ci.yml in %{linkStart}CI Lint%{linkEnd}."
+msgstr ""
+
 msgid "You cannot write to this read-only GitLab instance."
 msgstr ""
 
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 8989b2051bb..5c6c1c4fd15 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -114,33 +114,6 @@ describe 'Commits' do
             expect(page).to have_content 'canceled'
           end
         end
-
-        describe '.gitlab-ci.yml not found warning' do
-          context 'ci builds enabled' do
-            it "does not show warning" do
-              visit pipeline_path(pipeline)
-              expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
-            end
-
-            it 'shows warning' do
-              stub_ci_pipeline_yaml_file(nil)
-              visit pipeline_path(pipeline)
-              expect(page).to have_content '.gitlab-ci.yml not found in this commit'
-            end
-          end
-
-          context 'ci builds disabled' do
-            before do
-              stub_ci_builds_disabled
-              stub_ci_pipeline_yaml_file(nil)
-              visit pipeline_path(pipeline)
-            end
-
-            it 'does not show warning' do
-              expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
-            end
-          end
-        end
       end
 
       context "when logged as reporter" do
@@ -182,6 +155,39 @@ describe 'Commits' do
         end
       end
     end
+
+    describe '.gitlab-ci.yml not found warning' do
+      before do
+        project.add_reporter(user)
+      end
+
+      context 'ci builds enabled' do
+        it 'does not show warning' do
+          visit pipeline_path(pipeline)
+
+          expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+        end
+
+        it 'shows warning' do
+          stub_ci_pipeline_yaml_file(nil)
+
+          visit pipeline_path(pipeline)
+
+          expect(page).to have_content '.gitlab-ci.yml not found in this commit'
+        end
+      end
+
+      context 'ci builds disabled' do
+        it 'does not show warning' do
+          stub_ci_builds_disabled
+          stub_ci_pipeline_yaml_file(nil)
+
+          visit pipeline_path(pipeline)
+
+          expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+        end
+      end
+    end
   end
 
   context 'viewing commits for a branch' do
-- 
cgit v1.2.3


From 4508343d16f6b87019b7416248480983414c3fc8 Mon Sep 17 00:00:00 2001
From: Jacques Erasmus <jerasmus@gitlab.com>
Date: Mon, 29 Oct 2018 16:16:40 +0000
Subject: Fix broken "Show whitespace changes" button on MR "Changes" tab

---
 .../diffs/components/compare_versions.vue          |  12 +-
 .../52122-fix-broken-whitespace-button.yml         |   5 +
 .../diffs/components/compare_versions_spec.js      | 126 ++++++++++++++++++++-
 .../diffs/mock_data/merge_request_diffs.js         |  42 +++++++
 4 files changed, 178 insertions(+), 7 deletions(-)
 create mode 100644 changelogs/unreleased/52122-fix-broken-whitespace-button.yml
 create mode 100644 spec/javascripts/diffs/mock_data/merge_request_diffs.js

diff --git a/app/assets/javascripts/diffs/components/compare_versions.vue b/app/assets/javascripts/diffs/components/compare_versions.vue
index 9bbf62c0eb6..29b5aff0fb1 100644
--- a/app/assets/javascripts/diffs/components/compare_versions.vue
+++ b/app/assets/javascripts/diffs/components/compare_versions.vue
@@ -40,17 +40,14 @@ export default {
     comparableDiffs() {
       return this.mergeRequestDiffs.slice(1);
     },
-    isWhitespaceVisible() {
-      return !getParameterValues('w')[0];
-    },
     toggleWhitespaceText() {
-      if (this.isWhitespaceVisible) {
+      if (this.isWhitespaceVisible()) {
         return __('Hide whitespace changes');
       }
       return __('Show whitespace changes');
     },
     toggleWhitespacePath() {
-      if (this.isWhitespaceVisible) {
+      if (this.isWhitespaceVisible()) {
         return mergeUrlParams({ w: 1 }, window.location.href);
       }
 
@@ -67,6 +64,9 @@ export default {
       'expandAllFiles',
       'toggleShowTreeList',
     ]),
+    isWhitespaceVisible() {
+      return getParameterValues('w')[0] !== '1';
+    },
   },
 };
 </script>
@@ -121,7 +121,7 @@ export default {
         </a>
         <a
           :href="toggleWhitespacePath"
-          class="btn btn-default"
+          class="btn btn-default qa-toggle-whitespace"
         >
           {{ toggleWhitespaceText }}
         </a>
diff --git a/changelogs/unreleased/52122-fix-broken-whitespace-button.yml b/changelogs/unreleased/52122-fix-broken-whitespace-button.yml
new file mode 100644
index 00000000000..3f261eb2ac5
--- /dev/null
+++ b/changelogs/unreleased/52122-fix-broken-whitespace-button.yml
@@ -0,0 +1,5 @@
+---
+title: Fix broken "Show whitespace changes" button on MRs.
+merge_request: 22539
+author:
+type: fixed
diff --git a/spec/javascripts/diffs/components/compare_versions_spec.js b/spec/javascripts/diffs/components/compare_versions_spec.js
index 7237274eb43..d9d7f61785f 100644
--- a/spec/javascripts/diffs/components/compare_versions_spec.js
+++ b/spec/javascripts/diffs/components/compare_versions_spec.js
@@ -1 +1,125 @@
-// TODO: https://gitlab.com/gitlab-org/gitlab-ce/issues/48034
+import Vue from 'vue';
+import CompareVersionsComponent from '~/diffs/components/compare_versions.vue';
+import store from '~/mr_notes/stores';
+import { createComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
+import diffsMockData from '../mock_data/merge_request_diffs';
+
+describe('CompareVersions', () => {
+  let vm;
+  const targetBranch = { branchName: 'tmp-wine-dev', versionIndex: -1 };
+
+  beforeEach(() => {
+    vm = createComponentWithStore(Vue.extend(CompareVersionsComponent), store, {
+      mergeRequestDiffs: diffsMockData,
+      mergeRequestDiff: diffsMockData[0],
+      targetBranch,
+    }).$mount();
+  });
+
+  describe('template', () => {
+    it('should render Tree List toggle button with correct attribute values', () => {
+      const treeListBtn = vm.$el.querySelector('.js-toggle-tree-list');
+
+      expect(treeListBtn).not.toBeNull();
+      expect(treeListBtn.dataset.originalTitle).toBe('Toggle file browser');
+      expect(treeListBtn.querySelectorAll('svg use').length).not.toBe(0);
+      expect(treeListBtn.querySelector('svg use').getAttribute('xlink:href')).toContain(
+        '#hamburger',
+      );
+    });
+
+    it('should render comparison dropdowns with correct values', () => {
+      const sourceDropdown = vm.$el.querySelector('.mr-version-dropdown');
+      const targetDropdown = vm.$el.querySelector('.mr-version-compare-dropdown');
+
+      expect(sourceDropdown).not.toBeNull();
+      expect(targetDropdown).not.toBeNull();
+      expect(sourceDropdown.querySelector('a span').innerHTML).toContain('latest version');
+      expect(targetDropdown.querySelector('a span').innerHTML).toContain(targetBranch.branchName);
+    });
+
+    it('should not render comparison dropdowns if no mergeRequestDiffs are specified', () => {
+      vm.mergeRequestDiffs = [];
+
+      vm.$nextTick(() => {
+        const sourceDropdown = vm.$el.querySelector('.mr-version-dropdown');
+        const targetDropdown = vm.$el.querySelector('.mr-version-compare-dropdown');
+
+        expect(sourceDropdown).toBeNull();
+        expect(targetDropdown).toBeNull();
+      });
+    });
+
+    it('should render whitespace toggle button with correct attributes', () => {
+      const whitespaceBtn = vm.$el.querySelector('.qa-toggle-whitespace');
+      const href = vm.toggleWhitespacePath;
+
+      expect(whitespaceBtn).not.toBeNull();
+      expect(whitespaceBtn.getAttribute('href')).toEqual(href);
+      expect(whitespaceBtn.innerHTML).toContain('Hide whitespace changes');
+    });
+
+    it('should render view types buttons with correct values', () => {
+      const inlineBtn = vm.$el.querySelector('#inline-diff-btn');
+      const parallelBtn = vm.$el.querySelector('#parallel-diff-btn');
+
+      expect(inlineBtn).not.toBeNull();
+      expect(parallelBtn).not.toBeNull();
+      expect(inlineBtn.dataset.viewType).toEqual('inline');
+      expect(parallelBtn.dataset.viewType).toEqual('parallel');
+      expect(inlineBtn.innerHTML).toContain('Inline');
+      expect(parallelBtn.innerHTML).toContain('Side-by-side');
+    });
+  });
+
+  describe('setInlineDiffViewType', () => {
+    it('should persist the view type in the url', () => {
+      const viewTypeBtn = vm.$el.querySelector('#inline-diff-btn');
+      viewTypeBtn.click();
+
+      expect(window.location.toString()).toContain('?view=inline');
+    });
+  });
+
+  describe('setParallelDiffViewType', () => {
+    it('should persist the view type in the url', () => {
+      const viewTypeBtn = vm.$el.querySelector('#parallel-diff-btn');
+      viewTypeBtn.click();
+
+      expect(window.location.toString()).toContain('?view=parallel');
+    });
+  });
+
+  describe('comparableDiffs', () => {
+    it('should not contain the first item in the mergeRequestDiffs property', () => {
+      const { comparableDiffs } = vm;
+      const comparableDiffsMock = diffsMockData.slice(1);
+
+      expect(comparableDiffs).toEqual(comparableDiffsMock);
+    });
+  });
+
+  describe('isWhitespaceVisible', () => {
+    const originalHref = window.location.href;
+
+    afterEach(() => {
+      window.history.replaceState({}, null, originalHref);
+    });
+
+    it('should return "true" when no "w" flag is present in the URL (default)', () => {
+      expect(vm.isWhitespaceVisible()).toBe(true);
+    });
+
+    it('should return "false" when the flag is set to "1" in the URL', () => {
+      window.history.replaceState({}, null, '?w=1');
+
+      expect(vm.isWhitespaceVisible()).toBe(false);
+    });
+
+    it('should return "true" when the flag is set to "0" in the URL', () => {
+      window.history.replaceState({}, null, '?w=0');
+
+      expect(vm.isWhitespaceVisible()).toBe(true);
+    });
+  });
+});
diff --git a/spec/javascripts/diffs/mock_data/merge_request_diffs.js b/spec/javascripts/diffs/mock_data/merge_request_diffs.js
new file mode 100644
index 00000000000..d72ad7818dd
--- /dev/null
+++ b/spec/javascripts/diffs/mock_data/merge_request_diffs.js
@@ -0,0 +1,42 @@
+export default [
+  {
+    versionIndex: 4,
+    createdAt: '2018-10-23T11:49:16.611Z',
+    commitsCount: 4,
+    latest: true,
+    shortCommitSha: 'de7a8f7f',
+    versionPath: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37',
+    comparePath:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=de7a8f7f20c3ea2e0bef3ba01cfd41c21f6b4995',
+  },
+  {
+    versionIndex: 3,
+    createdAt: '2018-10-23T11:46:40.617Z',
+    commitsCount: 3,
+    latest: false,
+    shortCommitSha: 'e78fc18f',
+    versionPath: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=36',
+    comparePath:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=e78fc18fa37acb2185c59ca94d4a964464feb50e',
+  },
+  {
+    versionIndex: 2,
+    createdAt: '2018-10-04T09:57:39.648Z',
+    commitsCount: 2,
+    latest: false,
+    shortCommitSha: '48da7e7e',
+    versionPath: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=35',
+    comparePath:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=48da7e7e9a99d41c852578bd9cb541ca4d864b3e',
+  },
+  {
+    versionIndex: 1,
+    createdAt: '2018-09-25T20:30:39.493Z',
+    commitsCount: 1,
+    latest: false,
+    shortCommitSha: '47bac2ed',
+    versionPath: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=20',
+    comparePath:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=47bac2ed972c5bee344c1cea159a22cd7f711dc0',
+  },
+];
-- 
cgit v1.2.3


From 38a4a8bf43a2003ebad44350f5a1e3362e2e112e Mon Sep 17 00:00:00 2001
From: Winnie Hellmann <winnie@gitlab.com>
Date: Mon, 29 Oct 2018 17:21:35 +0000
Subject: Delete job_spec.js

---
 spec/javascripts/job_spec.js | 265 -------------------------------------------
 1 file changed, 265 deletions(-)
 delete mode 100644 spec/javascripts/job_spec.js

diff --git a/spec/javascripts/job_spec.js b/spec/javascripts/job_spec.js
deleted file mode 100644
index bc973407b25..00000000000
--- a/spec/javascripts/job_spec.js
+++ /dev/null
@@ -1,265 +0,0 @@
-// import $ from 'jquery';
-// import MockAdapter from 'axios-mock-adapter';
-// import axios from '~/lib/utils/axios_utils';
-// import { numberToHumanSize } from '~/lib/utils/number_utils';
-// import '~/lib/utils/datetime_utility';
-// import Job from '~/job';
-// import '~/breakpoints';
-// import waitForPromises from 'spec/helpers/wait_for_promises';
-
-// describe('Job', () => {
-//   const JOB_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/-/jobs/1`;
-//   let mock;
-//   let response;
-//   let job;
-
-//   preloadFixtures('builds/build-with-artifacts.html.raw');
-
-//   beforeEach(() => {
-//     loadFixtures('builds/build-with-artifacts.html.raw');
-
-//     spyOnDependency(Job, 'visitUrl');
-
-//     response = {};
-
-//     mock = new MockAdapter(axios);
-
-//     mock.onGet(new RegExp(`${JOB_URL}/trace.json?(.*)`)).reply(() => [200, response]);
-//   });
-
-//   afterEach(() => {
-//     mock.restore();
-
-//     clearTimeout(job.timeout);
-//   });
-
-//   describe('class constructor', () => {
-//     beforeEach(() => {
-//       jasmine.clock().install();
-//     });
-
-//     afterEach(() => {
-//       jasmine.clock().uninstall();
-//     });
-
-//     describe('running build', () => {
-//       it('updates the build trace on an interval', function (done) {
-//         response = {
-//           html: '<span>Update<span>',
-//           status: 'running',
-//           state: 'newstate',
-//           append: true,
-//           complete: false,
-//         };
-
-//         job = new Job();
-
-//         waitForPromises()
-//           .then(() => {
-//             expect($('#build-trace .js-build-output').text()).toMatch(/Update/);
-//             expect(job.state).toBe('newstate');
-
-//             response = {
-//               html: '<span>More</span>',
-//               status: 'running',
-//               state: 'finalstate',
-//               append: true,
-//               complete: true,
-//             };
-//           })
-//           .then(() => jasmine.clock().tick(4001))
-//           .then(waitForPromises)
-//           .then(() => {
-//             expect($('#build-trace .js-build-output').text()).toMatch(/UpdateMore/);
-//             expect(job.state).toBe('finalstate');
-//           })
-//           .then(done)
-//           .catch(done.fail);
-//       });
-
-//       it('replaces the entire build trace', (done) => {
-//         response = {
-//           html: '<span>Update<span>',
-//           status: 'running',
-//           append: false,
-//           complete: false,
-//         };
-
-//         job = new Job();
-
-//         waitForPromises()
-//           .then(() => {
-//             expect($('#build-trace .js-build-output').text()).toMatch(/Update/);
-
-//             response = {
-//               html: '<span>Different</span>',
-//               status: 'running',
-//               append: false,
-//             };
-//           })
-//           .then(() => jasmine.clock().tick(4001))
-//           .then(waitForPromises)
-//           .then(() => {
-//             expect($('#build-trace .js-build-output').text()).not.toMatch(/Update/);
-//             expect($('#build-trace .js-build-output').text()).toMatch(/Different/);
-//           })
-//           .then(done)
-//           .catch(done.fail);
-//       });
-//     });
-
-//     describe('truncated information', () => {
-//       describe('when size is less than total', () => {
-//         it('shows information about truncated log', (done) => {
-//           response = {
-//             html: '<span>Update</span>',
-//             status: 'success',
-//             append: false,
-//             size: 50,
-//             total: 100,
-//           };
-
-//           job = new Job();
-
-//           waitForPromises()
-//             .then(() => {
-//               expect(document.querySelector('.js-truncated-info').classList).not.toContain('hidden');
-//             })
-//             .then(done)
-//             .catch(done.fail);
-//         });
-
-//         it('shows the size in KiB', (done) => {
-//           const size = 50;
-
-//           response = {
-//             html: '<span>Update</span>',
-//             status: 'success',
-//             append: false,
-//             size,
-//             total: 100,
-//           };
-
-//           job = new Job();
-
-//           waitForPromises()
-//             .then(() => {
-//               expect(
-//                 document.querySelector('.js-truncated-info-size').textContent.trim(),
-//               ).toEqual(`${numberToHumanSize(size)}`);
-//             })
-//             .then(done)
-//             .catch(done.fail);
-//         });
-
-//         it('shows incremented size', (done) => {
-//           response = {
-//             html: '<span>Update</span>',
-//             status: 'success',
-//             append: false,
-//             size: 50,
-//             total: 100,
-//             complete: false,
-//           };
-
-//           job = new Job();
-
-//           waitForPromises()
-//             .then(() => {
-//               expect(
-//                 document.querySelector('.js-truncated-info-size').textContent.trim(),
-//               ).toEqual(`${numberToHumanSize(50)}`);
-
-//               response = {
-//                 html: '<span>Update</span>',
-//                 status: 'success',
-//                 append: true,
-//                 size: 10,
-//                 total: 100,
-//                 complete: true,
-//               };
-//             })
-//             .then(() => jasmine.clock().tick(4001))
-//             .then(waitForPromises)
-//             .then(() => {
-//               expect(
-//                 document.querySelector('.js-truncated-info-size').textContent.trim(),
-//               ).toEqual(`${numberToHumanSize(60)}`);
-//             })
-//             .then(done)
-//             .catch(done.fail);
-//         });
-
-//         it('renders the raw link', () => {
-//           response = {
-//             html: '<span>Update</span>',
-//             status: 'success',
-//             append: false,
-//             size: 50,
-//             total: 100,
-//           };
-
-//           job = new Job();
-
-//           expect(
-//             document.querySelector('.js-raw-link').textContent.trim(),
-//           ).toContain('Complete Raw');
-//         });
-//       });
-
-//       describe('when size is equal than total', () => {
-//         it('does not show the trunctated information', (done) => {
-//           response = {
-//             html: '<span>Update</span>',
-//             status: 'success',
-//             append: false,
-//             size: 100,
-//             total: 100,
-//           };
-
-//           job = new Job();
-
-//           waitForPromises()
-//             .then(() => {
-//               expect(document.querySelector('.js-truncated-info').classList).toContain('hidden');
-//             })
-//             .then(done)
-//             .catch(done.fail);
-//         });
-//       });
-//     });
-
-//     describe('output trace', () => {
-//       beforeEach((done) => {
-//         response = {
-//           html: '<span>Update</span>',
-//           status: 'success',
-//           append: false,
-//           size: 50,
-//           total: 100,
-//         };
-
-//         job = new Job();
-
-//         waitForPromises()
-//           .then(done)
-//           .catch(done.fail);
-//       });
-
-//       it('should render trace controls', () => {
-//         const controllers = document.querySelector('.controllers');
-
-//         expect(controllers.querySelector('.js-raw-link-controller')).not.toBeNull();
-//         expect(controllers.querySelector('.js-scroll-up')).not.toBeNull();
-//         expect(controllers.querySelector('.js-scroll-down')).not.toBeNull();
-//       });
-
-//       it('should render received output', () => {
-//         expect(
-//           document.querySelector('.js-build-output').innerHTML,
-//         ).toEqual('<span>Update</span>');
-//       });
-//     });
-//   });
-
-// });
-- 
cgit v1.2.3


From f5e081a33d855f7d769dafaa231afeda04713c11 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Mon, 29 Oct 2018 17:53:23 +0000
Subject: Update GitLab Pages to v1.3.0

---
 GITLAB_PAGES_VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION
index 6085e946503..f0bb29e7638 100644
--- a/GITLAB_PAGES_VERSION
+++ b/GITLAB_PAGES_VERSION
@@ -1 +1 @@
-1.2.1
+1.3.0
-- 
cgit v1.2.3


From abf3a2d2d434238892faf79fffa8d4ce9398e389 Mon Sep 17 00:00:00 2001
From: Mark Lapierre <mlapierre@gitlab.com>
Date: Fri, 26 Oct 2018 13:01:48 -0400
Subject: Add e2e test to push using a private token

Tests pushing over HTTP(S) using a personal access token
---
 qa/qa/factory/repository/push.rb                   |  2 +-
 .../repository/push_http_private_token_spec.rb     | 32 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb

diff --git a/qa/qa/factory/repository/push.rb b/qa/qa/factory/repository/push.rb
index 703c78daa99..ffa755b9e88 100644
--- a/qa/qa/factory/repository/push.rb
+++ b/qa/qa/factory/repository/push.rb
@@ -45,7 +45,7 @@ module QA
               repository.use_ssh_key(ssh_key)
             else
               repository.uri = repository_http_uri
-              repository.use_default_credentials
+              repository.use_default_credentials unless user
             end
 
             username = 'GitLab QA'
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
new file mode 100644
index 00000000000..8e4210482a2
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_http_private_token_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module QA
+  context 'Create' do
+    describe 'Git push over HTTP', :ldap_no_tls do
+      it 'user using a personal access token pushes code to the repository'  do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.perform(&:sign_in_using_credentials)
+
+        access_token = Factory::Resource::PersonalAccessToken.fabricate!.access_token
+
+        user = Factory::Resource::User.new.tap do |user|
+          user.username = Runtime::User.username
+          user.password = access_token
+        end
+
+        push = Factory::Repository::ProjectPush.fabricate! do |push|
+          push.user = user
+          push.file_name = 'README.md'
+          push.file_content = '# This is a test project'
+          push.commit_message = 'Add README.md'
+        end
+
+        push.project.visit!
+        Page::Project::Show.perform(&:wait_for_push)
+
+        expect(page).to have_content('README.md')
+        expect(page).to have_content('This is a test project')
+      end
+    end
+  end
+end
-- 
cgit v1.2.3