[CE->EE] Fix first part of the conflicts[ci skip]

.gitlab-ci.yml

@@ -376,15 +376,9 @@ trigger_docs:
   cache: {}
   artifacts: {}
   script:
-<<<<<<< HEAD
-    - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ee https://gitlab.com/api/v3/projects/1794617/trigger/builds"
-  only:
-=======
     - "HTTP_STATUS=$(curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=${CI_PROJECT_NAME} --silent --output curl.log --write-out '%{http_code}' https://gitlab.com/api/v3/projects/1794617/trigger/builds)"
     - if [ "${HTTP_STATUS}" -ne "201" ]; then echo "Error ${HTTP_STATUS}"; cat curl.log; echo; exit 1; fi
   only:
-    - master@gitlab-org/gitlab-ce
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
     - master@gitlab-org/gitlab-ee
 
 # Notify slack in the end

CHANGELOG.md

@@ -217,21 +217,10 @@ entry.
 - Requeue pending deletion projects.
 
 ## 8.16.8 (2017-03-19)
-<<<<<<< HEAD
-=======
 
 - Only show public emails in atom feeds.
 - To protect against Server-side Request Forgery project import URLs are now prohibited against localhost or the server IP except for the assigned instance URL and port. Imports are also prohibited from ports below 1024 with the exception of ports 22, 80, and 443.
 
-## 8.16.7 (2017-02-27)
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
-
-- No changes.
-- No changes.
-- No changes.
-- Only show public emails in atom feeds.
-- To protect against Server-side Request Forgery project import URLs are now prohibited against localhost or the server IP except for the assigned instance URL and port. Imports are also prohibited from ports below 1024 with the exception of ports 22, 80, and 443.
-
 ## 8.16.7 (2017-02-27)
 
 - Fix MR changes tab size count when there are over 100 files in the diff.
@@ -433,12 +422,7 @@ entry.
 
 ## 8.15.8 (2017-03-19)
 
-<<<<<<< HEAD
-- No changes.
-- No changes.
 - Read true-up info from license and validate it. !1159
-=======
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
 - Only show public emails in atom feeds.
 - To protect against Server-side Request Forgery project import URLs are now prohibited against localhost or the server IP except for the assigned instance URL and port. Imports are also prohibited from ports below 1024 with the exception of ports 22, 80, and 443.
 

app/assets/javascripts/filtered_search/filtered_search_dropdown.js

