Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-31

# Conflicts:
#	lib/api/issues.rb

[ci skip]

app/assets/javascripts/commons/gitlab_ui.js

 import Vue from 'vue';
 import {
-  GlPagination,
   GlProgressBar,
   GlLoadingIcon,
   GlTooltipDirective,
 } from '@gitlab-org/gitlab-ui';
 
-Vue.component('gl-pagination', GlPagination);
 Vue.component('gl-progress-bar', GlProgressBar);
 Vue.component('gl-loading-icon', GlLoadingIcon);
 

app/assets/javascripts/ide/components/ide.vue

@@ -43,7 +43,7 @@ export default {
       'currentProjectId',
       'errorMessage',
     ]),
-    ...mapGetters(['activeFile', 'hasChanges', 'someUncommitedChanges', 'isCommitModeActive']),
+    ...mapGetters(['activeFile', 'hasChanges', 'someUncommittedChanges', 'isCommitModeActive']),
   },
   mounted() {
     window.onbeforeunload = e => this.onBeforeUnload(e);
@@ -63,7 +63,7 @@ export default {
     onBeforeUnload(e = {}) {
       const returnValue = __('Are you sure you want to lose unsaved changes?');
 
-      if (!this.someUncommitedChanges) return undefined;
+      if (!this.someUncommittedChanges) return undefined;
 
       Object.assign(e, {
         returnValue,

app/assets/javascripts/ide/components/ide_side_bar.vue

@@ -25,11 +25,11 @@ export default {
   },
   computed: {
     ...mapState(['loading', 'currentActivityView', 'changedFiles', 'stagedFiles', 'lastCommitMsg']),
-    ...mapGetters(['currentProject', 'someUncommitedChanges']),
+    ...mapGetters(['currentProject', 'someUncommittedChanges']),
     showSuccessMessage() {
       return (
         this.currentActivityView === activityBarViews.edit &&
-        (this.lastCommitMsg && !this.someUncommitedChanges)
+        (this.lastCommitMsg && !this.someUncommittedChanges)
       );
     },
   },

app/assets/javascripts/ide/components/repo_commit_section.vue

@@ -27,10 +27,10 @@ export default {
       'unusedSeal',
     ]),
     ...mapState('commit', ['commitMessage', 'submitCommitLoading']),
-    ...mapGetters(['lastOpenedFile', 'hasChanges', 'someUncommitedChanges', 'activeFile']),
+    ...mapGetters(['lastOpenedFile', 'hasChanges', 'someUncommittedChanges', 'activeFile']),
     ...mapGetters('commit', ['discardDraftButtonDisabled']),
     showStageUnstageArea() {
-      return !!(this.someUncommitedChanges || this.lastCommitMsg || !this.unusedSeal);
+      return !!(this.someUncommittedChanges || this.lastCommitMsg || !this.unusedSeal);
     },
     activeFileKey() {
       return this.activeFile ? this.activeFile.key : null;

app/assets/javascripts/ide/stores/getters.js

@@ -63,7 +63,7 @@ export const isEditModeActive = state => state.currentActivityView === activityB
 export const isCommitModeActive = state => state.currentActivityView === activityBarViews.commit;
 export const isReviewModeActive = state => state.currentActivityView === activityBarViews.review;
 
-export const someUncommitedChanges = state =>
+export const someUncommittedChanges = state =>
   !!(state.changedFiles.length || state.stagedFiles.length);
 
 export const getChangesInFolder = state => path => {

app/assets/javascripts/vue_shared/components/pagination_links.vue

 <script>
+import { GlPagination } from '@gitlab-org/gitlab-ui';
 import { s__ } from '../../locale';
 
 export default {
+  components: {
+    GlPagination,
+  },
   props: {
     change: {
       type: Function,

changelogs/unreleased/gl-ui-pagination.yml

+---
+title: Remove gitlab-ui's pagination from global
+merge_request:
+author:
+type: performance

changelogs/unreleased/gt-fix-ide-typos-in-props.yml

+---
+title: Fix IDE typos in props
+merge_request: 22685
+author: George Tsiolis
+type: other

lib/api/issues.rb

@@ -17,8 +17,11 @@ module API
       end
     end
 
+<<<<<<< HEAD
     prepend EE::API::Issues
 
+=======
+>>>>>>> upstream/master
     helpers do
       # rubocop: disable CodeReuse/ActiveRecord
       def find_issues(args = {})