1. 09 Jun, 2016 7 commits
    • Douwe Maan's avatar
      Merge branch 'saml-ldap-link-flow' into 'master' · 30ee4ea6
      Douwe Maan authored
      Adjust the SAML control flow to allow LDAP identities to be added to an existing SAML user.
      
      ## What does this MR do?
      
      It correctly lets an existing SAML user to add their LDAP identity automatically at login.
      
      ## Why was this MR needed?
      
      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.
      
      ## What are the relevant issue numbers?
      
      Fixes #17346 
      
      /cc @dblessing @balameb @stanhu 
      
      See merge request !4498
      30ee4ea6
    • Yorick Peterse's avatar
      Merge branch 'make-omniauth-tests-to-not-modify-global-state' into 'master' · 1e4db9ed
      Yorick Peterse authored
      Make Omniauth providers specs to not modify global configuration
      
      See merge request !4534
      1e4db9ed
    • Rémy Coutable's avatar
      Merge branch '18019-fix-wiki-linking' into 'master' · 3d72cb89
      Rémy Coutable authored
      Fix wiki linking behavior for markdown wiki pages
      
      Related to #18019 
      
      - As per the documentation in !4372 
      
      ## TODO
      - [ ] !4432 Have wiki linking behave as per the documentation
          - [x] Move `WikiLinkFilter` specs to the pipeline level
          - [x] Verify current behavior on wiki `show` page
          - [x] Fix current behavior on wiki `show` page
          - [x] Verify current behaviour on wiki preview
          - [x] Fix current behaviour on wiki preview
              - [x] Rewrite all links and get preview links working
              - [x] Make sure all links are on-par with the wiki `show` page
              - [x] TDD `WikiLinkFilter` and get it working
              - [x] Hook `WikiLinkFilter` up
          - [x] Fix tests 
              - [x] Fix `markdown_spec`
              - [x] Fix `wiki` spinach feature
              - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass
              - [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.)
          - [x] Test in different ruby versions
          - [x] GitLab instances hosted on a relative URL
          - [x] Non-markdown rendering formats?
              - [x] RDoc
              - [x] ASCIIDoc
              - [x] Create issues to fix things for RDoc and ASCIIDoc
          - [x] Gauge performance impact
          - [x] Refactor
          - [x] Re-organize commits
          - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes
          - [x] Respond to @rymai's comments
              - [x] `class WikiLinkFilter < HTML::Pipeline::Filter`
              - [x] blank line after guard clause
              - [x] keyword arguments for `wiki` and `slug`
              - [x] invert the condition
              - [x] inline `user` in spec
              - [x] Make sure spec names are not out of date
              - [x] Comment for each rewrite rule
          - [x] Add CHANGELOG entry
          - [x] Reorganize commits
          - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes
          - [ ] Wait for merge
      
      See merge request !4432
      3d72cb89
    • Timothy Andrew's avatar
      Add #18019 to the CHANGELOG. · 19b91e74
      Timothy Andrew authored
      19b91e74
    • Timothy Andrew's avatar
      Hook up the updated `WikiLinkFilter` to the wiki controllers. · e6b1d166
      Timothy Andrew authored
      - Need to pass in a `page_slug` to the filter, so it can rewrite based
        on the current page (all links are rewritten to the level of the app root).
      - The earlier `markdown_preview` endpoint was at the level of the wiki.
        We need to know the current page (for rewriting, as above), so this
        commit moves the endpoint to the level of a wiki page.
      - Fix all tests
      e6b1d166
    • Timothy Andrew's avatar
      Implement the correct linking behaviour in `WikiLinkFilter`. · 8e71c19a
      Timothy Andrew authored
      Original Comments
      =================
      
      - Linking behaves as per rules documented here:
        https://gitlab.com/gitlab-org/gitlab-ce/blob/16568-document-wiki-linking-behavior/doc/markdown/wiki.md
      - All links (to other wiki pages) are rewritten to be at the level of
        the app root. We can't use links relative to the current
        page ('./foo', 'foo', '../foo'), because they won't work in the
        markdown preview, where the current page is suffixed with `/edit`
      - Move existing `WikiLinkFilter` specs to `WikiPipeline` spec. It makes
        sense to run these tests on the combined output of the pipeline,
        rather than a single filter, since we can catch issues with
        conflicting filters.
      - Add more tests to cover the new linking
      
      @rymai's Review
      ===============
      
      - Classes nested under `WikiLinkFilter` should declare `WikiLinkFilter`'s
        inherit, so nothing changes if the nested class is loaded first.
      - Add a blank line after a guard clause
      - Use keyword arguments for the `Rewriter` constructor
      - Invert a condition - use `if` instead of `unless`
      - Inline a `let` in `WikiPipeline` spec - it was only used in a single place
      - Change out of date spec names
      - Add a comment for every rewrite rule in `Rewriter`
      8e71c19a
    • Jacob Schatz's avatar
      Merge branch 'fix-award-emoji-hidden' into 'master' · 13fd88fa
      Jacob Schatz authored
      Shows award emoji for comments to all users who are logged in.
      
      ## What does this MR do?
      Fixes the award emoji picker not showing up for users who weren't able to edit another user's comment.
      
      ## Screenshots (if relevant)
      Before:
      
      ![Screen_Shot_2016-06-08_at_5.18.04_PM](/uploads/a8b40ba319481f53d55de055d84649b9/Screen_Shot_2016-06-08_at_5.18.04_PM.png)
      
      After (logged in):
      ![Screen_Shot_2016-06-08_at_5.16.16_PM](/uploads/535edcca6fbdd8834beda39399f85384/Screen_Shot_2016-06-08_at_5.16.16_PM.png)
      
      After (logged out):
      ![Screen_Shot_2016-06-08_at_5.15.08_PM](/uploads/7f0dff751714c7d20f78b56893cacd59/Screen_Shot_2016-06-08_at_5.15.08_PM.png)
      
      cc: @fatihacet 
      
      See merge request !4547
      13fd88fa
  2. 08 Jun, 2016 33 commits