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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| *	Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' ↵	Filipa Lacerda	2018-01-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix JS bundle not running on the Cluster update/destroy pages -- CE backport Closes gitlab-ee#4378 See merge request gitlab-org/gitlab-ce!16506
\| \| *	Merge branch '10-4-stable-prepare-rc7' of ↵	Luke Bennett	2018-01-17	3	-0/+17
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
\| \| \| *	Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'	Douwe Maan	2018-01-17	3	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wiki uploaded files are missing" Closes #42031 See merge request gitlab-org/gitlab-ce!16499 (cherry picked from commit 79b05cdd469726582e916cb606ba14b440a59011) 31e59219 Fix links to uploaded files on wiki pages
\| \| * \|	Merge branch '10-4-stable-prepare-rc7' of ↵	Luke Bennett	2018-01-17	3	-3/+8
\| \| \|\ \ \| \| \| \|/ \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
\| \| * \|	Merge branch 'mr-status-box-update' into 'master'	Filipa Lacerda	2018-01-17	5	-10/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed merge request status badge not updating after merging See merge request gitlab-org/gitlab-ce!16470
\| * \| \|	fixed up merge request badge merge	Phil Hughes	2018-01-17	4	-7/+11
\| \| \|/ \| \|/\|
\| * \|	Merge branch '42046-fork-icon' into 'master'	Fatih Acet	2018-01-17	3	-3/+8
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Icons on forks page are to big" Closes #42046 See merge request gitlab-org/gitlab-ce!16474 (cherry picked from commit 78ca7d97bbb12be11bd2ebeb8b03ae2277c5ec10) d76047a1 fix fork icon size and button icon color on Forks page 3ec647ed Update 42046-fork-icon.yml
\| *	Merge branch 'builds-api-nplusone' into 'master'	Stan Hu	2018-01-17	4	-4/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "N+1 queries with /projects/:project_id/builds API endpoint" Closes #41957 See merge request gitlab-org/gitlab-ce!16445 (cherry picked from commit 191b5153c86964e59400fe086b88b89bb45fe7a9) 7e084984 Add n plus one spec for v3 builds api c9a1a155 Fix N+1 in v3 builds API c9840842 Eager load user, runner, pipeline and its creator 09118796 Add N+1 query spec for Jobs API 87cc0373 Fix N+1 builds query in Jobs list API a4d7f155 Extend N+1 Builds and Jobs API specs 8cef1f4c Add missing newline in Jobs API spec feb34497 Use preload instead of includes to avoid joins
\| *	Merge branch 'docs/sast-dast' into 'master'	Marcia Ramos	2018-01-17	4	-9/+137
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port the SAST DAST doc examples from EE to CE Closes #42007 See merge request gitlab-org/gitlab-ce!16430
\| *	Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'	Stan Hu	2018-01-17	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent RevList failing on non utf8 paths Closes #41627 See merge request gitlab-org/gitlab-ce!16440 (cherry picked from commit 3228ac06a019c9126b965ff32e354d10011a4f76) c4dd7b82 Prevent RevList failing on non utf8 paths
\| *	Merge branch '41727-target-branch-name' into 'master'	Sean McGivern	2018-01-17	3	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set target_branch to the ref branch when creating MR from issue Closes #41727 See merge request gitlab-org/gitlab-ce!16422 (cherry picked from commit b4bc9bd5c5bedcd57e795f91f0668d7f2c622cde) 7e9484e9 Set target_branch to the ref branch when creating MR from issue
\| *	Merge branch '41874-closed-todo' into 'master'	Douwe Maan	2018-01-17	7	-16/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Closed issue label in todo's styling is difficult to read" Closes #41874 See merge request gitlab-org/gitlab-ce!16414
\| *	Merge branch 'sh-remove-import-retry-count-warning' into 'master'	Robert Speicher	2018-01-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove warning noise in ProjectImportOptions See merge request gitlab-org/gitlab-ce!16410 (cherry picked from commit b384d4781ada21ebb4bf8c703f59f188823b0ada) f4319f6a Remove warning noise in ProjectImportOptions
\| *	Merge branch 'mk-fix-permanent-redirect-validation' into 'master'	Douwe Maan	2018-01-17	4	-1/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Route validation when conflicting permanent redirects exist Closes gitlab-com/support-forum#2883 and #41786 See merge request gitlab-org/gitlab-ce!16397 (cherry picked from commit d607f16fe5a1ec51eaea5811b5118b1ba48acfbc) 1dc30595 Revert "Revert "Fix Route validation for unchanged path"" c517788e Fix Rubocop offense 601c24d5 Add RedirectRoute factory d4c8d1b7 Add changelog entry
\| *	Merge branch ↵	Kamil Trzciński	2018-01-17	5	-38/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41799-managed-prometheus-deployment-install-a-lot-of-extra-stuff' into 'master' Resolve "Managed Prometheus deployment installs a lot of extra stuff" Closes #41799 See merge request gitlab-org/gitlab-ce!16378 (cherry picked from commit 5c51cbca06b099427e15309b352d01d960f641e3) 37d96e7d Use ConfigMap content to populate values.yaml 0a69f490 Fixes suggestions on MR
\| *	Merge branch '10-4-stable-prepare-rc7' of ↵	Luke Bennett	2018-01-17	1	-13/+17
\| \|\ \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into 10-4-stable-prepare-rc7
\| \| *	Merge branch ↵	Kamil Trzciński	2018-01-17	1	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41809-auto-devops-performance-docker-image-not-compatible-with-gitlab-runner' into 'master' Include updated AutoDevOps template with Browser Performance using DinD Closes #41809 See merge request gitlab-org/gitlab-ce!16373 (cherry picked from commit ff252f61f73353ae3912707877c350bd6f7eb038) 9d7e0e49 Update AutoDevOps template with browser performance fix
\| * \|	Correct applications.vue conflict?	Luke Bennett	2018-01-17	1	-27/+23
\| \|/
\| *	Merge branch '41797-prometheus-wording-fixes' into 'master'	Kamil Trzciński	2018-01-17	1	-24/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Wording fixes on cluster page" Closes #41797 See merge request gitlab-org/gitlab-ce!16324
\| *	Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'	Douwe Maan	2018-01-17	18	-14/+749
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport authorized_keys Closes gitlab-ee#3953 See merge request gitlab-org/gitlab-ce!16014 (cherry picked from commit 2e4a1b3b78a76103198180acf873de8470d7cecf) ac86b204 Backport authorized_keys branch 'find-key-by-fingerprint' 255a0f85 Backport option to disable writing to `authorized_keys` file 07bd79cd Combine ssh docs and rename the doc bcffeade Use ApplicationSetting.current in Admin::ApplicationSettingsController 797fe0a6 Backport authorized_keys_enabled defaults to true' d2f4e8f9 Avoid adding index if already exists 01319e59 Make Gitlab::CurrentSettings available when getting settings d9557e43 Backport spec fixes in spec/lib/gitlab/shell_spec.rb 40e3d9f3 Fix typo in spec/requests/api/internal_spec.rb bd9ead68 Fix spec in shell_spec.rb 9edd9a5e Adds changelog for backport of authorized_keys DB lookup from EE
*	Update VERSION to 10.4.0-rc6v10.4.0-rc6	Mark Fletcher	2018-01-17	1	-1/+1
\|
*	Merge branch '10-4-stable-with-rc5-and-rc6' into '10-4-stable'	Mark Fletcher	2018-01-17	46	-79/+281
\|\ \| \| \| \| \| \| \| \|	10-4-stable with rc5 and rc6 from dev See merge request gitlab-org/gitlab-ce!16508
\| *	Merge branch '10-4-stable-prepare-rc6' into '10-4-stable'10-4-stable-with-rc5-and-rc6	LUKE BENNETT	2018-01-17	46	-79/+281
\| \|\ \|/ / \| \| \| \| \| \|	10.4.0-rc6 on rc5 sec release See merge request gitlab/gitlabhq!2310
\| *	Merge branch '42025-fix-issue-api' into 'master'10-4-stable-prepare-rc6	Sean McGivern	2018-01-15	3	-2/+18
\| \| \| \| \| \| \| \| \| \|	[API] Fix creating issue when assignee_id is empty See merge request gitlab-org/gitlab-ce!16458
\| *	Merge branch '41937-vue-prop-type' into 'master'	Phil Hughes	2018-01-15	2	-9/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Fix type is started key" Closes #41937 See merge request gitlab-org/gitlab-ce!16407
\| *	Merge branch 'fj-41598-fixing-request-mime-type' into 'master'	Douwe Maan	2018-01-15	3	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing request json mime type Closes #41598 See merge request gitlab-org/gitlab-ce!16427
\| *	Merge branch '41970-job-play-button' into 'master'	Kamil Trzciński	2018-01-15	3	-9/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Empty state for manual job - play button does not work" Closes #41970 See merge request gitlab-org/gitlab-ce!16426
\| *	Merge branch 'projects-dropdown-perf' into 'master'	Filipa Lacerda	2018-01-15	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed performance of projects dropdown Closes #41939 See merge request gitlab-org/gitlab-ce!16425
\| *	Merge branch 'disable-pages-on-jobs' into 'master'	Yorick Peterse	2018-01-15	3	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use simple Next/Prev paging for CI Jobs page Closes #41058 See merge request gitlab-org/gitlab-ce!16392
\| *	Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' ↵	Grzegorz Bizon	2018-01-15	3	-8/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Incorrect default merge request title when Jira activated" Closes #36669 See merge request gitlab-org/gitlab-ce!16356
\| *	Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'	Douwe Maan	2018-01-15	3	-17/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Attachments in e-mail notifications are using the wrong URL" Closes #41882 See merge request gitlab-org/gitlab-ce!16364
\| *	Merge branch 'remove-beta-notice-for-clusters' into 'master'	Achilleas Pipinellis	2018-01-15	1	-3/+0
\| \| \| \| \| \| \| \| \| \|	Remove Beta notice for Clusters See merge request gitlab-org/gitlab-ce!16350
\| *	Merge branch 'merge-request-lfs-badge' into 'master'	Douwe Maan	2018-01-15	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added LFS badge to merge request files tracked by LFS Closes #41829 See merge request gitlab-org/gitlab-ce!16345
\| *	Merge branch 'fix/sidebar-collapse-button-spacing' into 'master'	Phil Hughes	2018-01-15	1	-1/+0
\| \| \| \| \| \| \| \| \| \|	Restore sidebar collapse button padding #41803 See merge request gitlab-org/gitlab-ce!16323
\| *	Merge branch 'dz-improve-code-quality-docs' into 'master'	Achilleas Pipinellis	2018-01-15	1	-1/+2
\| \| \| \| \| \| \| \| \| \|	Use 0.69 version of codeclimate image for CI code quality docs See merge request gitlab-org/gitlab-ce!16319
\| *	Merge branch '41789-fix-up-web-ide-user-preference-copy-and-buttons' into ↵	Tim Zallmann	2018-01-15	8	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix up Web IDE user preference copy and buttons Closes #41789 See merge request gitlab-org/gitlab-ce!16298
\| *	Merge branch 'sh-fix-bare-import-hooks' into 'master'	James Lopez	2018-01-15	5	-2/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix hooks not being set up properly for bare import Rake task Closes #41739 See merge request gitlab-org/gitlab-ce!16280
\| *	Merge branch '41607-require-rsync-docs' into 'master'	Achilleas Pipinellis	2018-01-15	3	-5/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Document rsync as requirement for 10.4" Closes #41607 See merge request gitlab-org/gitlab-ce!16252
\| *	Merge branch '41491-fix-nil-blob-name-error' into 'master'	Annabel Dunstone Gray	2018-01-15	5	-4/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237
* \|	Update VERSION to 10.4.0-rc5v10.4.0-rc5	Luke Bennett	2018-01-15	1	-1/+1
\| \|
* \|	Merge branch '10-4-security-patch-rebased' into '10-4-stable'	LUKE BENNETT	2018-01-15	93	-277/+1217
\|\ \ \| \|/ \|/\| \| \| \| \|	[CE] Security Release 10.4 (rebased) See merge request gitlab/gitlabhq!2304
\| *	Make ruby lint happy	Oswaldo Ferreira	2018-01-15	1	-2/+2
\| \|
\| *	Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'	Robert Speicher	2018-01-15	8	-13/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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 'fl-ipythin-10-3' into 'security-10-3'	Phil Hughes	2018-01-15	7	-4/+176
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port of [10.2] Sanitizes IPython notebook output See merge request gitlab/gitlabhq!2285 (cherry picked from commit 1c46e031c70706450a8e0ae730f4c323b72f9e4c) aac035fe Port of [10.2] Sanitizes IPython notebook output
\| *	Merge branch 'fix/import-rce-10-3' into 'security-10-3'	James Lopez	2018-01-15	5	-16/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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-15	5	-1/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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-15	33	-141/+383
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276
\| *	Merge branch '41567-projectfix' into 'security-10-3'	Sean McGivern	2018-01-15	8	-20/+133
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	check project access on MR create See merge request gitlab/gitlabhq!2273 (cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834) 43e85f49 check project access on MR create
\| *	Merge branch 'ac/fix-path-traversal' into 'security-10-3'	Robert Speicher	2018-01-15	4	-2/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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 'sh-validate-path-project-import-10-3' into 'security-10-3'	Stan Hu	2018-01-15	4	-2/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate project path in Gitlab import - 10.3 port See merge request gitlab/gitlabhq!2268 (cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e) 2b94a7c2 Validate project path in Gitlab import