Resolve conflicts in app/models/group.rb db/schema.rb lib/api/entities.rb...

Resolve conflicts in app/models/group.rb db/schema.rb lib/api/entities.rb spec/serializers/pipeline_serializer_spec.rb

app/models/group.rb

@@ -53,12 +53,10 @@ class Group < Namespace
 
   validates :two_factor_grace_period, presence: true, numericality: { greater_than_or_equal_to: 0 }
 
-<<<<<<< HEAD
   validates :repository_size_limit,
             numericality: { only_integer: true, greater_than_or_equal_to: 0, allow_nil: true }
-=======
+
   add_authentication_token_field :runners_token
->>>>>>> upstream/master
 
   after_create :post_create_hook
   after_destroy :post_destroy_hook

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: 20180502125859) do
-=======
 ActiveRecord::Schema.define(version: 20180503150427) do
->>>>>>> upstream/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1700,12 +1696,9 @@ ActiveRecord::Schema.define(version: 20180503150427) do
     t.boolean "require_two_factor_authentication", default: false, null: false
     t.integer "two_factor_grace_period", default: 48, null: false
     t.integer "cached_markdown_version"
-<<<<<<< HEAD
     t.integer "plan_id"
     t.integer "project_creation_level"
-=======
     t.string "runners_token"
->>>>>>> upstream/master
   end
 
   add_index "namespaces", ["created_at"], name: "index_namespaces_on_created_at", using: :btree

lib/api/entities.rb

@@ -242,11 +242,6 @@ module API
       expose :requested_at
     end
 
-<<<<<<< HEAD
-    class Group < Grape::Entity
-      expose :id, :name, :path, :description, :visibility
-
-=======
     class BasicGroupDetails < Grape::Entity
       expose :id
       expose :web_url
@@ -255,7 +250,6 @@ module API
 
     class Group < BasicGroupDetails
       expose :path, :description, :visibility
->>>>>>> upstream/master
       expose :lfs_enabled?, as: :lfs_enabled
       expose :avatar_url do |group, options|
         group.avatar_url(only_path: false)

spec/serializers/pipeline_serializer_spec.rb

@@ -118,11 +118,7 @@ describe PipelineSerializer do
         it 'verifies number of queries', :request_store do
           recorded = ActiveRecord::QueryRecorder.new { subject }
 
-<<<<<<< HEAD
-          expect(recorded.count).to be_within(2).of(40)
-=======
-          expect(recorded.count).to be_within(1).of(44)
->>>>>>> upstream/master
+          expect(recorded.count).to be_within(1).of(48)
           expect(recorded.cached_count).to eq(0)
         end
       end