Skip to content

CE upstream - Friday

Lin Jen-Shin requested to merge ce-to-ee-2017-07-28 into master

Oh my goodness

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   GITALY_SERVER_VERSION
	both modified:   Gemfile
	both modified:   Gemfile.lock
	both modified:   app/controllers/admin/application_settings_controller.rb
	both modified:   app/helpers/application_settings_helper.rb
	both added:      app/views/projects/_flash_messages.html.haml
	both modified:   app/views/projects/merge_requests/show.html.haml
	both modified:   config/initializers/1_settings.rb
	both modified:   db/schema.rb
	both modified:   doc/administration/auth/ldap.md
	both added:      doc/user/project/repository/reducing_the_repo_size_using_git.md
	both modified:   lib/api/entities.rb
	both modified:   lib/api/merge_requests.rb
	both modified:   lib/api/settings.rb
	both modified:   lib/gitlab/ldap/adapter.rb
	both modified:   lib/gitlab/ldap/config.rb
	both modified:   spec/features/projects/branches_spec.rb
	both added:      spec/features/projects/show_project_spec.rb
	both modified:   spec/features/protected_branches_spec.rb
	both modified:   spec/lib/gitlab/git_access_spec.rb
	both modified:   spec/lib/gitlab/git_access_wiki_spec.rb
	both modified:   spec/lib/gitlab/key_fingerprint_spec.rb
	both modified:   spec/lib/gitlab/ldap/access_spec.rb
	both modified:   spec/lib/gitlab/ldap/adapter_spec.rb
	both modified:   spec/lib/gitlab/ldap/config_spec.rb
	both modified:   spec/lib/gitlab/shell_spec.rb
	both modified:   spec/models/merge_request_diff_file_spec.rb
	both modified:   spec/models/namespace_spec.rb
	both modified:   spec/requests/api/jobs_spec.rb
	both modified:   spec/requests/api/settings_spec.rb
	both modified:   spec/services/git_push_service_spec.rb
	both modified:   spec/services/projects/destroy_service_spec.rb
	both modified:   spec/services/projects/transfer_service_spec.rb
	both modified:   spec/support/test_env.rb

Merge request reports