CE->EE: Fix merge conflicts

CHANGELOG.md

@@ -4,24 +4,12 @@ entry.
 
 ## 9.5.5 (2017-09-18)
 
-<<<<<<< HEAD
-=======
 - [SECURITY] Upgrade mail and nokogiri gems due to security issues. !13662 (Markus Koller)
->>>>>>> ce/master
 - [FIXED] Fix division by zero error in blame age mapping. !13803 (Jeff Stubler)
 - [FIXED] Fix problems sanitizing URLs with empty passwords. !14083
 - [FIXED] Fix a wrong `X-Gitlab-Event` header when testing webhooks. !14108
 - [FIXED] Fixes the 500 errors caused by a race condition in GPG's tmp directory handling. !14194 (Alexis Reigel)
 - [FIXED] Fix Pipeline Triggers to show triggered label and predefined variables (e.g. CI_PIPELINE_TRIGGERED). !14244
-<<<<<<< HEAD
-- [FIXED] Disable GitLab Project Import Button if source disabled.
-- [FIXED] Fix project feature being deleted when updating project with invalid visibility level.
-- [FIXED] Fix new navigation wrapping and causing height to grow.
-- [FIXED] Normalize styles for empty state combo button.
-- [FIXED] Fix buttons with different height in merge request widget.
-- [FIXED] Fix broken svg in jobs dropdown for success status.
-- [FIXED] Improve migrations using triggers.
-=======
 - [FIXED] Fix project feature being deleted when updating project with invalid visibility level.
 - [FIXED] Fix new navigation wrapping and causing height to grow.
 - [FIXED] Fix buttons with different height in merge request widget.
@@ -29,7 +17,6 @@ entry.
 - [FIXED] Fix broken svg in jobs dropdown for success status.
 - [FIXED] Improve migrations using triggers.
 - [FIXED] Disable GitLab Project Import Button if source disabled.
->>>>>>> ce/master
 - [CHANGED] Update the GPG verification semantics: A GPG signature must additionally match the committer in order to be verified. !13771 (Alexis Reigel)
 - [OTHER] Fix repository equality check and avoid fetching ref if the commit is already available. This affects merge request creation performance. !13685
 - [OTHER] Update documentation for confidential issue. !14117

Gemfile.lock

@@ -317,12 +317,8 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
-<<<<<<< HEAD
     gitlab-license (1.0.0)
-    gitlab-markup (1.5.1)
-=======
     gitlab-markup (1.6.2)
->>>>>>> ce/master
     gitlab_omniauth-ldap (2.0.4)
       net-ldap (~> 0.16)
       omniauth (~> 1.3)
@@ -1067,12 +1063,8 @@ DEPENDENCIES
   gitaly-proto (~> 0.33.0)
   github-linguist (~> 4.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
-<<<<<<< HEAD
   gitlab-license (~> 1.0)
-  gitlab-markup (~> 1.5.1)
-=======
   gitlab-markup (~> 1.6.2)
->>>>>>> ce/master
   gitlab_omniauth-ldap (~> 2.0.4)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.4)

app/assets/javascripts/boards/stores/boards_store.js

@@ -2,10 +2,7 @@
 /* global List */
 import _ from 'underscore';
 import Cookies from 'js-cookie';
-<<<<<<< HEAD
 import boardsStoreEE from 'ee/boards/stores/boards_store_ee';
-=======
->>>>>>> ce/master
 import { getUrlParamsArray } from '../../lib/utils/common_utils';
 
 window.gl = window.gl || {};

app/assets/javascripts/dispatcher.js

@@ -84,15 +84,12 @@ import GpgBadges from './gpg_badges';
 import UserFeatureHelper from './helpers/user_feature_helper';
 import initChangesDropdown from './init_changes_dropdown';
 import { ajaxGet, convertPermissionToBoolean } from './lib/utils/common_utils';
-<<<<<<< HEAD
 
 // EE-only
 import ApproversSelect from './approvers_select';
 import AuditLogs from './audit_logs';
 import initGeoInfoModal from './init_geo_info_modal';
 import initGroupAnalytics from './init_group_analytics';
-=======
->>>>>>> ce/master
 
 (function() {
   var Dispatcher;

app/assets/javascripts/environments/components/environment.vue

@@ -65,7 +65,6 @@ export default {
 
     canCreateEnvironmentParsed() {
       return convertPermissionToBoolean(this.canCreateEnvironment);
-<<<<<<< HEAD
     },
 
     /**
@@ -76,8 +75,6 @@ export default {
      */
     shouldRenderPagination() {
       return this.state.paginationInformation && this.state.paginationInformation.totalPages > 1;
-=======
->>>>>>> ce/master
     },
   },