• GitLab Bot's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-06 · 9f7754b1
    GitLab Bot authored
    # Conflicts:
    #	.flayignore
    #	app/controllers/projects/issues_controller.rb
    #	app/controllers/projects/merge_requests_controller.rb
    #	app/models/namespace.rb
    #	app/models/wiki_page.rb
    #	config/routes/group.rb
    #	db/schema.rb
    #	doc/administration/auth/ldap.md
    #	doc/user/group/index.md
    #	locale/gitlab.pot
    #	spec/factories/uploads.rb
    #	spec/models/namespace_spec.rb
    #	spec/uploaders/file_uploader_spec.rb
    
    [ci skip]
    9f7754b1
user_spec.rb 85.9 KB