1. 09 Jun, 2016 18 commits
    • Connor Shea's avatar
      Add ISSUE_TEMPLATE.md and PULL_REQUEST_TEMPLATE.md to point contributors... · d1506ebe
      Connor Shea authored
      Add ISSUE_TEMPLATE.md and PULL_REQUEST_TEMPLATE.md to point contributors toward the GitLab.com repository.
      This adds templates for Issues/Pull Requests in a `.github` directory. These only effect issues/PRs opened in the GitHub mirror of the GitLab project. As we're shutting these down, I thought it'd be good to direct users/contributors to open issues/contribute code in the "correct" project.
    • 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)
      ## 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
    • Sean McGivern's avatar
      Add test for getting info/refs from repo · bf63964b
      Sean McGivern authored
    • 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
    • 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
    • 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
    • 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
    • Timothy Andrew's avatar
      Add #18019 to the CHANGELOG. · 19b91e74
      Timothy Andrew authored
    • 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
    • Timothy Andrew's avatar
      Implement the correct linking behaviour in `WikiLinkFilter`. · 8e71c19a
      Timothy Andrew authored
      Original Comments
      - Linking behaves as per rules documented here:
      - 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`
    • 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)
      After (logged in):
      After (logged out):
      cc: @fatihacet 
      See merge request !4547
    • Jacob Schatz's avatar
      Merge branch 'mention-loading-indicator' into 'master' · f5818baf
      Jacob Schatz authored
      Show loading indicator for autocomplete
      Closes #15435
      See merge request !4182
    • Jacob Schatz's avatar
      Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master' · e382f130
      Jacob Schatz authored
      #17284 Edit form does not cancel correctly
      ## What does this MR do?
      Replaces the markdown textarea with the currently saved note text when the note edit is cancelled.
      ## Are there points in the code the reviewer needs to double check?
      ## Why was this MR needed?
      Allows the user to revert back to the original note text, as expected, using cancel.
      ## What are the relevant issue numbers?
      Fixes #17284.
      ## Screenshots
      See merge request !4175
    • Jacob Schatz's avatar
      Merge branch 'nav-scroll-bug' into 'master' · cc54b74a
      Jacob Schatz authored
      Side nav scrolls if content height taller than screen
      ## What does this MR do?
      Header logo is now fixed at top; put back scrolling functionality in side nav
      ## Screenshots (if relevant)
      <img src="/uploads/e1d1b60c296c39c61d7fe7da22b6c52d/scroll.gif" width="600px">
      See merge request !4513
    • Robert Speicher's avatar
      Merge branch 'git-http-no-authenticity-token' into 'master' · 5d66e0e0
      Robert Speicher authored
      Disable CSRF protection when serving Git HTTP clients
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18331
      See merge request !4538
    • Connor Shea's avatar
    • Patricio Cano's avatar
    • Jacob Schatz's avatar
      Merge branch '17240-svg' into 'master' · 0001a0cf
      Jacob Schatz authored
      Add new icons in left sidebar and layout nav
      Closes #17609    
      Closes #17240    
      Closes #17321    
      @skyruler I couldn't find the icons for `Projects`, `Merge Requests`, `Snippets`, or `Help` in the design repo. Do you have them available somewhere?
      See merge request !4268
  2. 08 Jun, 2016 22 commits