delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update maven template with correct linktrizzi-master-patch-43016	Tim Rizzi	2019-06-04	1	-2/+2
\|
*	Merge branch 'bvl-design-diff-notes-ce' into 'master'	Douwe Maan	2019-06-04	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Adjustments related to DiffNotes on diffs outside of a project's main repository See merge request gitlab-org/gitlab-ce!29023
\| *	Make `resolvable_types` a class method	Bob Van Landuyt	2019-06-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	This turns Notable::RESOLVABLE_TYPES into a `Notable.resolvable_types`. That allows us to override it in EE.
* \|	Merge branch 'trizzi-master-patch-86505' into 'master'	Dmitriy Zaporozhets	2019-06-04	1	-59/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update maven.gitlab-ci.yml for GitLab Package See merge request gitlab-org/gitlab-ce!28796
\| * \|	Clarify error message and image in ymltrizzi-master-patch-86505	Tim Rizzi	2019-06-03	1	-3/+4
\| \| \|
\| * \|	Update yml file comments re: deploy	Tim Rizzi	2019-05-30	1	-4/+4
\| \| \|
\| * \|	Update instructions and uncomment out deploy	Tim Rizzi	2019-05-30	1	-13/+13
\| \| \|
\| * \|	Simplify deploy script and comment out for CE	Tim Rizzi	2019-05-30	1	-11/+16
\| \| \|
\| * \|	Update maven.gitlab-ci.yml for GitLab Package	Tim Rizzi	2019-05-27	1	-59/+9
\| \| \|
* \| \|	Ignore Puma empty worker stats	Jan Provaznik	2019-06-04	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In some cases (during worker start) it's possible that Puma.stats returns an empty hash for worker's last status. In that case we just skip sampling of the worker until these stats are available.
* \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Robert Speicher	2019-06-03	2	-1/+14
\|\ \ \
\| * \ \	Merge branch 'security-60143-address-xss-issue-master' into 'master'	Robert Speicher	2019-06-03	1	-0/+8
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reject slug+uri concat if slug is deemed unsafe See merge request gitlab/gitlabhq!3108
\| \| * \| \|	Reject slug+uri concat if slug is deemed unsafe	Kerri Miller	2019-05-24	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First reported: https://gitlab.com/gitlab-org/gitlab-ce/issues/60143 When the page slug is "javascript:" and we attempt to link to a relative path (using `.` or `..`) the code will concatenate the slug and the uri. This MR adds a guard to that concat step that will return `nil` if the incoming slug matches against any of the "unsafe" slug regexes; currently this is only for the slug "javascript:" but can be extended if needed. Manually tested against a non-exhaustive list from OWASP of common javascript XSS exploits that have to to with mangling the "javascript:" method, and all are caught by this change or by existing code that ingests the user-specified slug.
\| * \| \| \|	Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'	Robert Speicher	2019-06-03	1	-1/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Persistent XSS in note objects CE See merge request gitlab/gitlabhq!3075
\| \| * \| \| \|	Change `prohibited_key` to use regexes	charlieablett	2019-05-01	1	-4/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Add `html` to sensitive words	charlieablett	2019-05-01	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Refactor `attribute_cleaner` for readability	charlieablett	2019-04-30	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Further clarify `attribute_cleaner`	charlieablett	2019-04-29	1	-10/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Tighten up prohibited_key method	charlieablett	2019-04-26	1	-3/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Use English instead of Latin	Charlie Ablett	2019-04-25	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Add disallowed fields to AttributeCleaner	charlieablett	2019-04-24	2	-4/+13
\| \| \| \| \| \|
\| \| * \| \| \|	Exclude fields from note import	charlieablett	2019-04-23	1	-0/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'	Douwe Maan	2019-06-03	2	-19/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatically update MR merge-ref along merge status Closes #58495 See merge request gitlab-org/gitlab-ce!28513
\| * \| \| \| \| \|	Add payload to the service response	Oswaldo Ferreira	2019-05-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This introduces payload to the ServiceResponse with the merge ref HEAD commit data
\| * \| \| \| \| \|	Simplify merge_ref_head methods	Oswaldo Ferreira	2019-05-31	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Automatically update MR merge-ref along merge status	Oswaldo Ferreira	2019-05-31	2	-19/+7
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* \| \| \| \| \|	Merge dev.gitlab.org master into GitLab.com master	Yorick Peterse	2019-06-03	9	-29/+145
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'security-fix_milestones_search_api_leak' into 'master'	GitLab Release Tools Bot	2019-06-03	2	-3/+31
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve: Milestones leaked via search API Closes #2822 See merge request gitlab/gitlabhq!2997
\| \| * \| \| \| \|	Resolve: Milestones leaked via search API	Felipe Artur	2019-05-20	2	-3/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestone titles being leaked using search API when users cannot read milestones
\| * \| \| \| \| \|	Merge branch 'security-60039' into 'master'	GitLab Release Tools Bot	2019-06-03	1	-2/+21
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disallow invalid MR branch name See merge request gitlab/gitlabhq!3052
\| \| * \| \| \| \| \|	Validate MR branch names	Mark Chao	2019-05-03	1	-2/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents refspec as branch name, which would bypass branch protection when used in conjunction with rebase. HEAD seems to be a special case with lots of occurrence, so it is considered valid for now. Another special case is `refs/head/*`, which can be imported.
\| * \| \| \| \| \| \|	Merge branch 'security-id-leaked-password-in-import-url-frontend' into 'master'	GitLab Release Tools Bot	2019-06-03	1	-0/+4
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handling password on import by url page See merge request gitlab/gitlabhq!3061
\| \| * \| \| \| \| \| \|	Hide password on import by url form	Igor Drozdov	2019-05-29	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'dm-http-hostname-override' into 'master'	GitLab Release Tools Bot	2019-06-03	4	-22/+84
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Protect Gitlab::HTTP against DNS rebinding attack See merge request gitlab/gitlabhq!3071
\| \| * \| \| \| \| \| \| \|	Add DNS rebinding protection settings	Oswaldo Ferreira	2019-05-30	3	-11/+37
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Protect Gitlab::HTTP against DNS rebinding attack	Douwe Maan	2019-05-30	3	-22/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::HTTP now resolves the hostname only once, verifies the IP is not blocked, and then uses the same IP to perform the actual request, while passing the original hostname in the `Host` header and SSL SNI field.
\| * \| \| \| \| \| \| \| \|	Merge branch 'security-fix-project-existence-disclosure-master' into 'master'	GitLab Release Tools Bot	2019-06-03	1	-2/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix url redaction for issue links See merge request gitlab/gitlabhq!3091
\| \| * \| \| \| \| \| \| \|	Fix url redaction for issue links	Patrick Derichs	2019-05-03	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry Add missing href to all redactor specs and removed href assignment Remove obsolete spec If original_content is given, it should be used for link content
* \| \| \| \| \| \| \| \| \|	Merge branch 'ac-graphql-stats' into 'master'	Dmitriy Zaporozhets	2019-06-03	1	-0/+23
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Namespace and ProjectStatistics to GraphQL API See merge request gitlab-org/gitlab-ce!28277
\| * \| \| \| \| \| \| \| \| \|	Add Namespace and ProjectStatistics to GraphQL API	Alessio Caiazza	2019-06-03	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We can query namespaces, and nested projects. Projects now exposes statistics
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'abstract-auto-merge' into 'master'	Kamil Trzciński	2019-06-03	1	-7/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and abstract Auto Merge Processes See merge request gitlab-org/gitlab-ce!28595
\| * \| \| \| \| \| \| \| \| \| \|	Abstract auto merge processes	Shinya Maeda	2019-06-03	1	-7/+4
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have one auto merge strategy today - Merge When Pipeline Succeeds. In order to add more strategies for Merge Train feature, we abstract the architecture to be more extensible. Removed arguments Fix spec
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ce-fj-11886-fix-port-validation' into 'master'	Kamil Trzciński	2019-06-03	2	-1/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix port validations in .gitlab-webide.yml See merge request gitlab-org/gitlab-ce!29016
\| * \| \| \| \| \| \| \| \| \|	Fix port validations in .gitlab-webide.ymlce-fj-11886-fix-port-validation	Francisco Javier López	2019-06-01	2	-1/+4
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Remove delta island feature flag	Zeger-Jan van de Weg	2019-06-03	1	-1/+1
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delta islands were implemented last released in: https://gitlab.com/gitlab-org/gitaly/merge_requests/1110. It's been enabled on production and works as expected.
* \| \| \| \| \| \| \| \|	Merge branch 'osw-reset-merge-status-from-mergeable-mrs' into 'master'	Douglas Barbosa Alexandre	2019-05-31	1	-0/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset merge status from mergeable MRs See merge request gitlab-org/gitlab-ce!28843
\| * \| \| \| \| \| \| \| \|	Reset merge status from mergeable MRs	Oswaldo Ferreira	2019-05-31	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds migrations to reset the merge_status of opened, mergeable MRs. That's required by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28513 so we're able to sync the status update along merge-ref, without leaving MRs with a stale merge-ref.
* \| \| \| \| \| \| \| \| \|	Add optional param :start_project to allow variable commit targets	Kerri Miller	2019-05-31	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This extends POST#:id/repository/commits to allow the optional parameter `:start_project`, which will allow targeting other projects besides the one derived from `:id`. Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/50850
* \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-version-v1.43.0' into 'master'	Bob Van Landuyt	2019-05-31	2	-40/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Gitaly to v1.43.0 See merge request gitlab-org/gitlab-ce!28867
\| * \| \| \| \| \| \| \| \| \|	Remove hook directory requirement from Shellgitaly-version-v1.43.0	Zeger-Jan van de Weg	2019-05-30	2	-40/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It used to be the case that GitLab created symlinks for each repository to one copy of the Git hooks, so these ran when required. This changed to set the hooks dynamically on Gitaly when invoking Git. The side effect is that we didn't need all these symlinks anymore, which Gitaly doesn't create anymore either. Now that means that the tests in GitLab-Rails should test for it either. Related: https://gitlab.com/gitlab-org/gitaly/issues/1392#note_175619926