Skip to content
Snippets Groups Projects

6 2 stable

Closed 6 2 stable
6-2-stable into master
Closed gitlab-qa-bot requested to merge 6-2-stable into master
  1. Nov 23, 2013
  3. Nov 21, 2013
  5. Nov 20, 2013
  7. Nov 14, 2013
  9. Nov 05, 2013
  11. Nov 04, 2013
    • Dmitriy Zaporozhets's avatar
      Version 6.2.3 · 675e5203
      Dmitriy Zaporozhets authored 
      
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
      Unverified
      675e5203
    • Elias Mårtenson's avatar
      When looking up a user by DN, use single scope · e4e96f2d
      Elias Mårtenson authored 
      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.
      e4e96f2d
    • Dmitriy Zaporozhets's avatar
      Merge branch 'gitlab_shell_174_for_6_2_stable' of... · a811a4fa
      Dmitriy Zaporozhets authored 
      Merge branch 'gitlab_shell_174_for_6_2_stable' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable
      a811a4fa
  13. Nov 01, 2013
  15. Oct 31, 2013
  17. Oct 28, 2013
  19. Oct 25, 2013
  21. Oct 22, 2013
  23. Oct 21, 2013