Add latest changes from gitlab-org/gitlab@master

7 files changed, 98 insertions, 14 deletions

diff --git a/app/assets/javascripts/achievements/components/achievements_app.vue b/app/assets/javascripts/achievements/components/achievements_app.vue
new file mode 100644
index 00000000000..5f40231856f
--- /dev/null
+++ b/app/assets/javascripts/achievements/components/achievements_app.vue
@@ -0,0 +1,31 @@
+<script>
+export default {
+  inject: {
+    canAdminAchievement: {
+      type: Boolean,
+      required: true,
+    },
+    canAwardAchievement: {
+      type: Boolean,
+      required: true,
+    },
+    groupFullPath: {
+      type: String,
+      required: true,
+    },
+    groupId: {
+      type: Number,
+      required: true,
+    },
+    textQuery: {
+      type: String,
+      required: false,
+      default: null,
+    },
+  },
+};
+</script>
+
+<template>
+  <div></div>
+</template>
diff --git a/app/assets/javascripts/achievements/constants.js b/app/assets/javascripts/achievements/constants.js
new file mode 100644
index 00000000000..82a56588c96
--- /dev/null
+++ b/app/assets/javascripts/achievements/constants.js
@@ -0,0 +1,7 @@
+export const INDEX_ROUTE_NAME = 'index';
+export const NEW_ROUTE_NAME = 'new';
+export const EDIT_ROUTE_NAME = 'edit';
+export const trackViewsOptions = {
+  category: 'Achievements' /* eslint-disable-line @gitlab/require-i18n-strings */,
+  action: 'view_achievements_list',
+};
diff --git a/app/assets/javascripts/achievements/routes.js b/app/assets/javascripts/achievements/routes.js
new file mode 100644
index 00000000000..12aa17d73b6
--- /dev/null
+++ b/app/assets/javascripts/achievements/routes.js
@@ -0,0 +1,16 @@
+import { INDEX_ROUTE_NAME, NEW_ROUTE_NAME, EDIT_ROUTE_NAME } from './constants';
+
+export default [
+  {
+    name: INDEX_ROUTE_NAME,
+    path: '/',
+  },
+  {
+    name: NEW_ROUTE_NAME,
+    path: '/new',
+  },
+  {
+    name: EDIT_ROUTE_NAME,
+    path: '/:id/edit',
+  },
+];
diff --git a/app/assets/javascripts/pages/groups/achievements/index.js b/app/assets/javascripts/pages/groups/achievements/index.js
new file mode 100644
index 00000000000..d964b0feb96
--- /dev/null
+++ b/app/assets/javascripts/pages/groups/achievements/index.js
@@ -0,0 +1,43 @@
+import Vue from 'vue';
+import VueApollo from 'vue-apollo';
+import VueRouter from 'vue-router';
+import createDefaultClient from '~/lib/graphql';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
+import AchievementsApp from '~/achievements/components/achievements_app.vue';
+import routes from '~/achievements/routes';
+
+Vue.use(VueApollo);
+Vue.use(VueRouter);
+
+const init = () => {
+  const el = document.getElementById('js-achievements-app');
+
+  if (!el) {
+    return false;
+  }
+
+  const apolloProvider = new VueApollo({
+    defaultClient: createDefaultClient(),
+  });
+
+  const { basePath, viewModel } = el.dataset;
+  const provide = JSON.parse(viewModel);
+
+  const router = new VueRouter({
+    base: basePath,
+    mode: 'history',
+    routes,
+  });
+
+  return new Vue({
+    el,
+    router,
+    apolloProvider,
+    provide: convertObjectPropsToCamelCase(provide),
+    render(createElement) {
+      return createElement(AchievementsApp);
+    },
+  });
+};
+
+init();
diff --git a/app/assets/javascripts/super_sidebar/components/menu_section.vue b/app/assets/javascripts/super_sidebar/components/menu_section.vue
index b57a4e3013c..5de6e04d827 100644
--- a/app/assets/javascripts/super_sidebar/components/menu_section.vue
+++ b/app/assets/javascripts/super_sidebar/components/menu_section.vue
@@ -30,11 +30,6 @@ export default {
       required: false,
       default: 'div',
     },
-    collectionStyle: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   data() {
     return {
@@ -94,13 +89,7 @@ export default {
         </slot>
       </span>
 
-      <span
-        class="gl-pr-3 gl-truncate-end gl-text-gray-900"
-        :class="{
-          'gl-font-sm gl-font-weight-semibold': collectionStyle,
-        }"
-        data-testid="section-title"
-      >
+      <span class="gl-pr-3 gl-text-gray-900 gl-truncate-end">
         {{ item.title }}
       </span>
 
diff --git a/app/assets/javascripts/super_sidebar/components/pinned_section.vue b/app/assets/javascripts/super_sidebar/components/pinned_section.vue
index 93d9cf71a18..4fc86e41ef2 100644
--- a/app/assets/javascripts/super_sidebar/components/pinned_section.vue
+++ b/app/assets/javascripts/super_sidebar/components/pinned_section.vue
@@ -70,7 +70,6 @@ export default {
     :item="sectionItem"
     :expanded="expanded"
     :separated="true"
-    collection-style
     @collapse-toggle="expanded = !expanded"
   >
     <draggable
diff --git a/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue
index 055886621f1..12abd727ef0 100644
--- a/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue
+++ b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue
@@ -150,7 +150,6 @@ export default {
         v-for="item in nonStaticItems"
         :key="item.id"
         :item="item"
-        :collection-style="supportsPins"
         tag="li"
         @pin-add="createPin"
         @pin-remove="destroyPin"