• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-19 · 45fdfaa3
    GitLab Bot authored
    # Conflicts:
    #	app/services/protected_branches/legacy_api_update_service.rb
    #	app/services/users/destroy_service.rb
    #	db/post_migrate/20180723130817_delete_inconsistent_internal_id_records.rb
    #	spec/migrations/delete_inconsistent_internal_id_records_spec.rb
    #	spec/spec_helper.rb
    
    [ci skip]
    45fdfaa3
gitlab.pot 176 KB