1. 22 Jul, 2015 5 commits
    • Stan Hu's avatar
      Merge branch 'fix-cache-clear-test-issue' into 'master' · 6bf1beaf
      Stan Hu authored
      Use project repository expire_cache to clear cache in test
      
      Clearing the entire Redis cache in 643557da for the `branches_spec.rb` may be causing issues. Just clear what we need.
      
      See merge request !1022
      6bf1beaf
    • Stan Hu's avatar
      Clearing the entire Redis cache may be too expensive; just use · 5aff5223
      Stan Hu authored
      the repository expire_cache method
      5aff5223
    • Stan Hu's avatar
      Merge branch 'fix-dup-changelog-entry' into 'master' · dc550481
      Stan Hu authored
      Remove 7.14 entry that was pushed to 7.13
      
      See merge request !1020
      dc550481
    • Stan Hu's avatar
      Remove 7.14 entry that was pushed to 7.13 · 913e1b21
      Stan Hu authored
      913e1b21
    • Stan Hu's avatar
      Merge branch 'fix-404-empty-repo' into 'master' · f593b621
      Stan Hu authored
      Fix 404 error in files view after deleting the last file in a repository
      
      Here's the logic:
      
      1. In `TreeController`, `require_non_empty_project` will prevent `show` from being called if the project is  empty. That means all calls to `show` will be guaranteed to have at least 1 commit.
      2. If the ref name is not valid, then return a 404. This ensures that at least the controller is looking at a valid branch/tag/SHA ID.
      3. This leaves a number of cases:
      
      ```
      3a. Valid ref, valid directory
      3b. Valid ref, valid filename
      3c. Valid ref, invalid path
      3d. Valid ref, no files
      ```
      
      Case 3a: The tree will not be `empty?` and will pass through the whole function.
      
      Case 3b: The tree will be `empty?` but the `blob_at` will resolve properly and trigger a redirect to the file.
      
      Case 3c: In this case, a path is given. Return 404 if it cannot be resolved neither as a tree nor a blob.
      
      Case 3d: In this case, no path is given. If the tree is empty, this means it's an empty branch and just fall through.
      
      Example broken branch: https://gitlab.com/gitlab-org/gitlab-test/tree/empty-branch
      
      Closes #1362
      
      See merge request !1010
      f593b621
  2. 21 Jul, 2015 9 commits
  3. 20 Jul, 2015 16 commits
  4. 19 Jul, 2015 6 commits
    • Sven Strickroth's avatar
    • Valery Sizov's avatar
      Merge branch 'rs-issue-2001' into 'master' · d0ef64ac
      Valery Sizov authored
      Dynamically check `:admin_*` ability in issuable context
      
      Closes #2001
      
      See merge request !1002
      d0ef64ac
    • Robert Speicher's avatar
      Dynamically check `:admin_*` ability in issuable context · e65b0810
      Robert Speicher authored
      Closes #2001
      e65b0810
    • Daniel Gerhardt's avatar
      Fix label read access for unauthenticated users · 69417d36
      Daniel Gerhardt authored
      The label page was added to navigation for unauthorized users because
      the previously used milestone read permission was still checked. This
      has been fixed and read access to labels is now granted (again) for
      public projects.
      
      This regression has been introduced in
      07efb17e (7.12).
      
      See also 9bcd3639.
      
      Refs !836, !842.
      69417d36
    • Valery Sizov's avatar
      Merge branch 'fix-mixed-color-preview' into 'master' · e8aaf568
      Valery Sizov authored
      Fix bug where notes were being rendered with wrong color preferences due to caching
      
      ### What does this MR do?
      
      This MR adds the user's color preferences as part of the caching key for notes.
      
      ### Why was this MR needed?
      
      This should fix a bug introduced via 4d80360b where notes were being loaded from the cache without regard to the current user's color scheme.
      
      ### What are the relevant issue numbers?
      
      Closes #2008
      
      See merge request !994
      e8aaf568
    • Stan Hu's avatar
      Merge branch 'fix-oauth-redirection' into 'master' · 247609a3
      Stan Hu authored
      Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in
      
      ### What does this MR do?
      
      This MR fixes a bug when GitLab is used as an OAuth provider (e.g. to GitLab CI) where the user is not redirected back to the original URI after a successful sign-in. This MR tweaks the Doorkeeper configuration to set the `user_return_to` Devise session variable, as mentioned in this [Stack Overflow](http://stackoverflow.com/questions/14504739/how-to-use-both-devise-and-doorkeeper-gems) post.
      
      ### Why was this MR needed?
      
      If you attempt to "Login via GitLab" from GitLab CI and aren't logged out completely, GitLab asks for your username and password. After you login, you get directed to the GitLab dashboard instead of back to GitLab CI. It's easy to reproduce:
      
      1. Set up a GitLab CI and GitLab instance (e.g. ci.gitlab.com, gitlab.com).
      2. Start an Incognito Window so that you are logged out of GitLab CI and GitLab.
      3. Go to the GitLab CI instance. Click the "Login with GitLab".
      4. Enter in your credentials.
      5. Watch your browser login to GitLab and not return to GitLab CI.
      
      ### What are the relevant issue numbers?
      
      Closes #1612
      
      See merge request !998
      247609a3
  5. 18 Jul, 2015 4 commits