Skip to content

CE upstream: Friday

Lin Jen-Shin requested to merge ce-to-ee-2017-10-27 into master

Conflicts:

both modified:   app/assets/stylesheets/pages/boards.scss
both modified:   app/views/help/index.html.haml
both modified:   db/schema.rb
both modified:   doc/api/settings.md
both modified:   doc/user/project/merge_requests/index.md
both modified:   locale/gitlab.pot
both modified:   spec/support/update_invalid_issuable.rb

Merge request reports