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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'gitaly-write-ref-error-handling' into 'master'	Robert Speicher	2018-01-22	1	-13/+19
\|\ \| \| \| \| \| \| \| \|	Wrap Rugged-exceptions in Gitlab::Git::Repository#write_ref See merge request gitlab-org/gitlab-ce!16570
\| *	Move error-handling to lib/gitlab/git	Kim "BKC" Carlbäcker	2018-01-22	1	-2/+4
\| \|
\| *	Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handling	Kim "BKC" Carlbäcker	2018-01-18	1	-13/+17
\| \|
* \|	Merge branch '41673-blank-query-members-api' into 'master'	Rémy Coutable	2018-01-22	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Project/#/Members?query= blank causes 500 error" Closes #41673 See merge request gitlab-org/gitlab-ce!16235
\| * \|	Fix error on empty query for Members API	Mark Fletcher	2018-01-21	2	-2/+2
\| \| \|
* \| \|	Merge branch 'patch-19' into 'master'	Rémy Coutable	2018-01-22	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	minor typo fix See merge request gitlab-org/gitlab-ce!16543
\| * \| \|	typo fix	Ben Bodenmiller	2018-01-18	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-write-repo-config-prep' into 'master'	Douwe Maan	2018-01-22	1	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move rugged-call from Project#write_repository_config to Git::Repository#write_config See merge request gitlab-org/gitlab-ce!16572
\| * \| \| \|	_never_ unset gitlab.full_pathgitaly-write-repo-config-prep	Kim "BKC" Carlbäcker	2018-01-19	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Move rugged-call from Project#write_repository_config to ↵	Kim "BKC" Carlbäcker	2018-01-19	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Git::Repository#write_config
* \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-01-22	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42231-protected-branches-api-route-returns-404-for-branches-with-dots' into 'master' Resolve "Protected branches API route returns 404 for branches with dots" Closes #42231 See merge request gitlab-org/gitlab-ce!16591
\| * \| \| \| \|	Fix protected branches API to accept name parameter with dot	Mark Fletcher	2018-01-19	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix-redirect-routes-schema' into 'master'	Yorick Peterse	2018-01-19	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rework indexes on redirect_routes See merge request gitlab-org/gitlab-ce!16211
\| * \| \| \| \|	Rework indexes on redirect_routes to be more effective and enforce a case ↵fix-redirect-routes-schema	Greg Stark	2018-01-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	insensitive unique path
* \| \| \| \| \|	Merge branch 'fix-derefenced-target' into 'master'	Douwe Maan	2018-01-19	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dereferenced_target naming in Gitlab::Git::Ref initialize See merge request gitlab-org/gitlab-ce!16504
\| * \| \| \| \| \|	Fix dereferenced_target naming in Gitlab::Git::Ref initialize	Serdar Dogruyol	2018-01-17	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '42159-utf8-uploads' into 'master'	Douwe Maan	2018-01-19	1	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly escape UTF-8 path elements for uploads Closes #42159 See merge request gitlab-org/gitlab-ce!16560
\| * \| \| \| \| \| \|	Correctly escape UTF-8 path elements for uploads	Nick Thomas	2018-01-18	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Resolve "Projects API: filter 'with_issues_enabled=true' returns projects ↵	Jan Christophersen	2018-01-19	1	-2/+2
\| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with 'issues_enabled=false'"
* \| \| \| \| \| \|	Merge branch 'background-migration-fix' into 'master'	Douwe Maan	2018-01-18	2	-2/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce UPDATEs for background column type changes Closes #42158 See merge request gitlab-org/gitlab-ce!16551
\| * \| \| \| \| \|	Reduce UPDATEs for background column type changesbackground-migration-fix	Yorick Peterse	2018-01-18	2	-2/+5
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior to this commit we would essentially update all rows in a table, even those where the source column (e.g. `issues.closed_at`) was NULL. This in turn could lead to statement timeouts when using the default batch size of 10 000 rows per job. To work around this we don't schedule jobs for rows where the source value is NULL. We also don't update rows where the source column is NULL (as an extra precaution) or the target column already has a non-NULL value. Using this approach it should be possible to update 10 000 rows in the "issues" table in about 7.5 - 8 seconds. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/42158
* \| \| \| \| \|	Merge branch 'gitaly-commit-signature' into 'master'	Sean McGivern	2018-01-18	3	-6/+37
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retrieve commit signatures with Gitaly Closes gitaly#923 See merge request gitlab-org/gitlab-ce!16467
\| * \| \| \| \| \|	Retrieve commit signatures with Gitaly	Jacob Vosmaer (GitLab)	2018-01-18	3	-6/+37
\| \|/ / / / /
* \| \| \| \| \|	Remove Rugged::Walker from Repository#log	Jacob Vosmaer (GitLab)	2018-01-18	1	-26/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'feature/merge-request-system-hook' into 'master'	Douwe Maan	2018-01-18	2	-2/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
\| * \| \| \| \|	api support for merge_requests_events system hook	Alexis Reigel	2018-01-04	2	-2/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '42129-fix-project-snippet-user-agent-detail' into 'master'	Sean McGivern	2018-01-18	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the user-agent detail API endpoint for project snippets Closes #42129 See merge request gitlab-org/gitlab-ce!16521
\| * \| \| \| \|	Fix the user-agent detail API endpoint for project snippets	Nick Thomas	2018-01-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'	Oswaldo Ferreira	2018-01-17	14	-53/+140
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport 10.3.4 security fixes into master See merge request gitlab-org/gitlab-ce!16509
\| * \| \| \| \| \|	Make ruby lint happysh-backport-10-3-4-security-fixes	Oswaldo Ferreira	2018-01-17	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'	Robert Speicher	2018-01-16	2	-5/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.3] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2296 (cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c) a0f9d222 Prevents login with disabled OAuth providers
\| * \| \| \| \| \|	Merge branch 'fix/import-rce-10-3' into 'security-10-3'	James Lopez	2018-01-16	3	-3/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.3] Fix RCE via project import mechanism See merge request gitlab/gitlabhq!2294 (cherry picked from commit dcfec507d6f9ee119d65a832393e7c593af1d3b2) 86d75812 Fix RCE via project import mechanism
\| * \| \| \| \| \|	Merge branch ↵	Robert Speicher	2018-01-16	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook' into 'security-10-3' Don't allow line breaks on HTTP headers See merge request gitlab/gitlabhq!2277 (cherry picked from commit 7fc0a6fc096768a5604d6dd24d7d952e53300c82) 073b8f9c Don't allow line breaks on HTTP headers
\| * \| \| \| \| \|	Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵	Douwe Maan	2018-01-16	3	-33/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276 (cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c) 1f2bd3c0 Backport to 10.3
\| * \| \| \| \| \|	Merge branch 'ac/fix-path-traversal' into 'security-10-3'	Robert Speicher	2018-01-16	1	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.3] Fix path traversal in gitlab-ci.yml cache:key See merge request gitlab/gitlabhq!2270 (cherry picked from commit c32d0c6807dfd41d7838a35742e6d0986871b389) df29094a Fix path traversal in gitlab-ci.yml cache:key
\| * \| \| \| \| \|	Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'	Robert Speicher	2018-01-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.3] Fix XSS vulnerability in Pipeline job trace See merge request gitlab/gitlabhq!2258 (cherry picked from commit 44caa80ed9a2514a74a5eeab10ff51849d64851b) 5f86f3ff Fix XSS vulnerability in Pipeline job trace
\| * \| \| \| \| \|	Merge branch ↵	Stan Hu	2018-01-16	4	-10/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3' Filter out sensitive fields from the project services API See merge request gitlab/gitlabhq!2281 (cherry picked from commit 476f2576444632f2a9a61b4cead9c1077f2c81d7) 2bcbbda0 Filter out sensitive fields from the project services API
* \| \| \| \| \| \|	In development, allow the toggling of the performance bar	Rémy Coutable	2018-01-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The performance bar is still displayed by default in development. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '41118-add-sorting-to-deployments-api' into 'master'	Rémy Coutable	2018-01-17	1	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Enable ordering and sorting for the Deployments API" Closes #41118 See merge request gitlab-org/gitlab-ce!16396
\| * \| \| \| \| \| \|	Adds sorting to deployments API	Jacopo	2018-01-17	1	-1/+3
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds sorting to deployments API through the `order_by` and sort `fields`.
* \| \| \| \| \| \|	Remove unused methods from Gitlab::Git	Jacob Vosmaer (GitLab)	2018-01-17	1	-31/+0
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/gb/improve-manual-action-tooltips' into 'master'	Grzegorz Bizon	2018-01-17	1	-1/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix running manual action tooltip Closes #41418 See merge request gitlab-org/gitlab-ce!16489
\| * \| \| \| \|	Fix running manual action tooltip	Grzegorz Bizon	2018-01-16	1	-1/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'	Stan Hu	2018-01-16	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent RevList failing on non utf8 paths Closes #41627 See merge request gitlab-org/gitlab-ce!16440
\| * \| \| \| \|	Prevent RevList failing on non utf8 pathsjej/lfs-rev-list-handles-non-utf-paths-41627	James Edwards-Jones	2018-01-16	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'builds-api-nplusone' into 'master'	Stan Hu	2018-01-16	2	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "N+1 queries with /projects/:project_id/builds API endpoint" Closes #41957 See merge request gitlab-org/gitlab-ce!16445
\| * \| \| \| \|	Use preload instead of includes to avoid joinsbuilds-api-nplusone	Matija Čupić	2018-01-15	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix N+1 builds query in Jobs list API	Matija Čupić	2018-01-14	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Eager load user, runner, pipeline and its creator	Matija Čupić	2018-01-14	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Fix N+1 in v3 builds API	Matija Čupić	2018-01-13	1	-2/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The N+1 issue was caused by loading the job_artifacts_archive for each job (build) individually. Including that in the builds AssociationRelation fixed the issue.