Fix for issue #5431
Version 6.2.1
Update gitlab_git to recent version
Version to 6.2.2
Restore sidekiq rake tasks
Merge branch 'fix_sidekiq_rake' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable
Escape strings

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Best to escape strings not split them

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
Require gitlab-shell v1.7.3
Shell escape code search
Correctly escape search query
Revert "Best to escape strings not split them"

This reverts commit 1ab324cb6721e374e11f4aac0fab0140f7fdacc5.
Revert "Escape strings"

This reverts commit 03141bfccca2b61721a12f3bb17eb6308cfb0ec4.
Require gitlab-shell 1.7.4

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Use gitlab-shell 1.7.4
Merge branch 'gitlab_shell_174_for_6_2_stable' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable
When looking up a user by DN, use single scope

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.
Version 6.2.3

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'ldap_block_fix' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable
Make sure private_token for API is a string

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