1. 02 Jun, 2015 2 commits
    • Douwe Maan's avatar
      Merge branch 'rs-issue-1721' into 'master' · a675bea2
      Douwe Maan authored
      Fix link_to_gfm with only a reference having the incorrect link
      
      Before:
      
      ```ruby
      link_to_gfm("#4", "/foo")     # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
      link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
      ```
      
      After:
      
      ```ruby
      link_to_gfm("#4", "/foo")     # => "<a href="/foo">#4</a>"
      link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>"
      ```
      
      Closes #192
      Closes #1721
      Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115)
      
      See merge request !739
      a675bea2
    • Douwe Maan's avatar
      Merge branch 'feature/sso_integration' into 'master' · d99637bf
      Douwe Maan authored
      Add an option to automatically sign-in with an Omniauth provider
      
      Split of !669 as requested
      
      This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.
      
      See merge request !723
      d99637bf
  2. 01 Jun, 2015 14 commits
  3. 31 May, 2015 2 commits
  4. 29 May, 2015 22 commits