delta/gitlab/gitlab-ce.git/lib, branch fix-cache-for-commit-status gitlab.com: gitlab-org/gitlab-ce.git Merge branch '23403-fix-events-for-private-project-features' into 'security' 2016-11-09T11:27:41+00:00 Robert Speicher robert@gitlab.com 2016-11-04T14:15:43+00:00 b0088b527eacd16773a85ad8f88e49de7c646cf1 Respect project visibility settings in the contributions calendar This MR fixes a number of bugs relating to access controls and date selection of events for the contributions calendar Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23403 See merge request !2019 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Respect project visibility settings in the contributions calendar

This MR fixes a number of bugs relating to access controls and date selection of events for the contributions calendar

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23403

See merge request !2019

Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch 'fix-unathorized-cloning' into 'security' 2016-11-09T11:27:17+00:00 Douwe Maan douwe@gitlab.com 2016-11-02T21:50:44+00:00 b0bf92140f469db90ef378fd42a6f65eee1d4633 Ensure external users are not able to clone disabled repositories. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23788 See merge request !2017 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Ensure external users are not able to clone disabled repositories.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23788

See merge request !2017

Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch 'markdown-xss-fix-option-2.1' into 'security' 2016-11-09T11:26:44+00:00 Douwe Maan douwe@gitlab.com 2016-11-07T16:27:35+00:00 a14ee68fe4815d2906ece670bcc333303fd3c816 Fix for HackerOne XSS vulnerability in markdown This is an updated blacklist patch to fix https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2007. No text is removed. Dangerous schemes/protocols and invalid URIs are left intact but not linked. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153 See merge request !2015 Signed-off-by: Rémy Coutable <remy@rymai.me> 
Fix for HackerOne XSS vulnerability in markdown

This is an updated blacklist patch to fix https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2007. No text is removed. Dangerous schemes/protocols and invalid URIs are left intact but not linked.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153

See merge request !2015

Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch 'issue_23548_dev' into 'master' 2016-11-09T11:25:17+00:00 Douwe Maan douwe@gitlab.com 2016-11-01T20:18:51+00:00 bf061d0aff091a73611037b811cea2d3380962f4 disable markdown in comments when referencing disabled features fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23548 This MR prevents the following references when tool is disabled: - issues - snippets - commits - when repo is disabled - commit range - when repo is disabled - milestones This MR does not prevent references to repository files, since they are just markdown links and don't leak information. See merge request !2011 Signed-off-by: Rémy Coutable <remy@rymai.me> 
disable markdown in comments when referencing disabled features

fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23548

This MR prevents the following references when tool is disabled:

- issues
- snippets
- commits - when repo is disabled
- commit range - when repo is disabled
- milestones

This MR does not prevent references to repository files, since they are just markdown links and don't leak
information.

See merge request !2011

Signed-off-by: Rémy Coutable <remy@rymai.me>
Merge branch 'faster_project_search' into 'master' 2016-11-08T15:29:56+00:00 Sean McGivern sean@mcgivern.me.uk 2016-11-08T15:29:56+00:00 0108387053ac78bb2354511950fb5847a033e5d5 Faster search inside Project See merge request !7353 

Faster search inside Project

See merge request !7353
 Merge branch 'dz-refactor-contraints' into 'master' 2016-11-08T15:01:38+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-11-08T15:01:38+00:00 c3341884107b65545f9c352d2090dc2a5cf58e19 Refactor routing constraints ## What does this MR do? Refactors routing constraints ## Why was this MR needed? This refactoring make it possible to introduce nesting namespaces and project constrainer in future. ## What are the relevant issue numbers? Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121/ See merge request !7327 

Refactor routing constraints

## What does this MR do?

Refactors routing constraints

## Why was this MR needed?

This refactoring make it possible to introduce nesting namespaces and project constrainer in future. 

## What are the relevant issue numbers?

Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121/

See merge request !7327
 Merge branch 'dz-refactor-namespace-regex' into 'master' 2016-11-08T12:51:51+00:00 Sean McGivern sean@mcgivern.me.uk 2016-11-08T12:51:51+00:00 7be41074bb6596a41a5b6689ee98ab02cf4be50a Refactor namespace regex Reuse existing namespace regex constant in routing See merge request !7336 

Refactor namespace regex

Reuse existing namespace regex constant in routing

See merge request !7336
 Add small improvements to constrainers and specs 2016-11-08T12:32:42+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-11-08T12:32:42+00:00 08d21fe89927fa9ebd3695fde047a17d27893dbf Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Faster search 2016-11-08T12:21:19+00:00 Valery Sizov valery@gitlab.com 2016-11-08T12:21:19+00:00 869696bca3d8ff72e2dbaa96744eb7a7d560f0cf 






Merge branch 'use-separate-token-for-incoming-email' into 'master'

2016-11-08T10:47:45+00:00

Douwe Maan
douwe@gitlab.com

2016-11-08T10:47:45+00:00

9c3f3e9e359740b10edafaa1b06b0ff3e2070820


Use separate email-friendly token for incoming email

See merge request !5914





Use separate email-friendly token for incoming email

See merge request !5914