Resolve other merge conflicts

app/assets/javascripts/diff_notes/components/resolve_btn.js

@@ -19,11 +19,7 @@ const ResolveBtn = Vue.extend({
   data: function () {
     return {
       discussions: CommentsStore.state,
-<<<<<<< HEAD
-      loading: false,
-=======
       loading: false
->>>>>>> ce/master
     };
   },
   watch: {

app/assets/javascripts/dropzone_input.js

@@ -136,11 +136,6 @@ window.DropzoneInput = (function() {
       const textarea = child.get(0);
       caretStart = textarea.selectionStart;
       caretEnd = textarea.selectionEnd;
-<<<<<<< HEAD
-      caretStart = textarea.selectionStart;
-      caretEnd = textarea.selectionEnd;
-=======
->>>>>>> ce/master
       textEnd = $(child).val().length;
       beforeSelection = $(child).val().substring(0, caretStart);
       afterSelection = $(child).val().substring(caretEnd, textEnd);

app/models/identity.rb

@@ -7,11 +7,8 @@ class Identity < ActiveRecord::Base
   validates :extern_uid, allow_blank: true, uniqueness: { scope: :provider }
   validates :user_id, uniqueness: { scope: :provider }
 
-<<<<<<< HEAD
   scope :with_provider, ->(provider) { where(provider: provider) }
-=======
   scope :with_extern_uid, ->(provider, extern_uid) { where(extern_uid: extern_uid, provider: provider) }
->>>>>>> ce/master
 
   def ldap?
     provider.starts_with?('ldap')

app/services/commits/create_service.rb

@@ -37,10 +37,7 @@ module Commits
 
     def validate!
       validate_permissions!
-<<<<<<< HEAD
       validate_repository_size!
-=======
->>>>>>> ce/master
       validate_on_branch!
       validate_branch_existance!
 
@@ -55,15 +52,12 @@ module Commits
       end
     end
 
-<<<<<<< HEAD
     def validate_repository_size!
       if project.above_size_limit?
         raise_error(Gitlab::RepositorySizeError.new(project).commit_error)
       end
     end
 
-=======
->>>>>>> ce/master
     def validate_on_branch!
       if !@start_project.empty_repo? && !@start_project.repository.branch_exists?(@start_branch)
         raise_error('You can only create or edit files when you are on a branch')

app/views/layouts/nav/_project.html.haml

@@ -11,11 +11,7 @@
           Project
 
     - if project_nav_tab? :files
-<<<<<<< HEAD
-      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare repositories tags branches releases graphs network path_locks)) do
-=======
-      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare projects/repositories tags branches releases graphs network)) do
->>>>>>> ce/master
+      = nav_link(controller: %w(tree blob blame edit_tree new_tree find_file commit commits compare projects/repositories tags branches releases graphs network path_locks)) do
         = link_to project_files_path(@project), title: 'Repository',  class: 'shortcuts-tree' do
           %span
             Repository

app/views/projects/merge_requests/widget/_open.html.haml

@@ -27,11 +27,8 @@
       = render 'projects/merge_requests/widget/open/conflicts'
     - elsif @merge_request.work_in_progress?
       = render 'projects/merge_requests/widget/open/wip'
-<<<<<<< HEAD
     - elsif @merge_request.should_be_rebased?
       = render 'projects/merge_requests/widget/open/rebase'
-=======
->>>>>>> ce/master
     - elsif @merge_request.merge_when_pipeline_succeeds? && @merge_request.merge_error.present?
       = render 'projects/merge_requests/widget/open/error'
     - elsif @merge_request.merge_when_pipeline_succeeds?

config/webpack.config.js

@@ -21,10 +21,7 @@ var config = {
   entry: {
     blob:                 './blob_edit/blob_bundle.js',
     boards:               './boards/boards_bundle.js',
-<<<<<<< HEAD
     burndown_chart:       './burndown_chart/index.js',
-=======
->>>>>>> ce/master
     common:               './commons/index.js',
     common_vue:           ['vue', './vue_shared/common_vue.js'],
     common_d3:            ['d3'],
@@ -132,11 +129,8 @@ var config = {
         'notebook_viewer',
         'pdf_viewer',
         'pipelines',
-<<<<<<< HEAD
         'mr_widget_ee',
         'issue_show'
-=======
->>>>>>> ce/master
       ],
       minChunks: function(module, count) {
         return module.resource && (/vue_shared/).test(module.resource);

doc/api/users.md

@@ -1006,12 +1006,7 @@ Parameters:
 
 ### Get user activities (admin only)
 
-<<<<<<< HEAD
->**Note:** This API endpoint is only available on 8.15 EE and above.
-
-=======
 >**Note:** This API endpoint is only available on 8.15 (EE) and 9.1 (CE) and above.
->>>>>>> ce/master
 
 Get the last activity date for all users, sorted from oldest to newest.
 
@@ -1034,11 +1029,7 @@ Parameters:
 | `from` | string | no | Date string in the format YEAR-MONTH-DAY, e.g. `2016-03-11`. Defaults to 6 months ago. |
 
 ```bash
-<<<<<<< HEAD
-curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/user/activities
-=======
 curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/user/activities
->>>>>>> ce/master
 ```
 
 Example response:

lib/api/users.rb

@@ -57,17 +57,6 @@ module API
           render_api_error!("Not authorized.", 403)
         end
 
-<<<<<<< HEAD
-        if params[:username].present?
-          users = User.where(username: params[:username])
-        else
-          users = User.all
-          users = users.active if params[:active]
-          users = users.non_ldap if params[:skip_ldap]
-          users = users.search(params[:search]) if params[:search].present?
-          users = users.blocked if params[:blocked]
-          users = users.external if params[:external] && current_user.admin?
-=======
         authenticated_as_admin! if params[:external].present? || (params[:extern_uid].present? && params[:provider].present?)
 
         users = User.all
@@ -75,11 +64,11 @@ module API
         users = users.active if params[:active]
         users = users.search(params[:search]) if params[:search].present?
         users = users.blocked if params[:blocked]
+        users = users.non_ldap if params[:skip_ldap]
 
         if current_user.admin?
           users = users.joins(:identities).merge(Identity.with_extern_uid(params[:provider], params[:extern_uid])) if params[:extern_uid] && params[:provider]
           users = users.external if params[:external]
->>>>>>> ce/master
         end
 
         entity = current_user.admin? ? Entities::UserPublic : Entities::UserBasic

spec/features/merge_requests/widget_spec.rb

@@ -162,7 +162,6 @@ describe 'Merge request', :feature, :js do
     end
   end
 
-<<<<<<< HEAD
   context 'view merge request with MWPS enabled but fast-forward merge is not possible' do
     before do
       project.update(merge_requests_ff_only_enabled: true)
@@ -186,8 +185,6 @@ describe 'Merge request', :feature, :js do
     end
   end
 
-=======
->>>>>>> ce/master
   context 'merge error' do
     before do
       allow_any_instance_of(Repository).to receive(:merge).and_return(false)

spec/requests/api/internal_spec.rb

@@ -147,7 +147,6 @@ describe API::Internal, api: true  do
     end
   end
 
-<<<<<<< HEAD
   describe "GET /internal/authorized_keys" do
     context "unsing an existing key's fingerprint" do
       it "finds the key" do
@@ -196,8 +195,6 @@ describe API::Internal, api: true  do
     end
   end
 
-=======
->>>>>>> ce/master
   describe "POST /internal/allowed", :redis do
     context "access granted" do
       before do
@@ -207,7 +204,6 @@ describe API::Internal, api: true  do
 
       after do
         Timecop.return
-<<<<<<< HEAD
       end
 
       context 'with env passed as a JSON' do
@@ -224,8 +220,6 @@ describe API::Internal, api: true  do
 
           expect(response).to have_http_status(200)
         end
-=======
->>>>>>> ce/master
       end
 
       context 'with env passed as a JSON' do