CE->EE Resolve conflicts in specs[ci skip]

app/finders/issuable_finder.rb

@@ -36,11 +36,8 @@ class IssuableFinder
     items = by_search(items)
     items = by_assignee(items)
     items = by_author(items)
-<<<<<<< HEAD
     items = by_label(items)
     items = by_weight(items)
-=======
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     items = by_due_date(items)
     items = by_non_archived(items)
     items = by_iids(items)

app/models/user.rb

@@ -101,15 +101,12 @@ class User < ActiveRecord::Base
   has_many :todos,                    dependent: :destroy
   has_many :notification_settings,    dependent: :destroy
   has_many :award_emoji,              dependent: :destroy
-<<<<<<< HEAD
   has_many :path_locks,               dependent: :destroy
 
   # Protected Branch Access
   has_many :protected_branch_merge_access_levels, dependent: :destroy, class_name: ProtectedBranch::MergeAccessLevel
   has_many :protected_branch_push_access_levels, dependent: :destroy, class_name: ProtectedBranch::PushAccessLevel
-=======
   has_many :triggers,                 dependent: :destroy, class_name: 'Ci::Trigger', foreign_key: :owner_id
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
 
   has_many :assigned_issues,          dependent: :nullify, foreign_key: :assignee_id, class_name: "Issue"
   has_many :assigned_merge_requests,  dependent: :nullify, foreign_key: :assignee_id, class_name: "MergeRequest"

app/workers/stuck_ci_builds_worker.rb

-class StuckCiBuildsWorker
-  include Sidekiq::Worker
-  include CronjobQueue
-
-  BUILD_STUCK_TIMEOUT = 1.day
-
-  def perform
-    return if Gitlab::Geo.secondary?
-    Rails.logger.info 'Cleaning stuck builds'
-
-    builds = Ci::Build.joins(:project).running_or_pending.where('ci_builds.updated_at < ?', BUILD_STUCK_TIMEOUT.ago)
-    builds.find_each(batch_size: 50).each do |build|
-      Rails.logger.debug "Dropping stuck #{build.status} build #{build.id} for runner #{build.runner_id}"
-      build.drop
-    end
-
-    # Update builds that failed to drop
-    builds.update_all(status: 'failed')
-  end
-end

config/routes.rb

@@ -34,10 +34,7 @@ Rails.application.routes.draw do
   get '/autocomplete/users' => 'autocomplete#users'
   get '/autocomplete/users/:id' => 'autocomplete#user'
   get '/autocomplete/projects' => 'autocomplete#projects'
-<<<<<<< HEAD
   get '/autocomplete/project_groups' => 'autocomplete#project_groups'
-=======
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
 
   # Search
   get 'search' => 'search#show'

config/routes/project.rb

@@ -312,13 +312,9 @@ constraints(ProjectUrlConstrainer.new) do
         end
       end
 
-<<<<<<< HEAD
-      resources :boards, only: [:index, :show, :create, :update, :destroy] do
-=======
       get 'noteable/:target_type/:target_id/notes' => 'notes#index', as: 'noteable_notes'
 
-      resources :boards, only: [:index, :show] do
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
+      resources :boards, only: [:index, :show, :create, :update, :destroy] do
         scope module: :boards do
           resources :issues, only: [:index, :update]
 

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20170224075132) do
-=======
 ActiveRecord::Schema.define(version: 20170306170512) do
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -122,9 +118,11 @@ ActiveRecord::Schema.define(version: 20170306170512) do
     t.integer "shared_runners_minutes", default: 0, null: false
     t.integer "repository_size_limit", limit: 8, default: 0
     t.integer "terminal_max_session_time", default: 0, null: false
-<<<<<<< HEAD
     t.integer "minimum_mirror_sync_time", default: 15, null: false
     t.string "default_artifacts_expire_in", default: "0", null: false
+    t.integer "unique_ips_limit_per_user"
+    t.integer "unique_ips_limit_time_window"
+    t.boolean "unique_ips_limit_enabled", default: false, null: false
     t.string "elasticsearch_url", default: "http://localhost:9200"
     t.boolean "elasticsearch_aws", default: false, null: false
     t.string "elasticsearch_aws_region", default: "us-east-1"
@@ -156,12 +154,6 @@ ActiveRecord::Schema.define(version: 20170306170512) do
     t.integer "user_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-=======
-    t.string "default_artifacts_expire_in", default: "0", null: false
-    t.integer "unique_ips_limit_per_user"
-    t.integer "unique_ips_limit_time_window"
-    t.boolean "unique_ips_limit_enabled", default: false, null: false
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
   end
 
   add_index "approvers", ["target_id", "target_type"], name: "index_approvers_on_target_id_and_target_type", using: :btree

doc/api/v3_to_v4.md

@@ -63,21 +63,15 @@ changes are in V4:
 - Return 202 with JSON body on async removals on V4 API (DELETE `/projects/:id/repository/merged_branches` and DELETE `/projects/:id`) [!9449](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9449)
 - `projects/:id/milestones?iid[]=x&iid[]=y` array filter has been renamed to `iids` [!9096](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9096)
 - Return basic info about pipeline in `GET /projects/:id/pipelines` [!8875](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8875)
-<<<<<<< HEAD
 - Simplify project payload exposed on Environment endpoints [!9675](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9675)
-
-#### EE-specific
-
-- 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)
-
-=======
 - Renamed all `build` references to `job` [!9463](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9463)
 - Drop GET '/projects/:id/repository/commits/:sha/jobs' [!9463](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9463)
 - Rename Build Triggers to be Pipeline Triggers API [!9713](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9713)
   - `POST /projects/:id/trigger/builds` to `POST /projects/:id/trigger/pipeline`
   - Require description when creating a new trigger `POST /projects/:id/triggers`
-- Simplify project payload exposed on Environment endpoints [!9675](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9675)
 
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
+#### EE-specific
+
+- 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)

lib/api/entities.rb

@@ -652,7 +652,6 @@ module API
       end
     end
 
-<<<<<<< HEAD
     class License < Grape::Entity
       expose :starts_at, :expires_at, :licensee, :add_ons
 
@@ -669,8 +668,6 @@ module API
       expose :id, :variables
     end
 
-=======
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     class Runner < Grape::Entity
       expose :id
       expose :description

lib/gitlab/database.rb

@@ -51,13 +51,10 @@ module Gitlab
 
     def self.random
       postgresql? ? "RANDOM()" : "RAND()"
-<<<<<<< HEAD
     end
 
     def self.minute_interval(value)
       postgresql? ? "#{value} * '1 minute'::interval" : "INTERVAL #{value} MINUTE"
-=======
->>>>>>> 24f1ee5e9b1f4d9bc8cff581419b091756da8deb
     end
 
     def true_value