• Dmitriy Zaporozhets's avatar
    Merge branch 'master' into ce-upstream · f4d43ed3
    Dmitriy Zaporozhets authored
    Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    
    Conflicts:
    	app/controllers/projects/services_controller.rb
    	app/models/concerns/mentionable.rb
    	app/models/project.rb
    	app/models/user.rb
    	app/views/admin/users/index.html.haml
    	app/views/projects/services/_form.html.haml
    	config/gitlab.yml.example
    	config/initializers/1_settings.rb
    	lib/gitlab/git_access.rb
    	lib/gitlab/ldap/access.rb
    	lib/gitlab/ldap/person.rb
    	lib/gitlab/reference_extractor.rb
    	spec/lib/gitlab/ldap/access_spec.rb
    f4d43ed3
user.rb 16.5 KB