1. 09 Jun, 2016 21 commits
    • Jacob Schatz's avatar
      Merge branch 'button-focus-state' into 'master' · d64517c3
      Jacob Schatz authored
      Blur button tags when pressed to remove the focus state.
      
      ## Before 
      
      ![pemnD5exKl](/uploads/333155bf4a6c43715f3fc04d8f5aa35e/pemnD5exKl.gif)
      
      
      ## After
      
      ![dCPvSwsuWp](/uploads/9bcfbe59ac8de51e9d2c3edcb3d13ff3/dCPvSwsuWp.gif)
      
      See merge request !4418
      d64517c3
    • Jacob Schatz's avatar
      Merge branch 'labels-ui-fix' into 'master' · d7e8adea
      Jacob Schatz authored
      Updated labels UI
      
      - Fixed alignment issues
      - Added dropdown to mobile to make the options look nicer & to save space
      
      ![Screen_Shot_2016-05-25_at_09.42.46](/uploads/ff59abd2310725965b388a62c6c1f2af/Screen_Shot_2016-05-25_at_09.42.46.png)
      
      Closes #14227
      
      See merge request !4273
      d7e8adea
    • Jacob Schatz's avatar
      Merge branch '17562-filter-issues-is-only-visible-when-user-is-logged-in' into 'master' · ae126c55
      Jacob Schatz authored
      #17562 Fixes issues list filter only visible when user is logged in
      
      ## What does this MR do?
      
      1. Moves the issue/MR list search form out of the `if current_user` conditional, allowing guests to view the field.
      
      2.  Adds some margin to the search form, this is because in mobile view for guest users, the field was not supported by the RSS button and the New Issue button and would drop to meet the list.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Are there any views where the `margin-bottom: 12px` will affect the styling?
      
      ## Why was this MR needed?
      
      Guest user UX. Nothing feels better than increasing intangible value!
      
      ## What are the relevant issue numbers?
      
      Fixes #17562.
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-05-16_at_23.48.06](/uploads/cf0f0c48287517ac3e83b204b4ee09b2/Screen_Shot_2016-05-16_at_23.48.06.png)
      
      /cc @jschatz1 
      
      **UPDATE:**
      
      ![Screen_Shot_2016-05-20_at_16.13.22](/uploads/eb854838a514d0d54d0f13bde1636b8a/Screen_Shot_2016-05-20_at_16.13.22.png)
      
      See merge request !4171
      ae126c55
    • Robert Speicher's avatar
      Merge branch 'rs-fix-ldap-2fa-login' into 'master' · 8138f340
      Robert Speicher authored
      Fix 2FA-based login for LDAP users
      
      The OTP input form is shared by both LDAP and standard logins, but when
      coming from an LDAP-based form, the form parameters aren't nested in a
      Hash based on the `resource_name` value.
      
      Now we check for a nested `remember_me` parameter and use that if it
      exists, or fall back to the non-nested parameters if it doesn't.
      
      Somewhat confusingly, the OTP input form _does_ nest parameters under
      the `resource_name`, regardless of what type of login we're coming from,
      so that allows everything else to work as normal.
      
      Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18185
      
      See merge request !4493
      8138f340
    • Jacob Schatz's avatar
      Merge branch 'fix-changelog' into 'master' · 95de1c1a
      Jacob Schatz authored
      Update CHANGELOG
      
      Fixes wrong changelog entry for !4175
      
      See merge request !4548
      95de1c1a
    • Alfredo Sumaran's avatar
      Update CHANGELOG · cda68e92
      Alfredo Sumaran authored
      cda68e92
    • Phil Hughes's avatar
      Fixed failing label subscribe test · b0a80f69
      Phil Hughes authored
      b0a80f69
    • Phil Hughes's avatar
      Tests update · 8e8ec82d
      Phil Hughes authored
      8e8ec82d
    • Phil Hughes's avatar
      Updated subscribe icon · 9830f9a2
      Phil Hughes authored
      9830f9a2
    • Phil Hughes's avatar
      Fixed failing tests · 051dc1d2
      Phil Hughes authored
      051dc1d2
    • Phil Hughes's avatar
      Updated labels UI · e7ca709a
      Phil Hughes authored
      Closes #14227
      e7ca709a
    • Douwe Maan's avatar
      Merge branch 'fix-git-http-routing' into 'master' · 3803b380
      Douwe Maan authored
      Ensure only IDs ending in .git perform git actions
      
      ## What does this MR do?
      
      Rails's routing is pretty strange. Previously, `GET /namespace/project/info/refs` would go to the Git HTTP controller (if the redirect for that case was taken out).
      
      ## Are there points in the code the reviewer needs to double check?
      
      The specs fail if the redirect is moved to above the Git HTTP routes, removed altogether, or the Git HTTP constraints are changed. But there might still be missing cases.
      
      ## Why was this MR needed?
      
      The master build and HTTP cloning were both broken.
      
      ## What are the relevant issue numbers?
      
      Closes #18376.
      
      ## Screenshots (if relevant)
      
      Nope.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [not needed] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [x] [not needed] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ ] (not needed) API support added
      - [ ] Tests
        - [x] Added for this feature/bug
        - [ ] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !4558
      3803b380
    • Sean McGivern's avatar
      Add test for getting info/refs from repo · bf63964b
      Sean McGivern authored
      bf63964b
    • Sean McGivern's avatar
      Ensure only IDs ending in .git perform git actions · df5fb28a
      Sean McGivern authored
      It doesn't seem possible to set constraints based on format for project
      IDs ending in .git, so set the constraint on the ID and ensure the
      format is nil to avoid the case where the project ID is something like
      project.git.foo.
      df5fb28a
    • 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 19 commits