1. 14 Jun, 2016 5 commits
    • Douwe Maan's avatar
      Merge branch 'saml-ldap-link-flow' into 'master' · 520a57a1
      Douwe Maan authored
      Adjust the SAML control flow to allow LDAP identities to be added to an existing SAML user.
      
      It correctly lets an existing SAML user to add their LDAP identity automatically at login.
      
      A customer had issues with the `auto_link_ldap_user` feature. The flow was not working if there was an account with a SAML identity, but no LDAP identity. GitLab would pick up the correct LDAP person, but due to the order of the flow, that LDAP person was never associated with the user.
      
      Fixes #17346
      
      /cc @dblessing @balameb @stanhu
      
      See merge request !4498
      520a57a1
    • Douwe Maan's avatar
      Merge branch 'gh-fix-comments-on-diff' · 6e23d642
      Douwe Maan authored
      6e23d642
    • Douwe Maan's avatar
      Merge branch 'gh-disable-webhooks' · 212ebdfb
      Douwe Maan authored
      212ebdfb
    • Douwe Maan's avatar
      Merge branch 'todos-filter-project-delete' into 'master' · a834be61
      Douwe Maan authored
      Ensure we don't show TODOS for projects pending delete
      
      Joins the todos on the projects table in order to run the default scope. Also includes a where clause because the default scope is being removed soon.
      
      An alternative approach, more like the Issues page, would be to filter down the list by passing user.authorized_projects into the where clause.
      
      Or we could just be more defensive in the view when iterating.
      
      Todos page throws 500 error for users with todos in a project pending deletion.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17813
      
      cc\ @stanhu
      
      See merge request !4300
      a834be61
    • Douwe Maan's avatar
      Merge branch 'gh-rate-limit' · b2404508
      Douwe Maan authored
      b2404508
  2. 09 Jun, 2016 3 commits
  3. 02 Jun, 2016 31 commits
  4. 25 May, 2016 1 commit