• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-27 · bb516340
    GitLab Bot authored
    # Conflicts:
    #	app/services/members/approve_access_request_service.rb
    #	app/services/members/create_service.rb
    #	app/services/members/destroy_service.rb
    #	app/services/members/update_service.rb
    #	app/views/projects/merge_requests/show.html.haml
    #	config/webpack.config.js
    
    [ci skip]
    bb516340
user.rb 41.3 KB