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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update ConvDev Index docs w better screenshotjramsay-improved-convdev-image-docs	James Ramsay	2018-01-17	1	-0/+0
\|
*	Merge branch 'rs-buttons-partial' into 'master'	Rémy Coutable	2018-01-17	1	-21/+14
\|\ \| \| \| \| \| \| \| \|	Further simplify app/views/projects/buttons/_dropdown.html.haml See merge request gitlab-org/gitlab-ce!16503
\| *	Further simplify app/views/projects/buttons/_dropdown.html.hamlrs-buttons-partial	Robert Speicher	2018-01-16	1	-21/+14
\| \|
* \|	Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'	Oswaldo Ferreira	2018-01-17	86	-278/+1183
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+3
\| \| \|
\| * \|	fixed markdown_spec.js	Phil Hughes	2018-01-17	1	-1/+1
\| \| \|
\| * \|	fixed conflicts	Phil Hughes	2018-01-17	2	-44/+17
\| \| \|
\| * \|	Resolve conflicts in VERSION, db/schema.rb, and spec/models/service_spec.rb	Stan Hu	2018-01-16	3	-11/+3
\| \| \|
\| * \|	Update VERSION to 10.3.4	Oswaldo Ferreira	2018-01-16	1	-0/+4
\| \| \|
\| * \|	Update CHANGELOG.md for 10.3.4	Oswaldo Ferreira	2018-01-16	7	-36/+0
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'	Robert Speicher	2018-01-16	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-16	7	-4/+188
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-16	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-16	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-16	33	-139/+400
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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 '41567-projectfix' into 'security-10-3'	Sean McGivern	2018-01-16	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-16	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-16	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
\| * \|	Merge branch 'milestones-finder-order-fix' into 'security-10-3'	Robert Speicher	2018-01-16	7	-54/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove order param from the MilestoneFinder See merge request gitlab/gitlabhq!2259 (cherry picked from commit 14408042e78f2ebc2644f956621b461dbfa3d36d) 155881e7 Remove order param from the MilestoneFinder
\| * \|	Merge branch 'label-xss-10-3' into 'security-10-3'	Jacob Schatz	2018-01-16	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.3] Fix XSS in issue label dropdown See merge request gitlab/gitlabhq!2253 (cherry picked from commit 363ffabcebd7bb0d1a2d59ca1a75e4eadb4a4360) ea1fb0ea Fix XSS in issue label dropdown
\| * \|	Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'	Robert Speicher	2018-01-16	2	-5/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[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	9	-18/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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
* \| \|	Merge branch 'feature/39591-visibility-level' into 'master'	Clement Ho	2018-01-17	2	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Open visibility help in new tab Closes #39591 See merge request gitlab-org/gitlab-ce!16268
\| * \| \|	Open visibility help in new tab	Jussi Räsänen	2018-01-17	2	-1/+6
\|/ / /
* \| \|	Merge branch '41874-closed-todo' into 'master'	Douwe Maan	2018-01-17	7	-13/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Closed issue label in todo's styling is difficult to read" Closes #41874 See merge request gitlab-org/gitlab-ce!16414
\| * \| \|	Resolve "Closed issue label in todo's styling is difficult to read"	Simon Knox	2018-01-17	7	-13/+25
\|/ / /
* \| \|	Merge branch '42006-allow-toggling-of-performance-bar-in-development' into ↵	Sean McGivern	2018-01-17	4	-10/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Allow toggling of performance bar in development" Closes #42006 See merge request gitlab-org/gitlab-ce!16495
\| * \| \|	In development, allow the toggling of the performance bar	Rémy Coutable	2018-01-17	4	-10/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The performance bar is still displayed by default in development. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'revert-c8ddf067' into 'master'	Tim Zallmann	2018-01-17	2	-36/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'pre-commit-prettier' into 'master'" See merge request gitlab-org/gitlab-ce!16217
\| * \| \|	Revert "Merge branch 'pre-commit-prettier' into 'master'"revert-c8ddf067	Filipa Lacerda	2018-01-04	4	-41/+0
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !16061
* \| \| \|	Merge branch 'add-fast-blank' into 'master'	Sean McGivern	2018-01-17	3	-0/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fast blank can speed things up. Spotify uses it as well… See merge request gitlab-org/gitlab-ce!16468
\| * \| \| \|	Use the fast_blank gemadd-fast-blank	dosire	2018-01-16	3	-0/+10
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	See https://github.com/rails/rails/pull/24658#issuecomment-212651965
* \| \| \|	Merge branch 'qa-add-deploy-key-view-elements' into 'master'	Grzegorz Bizon	2018-01-17	3	-15/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add view elements to deploy keys pages See merge request gitlab-org/gitlab-ce!16464
\| * \| \| \|	Try to match more aggressivelyqa-add-deploy-key-view-elements	Lin Jen-Shin	2018-01-16	1	-2/+3
\| \| \| \| \|
\| * \| \| \|	Add view elements to deploy keys pages	Lin Jen-Shin	2018-01-15	3	-15/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch '42035-projects-dropdown-scroll' into 'master'	Tim Zallmann	2018-01-17	2	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Projects dropdown width and height shrinked, causes scrollbars wrapping around" Closes #42035 See merge request gitlab-org/gitlab-ce!16507
\| * \| \| \| \|	Restore custom height for projects dropdown42035-projects-dropdown-scroll	Annabel Dunstone Gray	2018-01-16	2	-1/+3
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch '41118-add-sorting-to-deployments-api' into 'master'	Rémy Coutable	2018-01-17	4	-6/+59
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-6/+59
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds sorting to deployments API through the `order_by` and sort `fields`.
* \| \| \| \|	Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' ↵	Filipa Lacerda	2018-01-17	2	-0/+7
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \|	Fix JS bundle not running on the Cluster update/destroy pagesce-backport-4378-fix-cluster-js-not-running-on-update-page	Eric Eastwood	2018-01-16	2	-0/+7
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4378 Conflicts: app/assets/javascripts/dispatcher.js
* \| \| \| \|	Merge branch 'remove-branch-names-contains' into 'master'	Sean McGivern	2018-01-17	2	-39/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused methods from Gitlab::Git See merge request gitlab-org/gitlab-ce!16494
\| * \| \| \| \|	Remove unused methods from Gitlab::Git	Jacob Vosmaer (GitLab)	2018-01-17	2	-39/+0
\|/ / / / /
* \| \| \| \|	Merge branch 'merge-request-target-branch-perf' into 'master'	Filipa Lacerda	2018-01-17	6	-9/+57
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved performance of merge requests target branch dropdown See merge request gitlab-org/gitlab-ce!16428
\| * \| \| \| \|	fixed missing commamerge-request-target-branch-perf	Phil Hughes	2018-01-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	actual spec fixes	Phil Hughes	2018-01-16	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	more spec fixes	Phil Hughes	2018-01-16	2	-2/+0
\| \| \| \| \| \|
\| * \| \| \| \|	fixed failing spec	Phil Hughes	2018-01-16	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	only search branches	Phil Hughes	2018-01-16	3	-21/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	target branch select dropdown doesnt care about tags so we dont need to waste time searching them
\| * \| \| \| \|	Improved performance of merge requests target branch dropdown	Phil Hughes	2018-01-16	4	-5/+61
\| \| \| \| \| \|