Add latest changes from gitlab-org/gitlab@master

12 files changed, 256 insertions, 7 deletions

diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js
index 460611356c0..b89b09521ee 100644
--- a/app/assets/javascripts/api.js
+++ b/app/assets/javascripts/api.js
@@ -37,7 +37,9 @@ const Api = {
   userStatusPath: '/api/:version/users/:id/status',
   userProjectsPath: '/api/:version/users/:id/projects',
   userPostStatusPath: '/api/:version/user/status',
-  commitPath: '/api/:version/projects/:id/repository/commits',
+  commitPath: '/api/:version/projects/:id/repository/commits/:sha',
+  commitsPath: '/api/:version/projects/:id/repository/commits',
+
   applySuggestionPath: '/api/:version/suggestions/:id/apply',
   applySuggestionBatchPath: '/api/:version/suggestions/batch_apply',
   commitPipelinesPath: '/:project_id/commit/:sha/pipelines',
@@ -319,9 +321,17 @@ const Api = {
       .catch(() => flash(__('Something went wrong while fetching projects')));
   },
 
+  commit(id, sha, params = {}) {
+    const url = Api.buildUrl(this.commitPath)
+      .replace(':id', encodeURIComponent(id))
+      .replace(':sha', encodeURIComponent(sha));
+
+    return axios.get(url, { params });
+  },
+
   commitMultiple(id, data) {
     // see https://docs.gitlab.com/ce/api/commits.html#create-a-commit-with-multiple-files-and-actions
-    const url = Api.buildUrl(Api.commitPath).replace(':id', encodeURIComponent(id));
+    const url = Api.buildUrl(Api.commitsPath).replace(':id', encodeURIComponent(id));
     return axios.post(url, JSON.stringify(data), {
       headers: {
         'Content-Type': 'application/json; charset=utf-8',
diff --git a/app/assets/javascripts/ref/constants.js b/app/assets/javascripts/ref/constants.js
new file mode 100644
index 00000000000..524ff2380c0
--- /dev/null
+++ b/app/assets/javascripts/ref/constants.js
@@ -0,0 +1,4 @@
+// This eslint-disable can be removed once a second
+// value is added to this file.
+/* eslint-disable import/prefer-default-export */
+export const X_TOTAL_HEADER = 'x-total';
diff --git a/app/assets/javascripts/ref/stores/actions.js b/app/assets/javascripts/ref/stores/actions.js
new file mode 100644
index 00000000000..8fcc99cef38
--- /dev/null
+++ b/app/assets/javascripts/ref/stores/actions.js
@@ -0,0 +1,65 @@
+import Api from '~/api';
+import * as types from './mutation_types';
+
+export const setProjectId = ({ commit }, projectId) => commit(types.SET_PROJECT_ID, projectId);
+
+export const setSelectedRef = ({ commit }, selectedRef) =>
+  commit(types.SET_SELECTED_REF, selectedRef);
+
+export const search = ({ dispatch, commit }, query) => {
+  commit(types.SET_QUERY, query);
+
+  dispatch('searchBranches');
+  dispatch('searchTags');
+  dispatch('searchCommits');
+};
+
+export const searchBranches = ({ commit, state }) => {
+  commit(types.REQUEST_START);
+
+  Api.branches(state.projectId, state.query)
+    .then(response => {
+      commit(types.RECEIVE_BRANCHES_SUCCESS, response);
+    })
+    .catch(error => {
+      commit(types.RECEIVE_BRANCHES_ERROR, error);
+    })
+    .finally(() => {
+      commit(types.REQUEST_FINISH);
+    });
+};
+
+export const searchTags = ({ commit, state }) => {
+  commit(types.REQUEST_START);
+
+  Api.tags(state.projectId, state.query)
+    .then(response => {
+      commit(types.RECEIVE_TAGS_SUCCESS, response);
+    })
+    .catch(error => {
+      commit(types.RECEIVE_TAGS_ERROR, error);
+    })
+    .finally(() => {
+      commit(types.REQUEST_FINISH);
+    });
+};
+
+export const searchCommits = ({ commit, state, getters }) => {
+  // Only query the Commit API if the search query looks like a commit SHA
+  if (getters.isQueryPossiblyASha) {
+    commit(types.REQUEST_START);
+
+    Api.commit(state.projectId, state.query)
+      .then(response => {
+        commit(types.RECEIVE_COMMITS_SUCCESS, response);
+      })
+      .catch(error => {
+        commit(types.RECEIVE_COMMITS_ERROR, error);
+      })
+      .finally(() => {
+        commit(types.REQUEST_FINISH);
+      });
+  } else {
+    commit(types.RESET_COMMIT_MATCHES);
+  }
+};
diff --git a/app/assets/javascripts/ref/stores/getters.js b/app/assets/javascripts/ref/stores/getters.js
new file mode 100644
index 00000000000..02d4ae8ff91
--- /dev/null
+++ b/app/assets/javascripts/ref/stores/getters.js
@@ -0,0 +1,5 @@
+/** Returns `true` if the query string looks like it could be a commit SHA */
+export const isQueryPossiblyASha = ({ query }) => /^[0-9a-f]{4,40}$/i.test(query);
+
+/** Returns `true` if there is at least one in-progress request */
+export const isLoading = ({ requestCount }) => requestCount > 0;
diff --git a/app/assets/javascripts/ref/stores/index.js b/app/assets/javascripts/ref/stores/index.js
new file mode 100644
index 00000000000..2bebffc19ab
--- /dev/null
+++ b/app/assets/javascripts/ref/stores/index.js
@@ -0,0 +1,16 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import * as actions from './actions';
+import * as getters from './getters';
+import mutations from './mutations';
+import createState from './state';
+
+Vue.use(Vuex);
+
+export default () =>
+  new Vuex.Store({
+    actions,
+    getters,
+    mutations,
+    state: createState(),
+  });
diff --git a/app/assets/javascripts/ref/stores/mutation_types.js b/app/assets/javascripts/ref/stores/mutation_types.js
new file mode 100644
index 00000000000..9f6195f5f3f
--- /dev/null
+++ b/app/assets/javascripts/ref/stores/mutation_types.js
@@ -0,0 +1,16 @@
+export const SET_PROJECT_ID = 'SET_PROJECT_ID';
+export const SET_SELECTED_REF = 'SET_SELECTED_REF';
+export const SET_QUERY = 'SET_QUERY';
+
+export const REQUEST_START = 'REQUEST_START';
+export const REQUEST_FINISH = 'REQUEST_FINISH';
+
+export const RECEIVE_BRANCHES_SUCCESS = 'RECEIVE_BRANCHES_SUCCESS';
+export const RECEIVE_BRANCHES_ERROR = 'RECEIVE_BRANCHES_ERROR';
+
+export const RECEIVE_TAGS_SUCCESS = 'RECEIVE_TAGS_SUCCESS';
+export const RECEIVE_TAGS_ERROR = 'RECEIVE_TAGS_ERROR';
+
+export const RECEIVE_COMMITS_SUCCESS = 'RECEIVE_COMMITS_SUCCESS';
+export const RECEIVE_COMMITS_ERROR = 'RECEIVE_COMMITS_ERROR';
+export const RESET_COMMIT_MATCHES = 'RESET_COMMIT_MATCHES';
diff --git a/app/assets/javascripts/ref/stores/mutations.js b/app/assets/javascripts/ref/stores/mutations.js
new file mode 100644
index 00000000000..73f9d7ee487
--- /dev/null
+++ b/app/assets/javascripts/ref/stores/mutations.js
@@ -0,0 +1,91 @@
+import * as types from './mutation_types';
+import { X_TOTAL_HEADER } from '../constants';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import httpStatusCodes from '~/lib/utils/http_status';
+
+export default {
+  [types.SET_PROJECT_ID](state, projectId) {
+    state.projectId = projectId;
+  },
+  [types.SET_SELECTED_REF](state, selectedRef) {
+    state.selectedRef = selectedRef;
+  },
+  [types.SET_QUERY](state, query) {
+    state.query = query;
+  },
+
+  [types.REQUEST_START](state) {
+    state.requestCount += 1;
+  },
+  [types.REQUEST_FINISH](state) {
+    state.requestCount -= 1;
+  },
+
+  [types.RECEIVE_BRANCHES_SUCCESS](state, response) {
+    state.matches.branches = {
+      list: convertObjectPropsToCamelCase(response.data).map(b => ({
+        name: b.name,
+        default: b.default,
+      })),
+      totalCount: parseInt(response.headers[X_TOTAL_HEADER], 10),
+      error: null,
+    };
+  },
+  [types.RECEIVE_BRANCHES_ERROR](state, error) {
+    state.matches.branches = {
+      list: [],
+      totalCount: 0,
+      error,
+    };
+  },
+
+  [types.RECEIVE_TAGS_SUCCESS](state, response) {
+    state.matches.tags = {
+      list: convertObjectPropsToCamelCase(response.data).map(b => ({
+        name: b.name,
+      })),
+      totalCount: parseInt(response.headers[X_TOTAL_HEADER], 10),
+      error: null,
+    };
+  },
+  [types.RECEIVE_TAGS_ERROR](state, error) {
+    state.matches.tags = {
+      list: [],
+      totalCount: 0,
+      error,
+    };
+  },
+
+  [types.RECEIVE_COMMITS_SUCCESS](state, response) {
+    const commit = convertObjectPropsToCamelCase(response.data);
+
+    state.matches.commits = {
+      list: [
+        {
+          name: commit.shortId,
+          value: commit.id,
+          subtitle: commit.title,
+        },
+      ],
+      totalCount: 1,
+      error: null,
+    };
+  },
+  [types.RECEIVE_COMMITS_ERROR](state, error) {
+    state.matches.commits = {
+      list: [],
+      totalCount: 0,
+
+      // 404's are expected when the search query doesn't match any commits
+      // and shouldn't be treated as an actual error
+      error: error.response?.status !== httpStatusCodes.NOT_FOUND ? error : null,
+    };
+  },
+  [types.RESET_COMMIT_MATCHES](state) {
+    state.matches.commits = {
+      list: [],
+      totalCount: 0,
+      error: null,
+    };
+  },
+};
diff --git a/app/assets/javascripts/ref/stores/state.js b/app/assets/javascripts/ref/stores/state.js
new file mode 100644
index 00000000000..65b9d6449d7
--- /dev/null
+++ b/app/assets/javascripts/ref/stores/state.js
@@ -0,0 +1,24 @@
+export default () => ({
+  projectId: null,
+
+  query: '',
+  matches: {
+    branches: {
+      list: [],
+      totalCount: 0,
+      error: null,
+    },
+    tags: {
+      list: [],
+      totalCount: 0,
+      error: null,
+    },
+    commits: {
+      list: [],
+      totalCount: 0,
+      error: null,
+    },
+  },
+  selectedRef: null,
+  requestCount: 0,
+});
diff --git a/app/models/clusters/applications/cilium.rb b/app/models/clusters/applications/cilium.rb
new file mode 100644
index 00000000000..0bbffd9e53e
--- /dev/null
+++ b/app/models/clusters/applications/cilium.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Clusters
+  module Applications
+    class Cilium < ApplicationRecord
+      self.table_name = 'clusters_applications_cilium'
+
+      include ::Clusters::Concerns::ApplicationCore
+      include ::Clusters::Concerns::ApplicationStatus
+
+      def allowed_to_uninstall?
+        false
+      end
+    end
+  end
+end
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 0c36bf5cf48..02b67706061 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -21,7 +21,8 @@ module Clusters
       Clusters::Applications::Jupyter.application_name => Clusters::Applications::Jupyter,
       Clusters::Applications::Knative.application_name => Clusters::Applications::Knative,
       Clusters::Applications::ElasticStack.application_name => Clusters::Applications::ElasticStack,
-      Clusters::Applications::Fluentd.application_name => Clusters::Applications::Fluentd
+      Clusters::Applications::Fluentd.application_name => Clusters::Applications::Fluentd,
+      Clusters::Applications::Cilium.application_name => Clusters::Applications::Cilium
     }.freeze
     DEFAULT_ENVIRONMENT = '*'
     KUBE_INGRESS_BASE_DOMAIN = 'KUBE_INGRESS_BASE_DOMAIN'
@@ -65,6 +66,7 @@ module Clusters
     has_one_cluster_application :knative
     has_one_cluster_application :elastic_stack
     has_one_cluster_application :fluentd
+    has_one_cluster_application :cilium
 
     has_many :kubernetes_namespaces
     has_many :metrics_dashboard_annotations, class_name: 'Metrics::Dashboard::Annotation', inverse_of: :cluster
diff --git a/app/serializers/cluster_application_entity.rb b/app/serializers/cluster_application_entity.rb
index 32b759b9628..6b9a3ce114b 100644
--- a/app/serializers/cluster_application_entity.rb
+++ b/app/serializers/cluster_application_entity.rb
@@ -4,7 +4,7 @@ class ClusterApplicationEntity < Grape::Entity
   expose :name
   expose :status_name, as: :status
   expose :status_reason
-  expose :version
+  expose :version, if: -> (e, _) { e.respond_to?(:version) }
   expose :external_ip, if: -> (e, _) { e.respond_to?(:external_ip) }
   expose :external_hostname, if: -> (e, _) { e.respond_to?(:external_hostname) }
   expose :hostname, if: -> (e, _) { e.respond_to?(:hostname) }
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 9954e7ef1e6..753d2f1d794 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -86,10 +86,10 @@
         -# This element is filled in using JavaScript.
 
   .content-block.emoji-block.emoji-block-sticky
-    .row
-      .col-md-12.col-lg-4.js-noteable-awards
+    .row.gl-m-0.gl-justify-content-space-between
+      .js-noteable-awards
         = render 'award_emoji/awards_block', awardable: @issue, inline: true
-      .col-md-12.col-lg-8.new-branch-col
+      .new-branch-col
         #js-vue-sort-issue-discussions
         #js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@issue), notes_filters: UserPreference.notes_filters.to_json } }
         = render 'new_branch' if show_new_branch_button?