Merge branch 'master' into 37220-es-modules

* master: (35 commits)
  Use WikiPages::CreateService in spec/features/projects/wiki/user_updates_wiki_page_spec.rb
  Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog
  Docs group mrs list view search bar
  Replace the project/milestone.feature spinach test with an rspec analog
  Make all the tooltips in the same direction on the commit info box
  Reset all connection schema cache after migration tests
  Emoji was rendered as italic
  Adds Event polyfill for IE
  Add gitaly to patch update doc
  Document how to swap database tables.
  Replace 'project/wiki.feature' spinach test with an rspec analog
  Check for sidebar cookie instead of class when resizing window
  update installation and update instructions for 10.0
  Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog
  Remove confidential toggle checkbox and related code as no longer necessary
  Bump grape_logging gem to 1.7.0 to get status codes for error messages
  Expand filtered parameters to include `token`
  Replace the project/team_management.feature spinach test with an rspec analog
  Replace the profile/emails.feature spinach test with an rspec analog
  Replace project/group_links.feature spinach test with an rspec analog
  ...

12 files changed, 33 insertions, 41 deletions

diff --git a/app/assets/javascripts/commons/polyfills.js b/app/assets/javascripts/commons/polyfills.js
index b78089525cc..cb5a9a9f6b5 100644
--- a/app/assets/javascripts/commons/polyfills.js
+++ b/app/assets/javascripts/commons/polyfills.js
@@ -12,4 +12,5 @@ import 'core-js/fn/symbol';
 // Browser polyfills
 import './polyfills/custom_event';
 import './polyfills/element';
+import './polyfills/event';
 import './polyfills/nodelist';
