Fix merge conflicts for the daily merge

MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7865

app/controllers/admin/health_check_controller.rb

@@ -2,13 +2,9 @@
 
 class Admin::HealthCheckController < Admin::ApplicationController
   def show
-<<<<<<< HEAD
     checks = ['standard']
     checks << 'geo' if Gitlab::Geo.secondary?
 
     @errors = HealthCheck::Utils.process_checks(checks)
-=======
-    @errors = HealthCheck::Utils.process_checks(['standard'])
->>>>>>> upstream/master
   end
 end

app/models/application_setting.rb

@@ -5,10 +5,7 @@ class ApplicationSetting < ActiveRecord::Base
   include CacheMarkdownField
   include TokenAuthenticatable
   include IgnorableColumn
-<<<<<<< HEAD
   prepend EE::ApplicationSetting
-=======
->>>>>>> upstream/master
 
   add_authentication_token_field :runners_registration_token
   add_authentication_token_field :health_check_access_token

db/schema.rb

@@ -177,11 +177,6 @@ ActiveRecord::Schema.define(version: 20181008200441) do
     t.boolean "throttle_authenticated_web_enabled", default: false, null: false
     t.integer "throttle_authenticated_web_requests_per_period", default: 7200, null: false
     t.integer "throttle_authenticated_web_period_in_seconds", default: 3600, null: false
-<<<<<<< HEAD
-=======
-    t.boolean "password_authentication_enabled_for_web"
-    t.boolean "password_authentication_enabled_for_git", default: true
->>>>>>> upstream/master
     t.integer "gitaly_timeout_default", default: 55, null: false
     t.integer "gitaly_timeout_medium", default: 30, null: false
     t.integer "gitaly_timeout_fast", default: 10, null: false

doc/administration/monitoring/prometheus/gitlab_metrics.md

@@ -45,10 +45,7 @@ The following metrics are available:
 | redis_ping_success                | Gauge     | 9.4   | Whether or not the last redis ping succeeded |
 | redis_ping_latency_seconds        | Gauge     | 9.4   | Round trip time of the redis ping |
 | user_session_logins_total         | Counter   | 9.4   | Counter of how many users have logged in |
-<<<<<<< HEAD
 | upload_file_does_not_exist        | Counter   | 10.7  | Number of times an upload record could not find its file |
-=======
->>>>>>> upstream/master
 | failed_login_captcha_total        | Gauge | 11.0 | Counter of failed CAPTCHA attempts during login |
 | successful_login_captcha_total    | Gauge | 11.0 | Counter of successful CAPTCHA attempts during login |
 

doc/api/settings.md

@@ -145,10 +145,7 @@ are listed in the descriptions of the relevant settings.
 | `authorized_keys_enabled`                | boolean          | no                                   | By default, we write to the `authorized_keys` file to support Git over SSH without additional configuration. GitLab can be optimized to authenticate SSH keys via the database file. Only disable this if you have configured your OpenSSH server to use the AuthorizedKeysCommand. |
 | `auto_devops_domain`                     | string           | no                                   | Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages. |
 | `auto_devops_enabled`                    | boolean          | no                                   | Enable Auto DevOps for projects by default. It will automatically build, test, and deploy applications based on a predefined CI/CD configuration. |
-<<<<<<< HEAD
 | `check_namespace_plan`                   | boolean          | no                                   | **(Premium)** Enabling this will make only licensed EE features available to projects if the project namespace's plan includes the feature or if the project is public. |
-=======
->>>>>>> upstream/master
 | `clientside_sentry_dsn`                  | string           | required by: `clientside_sentry_enabled` | Clientside Sentry Data Source Name. |
 | `clientside_sentry_enabled`              | boolean          | no                                   | (**If enabled, requires:** `clientside_sentry_dsn`) Enable Sentry error reporting for the client side. |
 | `container_registry_token_expire_delay`  | integer          | no                                   | Container Registry token duration in minutes. |

locale/gitlab.pot

@@ -142,15 +142,12 @@ msgstr ""
 msgid "%{name}'s avatar"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "%{nip_domain} can be used as an alternative to a custom domain."
 msgstr ""
 
 msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "%{openOrClose} %{noteable}"
 msgstr ""
 
@@ -352,12 +349,9 @@ msgstr ""
 msgid "Access expiration date"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Access to '%{classification_label}' not allowed"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Account"
 msgstr ""
 
@@ -1554,12 +1548,9 @@ msgstr ""
 msgid "CiVariable|Validation failed"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "ClassificationLabelUnavailable|is unavailable: %{reason}"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Clear search"
 msgstr ""
 
@@ -2138,12 +2129,9 @@ msgid "Configure push mirrors."
 msgstr ""
 
 msgid "Configure storage path settings."
-<<<<<<< HEAD
 msgstr ""
 
 msgid "Configure the %{link} integration."
-=======
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Configure the way a user creates a new account."
@@ -4808,12 +4796,9 @@ msgstr ""
 msgid "Maven package"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Max access level"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Maximum job timeout"
 msgstr ""
 
@@ -5431,12 +5416,9 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "OK"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Oct"
 msgstr ""
 
@@ -6875,7 +6857,6 @@ msgid "SearchAutocomplete|in this project"
 msgstr ""
 
 msgid "Secret"
-<<<<<<< HEAD
 msgstr ""
 
 msgid "Security"
@@ -6891,8 +6872,6 @@ msgid "SecurityDashboard|Monitor vulnerabilities in your code"
 msgstr ""
 
 msgid "SecurityDashboard|Pipeline %{pipelineLink} triggered"
-=======
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Select"
@@ -7604,12 +7583,9 @@ msgstr ""
 msgid "The maximum file size allowed is 200KB."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "The passphrase required to decrypt the private key. This is optional and the value is encrypted at rest."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>"
 msgstr ""
 
@@ -7703,15 +7679,12 @@ msgstr ""
 msgid "There are no unstaged changes"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "There was an error adding a todo."
 msgstr ""
 
 msgid "There was an error deleting the todo."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "There was an error loading users activity calendar."
 msgstr ""