Resolve conflicts

app/helpers/form_helper.rb

 module FormHelper
-<<<<<<< HEAD
   prepend ::EE::FormHelper
 
-=======
->>>>>>> ce-com/master
   def form_errors(model, type: 'form')
     return unless model.errors.any?
 

app/models/key.rb

@@ -25,12 +25,9 @@ class Key < ActiveRecord::Base
 
   validate :key_meets_restrictions
 
-<<<<<<< HEAD
   # EE-only
   scope :ldap, -> { where(type: 'LDAPKey') }
 
-=======
->>>>>>> ce-com/master
   delegate :name, :email, to: :user, prefix: true
 
   after_commit :add_to_shell, on: :create

app/views/admin/application_settings/_form.html.haml

@@ -50,7 +50,6 @@
             = f.check_box :project_export_enabled
             Project export enabled
 
-<<<<<<< HEAD
     -# EE-only
     - if ldap_enabled?
       .form-group
@@ -64,8 +63,6 @@
             If checked, group owners can manage LDAP group links and LDAP member overrides
             = link_to icon('question-circle'), help_page_path('administration/auth/ldap-ee')
 
-=======
->>>>>>> ce-com/master
     .form-group
       %label.control-label.col-sm-2 Enabled Git access protocols
       .col-sm-10
@@ -80,10 +77,6 @@
         .col-sm-10
           = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control'
 
-<<<<<<< HEAD
-
-=======
->>>>>>> ce-com/master
   %fieldset
     %legend Account and Limit Settings
     .form-group
@@ -582,28 +575,8 @@
         .help-block
           If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
 
-<<<<<<< HEAD
   = render partial: 'elasticsearch_form', locals: { f: f }
 
-  %fieldset
-    %legend Koding
-    .form-group
-      .col-sm-offset-2.col-sm-10
-        .checkbox
-          = f.label :koding_enabled do
-            = f.check_box :koding_enabled
-            Enable Koding
-    .form-group
-      = f.label :koding_url, 'Koding URL', class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
-        .help-block
-          Koding has integration enabled out of the box for the
-          %strong gitlab
-          team, and you need to provide that team's URL here. Learn more in the
-          = succeed "." do
-            = link_to "Koding administration documentation", help_page_path("administration/integration/koding")
-=======
   - if koding_enabled?
     %fieldset
       %legend Koding
@@ -625,7 +598,6 @@
             team, and you need to provide that team's URL here. Learn more in the
             = succeed "." do
               = link_to "Koding administration documentation", help_page_path("administration/integration/koding")
->>>>>>> ce-com/master
 
   %fieldset
     %legend PlantUML

lib/api/settings.rb

@@ -129,7 +129,6 @@ module API
                  desc: "Restrictions on the complexity of uploaded #{type.upcase} keys. A value of #{ApplicationSetting::FORBIDDEN_KEY_VALUE} disables all #{type.upcase} keys."
       end
 
-<<<<<<< HEAD
       optional :help_text, type: String, desc: 'GitLab server administrator information'
       optional :elasticsearch_indexing, type: Boolean, desc: 'Enable Elasticsearch indexing'
       given elasticsearch_indexing: ->(val) { val } do
@@ -149,10 +148,6 @@ module API
       all_attributes = ::EE::ApplicationSettingsHelper.repository_mirror_attributes + ApplicationSettingsHelper.visible_attributes
       optional(*all_attributes)
       at_least_one_of(*all_attributes)
-=======
-      optional(*::ApplicationSettingsHelper.visible_attributes)
-      at_least_one_of(*::ApplicationSettingsHelper.visible_attributes)
->>>>>>> ce-com/master
     end
     put "application/settings" do
       attrs = declared_params(include_missing: false)

spec/models/application_setting_spec.rb

@@ -469,7 +469,6 @@ describe ApplicationSetting do
     end
   end
 
-<<<<<<< HEAD
   describe '#repository_size_limit column' do
     it 'support values up to 8 exabytes' do
       setting.update_column(:repository_size_limit, 8.exabytes - 1)
@@ -555,8 +554,6 @@ describe ApplicationSetting do
     end
   end
 
-=======
->>>>>>> ce-com/master
   describe '#allowed_key_types' do
     it 'includes all key types by default' do
       expect(setting.allowed_key_types).to contain_exactly(*described_class::SUPPORTED_KEY_TYPES)