Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 97 deletions

diff --git a/.haml-lint_todo.yml b/.haml-lint_todo.yml
index 3f0d3d8ddf8..7ee4f639633 100644
--- a/.haml-lint_todo.yml
+++ b/.haml-lint_todo.yml
@@ -1,13 +1,13 @@
 # This configuration was generated by
 # `haml-lint --auto-gen-config`
-# on 2019-05-07 19:04:08 +0100 using Haml-Lint version 0.30.0.
+# on 2020-03-04 13:16:29 +0100 using Haml-Lint version 0.34.0.
 # The point is for the user to remove these configuration records
 # one by one as the lints are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of Haml-Lint, may require this file to be generated again.
 
 linters:
-  # Offense count: 2075
+  # Offense count: 1646
   NoPlainNodes:
     enabled: true
     exclude:
@@ -19,13 +19,11 @@ linters:
       - 'app/views/admin/application_settings/_gitaly.html.haml'
       - 'app/views/admin/application_settings/_influx.html.haml'
       - 'app/views/admin/application_settings/_ip_limits.html.haml'
-      - 'app/views/admin/application_settings/_logging.html.haml'
       - 'app/views/admin/application_settings/_performance.html.haml'
       - 'app/views/admin/application_settings/_plantuml.html.haml'
       - 'app/views/admin/application_settings/_prometheus.html.haml'
       - 'app/views/admin/application_settings/_realtime.html.haml'
       - 'app/views/admin/application_settings/_repository_check.html.haml'
-      - 'app/views/admin/application_settings/_repository_storage.html.haml'
       - 'app/views/admin/application_settings/_signin.html.haml'
       - 'app/views/admin/application_settings/_signup.html.haml'
       - 'app/views/admin/application_settings/_spam.html.haml'
@@ -42,13 +40,11 @@ linters:
       - 'app/views/admin/broadcast_messages/index.html.haml'
       - 'app/views/admin/dashboard/index.html.haml'
       - 'app/views/admin/deploy_keys/new.html.haml'
-      - 'app/views/admin/groups/show.html.haml'
       - 'app/views/admin/health_check/show.html.haml'
       - 'app/views/admin/hook_logs/_index.html.haml'
       - 'app/views/admin/hook_logs/show.html.haml'
       - 'app/views/admin/hooks/_form.html.haml'
       - 'app/views/admin/hooks/edit.html.haml'
-      - 'app/views/admin/hooks/index.html.haml'
       - 'app/views/admin/labels/_form.html.haml'
       - 'app/views/admin/logs/show.html.haml'
       - 'app/views/admin/projects/_projects.html.haml'
@@ -78,8 +74,6 @@ linters:
       - 'app/views/dashboard/milestones/index.html.haml'
       - 'app/views/dashboard/projects/_blank_state_admin_welcome.html.haml'
       - 'app/views/dashboard/projects/_blank_state_welcome.html.haml'
-      - 'app/views/dashboard/projects/_zero_authorized_projects.html.haml'
-      - 'app/views/dashboard/snippets/index.html.haml'
       - 'app/views/dashboard/todos/_todo.html.haml'
       - 'app/views/dashboard/todos/index.html.haml'
       - 'app/views/devise/confirmations/almost_there.haml'
@@ -97,12 +91,10 @@ linters:
       - 'app/views/devise/sessions/two_factor.html.haml'
       - 'app/views/devise/shared/_omniauth_box.html.haml'
       - 'app/views/devise/shared/_sign_in_link.html.haml'
-      - 'app/views/devise/shared/_signup_box.html.haml'
       - 'app/views/devise/shared/_tabs_normal.html.haml'
       - 'app/views/discussions/_discussion.html.haml'
       - 'app/views/discussions/_headline.html.haml'
       - 'app/views/discussions/_notes.html.haml'
-      - 'app/views/discussions/_resolve_all.html.haml'
       - 'app/views/doorkeeper/applications/_delete_form.html.haml'
       - 'app/views/doorkeeper/authorized_applications/_delete_form.html.haml'
       - 'app/views/errors/encoding.html.haml'
