CE upstream: Thursday

	both modified:   .gitlab-ci.yml
	both modified:   .rubocop.yml
	both modified:   CHANGELOG.md
	both modified:   app/assets/javascripts/api.js
	both modified:   app/assets/javascripts/boards/boards_bundle.js
	both modified:   app/assets/javascripts/boards/components/modal/index.js
	both modified:   app/assets/javascripts/dispatcher.js
	both modified:   app/assets/javascripts/filtered_search/dropdown_hint.js
	both modified:   app/assets/javascripts/filtered_search/filtered_search_bundle.js
	both modified:   app/assets/javascripts/filtered_search/filtered_search_manager.js
	both modified:   app/assets/javascripts/main.js
	both modified:   app/controllers/groups/application_controller.rb
	both modified:   app/controllers/groups_controller.rb
	both modified:   app/controllers/projects/merge_requests_controller.rb
	both modified:   app/helpers/system_note_helper.rb
	both modified:   app/models/system_note_metadata.rb
	both modified:   app/views/admin/users/index.html.haml
	both modified:   app/views/shared/_field.html.haml
	both modified:   app/views/shared/issuable/_search_bar.html.haml
	both modified:   doc/README.md
	both modified:   doc/ci/README.md
	both modified:   doc/user/project/milestones/index.md
	both modified:   features/steps/project/merge_requests.rb
	both modified:   features/steps/project/project.rb
	both modified:   features/support/env.rb
	both modified:   lib/gitlab/gon_helper.rb
	both modified:   lib/gitlab/usage_data.rb
	both modified:   scripts/prepare_build.sh
	both modified:   spec/controllers/groups_controller_spec.rb
	both modified:   spec/controllers/projects/environments_controller_spec.rb
	both modified:   spec/controllers/projects/merge_requests_controller_spec.rb
	both modified:   spec/controllers/projects/pipelines_controller_spec.rb
	both modified:   spec/controllers/projects_controller_spec.rb
	both modified:   spec/features/boards/boards_spec.rb
	both modified:   spec/features/boards/sidebar_spec.rb
	both modified:   spec/features/gitlab_flavored_markdown_spec.rb
	both modified:   spec/features/issues/award_emoji_spec.rb
	both modified:   spec/features/issues/form_spec.rb
	both modified:   spec/features/issues_spec.rb
	both modified:   spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
	both modified:   spec/features/projects/compare_spec.rb
	both modified:   spec/features/projects/pipeline_schedules_spec.rb
	both modified:   spec/features/task_lists_spec.rb
	both modified:   spec/fixtures/api/schemas/entities/merge_request_basic.json
	both modified:   spec/javascripts/blob/create_branch_dropdown_spec.js
	both modified:   spec/javascripts/blob/target_branch_dropdown_spec.js
	both modified:   spec/javascripts/gfm_auto_complete_spec.js
	both modified:   spec/javascripts/gl_dropdown_spec.js
	both modified:   spec/javascripts/labels_issue_sidebar_spec.js
	both modified:   spec/javascripts/project_title_spec.js
	both modified:   spec/javascripts/search_autocomplete_spec.js
	both modified:   spec/lib/gitlab/git/repository_spec.rb
	both modified:   spec/lib/gitlab/usage_data_spec.rb
	both modified:   spec/models/protected_branch_spec.rb
	both modified:   spec/services/projects/propagate_service_template_spec.rb
	both modified:   spec/support/test_env.rb
	both modified:   spec/workers/project_cache_worker_spec.rb