CE upstream merge
-
.gitlab-ci.yml -
Gemfile.lock -
app/assets/stylesheets/pages/issuable.scss -
app/controllers/concerns/lfs_request.rb -
app/controllers/projects/git_http_controller.rb -
app/helpers/issuables_helper.rb -
app/models/concerns/protected_branch_access.rb -
app/models/protected_branch/merge_access_level.rb -
app/models/protected_branch/push_access_level.rb -
app/services/system_note_service.rb -
app/views/shared/issuable/_filter.html.haml -
app/views/shared/issuable/_form.html.haml -
app/views/shared/issuable/form/_metadata.html.haml -
db/schema.rb -
doc/web_hooks/web_hooks.md -
features/steps/project/wiki.rb -
lib/api/projects.rb -
lib/gitlab/git_access.rb -
spec/features/security/project/private_access_spec.rb -
spec/features/security/project/public_access_spec.rb -
spec/mailers/notify_spec.rb -
spec/services/merge_requests/merge_service_spec.rb -
spec/services/merge_requests/refresh_service_spec.rb -
spec/services/projects/destroy_service_spec.rb
Merged changes https://gitlab.com/gitlab-org/gitlab-ce/compare/858602ea153056f6cbfeeb4114ea6e29aba03a7a...14046b9c734e5e6506d63276f39f3f9d770c3699