@@ -114,8 +106,6 @@ linters:
       - 'app/views/events/event/_push.html.haml'
       - 'app/views/groups/_create_chat_team.html.haml'
       - 'app/views/groups/_group_admin_settings.html.haml'
-      - 'app/views/groups/group_members/_new_group_member.html.haml'
-      - 'app/views/groups/group_members/index.html.haml'
       - 'app/views/groups/labels/edit.html.haml'
       - 'app/views/groups/labels/new.html.haml'
       - 'app/views/groups/milestones/edit.html.haml'
@@ -130,18 +120,14 @@ linters:
       - 'app/views/help/instance_configuration.html.haml'
       - 'app/views/help/instance_configuration/_gitlab_ci.html.haml'
       - 'app/views/help/instance_configuration/_gitlab_pages.html.haml'
-      - 'app/views/help/instance_configuration/_ssh_info.html.haml'
       - 'app/views/help/ui.html.haml'
       - 'app/views/import/bitbucket/status.html.haml'
       - 'app/views/import/bitbucket_server/status.html.haml'
-      - 'app/views/instance_statistics/cohorts/_cohorts_table.html.haml'
-      - 'app/views/instance_statistics/cohorts/_usage_ping.html.haml'
       - 'app/views/invites/show.html.haml'
       - 'app/views/layouts/_mailer.html.haml'
       - 'app/views/layouts/header/_default.html.haml'
       - 'app/views/layouts/header/_new_dropdown.haml'
       - 'app/views/layouts/mailer/devise.html.haml'
-      - 'app/views/layouts/nav/sidebar/_profile.html.haml'
       - 'app/views/layouts/notify.html.haml'
       - 'app/views/notify/_failed_builds.html.haml'
       - 'app/views/notify/_reassigned_issuable_email.html.haml'
@@ -153,7 +139,6 @@ linters:
       - 'app/views/notify/issue_moved_email.html.haml'
       - 'app/views/notify/member_access_denied_email.html.haml'
       - 'app/views/notify/member_invite_accepted_email.html.haml'
-      - 'app/views/notify/member_invite_declined_email.html.haml'
       - 'app/views/notify/member_invited_email.html.haml'
       - 'app/views/notify/new_gpg_key_email.html.haml'
       - 'app/views/notify/new_mention_in_issue_email.html.haml'
@@ -172,31 +157,11 @@ linters:
       - 'app/views/notify/removed_milestone_issue_email.html.haml'
       - 'app/views/notify/removed_milestone_merge_request_email.html.haml'
       - 'app/views/notify/repository_push_email.html.haml'
-      - 'app/views/peek/views/_gc.html.haml'
-      - 'app/views/peek/views/_redis.html.haml'
-      - 'app/views/peek/views/_sidekiq.html.haml'
-      - 'app/views/profiles/_event_table.html.haml'
-      - 'app/views/profiles/active_sessions/_active_session.html.haml'
-      - 'app/views/profiles/active_sessions/index.html.haml'
-      - 'app/views/profiles/audit_log.html.haml'
       - 'app/views/profiles/chat_names/_chat_name.html.haml'
       - 'app/views/profiles/chat_names/index.html.haml'
       - 'app/views/profiles/chat_names/new.html.haml'
-      - 'app/views/profiles/emails/index.html.haml'
-      - 'app/views/profiles/gpg_keys/_key.html.haml'
-      - 'app/views/profiles/gpg_keys/index.html.haml'
       - 'app/views/profiles/keys/_key.html.haml'
-      - 'app/views/profiles/keys/_key_details.html.haml'
-      - 'app/views/profiles/keys/index.html.haml'
-      - 'app/views/profiles/notifications/show.html.haml'
-      - 'app/views/profiles/passwords/edit.html.haml'
-      - 'app/views/profiles/personal_access_tokens/index.html.haml'
-      - 'app/views/profiles/preferences/show.html.haml'
       - 'app/views/profiles/show.html.haml'
-      - 'app/views/profiles/two_factor_auths/_codes.html.haml'
-      - 'app/views/profiles/two_factor_auths/codes.html.haml'
-      - 'app/views/profiles/two_factor_auths/create.html.haml'
-      - 'app/views/profiles/two_factor_auths/show.html.haml'
       - 'app/views/projects/_bitbucket_import_modal.html.haml'
       - 'app/views/projects/_customize_workflow.html.haml'
       - 'app/views/projects/_deletion_failed.html.haml'