@@ -108,14 +108,10 @@
       const hook = this.getCurrentHook();
 
       if (hook) {
-<<<<<<< HEAD
-        const data = hook.list.data;
+        const data = hook.list.data || [];
 
         if (!data) return;
 
-=======
-        const data = hook.list.data || [];
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
         const results = data.map((o) => {
           const updated = o;
           updated.droplab_hidden = false;

app/controllers/projects/issues_controller.rb

@@ -6,11 +6,7 @@ class Projects::IssuesController < Projects::ApplicationController
   include IssuableCollections
   include SpammableActions
 
-<<<<<<< HEAD
-  prepend_before_action :authenticate_user!, only: [:export_csv]
-=======
-  prepend_before_action :authenticate_user!, only: [:new]
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
+  prepend_before_action :authenticate_user!, only: [:new, :export_csv]
 
   before_action :redirect_to_external_issue_tracker, only: [:index, :new]
   before_action :module_enabled

app/models/project.rb

@@ -997,14 +997,11 @@ class Project < ActiveRecord::Base
     credentials = Gitlab::UrlSanitizer.http_credentials_for_user(user)
 
     Gitlab::UrlSanitizer.new("#{web_url}.git", credentials: credentials).full_url
-<<<<<<< HEAD
   end
 
   # No need to have a Kerberos Web url. Kerberos URL will be used only to clone
   def kerberos_url_to_repo
     "#{Gitlab.config.build_gitlab_kerberos_url + Gitlab::Application.routes.url_helpers.namespace_project_path(self.namespace, self)}.git"
-=======
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
   end
 
   # Check if current branch name is marked as protected in the system

app/models/project_wiki.rb

@@ -49,14 +49,11 @@ class ProjectWiki
     credentials = Gitlab::UrlSanitizer.http_credentials_for_user(user)
 
     Gitlab::UrlSanitizer.new(url, credentials: credentials).full_url
-<<<<<<< HEAD
   end
 
   # No need to have a Kerberos Web url. Kerberos URL will be used only to clone
   def kerberos_url_to_repo
     [Gitlab.config.build_gitlab_kerberos_url, "/", path_with_namespace, ".git"].join('')
-=======
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
   end
 
   def wiki_base_path

config/webpack.config.js

@@ -36,11 +36,8 @@ var config = {
     issuable:             './issuable/issuable_bundle.js',
     merge_conflicts:      './merge_conflicts/merge_conflicts_bundle.js',
     merge_request_widget: './merge_request_widget/ci_bundle.js',
-<<<<<<< HEAD
     mr_widget_ee:         './merge_request_widget/widget_bundle.js',
-=======
     monitoring:           './monitoring/monitoring_bundle.js',
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3
     network:              './network/network_bundle.js',
     profile:              './profile/profile_bundle.js',
     protected_branches:   './protected_branches/protected_branches_bundle.js',
@@ -185,4 +182,4 @@ if (WEBPACK_REPORT) {
   );
 }
 
-module.exports = config;
\ No newline at end of file
+module.exports = config;

doc/api/v3_to_v4.md

@@ -77,7 +77,6 @@ Below are the changes made between V3 and V4.
 - Change initial page from `0` to `1` on `GET /projects/:id/repository/commits` (like on the rest of the API) [!9679] (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9679)
 - Return correct `Link` header data for `GET /projects/:id/repository/commits` [!9679] (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9679)
 - Update endpoints for repository files [!9637](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9637)
-<<<<<<< HEAD
   - Moved `/projects/:id/repository/files?file_path=:file_path` to `/projects/:id/repository/files/:file_path` (`:file_path` should be URL-encoded)
   - `/projects/:id/repository/blobs/:sha` now returns JSON attributes for the blob identified by `:sha`, instead of finding the commit identified by `:sha` and returning the raw content of the blob in that commit identified by the required `?filepath=:filepath`
   - Moved `/projects/:id/repository/commits/:sha/blob?file_path=:file_path`  and `/projects/:id/repository/blobs/:sha?file_path=:file_path`  to `/projects/:id/repository/files/:file_path/raw?ref=:sha`
@@ -88,9 +87,3 @@ Below are the changes made between V3 and V4.
 - Remove the ProjectGitHook API. Use the ProjectPushRule API instead [!1301](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1301)
 - Removed `repository_storage` from `PUT /application/settings` and `GET /application/settings` (use `repository_storages` instead) [!1307](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1307)
 - Removed `elasticsearch_host` and `elasticsearch_port` from `PUT /application/settings` (use `elasticsearch_url` instead) [!1305](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1305)
-=======
-  - Moved `GET /projects/:id/repository/files?file_path=:file_path` to `GET /projects/:id/repository/files/:file_path` (`:file_path` should be URL-encoded)
-  - `GET /projects/:id/repository/blobs/:sha` now returns JSON attributes for the blob identified by `:sha`, instead of finding the commit identified by `:sha` and returning the raw content of the blob in that commit identified by the required `?filepath=:filepath`
-  - Moved `GET /projects/:id/repository/commits/:sha/blob?file_path=:file_path`  and `GET /projects/:id/repository/blobs/:sha?file_path=:file_path` to `GET /projects/:id/repository/files/:file_path/raw?ref=:sha`
-  - `GET /projects/:id/repository/tree` parameter `ref_name` has been renamed to `ref` for consistency
->>>>>>> b22d4c2e9f171b6cabeb537f3a3a0a688a4e0cc3