diff --git a/app/assets/javascripts/commons/polyfills/custom_event.js b/app/assets/javascripts/commons/polyfills/custom_event.js
index aea61b82d03..db51ade61ae 100644
--- a/app/assets/javascripts/commons/polyfills/custom_event.js
+++ b/app/assets/javascripts/commons/polyfills/custom_event.js
@@ -1,7 +1,12 @@
 if (typeof window.CustomEvent !== 'function') {
   window.CustomEvent = function CustomEvent(event, params) {
     const evt = document.createEvent('CustomEvent');
-    const evtParams = params || { bubbles: false, cancelable: false, detail: undefined };
+    const evtParams = {
+      bubbles: false,
+      cancelable: false,
+      detail: undefined,
+      ...params,
+    };
     evt.initCustomEvent(event, evtParams.bubbles, evtParams.cancelable, evtParams.detail);
     return evt;
   };
diff --git a/app/assets/javascripts/commons/polyfills/event.js b/app/assets/javascripts/commons/polyfills/event.js
new file mode 100644
index 00000000000..ff5b9a1982f
--- /dev/null
+++ b/app/assets/javascripts/commons/polyfills/event.js
@@ -0,0 +1,18 @@
+/**
+ * Polyfill for IE11 support.
+ * new Event() is not supported by IE11.
+ * Although `initEvent` is deprecated for modern browsers it is the one supported by IE
+ */
+if (typeof window.Event !== 'function') {
+  window.Event = function Event(event, params) {
+    const evt = document.createEvent('Event');
+    const evtParams = {
+      bubbles: false,
+      cancelable: false,
+      ...params,
+    };
+    evt.initEvent(event, evtParams.bubbles, evtParams.cancelable);
+    return evt;
+  };
+  window.Event.prototype = Event;
+}
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue
index e115ee40219..06f6ec241f4 100644
--- a/app/assets/javascripts/issue_show/components/app.vue
+++ b/app/assets/javascripts/issue_show/components/app.vue
@@ -72,10 +72,6 @@ export default {
       required: false,
       default: () => [],
     },
-    isConfidential: {
-      type: Boolean,
-      required: true,
-    },
     markdownPreviewPath: {
       type: String,
       required: true,
@@ -131,7 +127,6 @@ export default {
         this.showForm = true;
         this.store.setFormState({
           title: this.state.titleText,
-          confidential: this.isConfidential,
           description: this.state.descriptionText,
           lockedWarningVisible: false,
           updateLoading: false,
@@ -147,8 +142,6 @@ export default {
         .then((data) => {
           if (location.pathname !== data.web_url) {
             gl.utils.visitUrl(data.web_url);
-          } else if (data.confidential !== this.isConfidential) {
-            gl.utils.visitUrl(location.pathname);
           }
 
           return this.service.getData();
diff --git a/app/assets/javascripts/issue_show/components/fields/confidential_checkbox.vue b/app/assets/javascripts/issue_show/components/fields/confidential_checkbox.vue
deleted file mode 100644
index a0ff08e9111..00000000000
--- a/app/assets/javascripts/issue_show/components/fields/confidential_checkbox.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<script>
-  export default {
-    props: {
-      formState: {
-        type: Object,
-        required: true,
-      },
-    },
-  };
-</script>
-
-<template>
-  <fieldset class="checkbox">
-    <label for="issue-confidential">
-      <input
-        type="checkbox"
-        value="1"
-        id="issue-confidential"
-        v-model="formState.confidential" />
-      This issue is confidential and should only be visible to team members with at least Reporter access.
-    </label>
-  </fieldset>
-</template>
diff --git a/app/assets/javascripts/issue_show/components/form.vue b/app/assets/javascripts/issue_show/components/form.vue
index 6a2dd502fe2..28bf6c67ea5 100644
--- a/app/assets/javascripts/issue_show/components/form.vue
+++ b/app/assets/javascripts/issue_show/components/form.vue
@@ -4,7 +4,6 @@
   import descriptionField from './fields/description.vue';
   import editActions from './edit_actions.vue';
   import descriptionTemplate from './fields/description_template.vue';
-  import confidentialCheckbox from './fields/confidential_checkbox.vue';
 
   export default {
     props: {
@@ -44,7 +43,6 @@
       descriptionField,
       descriptionTemplate,
       editActions,
-      confidentialCheckbox,
     },
     computed: {
       hasIssuableTemplates() {
@@ -81,8 +79,6 @@
       :form-state="formState"
       :markdown-preview-path="markdownPreviewPath"
       :markdown-docs-path="markdownDocsPath" />
-    <confidential-checkbox
-      :form-state="formState" />
     <edit-actions
       :form-state="formState"
       :can-destroy="canDestroy" />
diff --git a/app/assets/javascripts/issue_show/index.js b/app/assets/javascripts/issue_show/index.js
index 8053ef57e6c..aca9dec2a96 100644
--- a/app/assets/javascripts/issue_show/index.js
+++ b/app/assets/javascripts/issue_show/index.js
@@ -35,7 +35,6 @@ document.addEventListener('DOMContentLoaded', () => {
           initialDescriptionHtml: this.initialDescriptionHtml,
           initialDescriptionText: this.initialDescriptionText,
           issuableTemplates: this.issuableTemplates,
-          isConfidential: this.isConfidential,
           markdownPreviewPath: this.markdownPreviewPath,
           markdownDocsPath: this.markdownDocsPath,
           projectPath: this.projectPath,
diff --git a/app/assets/javascripts/issue_show/stores/index.js b/app/assets/javascripts/issue_show/stores/index.js
index f4639e9ed2a..af8b0414266 100644
--- a/app/assets/javascripts/issue_show/stores/index.js
+++ b/app/assets/javascripts/issue_show/stores/index.js
@@ -3,7 +3,6 @@ export default class Store {
     this.state = initialState;
     this.formState = {
       title: '',
-      confidential: false,
       description: '',
       lockedWarningVisible: false,
       updateLoading: false,
diff --git a/app/assets/javascripts/new_sidebar.js b/app/assets/javascripts/new_sidebar.js
index fbe474f2f61..cea4f35096a 100644
--- a/app/assets/javascripts/new_sidebar.js
+++ b/app/assets/javascripts/new_sidebar.js
@@ -68,7 +68,7 @@ export default class NewNavSidebar {
     if (breakpoint === 'sm' || breakpoint === 'md') {
       this.toggleCollapsedSidebar(true);
     } else if (breakpoint === 'lg') {
-      const collapse = this.$sidebar.hasClass('sidebar-icons-only');
+      const collapse = Cookies.get('sidebar_collapsed') === 'true';
       this.toggleCollapsedSidebar(collapse);
     }
   }
diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss
index 2d6bc17d4ff..527e7d57c5c 100644
--- a/app/assets/stylesheets/framework/emojis.scss
+++ b/app/assets/stylesheets/framework/emojis.scss
@@ -1,4 +1,5 @@
 gl-emoji {
+  font-style: normal;
   display: inline-flex;
   vertical-align: middle;
   font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 8ad082f7a65..588ec1ff3bc 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -17,8 +17,11 @@
       max-width: $limited-layout-width-sm;
       margin-left: auto;
       margin-right: auto;
-      padding-top: 64px;
-      padding-bottom: 64px;
+
+      @media (min-width: $screen-md-min) {
+        padding-top: 64px;
+        padding-bottom: 64px;
+      }
     }
   }
 
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index a7acaf6c728..54c3c0173ae 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -608,7 +608,7 @@
 
       + .files,
       + .alert {
-        margin-top: 30px;
+        margin-top: 32px;
       }
     }
   }