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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update factories for git push serviceapi-configure-jira	Robert Schilling	2017-10-24	1	-0/+2
\|
*	Factories need to set required attributes	Robert Schilling	2017-10-24	1	-0/+2
\|
*	Update API docs	Robert Schilling	2017-10-24	2	-3/+3
\|
*	Validate username/pw for Jiraservice, require them in the API	Robert Schilling	2017-10-24	4	-2/+23
\|
*	Remove `<script>` and `<template>` from CHANGELOG.md	Stan Hu	2017-10-23	1	-1/+1
\|
*	Merge branch '37860-pipelines-page' into 'master'	Phil Hughes	2017-10-23	11	-83/+140
\|\ \| \| \| \| \| \| \| \|	Make pipelines table in MR view usable See merge request gitlab-org/gitlab-ce!14941
\| *	Changes after review37860-pipelines-page	Filipa Lacerda	2017-10-23	5	-3/+7
\| \|
\| *	Merge branch 'master' into 37860-pipelines-page	Filipa Lacerda	2017-10-23	307	-2848/+9528
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (88 commits) Fix deletion of container registry or images returning an error The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: Decrease ABC threshold to 54.28 Update VERSION to 10.2.0-pre Update CHANGELOG.md for 10.1.0 Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` Fix the external URLs generated for online view of HTML artifacts Use title as placeholder instead of issue title for reusability Fix failure in current_settings_spec.rb Clarify the difference between project_update and project_rename URI decode Page-Title header to preserve UTF-8 characters Update Gitaly version to v0.49.0 Decrease Perceived Complexity threshold to 14 Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Force non diff resolved discussion to display when collapse toggled Added submodule support in multi-file editor add note about after_script being run separately Check for element before evaluate_script Merge branch 'master-i18n' into 'master' Update Prometheus gem to fix problems with other files overwriting current file ...
\| * \|	Fix failing tests	Filipa Lacerda	2017-10-19	2	-2/+0
\| \| \|
\| * \|	Make pipelines table in MR view usable	Filipa Lacerda	2017-10-18	7	-81/+136
\| \| \|
* \| \|	Merge branch '39299-sidebar-links' into 'master'	Phil Hughes	2017-10-23	2	-11/+10
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CSS in load more participants Closes #39299 See merge request gitlab-org/gitlab-ce!15005
\| * \| \|	Fix button type39299-sidebar-links	Filipa Lacerda	2017-10-23	1	-1/+1
\| \| \| \|
\| * \| \|	Fix CSS in load more participants	Filipa Lacerda	2017-10-23	2	-11/+10
\| \| \| \|
* \| \| \|	Merge branch '35644-refactor-have-http-status-into-have-gitlab-http-status' ↵	Rémy Coutable	2017-10-23	179	-2658/+2663
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Refactor `have_http_status` into `have_gitlab_http_status` in the specs Closes #35644 See merge request gitlab-org/gitlab-ce!14958
\| * \| \| \|	Refactor `have_http_status` into `have_gitlab_http_status` in the specs	Jacopo	2017-10-20	179	-2658/+2663
\| \| \| \| \|
* \| \| \| \|	Merge branch 'cs-docs-fixes' into 'master'	Achilleas Pipinellis	2017-10-23	4	-8/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simple docs fixes See merge request gitlab-org/gitlab-ce!15001
\| * \| \| \| \|	Simple docs fixes	Connor Shea	2017-10-23	4	-8/+8
\|/ / / / /
* \| \| \| \|	Merge branch '38869-group-files' into 'master'	Phil Hughes	2017-10-23	4	-33/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes group_avatar & group_label_subscription from global namespace See merge request gitlab-org/gitlab-ce!15006
\| * \| \| \| \|	Removes group_avatar & group_label_subscription from global namespace	Filipa Lacerda	2017-10-23	4	-33/+20
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-fix-delete-merged-branches-typo' into 'master'	Achilleas Pipinellis	2017-10-23	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a small typo in the delete merged branches documentation See merge request gitlab-org/gitlab-ce!15003
\| * \| \| \| \| \|	Fix a small typo in the delete merged branches documentation	Mark Fletcher	2017-10-23	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'docs-fix-issue-new-branch-format' into 'master'	Achilleas Pipinellis	2017-10-23	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the description of the new branch created by an issue's new branch button See merge request gitlab-org/gitlab-ce!15004
\| * \| \| \| \| \|	Fix the description of the new branch created by an issue's new branch button	Mark Fletcher	2017-10-23	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '39369-document-vue-resource-http' into 'master'	Phil Hughes	2017-10-23	3	-50/+76
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves vue resource docs into a new file & add documentation to handle 204 Closes #39369 See merge request gitlab-org/gitlab-ce!15002
\| * \| \| \| \| \|	Moves vue resource docs into a new file.	Filipa Lacerda	2017-10-23	3	-50/+76
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds docs regarding handling 204 response
* \| \| \| \| \|	Merge branch 'backort_routes_group_routes_from_ee' into 'master'	Douwe Maan	2017-10-23	2	-44/+38
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE changes to group routes Closes gitlab-ee#3794 See merge request gitlab-org/gitlab-ce!14973
\| * \| \| \| \| \|	Backport EE changes to group routesbackort_routes_group_routes_from_ee	Valery Sizov	2017-10-22	2	-44/+38
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'	Douwe Maan	2017-10-23	3	-3/+7
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only cache the push event for the fork-source when it exists Closes #39352 See merge request gitlab-org/gitlab-ce!14989
\| * \| \| \| \| \|	Only cache the event for the fork-source when it existsbvl-fix-push-event-service-for-forks	Bob Van Landuyt	2017-10-22	3	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is possible for a fork not to have a source anymore, in this case we don't need to keep track of the push event.
* \| \| \| \| \| \|	Merge branch 'fix-escaped-text-replacement' into 'master'	Filipa Lacerda	2017-10-23	2	-3/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix escaped text replacement Closes #37724 See merge request gitlab-org/gitlab-ce!14193
\| * \| \| \| \| \| \|	notes.js: use the original content when resetting the form	Ben Boeckel	2017-10-19	2	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise, when an error occurred, the content was escaped and re-escaped on every error. Fixes #37724
\| * \| \| \| \| \| \|	notes.js: also return the original content when getting form data	Ben Boeckel	2017-10-19	1	-1/+3
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'create-new-branch-repo-editor' into 'master'	Filipa Lacerda	2017-10-23	10	-9/+449
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create new branch from dropdown. Closes #38485 See merge request gitlab-org/gitlab-ce!14714
\| * \| \| \| \| \|	Create new branch from dropdown.	Jacob Schatz	2017-10-23	10	-9/+449
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'zj-peek-gitaly' into 'master'	Rémy Coutable	2017-10-23	5	-0/+56
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show Gitaly data in the peek performance bar Closes #39231 See merge request gitlab-org/gitlab-ce!14949
\| * \| \| \| \| \|	Add Gitaly data to the Peek performance bar	Zeger-Jan van de Weg	2017-10-23	5	-0/+56
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'add-shared-vue-loading-button' into 'master'	Filipa Lacerda	2017-10-23	7	-5/+184
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add loading button See merge request gitlab-org/gitlab-ce!14883
\| * \| \| \| \| \| \|	Add loading buttonadd-shared-vue-loading-button	Eric Eastwood	2017-10-23	7	-5/+184
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encompasses designs from - https://gitlab.com/gitlab-org/gitlab-ce/issues/23206#note_43355199 - https://gitlab.com/gitlab-org/gitlab-ce/issues/29985#note_30417407
* \| \| \| \| \| \| \|	Merge branch 'patch-8' into 'master'	Achilleas Pipinellis	2017-10-23	1	-4/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update using_docker_images.md See merge request gitlab-org/gitlab-ce!14988
\| * \| \| \| \| \| \|	Update using_docker_images.md	Paul	2017-10-23	1	-4/+0
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '38869-diff' into 'master'	Phil Hughes	2017-10-23	6	-26/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Diff class from global namespace See merge request gitlab-org/gitlab-ce!14965
\| * \| \| \| \| \| \|	Remove Diff class from globalnamespace	Filipa Lacerda	2017-10-19	6	-26/+18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '39308-fix-broken-master' into 'master'	Sean McGivern	2017-10-23	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the broken .tests-metadata-state definition Closes #39308 See merge request gitlab-org/gitlab-ce!14969
\| * \| \| \| \| \| \| \|	Fix the broken .tests-metadata-state definition	Rémy Coutable	2017-10-20	1	-1/+2
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-container-registry-destroy' into 'master'	Filipa Lacerda	2017-10-23	2	-4/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix deletion of container registry or images returning an error Closes #39354 See merge request gitlab-org/gitlab-ce!14992
\| * \| \| \| \| \| \| \|	Fix deletion of container registry or images returning an error	Stan Hu	2017-10-23	2	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A successful DELETE call would result in a 204 No Content result, which would have an empty response body. Don't automatically try to parse this value as JSON both because there is no additional information passed in the response body. Closes #39354
* \| \| \| \| \| \| \| \|	Merge branch 'fix-fog-aliyun-39126' into 'master'	Stan Hu	2017-10-23	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This… Closes #39126 See merge request gitlab-org/gitlab-ce!14991
\| * \| \| \| \| \| \| \|	The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. ↵	Paul B	2017-10-23	2	-3/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge requests update the gem to v0.2.0 which contains the fix: https://github.com/fog/fog-aliyun/commit/a7456ca6b63e5a0d88c849914679d2fa4707c10c Closes #39126
* \| \| \| \| \| \| \|	Merge branch '28202_decrease_abc_threshold_step5' into 'master'	Robert Speicher	2017-10-22	3	-5/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease ABC threshold to 54.28 See merge request gitlab-org/gitlab-ce!14920
\| * \| \| \| \| \| \| \|	Decrease ABC threshold to 54.28	Maxim Rydkin	2017-10-22	3	-5/+12
\|/ / / / / / / /