1. 07 Apr, 2016 3 commits
    • Jacob Schatz's avatar
      Reset MR opts · b471c76b
      Jacob Schatz authored
      b471c76b
    • Robert Speicher's avatar
      Merge branch 'saml-external-groups' into 'master' · 936be025
      Robert Speicher authored
      Allow SAML to identify external users and set them as such
      
      Related to #4009
      
      Fixes #14577
      
      This allows SAML to retrieve group information form the `SAML Response`
      and match that to a setting that will flag all matching users as external.
      
      See merge request !3530
      936be025
    • Robert Speicher's avatar
      Merge branch 'patch/fix-markdown-preview-wikis' into 'master' · 730625f0
      Robert Speicher authored
      Wiki preview URL converting problem [via Markdown]
      
      Current implementation when rendering the preview, thinks relative links are for project repository files.
      
      We are creating a new preview route that will define correct context data to render for wikis instead.
      
      Fixes #2380, #1184
      
      See merge request !3461
      730625f0
  2. 06 Apr, 2016 37 commits