Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/pages/dashboard/merge_requests/index.js

+import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests';
 import projectSelect from '~/project_select';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
-import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests';
 import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
 import { FILTERED_SEARCH } from '~/pages/constants';

app/assets/javascripts/pages/groups/group_members/index/index.js

 /* eslint-disable no-new */
-import memberExpirationDate from '~/member_expiration_date';
 import Members from 'ee_else_ce/members';
+import memberExpirationDate from '~/member_expiration_date';
 import UsersSelect from '~/users_select';
 document.addEventListener('DOMContentLoaded', () => {

app/assets/javascripts/pages/groups/issues/index.js

+import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
 import initIssuablesList from '~/issuables_list';
 import projectSelect from '~/project_select';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
 import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar';
 import { FILTERED_SEARCH } from '~/pages/constants';
-import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
 import initManualOrdering from '~/manual_ordering';
 const ISSUE_BULK_UPDATE_PREFIX = 'issue_';

app/assets/javascripts/pages/groups/merge_requests/index.js

+import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests';
 import projectSelect from '~/project_select';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
 import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar';
 import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
-import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests';
 import { FILTERED_SEARCH } from '~/pages/constants';
 const ISSUABLE_BULK_UPDATE_PREFIX = 'merge_request_';

app/assets/javascripts/pages/groups/new/group_path_validator.js

+import _ from 'underscore';
 import InputValidator from '~/validators/input_validator';
-import _ from 'underscore';
 import fetchGroupPathAvailability from './fetch_group_path_availability';
 import flash from '~/flash';
 import { __ } from '~/locale';

app/assets/javascripts/pages/profiles/show/index.js

 import $ from 'jquery';
-import createFlash from '~/flash';
 import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete';
 import emojiRegex from 'emoji-regex';
+import createFlash from '~/flash';
 import EmojiMenu from './emoji_menu';
 import { __ } from '~/locale';

app/assets/javascripts/pages/projects/issues/form.js

 /* eslint-disable no-new */
 import $ from 'jquery';
-import GLForm from '~/gl_form';
 import IssuableForm from 'ee_else_ce/issuable_form';
+import GLForm from '~/gl_form';
 import LabelsSelect from '~/labels_select';
 import MilestoneSelect from '~/milestone_select';
 import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';

app/assets/javascripts/pages/projects/issues/index/index.js

 /* eslint-disable no-new */
+import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
 import IssuableIndex from '~/issuable_index';
 import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
 import UsersSelect from '~/users_select';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
 import { FILTERED_SEARCH } from '~/pages/constants';
 import { ISSUABLE_INDEX } from '~/pages/projects/constants';
-import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys';
 import initManualOrdering from '~/manual_ordering';
 document.addEventListener('DOMContentLoaded', () => {

app/assets/javascripts/pages/projects/merge_requests/index/index.js

+import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests';
 import IssuableIndex from '~/issuable_index';
 import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
 import UsersSelect from '~/users_select';
 import initFilteredSearch from '~/pages/search/init_filtered_search';
-import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests';
 import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
 import { FILTERED_SEARCH } from '~/pages/constants';
 import { ISSUABLE_INDEX } from '~/pages/projects/constants';

app/assets/javascripts/pages/projects/merge_requests/init_merge_request.js

 /* eslint-disable no-new */
 import $ from 'jquery';
+import IssuableForm from 'ee_else_ce/issuable_form';
 import Diff from '~/diff';
 import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
 import GLForm from '~/gl_form';
-import IssuableForm from 'ee_else_ce/issuable_form';
 import LabelsSelect from '~/labels_select';
 import MilestoneSelect from '~/milestone_select';
 import IssuableTemplateSelectors from '~/templates/issuable_template_selectors';

app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue

 <script>
 import _ from 'underscore';
-import { s__, sprintf } from '~/locale';
 import { GlModal, GlModalDirective } from '@gitlab/ui';
+import { s__, sprintf } from '~/locale';
 export default {
   components: {

app/assets/javascripts/pages/sessions/new/username_validator.js

+import _ from 'underscore';
 import InputValidator from '~/validators/input_validator';
-import _ from 'underscore';
 import axios from '~/lib/utils/axios_utils';
 import flash from '~/flash';
 import { __ } from '~/locale';

app/assets/javascripts/pages/users/index.js

 import $ from 'jquery';
-import UserCallout from '~/user_callout';
 import Cookies from 'js-cookie';
+import UserCallout from '~/user_callout';
 import UserTabs from './user_tabs';
 function initUserProfile(action) {

app/controllers/projects/pages_controller.rb

@@ -15,8 +15,7 @@ class Projects::PagesController < Projects::ApplicationController
   # rubocop: enable CodeReuse/ActiveRecord
   def destroy
-    project.remove_pages
-    project.pages_domains.destroy_all # rubocop: disable DestroyAll
+    ::Pages::DeleteService.new(@project, current_user).execute
     respond_to do |format|
       format.html do

app/services/pages/delete_service.rb

+# frozen_string_literal: true
+
+module Pages
+  class DeleteService < BaseService
+    def execute
+      project.remove_pages
+      project.pages_domains.destroy_all # rubocop: disable DestroyAll
+    end
+  end
+end

changelogs/unreleased/33880-add-api-to-disable-pages.yml

+---
+title: Add API endpoint to unpublish GitLab Pages
+merge_request: 19781
+author:
+type: added

doc/api/pages.md

+# Pages API
+
+Endpoints for managing [GitLab Pages](https://about.gitlab.com/product/pages/).
+
+The GitLab Pages feature must be enabled to use these endpoints. Find out more about [administering](../administration/pages/index.md) and [using](../user/project/pages/index.md) the feature.
+
+## Unpublish pages
+
+Remove pages. The user must have admin priviledges.
+
+```text
+DELETE /projects/:id/pages
+```
+
+| Attribute | Type           | Required | Description                              |
+| --------- | -------------- | -------- | ---------------------------------------- |
+| `id`      | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
+
+```bash
+curl --request 'DELETE' --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/projects/2/pages
+```

lib/api/api.rb

@@ -137,6 +137,7 @@ module API
     mount ::API::Discussions
     mount ::API::ResourceLabelEvents
     mount ::API::NotificationSettings
+    mount ::API::Pages
     mount ::API::PagesDomains
     mount ::API::Pipelines
     mount ::API::PipelineSchedules

lib/api/pages.rb

+# frozen_string_literal: true
+
+module API
+  class Pages < Grape::API
+    before do
+      require_pages_config_enabled!
+      authenticated_with_full_private_access!
+    end
+
+    params do
+      requires :id, type: String, desc: 'The ID of a project'
+    end
+    resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
+      desc 'Unpublish pages' do
+        detail 'This feature was introduced in GitLab 12.6'
+      end
+      delete ':id/pages' do
+        authorize! :remove_pages, user_project
+
+        status 204
+
+        ::Pages::DeleteService.new(user_project, current_user).execute
+      end
+    end
+  end
+end

qa/qa/resource/base.rb

@@ -64,7 +64,7 @@ module QA
       end
       def visit!
-        Runtime::Logger.debug(%Q[Visiting #{self.class.name} at "#{web_url}"]) if Runtime::Env.debug?
+        Runtime::Logger.debug(%Q[Visiting #{self.class.name} at "#{web_url}"])
         Support::Retrier.retry_until do
           visit(web_url)