app/models/merge_request.rb · 30800334d92c4e392cbfd9cd06ff71cb043e3c11 · nexedi / gitlab-ce

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into 3553-epics-list · ffd414c9

Jarka Kadlecova authored Nov 10, 2017

# Conflicts:
#	app/controllers/concerns/issuable_actions.rb
#	app/controllers/projects/issues_controller.rb
#	app/models/merge_request.rb
#	ee/app/controllers/ee/projects/issues_controller.rb

ffd414c9

merge_request.rb 26.5 KB

Replace merge_request.rb