Skip to content
Commits on Jun 30, 2016
  1. @tsigo

    Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.

    [ci skip]
    tsigo committed Jun 30, 2016
  2. @tsigo

    Merge branch 'as-fix-changelog-entries' into 'master'

    Remove duplicated entries from CHANGELOG
    
    [ci skip]
    
    See merge request !5028
    tsigo committed Jun 30, 2016
  3. @brodock

    Merge branch 'build-reopen-json' into 'master'

    Build path sends JSON file path
    
    ## What does this MR do?
    
    Fixes an issue with browser caching JSON response on build page.
    
    Steps to see:
    
    - Open build (https://gitlab.com/gitlab-org/gitlab-ce/builds/2030226)
    - Close tab
    - Re-open tab
    
    You should now see some JSON 😞 
    
    This MR appends `.json` to the end of the build URL so that the browser can't cache it as the same URL.
    
    
    See merge request !4935
    brodock committed Jun 30, 2016
  4. @theif
  5. @tsigo

    Merge branch 'cleanup-forgotten-lines' into 'master'

    Cleanup forgotten lines
    
    The `coveralls` gem was unused and thus removed in 7a2f25a. I've forgotten some lines in that MR
    
    See merge request !5025
    tsigo committed Jun 30, 2016
  6. @tsigo

    Merge branch 'fix/build-retry-button-in-view' into 'master'

    Do not show build retry link when build is active
    
    Closes #19244
    
    See merge request !4967
    tsigo committed Jun 30, 2016
  7. @YorickPeterse

    Merge branch '18991-update-test-env-gitlab-shell-version-when-v3-1-0-…

    …is-published' into 'master'
    
    
    Remove hardcoded gitlab-shell version in test env now that the required tag is published
    
    See merge request !5023
    YorickPeterse committed Jun 30, 2016
  8. @ZJvandeWeg

    Remove coveralls lines

    ZJvandeWeg committed Jun 30, 2016
  9. @tsigo

    Merge branch 'fix-external-issue-rendering' into 'master'

    Handle external issues in IssueReferenceFilter
    
    Rendering issue references such as `#1` was broken for projects using an external issues tracker.
    
    See gitlab-org/gitlab-ce#19036
    
    See merge request !4988
    tsigo committed Jun 30, 2016
  10. @DouweM

    Merge branch 'ericidema/gitlab-ce-import-with-github-personal-access-…

    …tokens' into 'master'
    
    
    Allow importing from Github using Personal Access Tokens
    
    _Originally opened at !4005 by @ericidema._
    
    ------
    
    ## What does this MR do?
    
    * Made changes to `Gitlab::GithubImport::Client` so that it can be used with Github Personal Access Tokens without the need for OAuth.
    * Added UI to collect Personal Access Token from user.
    * Detect if the user has logged in with GitHub and use OAuth to skip the Personal Access Token form.
    
    ## Are there points in the code the reviewer needs to double check?
    
    Twin Omnibus MR: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/774
    
    ## What are the relevant issue numbers?
    
    Closes #13970.
    
    ## Screenshots
    
    ### GitHub import is configured
    
    ![github_import_configured](/uploads/151e4f0edf3f87bfa03c2d97dda8b3d8/github_import_configured.png)
    
    -----
    
    ### GitHub import is not configured
    
    ![github_import_not_configured](/uploads/cb129f7e2ffe66cceb28ccd9af480284/github_import_not_configured.png)
    
    -----
    
    ## Does this MR meet the acceptance criteria?
    
    - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
    - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
    - Tests
      - [x] Added for this feature/bug
      - [ ] All builds are passing
    - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
    - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
    - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
    
    See merge request !4938
    DouweM committed Jun 30, 2016
  11. @rymai

    Merge branch 'fix-changelog' into 'master'

    Fix wrong line in changelog
    
    ## What does this MR do?
    
    Fix a wrong line in the changelog
    
    
    
    See merge request !5008
    rymai committed Jun 30, 2016
  12. @rymai

    Merge branch 'fix_restore_warning' into 'master'

    Fix restore warning message
    
    ## What does this MR do?
    
    Fix the restore Rake task so it properly outputs the database warning. This is a pretty important warning and it was not even being output. After this fix, the output looks like the screenshot below.
    
    ![Screen_Shot_2016-06-28_at_3.53.46_PM](/uploads/d250189d39fcacd0c8ec0aacf9cd930d/Screen_Shot_2016-06-28_at_3.53.46_PM.png)
    
    See merge request !4980
    rymai committed Jun 30, 2016
  13. @rymai

    Make GH one-off auth the default again for importing GH projects

    Advertise the PAT as an alternative unless GH import is not configured.
    
    Signed-off-by: Rémy Coutable <remy@rymai.me>
    rymai committed Jun 27, 2016
  14. @eki @rymai

    Import from Github using Personal Access Tokens.

    This stands as an alternative to using OAuth to access a user's Github
    repositories.  This is setup in such a way that it can be used without OAuth
    configuration.
    
    From a UI perspective, the how to import modal has been replaced by a full
    page, which includes a form for posting a personal access token back to the
    Import::GithubController.
    
    If the user has logged in via GitHub, skip the Personal Access Token and go
    directly to Github for an access token via OAuth.
    eki committed with rymai May 2, 2016
  15. Merge branch 'sidebar-breakpoint' into 'master'

    Updated breakpoint for sidebar pinning
    
    ## What does this MR do?
    
    Updates the breakpoint for sidebar pinning to 1024px.
    
    Think we will have the same issue as before when picking into stable with `$window` not being defined.
    
    See merge request !5019
    Jacob Schatz committed Jun 30, 2016
  16. @eReGeBe

    Remove hardcoded gitlab-shell version in test env now that the requir…

    …ed tag is published
    eReGeBe committed Jun 30, 2016
  17. @YorickPeterse

    Merge branch '18709-branch-tag-collection-caching' into 'master'

    Project dashboard appears to be loading tags on every request
    
    See merge request !4996
    YorickPeterse committed Jun 30, 2016
  18. @DouweM

    Merge branch 'rack-request-trusted-proxies' into 'master'

    Make Rack::Request use our trusted proxies when filtering IP addresses
    
    ## What does this MR do?
    
    This allows us to control the trusted proxies while deployed in a private network.
    
    ## Are there points in the code the reviewer needs to double check?
    
    If we want to limit what is impacted, we can do this specifically for the rack_attack request object.
    
    ## Why was this MR needed?
    
    Normally Rack::Request will trust all private IPs as trusted proxies, which can cause problems if your users are connection on you network via private IP ranges.
        
    Normally in a rails app this is handled by action_dispatch request, but rack_attack is specifically using the Rack::Request object instead.
    
    ## What are the relevant issue numbers?
    
    Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17550
    
    ## Does this MR meet the acceptance criteria?
    
    - [x] [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
      - [x] Added for this feature/bug
      - [x] 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)
    
    
    \cc @stanhu
    
    See merge request !4958
    DouweM committed Jun 30, 2016
  19. @tsigo

    Merge branch 'code_style_fixes' into 'master'

    Remove unnecessary parens and other code style fixes
    
    This MR is based on reviewers` comments to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/440
    
    See merge request !5015
    tsigo committed Jun 30, 2016
  20. @tsigo

    Merge branch 'rubocop/enable-unneeded-capital-w-cop' into 'master'

    Enable Style/UnneededCapitalW Rubocop cop
    
    ## What does this MR do?
    
    This MR enables Rubocop cop that checks if `%W[]`, which supports interpolation, is needed.
    
    ## What are the relevant issue numbers?
    
    #17478 
    
    See merge request !5010
    tsigo committed Jun 30, 2016
  21. @iamphill
  22. Merge branch 'pin-nav-cookie-expiry' into 'master'

    Expiry date on pinned nav cookie
    
    ## What does this MR do?
    
    Adds an expiry date far into the future for the pinned nav cookie so that it survives logout & browser closing.
    
    See merge request !5009
    Jacob Schatz committed Jun 30, 2016
  23. @pacoguzman

    Expire branch/tag git data when needed.

    When pushing commits to existing branches we don’t
    need to flush branch git data (branch names / counts)
    
    When flushes the cache when pushing commits skip to
    flush branch and tag git data (names / counts) because
    those operations are managed explicitly in each case
    
    Repopulated expired cache as soon as possible
    pacoguzman committed Jun 28, 2016
  24. @randx

    Merge branch 'global-ajax-error-handler' into 'master'

    Global Ajax error handler
    
    ## What does this MR do?
    Introduces a new global Ajax error handler to show a flash warning about the error detail of XHR requests which failed with status code 404 and 500
    
    ## Are there points in the code the reviewer needs to double check?
    Double check the wording.
    
    ## Why was this MR needed?
    A global solution for the problem in the #17880
    
    ## What are the relevant issue numbers?
    Fixes #17880 
    
    ## Screenshots (if relevant)
    
    For requests failed with 404 - 500 
    
    ![Screen_Shot_2016-06-21_at_00.07.26](/uploads/04bb3a5a958c3d21aef4fd12bd3d105a/Screen_Shot_2016-06-21_at_00.07.26.png)
    
    For requests failed with 401
    
    ![Screen_Shot_2016-06-21_at_00.08.30](/uploads/25cc885ba388f4c6f4c555fa338e1a63/Screen_Shot_2016-06-21_at_00.08.30.png)
    
    See merge request !4797
    randx committed Jun 30, 2016
  25. @vsizov

    Remove unnecessary parens

    vsizov committed Jun 30, 2016
  26. @randx

    Merge branch 'issue-18886' into 'master'

    Loop all disks when displaying system info. Closes #18886
    
    
    
    See merge request !4983
    randx committed Jun 30, 2016
  27. @randx

    Merge branch 'remove-converalls-gem' into 'master'

    Remove coveralls as its unused
    
    This gem is unused so could be removed.
    
    @dzaporozhets @connorshea  We've discussed this some time ago on Slack
    
    See merge request !5001
    randx committed Jun 30, 2016
  28. @grzesiek
  29. @YorickPeterse

    Merge branch 'shards' into 'master'

    Implement multiple repository mount points
    
    See merge request !4578
    YorickPeterse committed Jun 30, 2016
  30. @iamphill
  31. @YorickPeterse

    Merge branch 'shards-config' into 'shards'

    Add Application Setting to configure default Repository Path for new projects
    
    See merge request !4657
    YorickPeterse committed Jun 30, 2016
  32. @stanhu @YorickPeterse
  33. @YorickPeterse

    Handle external issues in IssueReferenceFilter

    IssueReferenceFilter will end up processing internal issue references
    when a project uses an external issues tracker while still using
    internal issue references (in the form of `#\d+`). This commit ensures
    that these links are rendered as external issue links, regardless of
    whether the project one currently views uses an internal or external
    issues tracker.
    
    Fixes gitlab-org/gitlab-ce#19036, gitlab-com/performance#16
    YorickPeterse committed Jun 28, 2016
  34. @grzesiek
  35. @grzesiek
Something went wrong with that request. Please try again.