• Rémy Coutable's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-07-26 · c285f350
    Rémy Coutable authored
    # Conflicts:
    #	Gemfile
    #	Gemfile.lock
    #	app/assets/stylesheets/pages/pipelines.scss
    #	app/helpers/system_note_helper.rb
    #	app/services/ci/create_pipeline_service.rb
    #	app/services/system_note_service.rb
    #	doc/api/issues.md
    #	doc/articles/index.md
    #	doc/integration/README.md
    #	doc/user/project/quick_actions.md
    #	lib/api/helpers/related_resources_helpers.rb
    #	lib/api/triggers.rb
    #	lib/api/v3/entities.rb
    #	spec/controllers/admin/dashboard_controller_spec.rb
    #	spec/features/issues/user_uses_slash_commands_spec.rb
    #	spec/requests/api/triggers_spec.rb
    #	spec/serializers/pipeline_serializer_spec.rb
    #	spec/services/quick_actions/interpret_service_spec.rb
    #	spec/support/api/milestones_shared_examples.rb
    #	spec/support/stub_configuration.rb
    [ci skip]
    c285f350
users_spec.rb 50.4 KB