Resolve conflicts in app/views/admin/application_settings/

Signed-off-by: Rémy Coutable <remy@rymai.me>

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

@@ -13,12 +13,9 @@
     .form-group
       = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'label-light'
       = f.number_field :max_attachment_size, class: 'form-control'
-<<<<<<< HEAD
 
     = render 'repository_size_limit_setting', form: f
 
-=======
->>>>>>> upstream/master
     .form-group
       = f.label :session_expire_delay, 'Session duration (minutes)', class: 'label-light'
       = f.number_field :session_expire_delay, class: 'form-control'
@@ -35,7 +32,6 @@
         = f.check_box :user_default_external, class: 'form-check-input'
         = f.label :user_default_external, class: 'form-check-label' do
           Newly registered users will by default be external
-<<<<<<< HEAD
 
     - if ::Gitlab.dev_env_or_com?
       .form-group
@@ -45,7 +41,5 @@
           = f.label :check_namespace_plan, class: 'form-check-label' do
             Enabling this will only make licensed EE features available to projects if the project namespace's plan
             includes the feature or if the project is public.
-=======
->>>>>>> upstream/master
 
   = f.submit 'Save changes', class: 'btn btn-success'

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

@@ -20,12 +20,9 @@
         = f.check_box :shared_runners_enabled, class: 'form-check-input'
         = f.label :shared_runners_enabled, class: 'form-check-label' do
           Enable shared runners for new projects
-<<<<<<< HEAD
 
     = render 'shared_runners_minutes_setting', form: f
 
-=======
->>>>>>> upstream/master
     .form-group
       = f.label :shared_runners_text, class: 'label-light'
       = f.text_area :shared_runners_text, class: 'form-control', rows: 4

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

@@ -20,7 +20,6 @@
           By default GitLab sends emails in HTML and plain text formats so mail
           clients can choose what format to use. Disable this option if you only
           want to send emails in plain text format.
-<<<<<<< HEAD
     -# EE-specific start
     - if License.feature_available?(:email_additional_text)
       .form-group
@@ -29,7 +28,5 @@
         .form-text.text-muted
           = _('Add additional text to appear in all email communications. %{character_limit} character limit') % { character_limit: number_with_delimiter(Gitlab::CurrentSettings.email_additional_text_character_limit) }
     -# EE-specific end
-=======
->>>>>>> upstream/master
 
   = f.submit 'Save changes', class: "btn btn-success"

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

@@ -3,13 +3,10 @@
 
   %fieldset
     .form-group
-<<<<<<< HEAD
       = f.label :help_text, class: 'label-light'
       = f.text_area :help_text, class: 'form-control', rows: 4
       .form-text.text-muted Markdown enabled
     .form-group
-=======
->>>>>>> upstream/master
       = f.label :help_page_text, class: 'label-light'
       = f.text_area :help_page_text, class: 'form-control', rows: 4
       .form-text.text-muted Markdown enabled

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

@@ -11,11 +11,8 @@
       %span.form-text.text-muted
         If disabled, only admins will be able to setup mirrors in projects.
         = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring')
-<<<<<<< HEAD
 
   - if Gitlab.com? && License.feature_available?(:repository_mirrors)
     = render 'mirror_settings', f: f
-=======
->>>>>>> upstream/master
 
   = f.submit 'Save changes', class: "btn btn-success"

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

@@ -24,11 +24,7 @@
           Enable domain blacklist for sign ups
     .form-group
       .form-check
-<<<<<<< HEAD
-        = radio_button_tag :blacklist_type, :file, false, class: "form-check-input"
-=======
         = radio_button_tag :blacklist_type, :file, false, class: 'form-check-input'
->>>>>>> upstream/master
         = label_tag :blacklist_type_file, class: 'form-check-label' do
           .option-title
             Upload blacklist file

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

@@ -5,10 +5,7 @@
     .form-group
       = f.label :default_branch_protection, class: 'label-light'
       = f.select :default_branch_protection, options_for_select(Gitlab::Access.protection_options, @application_setting.default_branch_protection), {}, class: 'form-control'
-<<<<<<< HEAD
     = render partial: 'admin/application_settings/ee/project_creation_level', locals: { form: f, application_setting: @application_setting }
-=======
->>>>>>> upstream/master
     .form-group.visibility-level-setting
       = f.label :default_project_visibility, class: 'label-light'
       = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new)
@@ -23,7 +20,6 @@
       - checkbox_name = 'application_setting[restricted_visibility_levels][]'
       = hidden_field_tag(checkbox_name)
       - restricted_level_checkboxes('restricted-visibility-help', checkbox_name, class: 'form-check-input').each do |level|
-<<<<<<< HEAD
         .form-check
           = level
       %span.form-text.text-muted#restricted-visibility-help
@@ -53,25 +49,6 @@
         %span.form-text.text-muted
           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')
-=======
-        .form-check
-          = level
-      %span.form-text.text-muted#restricted-visibility-help
-        Selected levels cannot be used by non-admin users for groups, projects or snippets.
-        If the public level is restricted, user profiles are only visible to logged in users.
-    .form-group
-      = f.label :import_sources, class: 'label-light'
-      = hidden_field_tag 'application_setting[import_sources][]'
-      - import_sources_checkboxes('import-sources-help', class: 'form-check-input').each do |source|
-        .form-check= source
-      %span.form-text.text-muted#import-sources-help
-        Enabled sources for code import during project creation. OmniAuth must be configured for GitHub
-        = link_to "(?)", help_page_path("integration/github")
-        , Bitbucket
-        = link_to "(?)", help_page_path("integration/bitbucket")
-        and GitLab.com
-        = link_to "(?)", help_page_path("integration/gitlab")
->>>>>>> upstream/master
 
     .form-group
       .form-check