@@ -206,10 +171,8 @@ linters:
       - 'app/views/projects/_import_project_pane.html.haml'
       - 'app/views/projects/_issuable_by_email.html.haml'
       - 'app/views/projects/_md_preview.html.haml'
-      - 'app/views/projects/_new_project_fields.html.haml'
       - 'app/views/projects/_readme.html.haml'
       - 'app/views/projects/artifacts/_artifact.html.haml'
-      - 'app/views/projects/artifacts/_search_bar.html.haml'
       - 'app/views/projects/artifacts/_tree_file.html.haml'
       - 'app/views/projects/artifacts/browse.html.haml'
       - 'app/views/projects/blame/_age_map_legend.html.haml'
@@ -219,7 +182,6 @@ linters:
       - 'app/views/projects/blob/_new_dir.html.haml'
       - 'app/views/projects/blob/_remove.html.haml'
       - 'app/views/projects/blob/_render_error.html.haml'
-      - 'app/views/projects/blob/_template_selectors.html.haml'
       - 'app/views/projects/blob/_upload.html.haml'
       - 'app/views/projects/blob/edit.html.haml'
       - 'app/views/projects/blob/new.html.haml'
@@ -244,8 +206,6 @@ linters:
       - 'app/views/projects/deploy_keys/_form.html.haml'
       - 'app/views/projects/deploy_keys/_index.html.haml'
       - 'app/views/projects/deploy_keys/edit.html.haml'
-      - 'app/views/projects/deploy_tokens/_revoke_modal.html.haml'
-      - 'app/views/projects/deploy_tokens/_table.html.haml'
       - 'app/views/projects/deployments/_deployment.html.haml'
       - 'app/views/projects/diffs/_file_header.html.haml'
       - 'app/views/projects/diffs/_replaced_image_diff.html.haml'
@@ -254,10 +214,8 @@ linters:
       - 'app/views/projects/environments/show.html.haml'
       - 'app/views/projects/forks/error.html.haml'
       - 'app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml'
-      - 'app/views/projects/graphs/charts.html.haml'
       - 'app/views/projects/hook_logs/_index.html.haml'
       - 'app/views/projects/hook_logs/show.html.haml'
-      - 'app/views/projects/hooks/_index.html.haml'
       - 'app/views/projects/hooks/edit.html.haml'
       - 'app/views/projects/imports/new.html.haml'
       - 'app/views/projects/imports/show.html.haml'
@@ -294,20 +252,9 @@ linters:
       - 'app/views/projects/merge_requests/widget/open/_error.html.haml'
       - 'app/views/projects/mirrors/_regenerate_public_ssh_key_confirm_modal.html.haml'
       - 'app/views/projects/mirrors/_ssh_host_keys.html.haml'
-      - 'app/views/projects/new.html.haml'
       - 'app/views/projects/no_repo.html.haml'
-      - 'app/views/projects/pages/_access.html.haml'
-      - 'app/views/projects/pages/_destroy.haml'
-      - 'app/views/projects/pages/_https_only.html.haml'
-      - 'app/views/projects/pages/_list.html.haml'
-      - 'app/views/projects/pages/_no_domains.html.haml'
-      - 'app/views/projects/pages/_use.html.haml'
-      - 'app/views/projects/pages/show.html.haml'
       - 'app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml'
       - 'app/views/projects/pipelines/_info.html.haml'
-      - 'app/views/projects/pipelines/charts/_pipelines.haml'
-      - 'app/views/projects/protected_branches/shared/_branches_list.html.haml'
-      - 'app/views/projects/protected_branches/shared/_create_protected_branch.html.haml'
       - 'app/views/projects/protected_branches/shared/_dropdown.html.haml'
       - 'app/views/projects/protected_branches/shared/_index.html.haml'
       - 'app/views/projects/protected_branches/shared/_matching_branch.html.haml'
