Skip to content

CE upstream: Thursday

Nick Thomas requested to merge nt/ce-to-ee-thursday into master 
	both modified:   app/assets/javascripts/environments/components/environment.vue
	both modified:   app/assets/javascripts/environments/folder/environments_folder_view.vue
	both modified:   app/policies/project_policy.rb
	both modified:   doc/README.md
	both modified:   spec/controllers/projects_controller_spec.rb
	both modified:   spec/features/projects/milestones/milestone_spec.rb

Then:

# Conflicts:
#       app/assets/javascripts/environments/components/environment.vue
#       app/assets/javascripts/environments/folder/environments_folder_bundle.js
#       app/assets/javascripts/environments/folder/environments_folder_view.vue

Merge request reports