• Rémy Coutable's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-04-26 · ac1e1b05
    Rémy Coutable authored
    # Conflicts:
    #	.gitlab-ci.yml
    #	CHANGELOG.md
    #	Gemfile.lock
    #	app/views/projects/blob/_header.html.haml
    #	config/database.yml.postgresql
    #	db/schema.rb
    #	scripts/prepare_build.sh
    #	spec/features/merge_requests/diffs_spec.rb
    #	spec/features/protected_branches_spec.rb
    #	spec/javascripts/blob/blob_fork_suggestion_spec.js
    #	spec/support/test_env.rb
    #	yarn.lock
    [ci skip]
    ac1e1b05
.gitignore 886 Bytes