summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 10.6.6v10.6.610-6-stableFilipa Lacerda2018-05-281-1/+1
|
* Update CHANGELOG.md for 10.6.6Filipa Lacerda2018-05-285-20/+10
| | | [ci skip]
* Merge branch 'security-fj-import-export-assignment-10-6' into 'security-10-6'Mayra Cabrera2018-05-2512-13/+97
| | | | | [10.6] Arbitrary assignment of Project fields using "Import project" from a Gitlab tar.gz See merge request gitlab/gitlabhq!2392
* Merge branch '42682-merge-request-internal-access' into 'security-10-6'Sean McGivern2018-05-259-12/+97
| | | | | Do not allow non-members to create MRs via forked projects when MRs are private See merge request gitlab/gitlabhq!2368
* Merge branch 'security-dm-delete-deploy-key-10-6' into 'security-10-6'Mayra Cabrera2018-05-253-4/+47
| | | | | [10.6] Fix API to remove deploy key from project instead of deleting it entirely See merge request gitlab/gitlabhq!2381
* Merge branch ↵Filipa Lacerda2018-05-253-2/+18
| | | | | | | 'security-10-6-users-can-update-their-password-without-entering-current-password' into 'security-10-6' [10.6] No longer allow password change without previous password being provided See merge request gitlab/gitlabhq!2385
* Update VERSION to 10.6.5v10.6.5Mayra Cabrera2018-04-241-1/+1
|
* Update CHANGELOG.md for 10.6.5Mayra Cabrera2018-04-242-5/+7
| | | [ci skip]
* Merge branch 'security_issue_42029' into 'security-10-6'Phil Hughes2018-04-244-2/+18
| | | | | Sanitizes user name to avoid XSS attacks See merge request gitlab/gitlabhq!2365
* 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
* Update VERSION to 10.6.4v10.6.4Mayra Cabrera2018-04-091-1/+1
|
* Update CHANGELOG.md for 10.6.4Mayra Cabrera2018-04-0910-45/+18
| | | [ci skip]
* Merge branch '10-6-stable-patch-4' into '10-6-stable'Mayra Cabrera2018-04-0952-67/+313
|\ | | | | | | | | Prepare 10.6.4 release See merge request gitlab-org/gitlab-ce!18252
| * Merge branch 'sh-fix-recaptcha-test' into 'master'10-6-stable-patch-4Stan Hu2018-04-092-4/+1
| | | | | | | | | | | | | | Fix the reCAPTCHA spec failures by not rendering the widget in test mode Closes #45138 See merge request gitlab-org/gitlab-ce!18235
| * Fix broken eslint rule in ↵Filipa Lacerda2018-04-091-1/+1
| | | | | | | | spec/javascripts/notes/components/noteable_discussion_spec.js
| * Merge branch '45070-prometheus-integration-via-kubernetes-is-broken' into ↵Kamil Trzciński2018-04-092-0/+6
| | | | | | | | | | | | | | | | | | 'master' Override Prometheus service name to fix integration with GitLab. Closes #45070 See merge request gitlab-org/gitlab-ce!18206
| * Merge branch 'issue_44551' into 'master'Sean McGivern2018-04-097-8/+69
| | | | | | | | | | | | | | Fix 404 in group boards when moving issue between lists Closes #44551 See merge request gitlab-org/gitlab-ce!18064
| * Merge branch 'fix/sm/fix-wrong-error-handling-in-update-page-service' into ↵Kamil Trzciński2018-04-092-11/+48
| | | | | | | | | | | | | | | | | | 'master' Fix wrong error handling in update page service Closes #44817 See merge request gitlab-org/gitlab-ce!18098
| * Merge branch 'sh-cleanup-pages-worker' into 'master'Nick Thomas2018-04-092-0/+8
| | | | | | | | | | Free open file descriptors and libgit2 buffers in UpdatePagesService See merge request gitlab-org/gitlab-ce!18099
| * Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master'Kamil Trzciński2018-04-094-1/+26
| | | | | | | | | | | | | | Fix background pipeline stages migration Closes #44135 See merge request gitlab-org/gitlab-ce!18076
| * Merge branch 'jivl-change-copy-text-promote-milestones-labels' into 'master'Sean McGivern2018-04-0914-12/+45
| | | | | | | | | | | | | | Fix promoting labels and milestones copy text Closes #44208 See merge request gitlab-org/gitlab-ce!17726
| * Merge branch '44717-no-resolve-issue' into 'master'Fatih Acet2018-04-093-7/+22
| | | | | | | | | | | | | | Resolve "There should not be a jump discussion button on issues" Closes #44717 See merge request gitlab-org/gitlab-ce!18034
| * Merge branch 'docs-fix_code_quality_example_documentation' into 'master'Achilleas Pipinellis2018-04-091-6/+1
| | | | | | | | | | Fix code quality example documentation See merge request gitlab-org/gitlab-ce!18053
| * Merge branch '44649-reference-parsing-conflicting-with-auto-linking' into ↵Douwe Maan2018-04-093-2/+20
| | | | | | | | | | | | | | | | | | 'master' Resolve "Reference parsing conflicting with auto-linking" Closes #44649 See merge request gitlab-org/gitlab-ce!18045
| * Merge branch '43794-fix-domain-verification-validation-errors' into 'master'Grzegorz Bizon2018-04-093-3/+31
| | | | | | | | | | | | | | Resolve "ActiveRecord::RecordInvalid: Validation failed: Certificate misses intermediates" Closes #43794 See merge request gitlab-org/gitlab-ce!17992
| * Merge branch 'dm-refs-contains-sha-encoding' into 'master'Sean McGivern2018-04-093-2/+11
| | | | | | | | | | | | | | Fix listing commit branch/tags that contain special characters Closes #43212 See merge request gitlab-org/gitlab-ce!18023
| * Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into ↵Kamil Trzciński2018-04-097-12/+26
|/ | | | | | | 'master' Port to CE: Resolve "Multiple clusters: incorrect cluster details injected - environment scope is ignored" See merge request gitlab-org/gitlab-ce!17904
* Update VERSION to 10.6.3v10.6.3Filipa Lacerda2018-04-031-1/+1
|
* Update CHANGELOG.md for 10.6.3Filipa Lacerda2018-04-033-10/+8
| | | [ci skip]
* Merge branch 'jej/mattermost-notification-confidentiality-10-6' into ↵Douwe Maan2018-04-0335-21/+498
| | | | | | | 'security-10-6' [10.6] Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2366
* Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-033-4/+38
| | | | | Port of "Fix XSS on commit diff view" for 10-6 See merge request gitlab/gitlabhq!2364
* Merge branch 'fl-fix-milestone-bug-10-6' into 'security-10-6'Phil Hughes2018-04-032-4/+21
| | | | | Escape miletone attribute when appending to the DOM See merge request gitlab/gitlabhq!2359
* Update VERSION to 10.6.2v10.6.2Filipa Lacerda2018-03-291-1/+1
|
* Update CHANGELOG.md for 10.6.2Filipa Lacerda2018-03-293-10/+8
| | | [ci skip]
* Merge branch 'cherry-pick-058dd1' into '10-6-stable'Marin Jankovski2018-03-293-13/+15
|\ | | | | | | | | [10.6] Autolinking includes trailing exclamation marks See merge request gitlab-org/gitlab-ce!18077
| * Merge branch '44587-autolinking-includes-trailing-exclamation-marks' into ↵cherry-pick-058dd1Robert Speicher2018-03-293-13/+15
| | | | | | | | | | | | | | | | | | 'master' Resolve "Autolinking includes trailing exclamation marks" Closes #44587 See merge request gitlab-org/gitlab-ce!17965
* | Merge branch 'cherry-pick-ab8f13c3' into '10-6-stable'Marin Jankovski2018-03-296-22/+28
|\ \ | |/ |/| | | | | [10.6] Fix LDAP login without user in DB See merge request gitlab-org/gitlab-ce!18075
| * Merge branch 'fix/ldap_wihtout_user' into 'master'cherry-pick-ab8f13c3Douwe Maan2018-03-296-22/+28
|/ | | | | | | | | Fix LDAP login without user in DB See merge request gitlab-org/gitlab-ce!17988 (cherry picked from commit ab8f13c3ef6e07eb8d44805dc9eef4b008e1bbe9) 7d017926 Fix LDAP login without user in DB
* Update VERSION to 10.6.1v10.6.1Filipa Lacerda2018-03-271-1/+1
|
* Update CHANGELOG.md for 10.6.1Filipa Lacerda2018-03-276-25/+20
| | | [ci skip]
* Merge branch '10-6-stable-patch-1' into '10-6-stable'James Lopez2018-03-272-1/+6
|\ | | | | | | | | Prepare 10.6.1 release See merge request gitlab-org/gitlab-ce!17989
| * Merge branch 'bug/44103-ie11-compatibility' into 'master'10-6-stable-patch-1Fatih Acet2018-03-261-0/+1
| | | | | | | | | | | | | | Array.fill polyfill for IE 11 compatibility. Closes #44103 See merge request gitlab-org/gitlab-ce!17897
| * Merge branch 'docs/rs-update-changelog' into 'master'Douwe Maan2018-03-261-1/+5
|/ | | | | | | Add missing changelog entries for 10.6.0 See merge request gitlab-org/gitlab-ce!17973 [ci skip]
* Merge branch '10-6-stable-patch-1' into '10-6-stable'Robert Speicher2018-03-2331-60/+957
|\ | | | | | | | | Prepare 10.6.1 release See merge request gitlab-org/gitlab-ce!17938
| * Merge branch ↵Stan Hu2018-03-237-17/+73
| | | | | | | | | | | | | | | | | | '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master' Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error" Closes #44564 See merge request gitlab-org/gitlab-ce!17962
| * Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-232-1/+6
| | | | | | | | | | | | | | Fix EncodingHelper#clean blowing up on UTF-16BE strings Closes gitaly#1101 See merge request gitlab-org/gitlab-ce!17943
| * Merge branch 'sh-update-loofah' into 'master'Robert Speicher2018-03-233-5/+12
| | | | | | | | | | | | | | Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4 Closes #44554 See merge request gitlab-org/gitlab-ce!17945
| * Merge branch 'docs/ci-caching' into 'master'Marcia Ramos2018-03-234-22/+702
| | | | | | | | | | | | | | | | Add docs on CI caching Closes #32515, #18945, and gitlab-runner#1621 See merge request gitlab-org/gitlab-ce!12183
| * Merge branch 'fix-ci-job-auto-retry' into 'master'Grzegorz Bizon2018-03-233-1/+39
| | | | | | | | | | Prevent auto-retry AccessDenied error from stopping transition to failed See merge request gitlab-org/gitlab-ce!17862
| * Merge branch 'ee-5063-to-ce-backport' into 'master'Douwe Maan2018-03-233-5/+5
| | | | | | | | | | Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE See merge request gitlab-org/gitlab-ce!17909
View Lorry Controller Status