• Ruben Davila's avatar
    Merge remote-tracking branch 'ce/master' into ce-to-ee · e4138b34
    Ruben Davila authored
    Conflicts:
    	Gemfile.lock
    	app/views/projects/_merge_request_settings.html.haml
    	app/views/projects/tree/_tree_content.html.haml
    	doc/user/project/merge_requests.md
    	doc/user/project/merge_requests/img/commit_compare.png
    	doc/workflow/README.md
    e4138b34
This project manages its dependencies using Bundler. Learn more
Gemfile 8.69 KB