Merge branch 'dz-move-ee-files' into 'master'

Move ee-only files under top level ee directory See merge request gitlab-org/gitlab-ee!3498

Merge branch 'dz-move-ee-files' into 'master'
Move ee-only files under top level ee directory See merge request gitlab-org/gitlab-ee!3498
f5691ac7 · Rémy Coutable · b12d5b2d · 507353bc · f5691ac7 · f5691ac7
Commit f5691ac7 authored Nov 21, 2017 by Rémy Coutable
107 changed files
--- a/app/controllers/concerns/send_file_upload.rb
+++ b/app/controllers/concerns/send_file_upload.rb
--- a/app/controllers/oauth/jira/authorizations_controller.rb
+++ b/app/controllers/oauth/jira/authorizations_controller.rb
--- a/app/controllers/profiles/billings_controller.rb
+++ b/app/controllers/profiles/billings_controller.rb
--- a/app/controllers/profiles/pipeline_quota_controller.rb
+++ b/app/controllers/profiles/pipeline_quota_controller.rb
--- a/app/finders/log_finder.rb
+++ b/app/finders/log_finder.rb
--- a/app/helpers/ee/lock_helper.rb
+++ b/app/helpers/ee/lock_helper.rb
--- a/app/helpers/push_rules_helper.rb
+++ b/app/helpers/push_rules_helper.rb
--- a/app/models/board_assignee.rb
+++ b/app/models/board_assignee.rb
--- a/app/models/board_label.rb
+++ b/app/models/board_label.rb
--- a/app/models/ci/sources/pipeline.rb
+++ b/app/models/ci/sources/pipeline.rb
--- a/app/models/concerns/elastic/application_search.rb
+++ b/app/models/concerns/elastic/application_search.rb
--- a/app/models/concerns/elastic/issues_search.rb
+++ b/app/models/concerns/elastic/issues_search.rb
--- a/app/models/concerns/elastic/merge_requests_search.rb
+++ b/app/models/concerns/elastic/merge_requests_search.rb
--- a/app/models/concerns/elastic/milestones_search.rb
+++ b/app/models/concerns/elastic/milestones_search.rb
--- a/app/models/concerns/elastic/notes_search.rb
+++ b/app/models/concerns/elastic/notes_search.rb
--- a/app/models/concerns/elastic/projects_search.rb
+++ b/app/models/concerns/elastic/projects_search.rb
--- a/app/models/concerns/elastic/repositories_search.rb
+++ b/app/models/concerns/elastic/repositories_search.rb
--- a/app/models/concerns/elastic/snippets_search.rb
+++ b/app/models/concerns/elastic/snippets_search.rb
--- a/app/models/concerns/elastic/wiki_repositories_search.rb
+++ b/app/models/concerns/elastic/wiki_repositories_search.rb
--- a/app/models/hooks/group_hook.rb
+++ b/app/models/hooks/group_hook.rb
--- a/app/models/project_services/gitlab_slack_application_service.rb
+++ b/app/models/project_services/gitlab_slack_application_service.rb
--- a/app/models/project_services/jenkins_deprecated_service.rb
+++ b/app/models/project_services/jenkins_deprecated_service.rb
--- a/app/models/project_services/jenkins_service.rb
+++ b/app/models/project_services/jenkins_service.rb
--- a/app/serializers/file_lock_entity.rb
+++ b/app/serializers/file_lock_entity.rb
--- a/app/services/boards/destroy_service.rb
+++ b/app/services/boards/destroy_service.rb
--- a/app/services/boards/update_service.rb
+++ b/app/services/boards/update_service.rb
--- a/app/services/concerns/exclusive_lease_guard.rb
+++ b/app/services/concerns/exclusive_lease_guard.rb
--- a/app/services/issues/export_csv_service.rb
+++ b/app/services/issues/export_csv_service.rb
--- a/app/services/oauth2/logout_token_validation_service.rb
+++ b/app/services/oauth2/logout_token_validation_service.rb
--- a/app/services/path_locks/lock_service.rb
+++ b/app/services/path_locks/lock_service.rb
--- a/app/services/path_locks/unlock_service.rb
+++ b/app/services/path_locks/unlock_service.rb
--- a/app/services/projects/slack_application_install_service.rb
+++ b/app/services/projects/slack_application_install_service.rb
--- a/app/services/projects/update_mirror_service.rb
+++ b/app/services/projects/update_mirror_service.rb
--- a/app/services/projects/update_remote_mirror_service.rb
+++ b/app/services/projects/update_remote_mirror_service.rb
--- a/app/services/projects/update_repository_storage_service.rb
+++ b/app/services/projects/update_repository_storage_service.rb
--- a/app/services/slash_commands/global_slack_handler.rb
+++ b/app/services/slash_commands/global_slack_handler.rb
--- a/app/uploaders/object_store_uploader.rb
+++ b/app/uploaders/object_store_uploader.rb
--- a/app/validators/host_validator.rb
+++ b/app/validators/host_validator.rb
--- a/app/validators/ldap_filter_validator.rb
+++ b/app/validators/ldap_filter_validator.rb
--- a/app/views/admin/audit_logs/index.html.haml
+++ b/app/views/admin/audit_logs/index.html.haml
--- a/app/views/admin/emails/show.html.haml
+++ b/app/views/admin/emails/show.html.haml
--- a/app/views/admin/projects/_shared_runner_status.html.haml
+++ b/app/views/admin/projects/_shared_runner_status.html.haml
--- a/app/views/admin/push_rules/show.html.haml
+++ b/app/views/admin/push_rules/show.html.haml
--- a/app/views/admin/users/_limits.html.haml
+++ b/app/views/admin/users/_limits.html.haml
--- a/app/views/dashboard/projects/_blank_state_ee_trial.html.haml
+++ b/app/views/dashboard/projects/_blank_state_ee_trial.html.haml
--- a/app/views/devise/sessions/_new_kerberos.html.haml
+++ b/app/views/devise/sessions/_new_kerberos.html.haml
--- a/app/views/errors/kerberos_denied.html.haml
+++ b/app/views/errors/kerberos_denied.html.haml
--- a/app/views/layouts/header/_ee_license_banner.html.haml
+++ b/app/views/layouts/header/_ee_license_banner.html.haml
--- a/app/views/layouts/nav/_admin_ee.html.haml
+++ b/app/views/layouts/nav/_admin_ee.html.haml
--- a/app/views/layouts/service_desk.html.haml
+++ b/app/views/layouts/service_desk.html.haml
--- a/app/views/ldap_group_links/_form.html.haml
+++ b/app/views/ldap_group_links/_form.html.haml
--- a/app/views/ldap_group_links/_ldap_group_link.html.haml
+++ b/app/views/ldap_group_links/_ldap_group_link.html.haml
--- a/app/views/ldap_group_links/_ldap_group_links.html.haml
+++ b/app/views/ldap_group_links/_ldap_group_links.html.haml
--- a/app/views/namespaces/_shared_runner_status.html.haml
+++ b/app/views/namespaces/_shared_runner_status.html.haml
--- a/app/views/namespaces/_shared_runners_minutes_setting.html.haml
+++ b/app/views/namespaces/_shared_runners_minutes_setting.html.haml
--- a/app/views/namespaces/pipelines_quota/_list.haml
+++ b/app/views/namespaces/pipelines_quota/_list.haml
--- a/app/views/notify/add_merge_request_approver_email.html.haml
+++ b/app/views/notify/add_merge_request_approver_email.html.haml
--- a/app/views/notify/add_merge_request_approver_email.text.erb
+++ b/app/views/notify/add_merge_request_approver_email.text.erb
--- a/app/views/notify/approved_merge_request_email.html.haml
+++ b/app/views/notify/approved_merge_request_email.html.haml
--- a/app/views/notify/approved_merge_request_email.text.haml
+++ b/app/views/notify/approved_merge_request_email.text.haml
--- a/app/views/notify/issues_csv_email.html.haml
+++ b/app/views/notify/issues_csv_email.html.haml
--- a/app/views/notify/issues_csv_email.text.erb
+++ b/app/views/notify/issues_csv_email.text.erb
--- a/app/views/notify/send_admin_notification.html.haml
+++ b/app/views/notify/send_admin_notification.html.haml
--- a/app/views/notify/send_admin_notification.text.haml
+++ b/app/views/notify/send_admin_notification.text.haml
--- a/app/views/notify/send_unsubscribed_notification.html.haml
+++ b/app/views/notify/send_unsubscribed_notification.html.haml
--- a/app/views/notify/send_unsubscribed_notification.text.haml
+++ b/app/views/notify/send_unsubscribed_notification.text.haml
--- a/app/views/notify/service_desk_new_note_email.html.haml
+++ b/app/views/notify/service_desk_new_note_email.html.haml
--- a/app/views/notify/service_desk_new_note_email.text.erb
+++ b/app/views/notify/service_desk_new_note_email.text.erb
--- a/app/views/notify/service_desk_thank_you_email.html.haml
+++ b/app/views/notify/service_desk_thank_you_email.html.haml
--- a/app/views/notify/service_desk_thank_you_email.text.erb
+++ b/app/views/notify/service_desk_thank_you_email.text.erb
--- a/app/views/notify/unapproved_merge_request_email.html.haml
+++ b/app/views/notify/unapproved_merge_request_email.html.haml
--- a/app/views/notify/unapproved_merge_request_email.text.haml
+++ b/app/views/notify/unapproved_merge_request_email.text.haml
--- a/app/views/profiles/billings/index.html.haml
+++ b/app/views/profiles/billings/index.html.haml
--- a/app/views/profiles/pipeline_quota/index.haml
+++ b/app/views/profiles/pipeline_quota/index.haml
--- a/app/views/profiles/slacks/edit.html.haml
+++ b/app/views/profiles/slacks/edit.html.haml
--- a/app/views/projects/_above_size_limit_warning.html.haml
+++ b/app/views/projects/_above_size_limit_warning.html.haml
--- a/app/views/projects/audit_events/index.html.haml
+++ b/app/views/projects/audit_events/index.html.haml
--- a/app/views/projects/buttons/_update_mirror.html.haml
+++ b/app/views/projects/buttons/_update_mirror.html.haml
--- a/app/views/projects/commits/_mirror_status.html.haml
+++ b/app/views/projects/commits/_mirror_status.html.haml
--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
--- a/app/views/projects/issues/export_issues/_button.html.haml
+++ b/app/views/projects/issues/export_issues/_button.html.haml
--- a/app/views/projects/issues/export_issues/_csv_download.html.haml
+++ b/app/views/projects/issues/export_issues/_csv_download.html.haml
--- a/app/views/projects/issues/export_issues/_export_issues_list.svg
+++ b/app/views/projects/issues/export_issues/_export_issues_list.svg
--- a/app/views/projects/jobs/_shared_runner_limit_warning.html.haml
+++ b/app/views/projects/jobs/_shared_runner_limit_warning.html.haml
--- a/app/views/projects/merge_requests/widget/open/_approvals_body.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_approvals_body.html.haml
--- a/app/views/projects/merge_requests/widget/open/_approvals_footer.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_approvals_footer.html.haml
--- a/app/views/projects/merge_requests/widget/open/_size_limit_reached.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_size_limit_reached.html.haml
--- a/app/views/projects/push_rules/_index.html.haml
+++ b/app/views/projects/push_rules/_index.html.haml
--- a/app/views/projects/services/gitlab_slack_application/_help.html.haml
+++ b/app/views/projects/services/gitlab_slack_application/_help.html.haml
--- a/app/views/projects/services/gitlab_slack_application/_slack_button.html.haml
+++ b/app/views/projects/services/gitlab_slack_application/_slack_button.html.haml
--- a/app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml
+++ b/app/views/projects/services/gitlab_slack_application/_slack_integration_form.html.haml
--- a/app/views/projects/settings/slacks/edit.html.haml
+++ b/app/views/projects/settings/slacks/edit.html.haml
--- a/app/views/shared/_mirror_status.html.haml
+++ b/app/views/shared/_mirror_status.html.haml
--- a/app/views/shared/_mirror_trigger_builds_setting.html.haml
+++ b/app/views/shared/_mirror_trigger_builds_setting.html.haml
--- a/app/views/shared/_mirror_update_button.html.haml
+++ b/app/views/shared/_mirror_update_button.html.haml
--- a/app/views/shared/_remote_mirror_update_button.html.haml
+++ b/app/views/shared/_remote_mirror_update_button.html.haml
--- a/app/views/shared/_repository_size_limit_setting.html.haml
+++ b/app/views/shared/_repository_size_limit_setting.html.haml
--- a/app/views/shared/_shared_runners_minutes_limit.html.haml
+++ b/app/views/shared/_shared_runners_minutes_limit.html.haml
--- a/app/views/shared/audit_events/_event_table.html.haml
+++ b/app/views/shared/audit_events/_event_table.html.haml
--- a/app/views/shared/boards/_switcher.html.haml
+++ b/app/views/shared/boards/_switcher.html.haml
--- a/app/views/shared/issuable/_approvals.html.haml
+++ b/app/views/shared/issuable/_approvals.html.haml
--- a/app/views/shared/issuable/form/_weight.html.haml
+++ b/app/views/shared/issuable/form/_weight.html.haml
--- a/app/views/shared/milestones/_burndown.html.haml
+++ b/app/views/shared/milestones/_burndown.html.haml
--- a/app/views/shared/milestones/_weight.html.haml
+++ b/app/views/shared/milestones/_weight.html.haml
--- a/app/views/shared/push_rules/_commit_committer_check_setting.html.haml
+++ b/app/views/shared/push_rules/_commit_committer_check_setting.html.haml
--- a/app/views/shared/push_rules/_form.html.haml
+++ b/app/views/shared/push_rules/_form.html.haml
--- a/app/views/shared/push_rules/_reject_unsigned_commits_setting.html.haml
+++ b/app/views/shared/push_rules/_reject_unsigned_commits_setting.html.haml