• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-13 · aac0559d
    GitLab Bot authored
    # Conflicts:
    #	app/views/admin/application_settings/_account_and_limit.html.haml
    #	app/views/admin/application_settings/_ci_cd.html.haml
    #	app/views/admin/application_settings/_email.html.haml
    #	app/views/admin/application_settings/_help_page.html.haml
    #	app/views/admin/application_settings/_repository_mirrors_form.html.haml
    #	app/views/admin/application_settings/_signup.html.haml
    #	app/views/admin/application_settings/_visibility_and_access.html.haml
    #	lib/api/users.rb
    
    [ci skip]
    aac0559d
application.rb 9.74 KB