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/components/environment_item.vue
	both modified:   app/assets/javascripts/environments/components/environment_rollback.vue
	both modified:   app/assets/javascripts/environments/components/environment_stop.vue
	both modified:   app/assets/javascripts/environments/components/environments_table.vue
	both modified:   app/assets/javascripts/environments/folder/environments_folder_view.vue
	both modified:   app/assets/stylesheets/pages/members.scss
	both modified:   app/helpers/milestones_helper.rb
	both modified:   app/helpers/tree_helper.rb
	both modified:   app/models/project.rb
	both added:      app/validators/dynamic_path_validator.rb
	both modified:   app/views/projects/blob/_blob.html.haml
	both modified:   app/views/projects/settings/_head.html.haml
	both modified:   app/views/projects/tree/_tree_header.html.haml
	both added:      app/views/shared/notes/_note.html.haml
	both added:      db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb
	both modified:   doc/api/projects.md
	both added:      doc/articles/how_to_configure_ldap_gitlab_ce/index.md
	both modified:   doc/articles/index.md
	both modified:   doc/topics/authentication/index.md
	both modified:   features/support/env.rb
	both modified:   lib/gitlab/import_export/import_export.yml
	both modified:   spec/features/merge_requests/create_new_mr_spec.rb
	both modified:   spec/finders/issues_finder_spec.rb
	both modified:   spec/finders/merge_requests_finder_spec.rb
	both modified:   spec/finders/snippets_finder_spec.rb
	both modified:   spec/lib/gitlab/import_export/safe_model_attributes.yml
	both modified:   spec/mailers/notify_spec.rb
	both modified:   spec/workers/post_receive_spec.rb

Merge request reports