Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

The blocked? method is used to check whether a user exists in LDAP. Prior to this change, if the LDAP server had more objects below the one pointed to by the DN, those objects would also be picked up by the search, causing the method to determine the user should be blocked.

One case where this can happen is when using Active Directory and a user have a mobile phone assigned. In this case, Exchange will add an entry called ExchangeActiveSyncDevices under the users entry. The user-visible behaviour is then that a user loses Gitlab access when he enables a mobile device.

This fix sets the search scope to BaseObject in order to ensure that only the user itself is returned.

Merge branch 'gitlab_shell_174_for_6_2_stable' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable

Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

This reverts commit 03141bfc.

This reverts commit 1ab324cb.

Signed-off-by: NNigel Kukard <nkukard@lbsd.net>

Signed-off-by: NNigel Kukard <nkukard@lbsd.net>

change 6-1-stable to 6-2-stable in installation guide

corrected the url of the init-script

Use init.d/gitlab script from 6-0-stable branch

Seems like init.d/gitlab script from master branch is not working anymore. Change to a version from 6-0-stable works fine.

It says:
```
Starting the GitLab Unicorn web server...
/etc/init.d/gitlab: 132: /etc/init.d/gitlab: script/web: not found
Starting the GitLab Sidekiq event dispatcher...
/etc/init.d/gitlab: 141: /etc/init.d/gitlab: script/background_jobs: not found
GitLab is not running.
```