Resolve simple conflicts in app/, excluding views

app/helpers/dropdowns_helper.rb

@@ -9,13 +9,10 @@ module DropdownsHelper
 
       dropdown_output = dropdown_toggle(toggle_text, data_attr, options)
 
-<<<<<<< HEAD
       if options.key?(:toggle_link)
         dropdown_output = dropdown_toggle_link(toggle_text, data_attr, options)
       end
 
-=======
->>>>>>> ce/master
       dropdown_output << content_tag(:div, class: "dropdown-menu dropdown-select #{options[:dropdown_class] if options.key?(:dropdown_class)}") do
         output = ""
 

app/models/ci/pipeline.rb

@@ -11,7 +11,6 @@ module Ci
     belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline'
     belongs_to :pipeline_schedule, class_name: 'Ci::PipelineSchedule'
 
-<<<<<<< HEAD
     has_one :source_pipeline, class_name: Ci::Sources::Pipeline
 
     has_many :sourced_pipelines, class_name: Ci::Sources::Pipeline, foreign_key: :source_pipeline_id
@@ -22,9 +21,7 @@ module Ci
     has_many :auto_canceled_pipelines, class_name: 'Ci::Pipeline', foreign_key: 'auto_canceled_by_id'
     has_many :auto_canceled_jobs, class_name: 'CommitStatus', foreign_key: 'auto_canceled_by_id'
 
-=======
     has_many :stages
->>>>>>> ce/master
     has_many :statuses, class_name: 'CommitStatus', foreign_key: :commit_id
     has_many :builds, foreign_key: :commit_id
     has_many :trigger_requests, dependent: :destroy, foreign_key: :commit_id

app/models/concerns/protected_ref.rb

@@ -19,7 +19,6 @@ module ProtectedRef
       types.each do |type|
         has_many :"#{type}_access_levels", dependent: :destroy
 
-<<<<<<< HEAD
         validates :"#{type}_access_levels", length: { minimum: 0 }
 
         accepts_nested_attributes_for :"#{type}_access_levels", allow_destroy: true
@@ -29,11 +28,6 @@ module ProtectedRef
         protected_type = self.model_name.singular
         scope :"#{type}_access_by_user", -> (user) { access_level_class.joins(protected_type.to_sym).where("#{protected_type}_id" => self.ids).merge(access_level_class.by_user(user)) }
         scope :"#{type}_access_by_group", -> (group) { access_level_class.joins(protected_type.to_sym).where("#{protected_type}_id" => self.ids).merge(access_level_class.by_group(group)) }
-=======
-        validates :"#{type}_access_levels", length: { is: 1, message: "are restricted to a single instance per #{self.model_name.human}." }
-
-        accepts_nested_attributes_for :"#{type}_access_levels", allow_destroy: true
->>>>>>> ce/master
       end
     end
 

app/models/project.rb

@@ -170,11 +170,7 @@ class Project < ActiveRecord::Base
   has_many :audit_events, as: :entity, dependent: :destroy
   has_many :notification_settings, dependent: :destroy, as: :source
 
-<<<<<<< HEAD
-  has_one :import_data, dependent: :delete, class_name: 'ProjectImportData'
-=======
   has_one :import_data, dependent: :delete, class_name: "ProjectImportData"
->>>>>>> ce/master
   has_one :project_feature, dependent: :destroy
   has_one :statistics, class_name: 'ProjectStatistics', dependent: :delete
   has_many :container_repositories, dependent: :destroy

app/models/project_services/deployment_service.rb

@@ -31,14 +31,13 @@ class DeploymentService < Service
     raise NotImplementedError
   end
 
-<<<<<<< HEAD
   # Environments have a rollout status. This represents the current state of
   # deployments to that environment.
   def rollout_status(environment)
     raise NotImplementedError
-=======
+  end
+
   def can_test?
     false
->>>>>>> ce/master
   end
 end

app/policies/group_policy.rb

@@ -13,13 +13,10 @@ class GroupPolicy < BasePolicy
 
     can_read = false
     can_read ||= globally_viewable
-<<<<<<< HEAD
     can_read ||= member
     can_read ||= @user.admin?
     can_read ||= @user.auditor?
-=======
     can_read ||= access_level >= GroupMember::GUEST
->>>>>>> ce/master
     can_read ||= GroupProjectsFinder.new(group: @subject, current_user: @user).execute.any?
     can! :read_group if can_read
 

app/serializers/pipeline_details_entity.rb

 class PipelineDetailsEntity < PipelineEntity
   expose :details do
-<<<<<<< HEAD
-    expose :stages, using: StageEntity
+    expose :legacy_stages, as: :stages, using: StageEntity
     expose :artifacts, using: BuildArtifactEntity
     expose :manual_actions, using: BuildActionEntity
   end
 
   expose :triggered_by_pipeline, as: :triggered_by, with: TriggeredPipelineEntity
   expose :triggered_pipelines, as: :triggered, using: TriggeredPipelineEntity
-=======
-    expose :legacy_stages, as: :stages, using: StageEntity
-    expose :artifacts, using: BuildArtifactEntity
-    expose :manual_actions, using: BuildActionEntity
-  end
->>>>>>> ce/master
 end

app/serializers/pipeline_serializer.rb

@@ -19,17 +19,11 @@ class PipelineSerializer < BaseSerializer
         :cancelable_statuses,
         :trigger_requests,
         :project,
-<<<<<<< HEAD
         { triggered_by_pipeline: [:project, :user] },
         { triggered_pipelines: [:project, :user] },
-        { pending_builds: :project },
-        { manual_actions: :project },
-        { artifacts: :project }
-=======
         :manual_actions,
         :artifacts,
         { pending_builds: :project }
->>>>>>> ce/master
       ])
     end
 

app/services/members/create_service.rb

@@ -17,26 +17,18 @@ module Members
       return error("Too many users specified (limit is #{user_limit})") if
         user_limit && user_ids.size > user_limit
 
-<<<<<<< HEAD
       members = @source.add_users(
-        params[:user_ids].split(','),
-=======
-      @source.add_users(
         user_ids,
->>>>>>> ce/master
         params[:access_level],
         expires_at: params[:expires_at],
         current_user: current_user
       )
 
-<<<<<<< HEAD
       members.compact.each do |member|
         AuditEventService.new(@current_user, @source, action: :create)
           .for_member(member).security_event
       end
 
-      true
-=======
       success
     end
 
@@ -46,7 +38,6 @@ module Members
       limit = params.fetch(:limit, DEFAULT_LIMIT)
 
       limit && limit < 0 ? nil : limit
->>>>>>> ce/master
     end
   end
 end