summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue_45463' into 'master'Sean McGivern2018-05-024-4/+50
| | | | | | | Fix users not seeing labels from private groups when being a member of a child project Closes #45463 See merge request gitlab-org/gitlab-ce!18544
* Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan2018-05-0216-72/+176
| | | | | | | Fix errors on pushing/editing files on empty repositories Closes #44618 and #42583 See merge request gitlab-org/gitlab-ce!18462
* Merge branch '44775-avatar-on-os-fails-with-cdn' into 'master'John Northrup2018-05-024-4/+26
| | | | | | | Resolve "Avatar URLs are wrong when using a CDN path and Object Storage" Closes #44775 See merge request gitlab-org/gitlab-ce!18092
* Update VERSION to 10.7.1v10.7.1Mayra Cabrera2018-04-231-1/+1
|
* Update CHANGELOG.md for 10.7.1Mayra Cabrera2018-04-2317-82/+28
| | | [ci skip]
* Merge branch '10-7-stable-patch-1' into '10-7-stable'Stan Hu2018-04-23130-1052/+4067
|\ | | | | | | | | Prepare 10.7.1 release See merge request gitlab-org/gitlab-ce!18500
| * Merge branch '45433-upgrade-doorkeeper' into 'master'Marin Jankovski2018-04-231-1/+1
| | | | | | | | | | | | | | Update doorkeeper Closes #45433 and #45647 See merge request gitlab-org/gitlab-ce!18543
| * Merge branch '45625-job-log-shows-no-job-log' into 'master'Grzegorz Bizon2018-04-231-0/+5
| | | | | | | | | | | | | | Removes 'Job log message' from build trace Closes #45625 See merge request gitlab-org/gitlab-ce!18523
| * Merge branch 'docs-pages-update2' into 'master'Robert Speicher2018-04-231-5/+31
| | | | | | | | | | add restart of gitlab-pages to apply gitlab pages settings See merge request gitlab-org/gitlab-ce!18455
| * Add missing web ide imagesJames Ramsay2018-04-233-0/+0
| |
| * Remove a test case that has been incorrectly pickedGrzegorz Bizon2018-04-231-28/+0
| |
| * Merge branch '10-7-stable-patch-1-fix-gitaly-proto-version' into ↵Filipa Lacerda2018-04-232-4/+4
| |\ | | | | | | | | | | | | | | | | | | '10-7-stable-patch-1' Fix gitaly-proto version for gitlab-ce v10.7.1 See merge request gitlab-org/gitlab-ce!18510
| | * GetSnapshot RPC requires gitaly-proto v0.9610-7-stable-patch-1-fix-gitaly-proto-versionNick Thomas2018-04-202-4/+4
| |/
| * Merge branch 'sh-downgrade-mysql-ci' into 'master'Robert Speicher2018-04-201-1/+1
| | | | | | | | | | | | | | Downgrade MySQL CI service from 8.0 to 5.7 Closes #45606 See merge request gitlab-org/gitlab-ce!18512
| * Merge branch '39345-get-raw-archive' into 'master'Douwe Maan2018-04-2012-2/+193
| | | | | | | | | | | | | | Add an API endpoint to download git repository snapshots Closes #39345 See merge request gitlab-org/gitlab-ce!18173
| * Merge branch '45514-resolved-table' into 'master'Filipa Lacerda2018-04-202-2/+11
| | | | | | | | | | | | | | Resolve "Text from the diff is showing within a table header inside the discussion after the discussion is resolved" Closes #45514 See merge request gitlab-org/gitlab-ce!18492
| * Merge branch 'issue_45435' into 'master'Phil Hughes2018-04-202-0/+9
| | | | | | | | | | | | | | Fix issues without links when added from boards new issue modal Closes #45435 See merge request gitlab-org/gitlab-ce!18460
| * Merge branch '45543_update_container_scanning_documentation' into 'master'Robert Speicher2018-04-201-0/+3
| | | | | | | | | | | | | | Update Container Scanning documentation Closes #45543 See merge request gitlab-org/gitlab-ce!18479
| * Merge branch 'fj-42601-respect-visibility-options' into 'master'Douwe Maan2018-04-203-4/+26
| | | | | | | | | | | | | | Respect visibility options and description when importing project from template Closes #42601 See merge request gitlab-org/gitlab-ce!18473
| * Merge branch 'fix-direct-upload-for-old-records' into 'master'Grzegorz Bizon2018-04-207-47/+204
| | | | | | | | | | | | Fix direct_upload for old records See merge request gitlab-org/gitlab-ce!18360
| * Merge branch '45476-geo-statement-timeout-counting-local-job-artifacts' into ↵Yorick Peterse2018-04-203-1/+22
| | | | | | | | | | | | | | | | | | 'master' Resolve "Geo: Statement timeout counting local job artifacts" Closes #45476 See merge request gitlab-org/gitlab-ce!18444
| * Merge branch '45507-fix-repository-archive-url' into 'master'Douwe Maan2018-04-203-5/+36
| | | | | | | | | | | | | | Fix specifying a non-default ref when requesting an archive using the legacy URL Closes #45507 See merge request gitlab-org/gitlab-ce!18468
| * Merge branch 'sh-fix-award-emoji-nplus-one-participants' into 'master'Yorick Peterse2018-04-203-1/+23
| | | | | | | | | | | | | | Fix N+1 queries when loading participants for a commit note Closes #45526 See merge request gitlab-org/gitlab-ce!18471
| * Merge branch 'ide-subgroup-fix' into 'master'Filipa Lacerda2018-04-203-2/+32
| | | | | | | | | | | | | | Fixed web IDE not working for sub-groups Closes #45412 See merge request gitlab-org/gitlab-ce!18404
| * Merge branch 'docs-fix-sp-examples' into 'master'Marcia Ramos2018-04-201-1/+5
| | | | | | | | | | Fix code climate example See merge request gitlab-org/gitlab-ce!18267
| * Merge branch 'docs-fix_dast_example' into 'master'Marcia Ramos2018-04-201-3/+3
| | | | | | | | | | Fix DAST example in documentation See merge request gitlab-org/gitlab-ce!18456
| * Merge branch 'sh-fix-web-ide-typo-docs' into 'master'Rémy Coutable2018-04-201-1/+1
| | | | | | | | | | Fix Markdown typo in Web IDE docs See merge request gitlab-org/gitlab-ce!18443
| * Merge branch 'docs-web-ide-ce-fix' into 'master'Marcia Ramos2018-04-201-0/+33
| | | | | | | | | | | | Docs: update Web IDE > CE (10.7) See merge request gitlab-org/gitlab-ce!18433
| * Merge branch '45446-new-sha-widget-breaks-on-new-merge-request' into 'master'Filipa Lacerda2018-04-202-5/+1
| | | | | | | | | | | | | | Fix regression around new SHA widget in "New Merge Request" Screen Closes #45446 See merge request gitlab-org/gitlab-ce!18422
| * Merge branch 'docs-update-assign-labels-to-subgroups' into 'master'Sean McGivern2018-04-201-2/+1
| | | | | | | | | | Docs assign labels to subgroups See merge request gitlab-org/gitlab-ce!18438
| * Merge branch '44981-http-io-trace-with-multi-byte-char' into 'master'Kamil Trzciński (OoO till 16th of April)2018-04-204-617/+2893
| | | | | | | | | | | | | | Fix `Trace::HttpIO` can not render multi-byte chars Closes #44981 See merge request gitlab-org/gitlab-ce!18417
| * Merge branch 'docs-add-badges' into 'master'Gabriel Mazetto2018-04-208-26/+51
| | | | | | | | | | | | | | Docs: add product badges to docs Closes #42631 See merge request gitlab-org/gitlab-ce!18408
| * Merge branch 'ide-tree-loading-fix' into 'master'Filipa Lacerda2018-04-203-6/+17
| | | | | | | | | | Fixed loading state not showing in IDE tree list See merge request gitlab-org/gitlab-ce!18421
| * Merge branch ↵Nick Thomas2018-04-204-3/+24
| | | | | | | | | | | | | | | | | | '45363-optional-params-on-api-endpoint-produce-invalid-pagination-header-links' into 'master' Fix URLs in the `Link` header for `GET /projects/:id/repository/contributors` when no value is passed for `order_by` or `sort` Closes #45363 See merge request gitlab-org/gitlab-ce!18393
| * Merge branch 'fix/gb/fix-empty-secret-variables' into 'master'Stan Hu2018-04-203-3/+8
| | | | | | | | | | | | | | Fix a case with empty secret CI/CD variables Closes #31929 See merge request gitlab-org/gitlab-ce!18400
| * Merge branch ↵Phil Hughes2018-04-202-18/+14
| | | | | | | | | | | | | | | | | | '45406-error-getting-performance-bar-results-for-uuid-regularly-seen-in-production' into 'master' Resolve ""Error getting performance bar results for [UUID]" regularly seen in production" Closes #45406 See merge request gitlab-org/gitlab-ce!18419
| * Merge branch 'rendering-markdown-multiple-projects' into 'master'Douwe Maan2018-04-2038-98/+254
| | | | | | | | | | Optimise rendering of Markdown documents that belong to different projects See merge request gitlab-org/gitlab-ce!18157
| * Merge branch '44294-skeleton-lines' into 'master'Phil Hughes2018-04-205-68/+34
| | | | | | | | | | | | | | Resolve "skeleton placeholder on diff has white background" Closes #44294 See merge request gitlab-org/gitlab-ce!17792
| * Merge branch 'ab-45247-project-lookups-validation' into 'master'Yorick Peterse2018-04-203-2/+49
| | | | | | | | | | | | | | Validate project path prior to hitting the database. Closes #45247 See merge request gitlab-org/gitlab-ce!18322
| * Merge branch ↵Mike Greiling2018-04-202-4/+3
| | | | | | | | | | | | | | | | | | '45353-raw-html-is-being-shown-on-the-mr-page-from-performance-widget' into 'master' Resolve "Raw HTML is being shown on the MR page from Performance widget" Closes #45353 See merge request gitlab-org/gitlab-ce!18370
| * Merge branch 'ide-mr-changes-alert-box' into 'master'Filipa Lacerda2018-04-203-85/+75
| | | | | | | | | | | | | | Remove confirm box when redirecting to new merge request form in IDE Closes #45326 See merge request gitlab-org/gitlab-ce!18362
| * Merge branch 'ide-firefox-scroll-fix' into 'master'Filipa Lacerda2018-04-201-1/+2
| | | | | | | | | | | | | | Fixed IDE sidebar not being scrollable in FireFox Closes #45314 See merge request gitlab-org/gitlab-ce!18350
| * Merge branch 'changes-bar-peek-id-change' into 'master'Filipa Lacerda2018-04-201-28/+21
| | | | | | | | | | Changes the ID for the performance bar to correctly sticky the stat bar to the top See merge request gitlab-org/gitlab-ce!18359
| * Merge branch '45287-align-icons' into 'master'Phil Hughes2018-04-202-7/+6
| | | | | | | | | | | | | | Resolve "Retry icon is misaligned in pipelines graph actions" Closes #45287 See merge request gitlab-org/gitlab-ce!18345
* | Update VERSION to 10.7.0v10.7.0James Lopez2018-04-201-1/+1
| |
* | Update CHANGELOG.md for 10.7.0James Lopez2018-04-20184-924/+207
|/ | | [ci skip]
* Update VERSION to 10.7.0-rc7v10.7.0-rc7Robert Speicher2018-04-181-1/+1
|
* Merge branch '5706-fix_container_scanning_in_vendored_gitlab_ci_yml' into ↵Robert Speicher2018-04-181-1/+3
| | | | | | | | | | 'master' Resolve "Avoid possible infinite loops in Container Scanning" See merge request gitlab-org/gitlab-ce!18467 (cherry picked from commit 371a9edc96810385189bb779ab2b43c19991d7dd)
* Merge branch 'revert-goldiloader' into 'master'Robert Speicher2018-04-1821-173/+42
| | | | | | | | Revert the addition of goldiloader See merge request gitlab-org/gitlab-ce!18458 (cherry picked from commit aa2bb207560e06d81ae4fcf07ee4bb86dfa862a1)
* Merge branch '10-7-stable-prepare-rc7' into '10-7-stable'Robert Speicher2018-04-182-5/+1
|\ | | | | | | | | Prepare 10.7 RC7 release See merge request gitlab-org/gitlab-ce!18446