@@ -325,7 +272,6 @@ linters:
       - 'app/views/projects/runners/_shared_runners.html.haml'
       - 'app/views/projects/runners/edit.html.haml'
       - 'app/views/projects/services/_form.html.haml'
-      - 'app/views/projects/services/_index.html.haml'
       - 'app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml'
       - 'app/views/projects/services/mattermost_slash_commands/_help.html.haml'
       - 'app/views/projects/services/prometheus/_metrics.html.haml'
@@ -338,25 +284,21 @@ linters:
       - 'app/views/projects/tags/releases/edit.html.haml'
       - 'app/views/projects/tree/_tree_row.html.haml'
       - 'app/views/projects/tree/_truncated_notice_tree_row.html.haml'
-      - 'app/views/projects/triggers/_content.html.haml'
       - 'app/views/projects/triggers/_form.html.haml'
       - 'app/views/projects/triggers/_index.html.haml'
       - 'app/views/projects/triggers/_trigger.html.haml'
       - 'app/views/projects/triggers/edit.html.haml'
-      - 'app/views/projects/wikis/_new.html.haml'
       - 'app/views/projects/wikis/_pages_wiki_page.html.haml'
       - 'app/views/projects/wikis/edit.html.haml'
       - 'app/views/projects/wikis/history.html.haml'
-      - 'app/views/repository_check_mailer/notify.html.haml'
-      - 'app/views/search/_form.html.haml'
       - 'app/views/search/results/_issue.html.haml'
       - 'app/views/search/results/_note.html.haml'
       - 'app/views/search/results/_snippet_blob.html.haml'
       - 'app/views/search/results/_snippet_title.html.haml'
       - 'app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml'
       - 'app/views/shared/_commit_message_container.html.haml'
-      - 'app/views/shared/_confirm_modal.html.haml'
       - 'app/views/shared/_confirm_fork_modal.html.haml'
+      - 'app/views/shared/_confirm_modal.html.haml'
       - 'app/views/shared/_delete_label_modal.html.haml'
       - 'app/views/shared/_group_form.html.haml'
       - 'app/views/shared/_group_tips.html.haml'
@@ -364,18 +306,14 @@ linters:
       - 'app/views/shared/_no_password.html.haml'
       - 'app/views/shared/_no_ssh.html.haml'
       - 'app/views/shared/_outdated_browser.html.haml'
-      - 'app/views/shared/_personal_access_tokens_created_container.html.haml'
-      - 'app/views/shared/_personal_access_tokens_table.html.haml'
       - 'app/views/shared/_ping_consent.html.haml'
       - 'app/views/shared/_project_limit.html.haml'
-      - 'app/views/shared/_service_settings.html.haml'
       - 'app/views/shared/boards/components/_board.html.haml'
       - 'app/views/shared/boards/components/_sidebar.html.haml'
       - 'app/views/shared/boards/components/sidebar/_due_date.html.haml'
       - 'app/views/shared/boards/components/sidebar/_labels.html.haml'
       - 'app/views/shared/boards/components/sidebar/_milestone.html.haml'
       - 'app/views/shared/deploy_tokens/_revoke_modal.html.haml'
-      - 'app/views/shared/empty_states/_priority_labels.html.haml'
       - 'app/views/shared/hook_logs/_content.html.haml'
       - 'app/views/shared/issuable/_assignees.html.haml'
       - 'app/views/shared/issuable/_board_create_list_dropdown.html.haml'
@@ -400,57 +338,42 @@ linters:
       - 'app/views/shared/notifications/_button.html.haml'
       - 'app/views/shared/notifications/_custom_notifications.html.haml'
       - 'app/views/shared/notifications/_new_button.html.haml'
-      - 'app/views/shared/notifications/_notification_dropdown.html.haml'
-      - 'app/views/shared/plugins/_index.html.haml'
-      - 'app/views/shared/projects/_dropdown.html.haml'
-      - 'app/views/shared/projects/_list.html.haml'
-      - 'app/views/shared/projects/_project.html.haml'
       - 'app/views/shared/runners/_runner_description.html.haml'
       - 'app/views/shared/runners/show.html.haml'
