Skip to content

CE upstream - 9-1-stable (recreated)

Felipe Artur requested to merge 9-1-ce-upstream into 9-1-stable-ee

This is huge...

	both modified:   app/assets/javascripts/build.js
	both modified:   app/assets/javascripts/dispatcher.js
	both modified:   app/assets/javascripts/environments/folder/environments_folder_view.js
	both modified:   app/assets/javascripts/filtered_search/filtered_search_manager.js
	both modified:   app/assets/stylesheets/framework/filters.scss
	both modified:   app/assets/stylesheets/pages/projects.scss
	both modified:   app/controllers/admin/application_controller.rb
	both modified:   app/controllers/projects/protected_branches_controller.rb
	both added:      app/controllers/projects/protected_refs_controller.rb
	both added:      app/controllers/projects/protected_tags_controller.rb
	both modified:   app/controllers/projects/settings/repository_controller.rb
	both modified:   app/helpers/branches_helper.rb
	both modified:   app/models/ci/build.rb
	both modified:   app/models/concerns/protected_branch_access.rb
	both modified:   app/models/group.rb
	both modified:   app/models/members/group_member.rb
	both modified:   app/models/note.rb
	both modified:   app/models/project.rb
	both modified:   app/models/project_services/chat_message/merge_message.rb
	both modified:   app/models/protected_branch.rb
	both modified:   app/models/user.rb
	both modified:   app/services/projects/destroy_service.rb
	both modified:   app/views/admin/users/index.html.haml
	both modified:   app/views/notify/new_merge_request_email.html.haml
	added by us:     app/views/notify/service_desk_new_note_email.html.haml
	both modified:   app/views/projects/blob/_header.html.haml
	both modified:   app/views/projects/merge_requests/widget/open/_accept.html.haml
	both modified:   app/views/shared/_clone_panel.html.haml
	both modified:   app/views/shared/issuable/_search_bar.html.haml
	both modified:   config/routes/project.rb
	both modified:   db/schema.rb
	both modified:   doc/README.md
	both modified:   doc/api/issues.md
	both modified:   lib/gitlab/checks/change_access.rb
	both modified:   lib/gitlab/email/handler.rb
	both modified:   spec/features/admin/admin_groups_spec.rb
	both modified:   spec/features/dashboard/group_spec.rb
	both modified:   spec/features/issues/filtered_search/dropdown_hint_spec.rb
	both modified:   spec/features/issues/filtered_search/search_bar_spec.rb
	both added:      spec/features/protected_tags/access_control_ce_spec.rb
	both modified:   spec/javascripts/build_spec.js
	both modified:   spec/lib/gitlab/import_export/all_models.yml
	both modified:   spec/lib/gitlab/import_export/safe_model_attributes.yml
	both modified:   spec/models/ci/build_spec.rb
	both modified:   spec/models/merge_request_spec.rb
	both modified:   spec/models/project_services/chat_message/merge_message_spec.rb
	both modified:   spec/models/project_services/chat_message/pipeline_message_spec.rb
	both modified:   spec/models/project_spec.rb
	both modified:   spec/services/projects/destroy_service_spec.rb]

Merge request reports