summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use grpc 1.11.010-7-grpc-1.11Jacob Vosmaer2018-05-182-3/+3
|
* Update VERSION to 10.7.3v10.7.3Mayra Cabrera2018-05-021-1/+1
|
* Update CHANGELOG.md for 10.7.3Mayra Cabrera2018-05-029-40/+14
| | | [ci skip]
* Merge branch '10-7-stable-patch-3' into '10-7-stable'Robert Speicher2018-05-0259-340/+735
|\ | | | | | | | | Prepare 10.7.3 release See merge request gitlab-org/gitlab-ce!18647
| * Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-05-023-2/+27
| |
| * Merge branch 'make-job-lfs-artifacts-read-only' into 'master'Douwe Maan2018-05-028-22/+20
| | | | | | | | | | Fix file_store for artifacts and lfs when saving See merge request gitlab-org/gitlab-ce!18624
| * Merge branch 'bvl-fix-openid-redirect' into 'master'Douwe Maan2018-05-025-1/+23
| | | | | | | | | | | | | | Skip `authenticate_user!` for Doorkeeper controllers Closes #44639 See merge request gitlab-org/gitlab-ce!18599
| * Merge branch 'dm-commit-trailer-without-gravatar' into 'master'Robert Speicher2018-05-0210-227/+250
| | | | | | | | | | | | | | Fix commit trailer rendering when Gravatar is disabled Closes #45633 See merge request gitlab-org/gitlab-ce!18586
| * Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-05-028-8/+158
| | | | | | | | | | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite See merge request gitlab-org/gitlab-ce!18580
| * Merge branch 'update-doorkeeper-changelog' into 'master'Stan Hu2018-05-021-0/+5
| | | | | | | | | | Add changelog entry for updating doorkeeper See merge request gitlab-org/gitlab-ce!18550
| * 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
* | Merge branch '10-7-stable' of gitlab.com:gitlab-org/gitlab-ce into 10-7-stableMayra Cabrera2018-04-301-1/+1
|\ \
| * \ Merge branch 'update-pages-for-10-7' into '10-7-stable'Kamil Trzciński2018-04-301-1/+1
| |\ \ | | |/ | |/| | | | | | | Update GitLab Pages to v0.8.1 (v10.7) See merge request gitlab-org/gitlab-ce!18625
| | * Update GitLab Pages to v0.8.1Nick Thomas2018-04-271-1/+1
| |/
* | Update VERSION to 10.7.2v10.7.2Mayra Cabrera2018-04-251-1/+1
| |
* | Update CHANGELOG.md for 10.7.2Mayra Cabrera2018-04-253-10/+8
| | | | | | [ci skip]
* | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-255-72/+144
| | | | | | | | | | Serve archive requests with the correct file in all cases (10.7) See merge request gitlab/gitlabhq!2376
* | Merge branch '10-7-security_issue_42029' into 'security-10-7'Phil Hughes2018-04-244-2/+17
|/ | | | | Sanitize user name to avoid XSS attacks See merge request gitlab/gitlabhq!2373
* 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