-      - 'app/views/shared/snippets/_embed.html.haml'
       - 'app/views/shared/snippets/_header.html.haml'
       - 'app/views/shared/snippets/_snippet.html.haml'
-      - 'app/views/shared/tokens/_scopes_list.html.haml'
       - 'app/views/shared/web_hooks/_form.html.haml'
       - 'app/views/shared/web_hooks/_hook.html.haml'
-      - 'app/views/shared/web_hooks/_test_button.html.haml'
       - 'app/views/u2f/_authenticate.html.haml'
       - 'app/views/u2f/_register.html.haml'
       - 'app/views/users/_deletion_guidance.html.haml'
       - 'ee/app/views/admin/_namespace_plan_info.html.haml'
       - 'ee/app/views/admin/application_settings/_templates.html.haml'
       - 'ee/app/views/admin/audit_logs/index.html.haml'
-      - 'ee/app/views/admin/dashboard/stats.html.haml'
       - 'ee/app/views/admin/emails/show.html.haml'
       - 'ee/app/views/admin/geo/nodes/edit.html.haml'
       - 'ee/app/views/admin/geo/nodes/new.html.haml'
       - 'ee/app/views/admin/geo/projects/_registry_failed.html.haml'
       - 'ee/app/views/admin/geo/projects/_registry_never.html.haml'
-      - 'ee/app/views/admin/licenses/_breakdown.html.haml'
       - 'ee/app/views/admin/licenses/_upload_trial_license.html.haml'
-      - 'ee/app/views/admin/licenses/missing.html.haml'
       - 'ee/app/views/admin/licenses/new.html.haml'
       - 'ee/app/views/admin/licenses/show.html.haml'
       - 'ee/app/views/admin/monitoring/ee/_nav.html.haml'
       - 'ee/app/views/admin/projects/_shared_runner_status.html.haml'
-      - 'ee/app/views/admin/push_rules/show.html.haml'
+      - 'ee/app/views/admin/users/_auditor_access_level_radio.html.haml'
+      - 'ee/app/views/admin/users/_auditor_user_badge.html.haml'
       - 'ee/app/views/admin/users/_limits.html.haml'
       - 'ee/app/views/admin/users/_user_detail_note.html.haml'
       - 'ee/app/views/dashboard/projects/_blank_state_ee_trial.html.haml'
       - 'ee/app/views/errors/kerberos_denied.html.haml'
-      - 'ee/app/views/groups/analytics/show.html.haml'
-      - 'ee/app/views/groups/audit_events/index.html.haml'
       - 'ee/app/views/groups/ee/_settings_nav.html.haml'
       - 'ee/app/views/groups/epics/_epic.html.haml'
       - 'ee/app/views/groups/group_members/_ldap_sync.html.haml'
       - 'ee/app/views/groups/group_members/_sync_button.html.haml'
       - 'ee/app/views/groups/hooks/edit.html.haml'
-      - 'ee/app/views/groups/hooks/index.html.haml'
       - 'ee/app/views/groups/ldap_group_links/index.html.haml'
-      - 'ee/app/views/groups/pipeline_quota/index.html.haml'
       - 'ee/app/views/jira_connect/subscriptions/index.html.haml'
       - 'ee/app/views/layouts/jira_connect.html.haml'
-      - 'ee/app/views/layouts/nav/ee/_epic_link.html.haml'
       - 'ee/app/views/layouts/nav/ee/admin/_new_monitoring_sidebar.html.haml'
       - 'ee/app/views/layouts/service_desk.html.haml'
       - 'ee/app/views/ldap_group_links/_form.html.haml'
@@ -466,26 +389,22 @@ linters:
       - 'ee/app/views/notify/epic_status_changed_email.html.haml'
       - 'ee/app/views/notify/issues_csv_email.html.haml'
       - 'ee/app/views/notify/new_review_email.html.haml'
-      - 'ee/app/views/notify/prometheus_alert_fired_email.html.haml'
       - 'ee/app/views/notify/send_admin_notification.html.haml'
       - 'ee/app/views/notify/send_unsubscribed_notification.html.haml'
       - 'ee/app/views/notify/unapproved_merge_request_email.html.haml'
       - 'ee/app/views/oauth/geo_auth/error.html.haml'
       - 'ee/app/views/profiles/pipeline_quota/index.haml'
