• 🤖 GitLab Bot 🤖's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-05 · bca0dfcb
    🤖 GitLab Bot 🤖 authored
    # Conflicts:
    #	Gemfile.rails5.lock
    #	app/assets/stylesheets/bootstrap_migration.scss
    #	app/models/ci/pipeline.rb
    #	app/models/personal_snippet.rb
    #	app/services/application_settings/update_service.rb
    #	db/schema.rb
    #	doc/user/project/import/github.md
    #	locale/gitlab.pot
    #	spec/serializers/pipeline_serializer_spec.rb
    #	spec/uploaders/object_storage_spec.rb
    
    [ci skip]
    bca0dfcb
README.md 7.56 KB