All conflicts resolved

.gitlab-ci.yml

@@ -241,29 +241,6 @@ rake brakeman: *exec
 rake flay: *exec
 license_finder: *exec
 rake downtime_check: *exec
-<<<<<<< HEAD
-=======
-rake ee_compat_check:
-  <<: *exec
-  only:
-    - branches@gitlab-org/gitlab-ce
-  except:
-    - master
-    - tags
-    - /^[\d-]+-stable(-ee)?$/
-  allow_failure: yes
-  cache:
-    key: "ruby233-ee_compat_check_repo"
-    paths:
-      - ee_compat_check/repo/
-      - vendor/ruby
-  artifacts:
-    name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}_${CI_BUILD_REF}"
-    when: on_failure
-    expire_in: 10d
-    paths:
-      - ee_compat_check/patches/*.patch
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
 
 rake db:migrate:reset:
   stage: test

app/assets/stylesheets/pages/admin.scss

-/**
- * Admin area
- *
- */
-.admin-dashboard {
-  .data {
-    a {
-      h1 {
-        line-height: 48px;
-        font-size: 48px;
-        padding: 20px;
-        text-align: center;
-        font-weight: normal;
-      }
-    }
-  }
-
-  .str-truncated {
-    max-width: 60%;
-  }
-}
-
-.admin-filter form {
-  .select2-container {
-    width: 100%;
-  }
-
-  .controls {
-    margin-left: 130px;
-  }
-
-  .form-actions {
-    padding-left: 130px;
-    background: #fff;
-   }
-
-  .visibility-levels {
-    .controls {
-      margin-bottom: 9px;
-    }
-
-    i {
-      color: inherit;
-    }
-  }
-}
-
-.broadcast-messages {
-  .message {
-    line-height: 2;
-  }
-}
-
-.broadcast-message {
-  @extend .alert-warning;
-  padding: 10px;
-  text-align: center;
-
-  > div,
-  p {
-    display: inline;
-    margin: 0;
-
-    a {
-      color: inherit;
-      text-decoration: underline;
-    }
-  }
-}
-
-.broadcast-message-preview {
-  @extend .broadcast-message;
-  margin-bottom: 20px;
-}
-
-.license-key-field {
-  font-family: monospace;
-}
-
-// Users List
-
-.users-list {
-  .user-row {
-    display: -webkit-flex;
-    display: -ms-flexbox;
-    display: flex;
-    white-space: nowrap;
-  }
-
-  .user-details {
-    flex: 1 1 auto;
-    overflow: hidden;
-    padding-right: 8px;
-  }
-
-  .user-name {
-    display: inline-block;
-    font-weight: 600;
-  }
-
-  .user-name,
-  .user-email {
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-
-  .dropdown {
-    .btn-block {
-      margin-bottom: 0;
-      line-height: inherit;
-    }
-  }
-
-  .label-default {
-    color: $btn-transparent-color;
-  }
-}
-
-.abuse-reports {
-  .table {
-    table-layout: fixed;
-  }
-
-  .subheading {
-    padding-bottom: $gl-padding;
-  }
-
-  .message {
-    word-wrap: break-word;
-  }
-
-  .btn {
-    white-space: normal;
-    padding: $gl-btn-padding;
-  }
-
-  th {
-    width: 15%;
-
-    &.wide {
-      width: 55%;
-    }
-  }
-
-  @media (max-width: $screen-sm-max) {
-    th {
-      width: 100%;
-    }
-
-    td {
-      width: 100%;
-      float: left;
-    }
-  }
-
-  .no-reports {
-    .emoji-icon {
-      margin-left: $btn-side-margin;
-      margin-top: 3px;
-    }
-
-    span {
-      font-size: 19px;
-    }
-  }
-}
-
-.admin-builds-table {
-  .ci-table td:last-child {
-    min-width: 120px;
-  }
-}

app/assets/stylesheets/pages/issuable.scss

@@ -233,11 +233,7 @@
       width: 100%;
       text-align: center;
       padding-bottom: 10px;
-<<<<<<< HEAD
-      color: $sidebar-collapsed-icon-color;
-=======
       color: $issuable-sidebar-color;
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
 
       &:hover {
         color: $gl-gray;

app/controllers/projects/issues_controller.rb

@@ -49,16 +49,11 @@ class Projects::IssuesController < Projects::ApplicationController
     build_params = issue_params.merge(merge_request_for_resolving_discussions: merge_request_for_resolving_discussions)
     @issue = @noteable = Issues::BuildService.new(project, current_user, build_params).execute
 
-<<<<<<< HEAD
-    @issue = @noteable = @project.issues.new(issue_params)
-
     # Set Issue description based on project template
     if @project.issues_template.present?
       @issue.description = @project.issues_template
     end
 
-=======
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
     respond_with(@issue)
   end
 

app/helpers/projects_helper.rb

@@ -413,7 +413,6 @@ module ProjectsHelper
       "success"
     end
   end
-<<<<<<< HEAD
 
   def membership_locked?
     if @project.group && @project.group.membership_lock
@@ -423,23 +422,6 @@ module ProjectsHelper
     end
   end
 
-  def new_readme_path
-    ref = @repository.root_ref if @repository
-    ref ||= 'master'
-
-    namespace_project_new_blob_path(@project.namespace, @project, tree_join(ref), file_name: 'README.md')
-  end
-
-  def new_license_path
-    ref = @repository.root_ref if @repository
-    ref ||= 'master'
-
-    namespace_project_new_blob_path(@project.namespace, @project, tree_join(ref), file_name: 'LICENSE')
-  end
-
-=======
-  
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
   def readme_cache_key
     sha = @project.commit.try(:sha) || 'nil'
     [@project.path_with_namespace, sha, "readme"].join('-')

config/routes/group.rb

@@ -23,7 +23,6 @@ scope(path: 'groups/*group_id',
   resource :avatar, only: [:destroy]
   resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
 
-<<<<<<< HEAD
   ## EE-specific
   resource :notification_setting, only: [:update]
   resources :audit_events, only: [:index]
@@ -37,10 +36,7 @@ scope(path: 'groups/*group_id',
   end
   ## EE-specific
 
-  resources :labels, except: [:show], constraints: { id: /\d+/ } do
-=======
   resources :labels, except: [:show] do
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
     post :toggle_subscription, on: :member
   end
 end

doc/api/merge_requests.md

@@ -526,7 +526,6 @@ Parameters:
 }
 ```
 
-<<<<<<< HEAD
 ## Merge Request Approvals
 
 >**Note:** This API endpoint is only available on 8.9 EE and above.
@@ -629,10 +628,7 @@ POST /projects/:id/merge_requests/:merge_request_id/approve
 }
 ```
 
-## Cancel Merge When Build Succeeds
-=======
 ## Cancel Merge When Pipeline Succeeds
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
 
 If you don't have permissions to accept this merge request - you'll get a `401`
 

lib/api/users.rb

@@ -34,10 +34,7 @@ module API
         optional :active, type: Boolean, default: false, desc: 'Filters only active users'
         optional :external, type: Boolean, default: false, desc: 'Filters only external users'
         optional :blocked, type: Boolean, default: false, desc: 'Filters only blocked users'
-<<<<<<< HEAD
         optional :skip_ldap, type: Boolean, default: false, desc: 'Skip LDAP users'
-=======
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
         use :pagination
       end
       get do

spec/controllers/projects/issues_controller_spec.rb

@@ -296,7 +296,6 @@ describe Projects::IssuesController do
   end
 
   describe 'POST #create' do
-<<<<<<< HEAD
     def post_new_issue(attrs = {})
       sign_in(user)
       project = create(:empty_project, :public)
@@ -309,7 +308,8 @@ describe Projects::IssuesController do
       }
 
       project.issues.first
-=======
+    end
+
     context 'resolving discussions in MergeRequest' do
       let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first }
       let(:merge_request) { discussion.noteable }
@@ -344,7 +344,6 @@ describe Projects::IssuesController do
 
         expect(discussion.resolved?).to eq(true)
       end
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
     end
 
     context 'Akismet is enabled' do

spec/finders/merge_requests_finder_spec.rb

@@ -33,17 +33,16 @@ describe MergeRequestsFinder do
       expect(merge_requests.size).to eq(1)
     end
 
-<<<<<<< HEAD
     it 'ignores sorting by weight' do
       params = { project_id: project1.id, scope: 'authored', state: 'opened', weight: Issue::WEIGHT_ANY }
       merge_requests = MergeRequestsFinder.new(user, params).execute
       expect(merge_requests.size).to eq(1)
-=======
+    end
+
     it 'filters by non_archived' do
       params = { non_archived: true }
       merge_requests = MergeRequestsFinder.new(user, params).execute
       expect(merge_requests.size).to eq(3)
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
     end
   end
 end

spec/services/projects/create_service_spec.rb

@@ -125,28 +125,22 @@ describe Projects::CreateService, '#execute', services: true do
     end
   end
 
-<<<<<<< HEAD
-    context "git hook sample" do
-      before do
-        @push_rule_sample = create :push_rule_sample
-      end
+  context "git hook sample" do
+    before do
+      @push_rule_sample = create :push_rule_sample
+    end
 
-      it "creates git hook from sample" do
-        push_rule = create_project(@user, @opts).push_rule
-        [:force_push_regex, :deny_delete_tag, :delete_branch_regex, :commit_message_regex].each do |attr_name|
-          expect(push_rule.send(attr_name)).to eq @push_rule_sample.send(attr_name)
-        end
+    it "creates git hook from sample" do
+      push_rule = create_project(@user, @opts).push_rule
+      [:force_push_regex, :deny_delete_tag, :delete_branch_regex, :commit_message_regex].each do |attr_name|
+        expect(push_rule.send(attr_name)).to eq @push_rule_sample.send(attr_name)
       end
     end
+  end
 
-    context 'repository creation' do
-      it 'synchronously creates the repository' do
-        expect_any_instance_of(Project).to receive(:create_repository)
-=======
   context 'repository creation' do
     it 'synchronously creates the repository' do
       expect_any_instance_of(Project).to receive(:create_repository)
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
 
       project = create_project(user, opts)
       expect(project).to be_valid

spec/services/system_note_service_spec.rb

@@ -720,7 +720,6 @@ describe SystemNoteService, services: true do
     end
   end
 
-<<<<<<< HEAD
   describe '.approve_mr' do
     let(:noteable)    { create(:merge_request, source_project: project) }
     subject { described_class.approve_mr(noteable, author) }
@@ -796,7 +795,9 @@ describe SystemNoteService, services: true do
     def spend_time!(seconds)
       noteable.spend_time(seconds, author)
       noteable.save!
-=======
+    end
+  end
+
   describe '.discussion_continued_in_issue' do
     let(:discussion) { Discussion.for_diff_notes([create(:diff_note_on_merge_request)]).first }
     let(:merge_request) { discussion.noteable }
@@ -822,7 +823,6 @@ describe SystemNoteService, services: true do
       note = SystemNoteService.discussion_continued_in_issue(discussion, project, user, issue)
 
       expect(note.note).to include(issue.to_reference)
->>>>>>> 50a784482e997cc039015e24b37d3f8a01a9cd3e
     end
   end
 end