1. 17 Oct, 2016 2 commits
  2. 11 Oct, 2016 13 commits
  3. 05 Oct, 2016 15 commits
  4. 29 Sep, 2016 5 commits
  5. 28 Sep, 2016 5 commits
    • Alejandro Rodríguez's avatar
    • Ruben Davila's avatar
      Fix CHANGELOG · 0816838b
      Ruben Davila authored
      0816838b
    • Jacob Schatz's avatar
      Merge branch 'resolve-buttons-path' into 'master' · 56dc3e4b
      Jacob Schatz authored
      Pass the full project path for resolve buttons
      
      ## What does this MR do?
      
      The full project path is passed from the HTML into the JS rather than the resolve button JS generating the URL based on the the namespaces.
      
      @smcgivern @stanhu Do we have anyway of adding tests for installs with relative URLs?
      
      ## What are the relevant issue numbers?
      
      Closes #21704
      
      See merge request !6129
      56dc3e4b
    • Fatih Acet's avatar
      Merge branch '22525-emoji-dropdown-shows-search-results-label-several-times' into 'master' · d609605e
      Fatih Acet authored
      Fixed awards dropdown search text from repeating
      
      ## What does this MR do?
      
      Thanks @zeiv for this!
      
      >This fixes #20463 by adding the .emoji-search class to the "Search results" h5 element.  AwardsHandler.prototype.setupSearch() was trying to remove the element before creating a new one, but wasn't because the it was attempting to select it with the .emoji-search class, which wasn't being added.
      
      ## Are there points in the code the reviewer needs to double check?
      
      >I don't believe so.
      
      ## Why was this MR needed?
      
      >See #20463
      
      _(and #22525)_
      
      ## Screenshots (if relevant)
      
      ![2016-09-23_15.56.04](/uploads/b421400a08b3d9fa32c577e7d8952504/2016-09-23_15.56.04.gif)
      
      ## Does this MR meet the acceptance criteria?
      
      - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
      - [ ] API support added
      - Tests
        - [ ] Added for this feature/bug
        - [ ] All builds are passing
      - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
      - [ ] 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)
      
      ## What are the relevant issue numbers?
      
      
      Closes #22525
      
      See merge request !6498
      d609605e
    • Douwe Maan's avatar
      Merge branch 'lfs-ssh-authorization-fix' into 'master' · c91bc7c9
      Douwe Maan authored
      Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called
      
      ## What does this MR do?
      
       Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called, instead return the saved token if one is present.
      
      This was causing a lot of 401s, leading to 403s, as state in #22527
      
      As it turns out, when pushing a lot of LFS objects, the LFS client was calling `git-lfs-authenticate` in the middle of the request again. This caused the `lfs_token` to be regenerated. The problem lies in that the LFS client was not aware of this change, and was still using the old token. This caused all subsequent requests to fail with a 401 error.
      
      Since HTTP Auth is protected by Rack Attack, this 401s where immediately flagged and resulted in the IP of the user being banned. 
      
      With this change, GitLab returns the value stored in Redis, if one is present, thus if the LFS client calls `git-lfs-authenticate` again during the request, the auth header will remain unchanged, allowing all subsequent requests to continue without issues.
      
      ## What are the relevant issue numbers?
      
      Fixes #22527
      
      cc @SeanPackham @jacobvosmaer-gitlab
      
      See merge request !6551
      c91bc7c9