• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-17 · 0095cd16
    GitLab Bot authored
    # Conflicts:
    #	app/models/concerns/protected_branch_access.rb
    #	app/models/concerns/protected_tag_access.rb
    #	changelogs/unreleased/44596-double-title-merge-request-message.yml
    #	doc/user/admin_area/img/admin_area_settings_button.png
    #	doc/user/admin_area/settings/continuous_integration.md
    #	spec/support/helpers/stub_configuration.rb
    
    [ci skip]
    0095cd16
test_bundle.js 6.62 KB