1. 18 Jun, 2015 2 commits
    • Douwe Maan's avatar
      Merge branch 'fix/oauth_user_ldap_person' into 'master' · a95a3f41
      Douwe Maan authored
      Fix behavior of ldap_person method in Gitlab::OAuth::User
      
      Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
      Improved tests to cover the ldap_person method, which was previously stubbed.
      
      Restored the previous implementation of ldap_person, as I could not find a more concise to write it that still works with all the test cases.
      
      See merge request !837
      a95a3f41
    • Douwe Maan's avatar
      Merge branch 'rs-custom-dashboard-backport' into '7-12-stable' · a3d98ab2
      Douwe Maan authored
      Backport custom dashboard
      
      This is a backport of !778 without the `Gitlab::Themes` refactor for the 7.12 branch.
      
      See merge request !828
      a3d98ab2
  2. 17 Jun, 2015 2 commits
  3. 16 Jun, 2015 25 commits
  4. 15 Jun, 2015 5 commits
  5. 12 Jun, 2015 6 commits