• Jacob Vosmaer's avatar
    Merge commit '27cf081e' into merge_ce_27cf081e · ee8836a9
    Jacob Vosmaer authored
    Conflicts:
    	VERSION
    	app/models/user.rb
    	app/services/merge_requests/build_service.rb
    	config/gitlab.yml.example
    	db/schema.rb
    	doc/integration/README.md
    	features/project/merge_requests.feature
    	features/steps/project/merge_requests.rb
    ee8836a9
api.rb 1.33 KB