Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

app/models/project_services/bamboo_service.rb

app/models/project_services/teamcity_service.rb

app/models/service.rb

app/views/admin/users/index.html.haml

app/views/ci/admin/runners/index.html.haml

app/views/ci/admin/runners/show.html.haml

app/views/dashboard/projects/_projects.html.haml

app/views/explore/groups/index.html.haml

app/views/explore/projects/_filter.html.haml

app/views/groups/_projects.html.haml

app/views/groups/group_members/index.html.haml

app/views/layouts/_search.html.haml

app/views/projects/project_members/index.html.haml

app/views/search/_form.html.haml

app/views/shared/issuable/_search_form.html.haml

doc/customization/welcome_message.md

doc/update/patch_versions.md

lib/gitlab/ldap/user.rb

spec/lib/gitlab/ldap/user_spec.rb

spec/models/project_services/bamboo_service_spec.rb