-      - 'ee/app/views/projects/audit_events/index.html.haml'
       - 'ee/app/views/projects/blob/_owners.html.haml'
       - 'ee/app/views/projects/commits/_mirror_status.html.haml'
-      - 'ee/app/views/projects/feature_flags/_configure_feature_flags_modal.html.haml'
       - 'ee/app/views/projects/issues/_issue_weight.html.haml'
-      - 'ee/app/views/projects/issues/_related_issues.html.haml'
       - 'ee/app/views/projects/issues/export_csv/_modal.html.haml'
       - 'ee/app/views/projects/jobs/_shared_runner_limit_warning.html.haml'
       - 'ee/app/views/projects/merge_requests/_approvals_count.html.haml'
       - 'ee/app/views/projects/merge_requests/widget/open/_geo.html.haml'
       - 'ee/app/views/projects/mirrors/_mirrored_repositories_count.html.haml'
+      - 'ee/app/views/projects/protected_branches/_update_protected_branch.html.haml'
       - 'ee/app/views/projects/protected_branches/ee/_create_protected_branch.html.haml'
       - 'ee/app/views/projects/protected_branches/ee/_dropdown.html.haml'
-      - 'ee/app/views/projects/protected_branches/ee/_fallback_update_protected_branch.html.haml'
       - 'ee/app/views/projects/protected_tags/_protected_tag_extra_create_access_levels.haml'
       - 'ee/app/views/projects/protected_tags/ee/_create_protected_tag.html.haml'
       - 'ee/app/views/projects/push_rules/_index.html.haml'
@@ -495,22 +414,16 @@ linters:
       - 'ee/app/views/projects/settings/slacks/edit.html.haml'
       - 'ee/app/views/shared/_additional_email_text.html.haml'
       - 'ee/app/views/shared/_mirror_update_button.html.haml'
-      - 'ee/app/views/shared/_shared_runners_minutes_limit.html.haml'
-      - 'ee/app/views/shared/audit_events/_event_table.html.haml'
       - 'ee/app/views/shared/boards/components/_list_weight.html.haml'
-      - 'ee/app/views/shared/boards/components/sidebar/_epic.html.haml'
-      - 'ee/app/views/shared/ee/_import_form.html.haml'
       - 'ee/app/views/shared/epic/_search_bar.html.haml'
       - 'ee/app/views/shared/issuable/_approvals.html.haml'
       - 'ee/app/views/shared/issuable/_board_create_list_dropdown.html.haml'
       - 'ee/app/views/shared/issuable/_filter_weight.html.haml'
-      - 'ee/app/views/shared/issuable/_sidebar_item_epic.haml'
       - 'ee/app/views/shared/members/ee/_ldap_tag.html.haml'
       - 'ee/app/views/shared/members/ee/_override_member_buttons.html.haml'
       - 'ee/app/views/shared/members/ee/_sso_badge.html.haml'
       - 'ee/app/views/shared/milestones/_burndown.html.haml'
       - 'ee/app/views/shared/milestones/_weight.html.haml'
-      - 'ee/app/views/shared/promotions/_promote_audit_events.html.haml'
       - 'ee/app/views/shared/promotions/_promote_burndown_charts.html.haml'
       - 'ee/app/views/shared/promotions/_promote_csv_export.html.haml'
       - 'ee/app/views/shared/promotions/_promote_issue_weights.html.haml'
@@ -518,7 +431,3 @@ linters:
       - 'ee/app/views/shared/promotions/_promote_servicedesk.html.haml'
       - 'ee/app/views/shared/push_rules/_form.html.haml'
       - 'ee/app/views/unsubscribes/show.html.haml'
-      - 'ee/app/views/admin/users/_auditor_access_level_radio.html.haml'
-      - 'ee/app/views/admin/users/_auditor_user_badge.html.haml'
-      - 'ee/app/views/projects/protected_branches/_update_protected_branch.html.haml'
-      - 'ee/app/views/analytics/cycle_analytics/show.html.haml'