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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Handle CR-LFs properly in .gitmodules filesh-cleanup-crlf-gitmodules	Stan Hu	2018-03-30	2	-2/+5
\| \| \| \| \| \|	Any submodule lines that had a CR-LF ending would be ignored by the parser. Closes gitlab-org/gitlab-ce#2262
*	Merge branch ↵	Rémy Coutable	2018-03-30	2	-1/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'theothertom/gitlab-ce-bug/42663/update-jira-integration-docs-for-new-jira-UI-docs' into 'master' Update Jira integration docs for new Jira UI Closes #42663 See merge request gitlab-org/gitlab-ce!18107
\| *	Copyedit JIRA docs	Achilleas Pipinellis	2018-03-30	1	-5/+9
\| \|
\| *	Update Jira integration docs for new Jira UI	Tom Grace	2018-02-02	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/42663 The new Jira UI doesn't show transition IDs in the admin interface. This updates the docs to list a couple of alternative methods of getting the required ID.
* \|	Merge branch 'fj-42685-extend-project-export-endpoint' into 'master'	Douwe Maan	2018-03-30	19	-25/+671
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend API for exporting a project with direct upload URL Closes #42685 See merge request gitlab-org/gitlab-ce!17686
\| * \|	Extend API for exporting a project with direct upload URL	Francisco Javier López	2018-03-30	19	-25/+671
\|/ /
* \|	Merge branch '41967_issue_api_closed_by_info' into 'master'	Sean McGivern	2018-03-30	11	-1/+90
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add closed by information to issue API See merge request gitlab-org/gitlab-ce!17042
\| * \|	added missing space in docs and a changelog	haseeb	2018-03-06	2	-2/+7
\| \| \|
\| * \|	changed the way of nullifying colums	haseeb	2018-03-05	2	-1/+5
\| \| \|
\| * \|	note added	haseeb	2018-03-03	1	-0/+21
\| \| \|
\| * \|	nullify closed by on reopenning issue	haseeb	2018-03-03	1	-0/+1
\| \| \|
\| * \|	closed by added to all_models.yml	haseeb	2018-03-01	1	-0/+1
\| \| \|
\| * \|	closedby_id added to safe attributes	haseeb	2018-03-01	2	-2/+2
\| \| \|
\| * \|	added new field into safe model	haseeb	2018-02-28	1	-0/+1
\| \| \|
\| * \|	removed hasmany association from users	haseeb	2018-02-28	1	-1/+0
\| \| \|
\| * \|	schema version change	haseeb	2018-02-28	1	-1/+1
\| \| \|
\| * \|	documentation updated	haseeb	2018-02-28	1	-0/+27
\| \| \|
\| * \|	schema version change	haseeb	2018-02-28	1	-1/+1
\| \| \|
\| * \|	added forign key and specs	haseeb	2018-02-28	4	-1/+15
\| \| \|
\| * \|	closed by field added	haseeb	2018-02-28	4	-0/+16
\| \| \|
* \| \|	Merge branch 'nested-restore-changelog' into 'master'	Douwe Maan	2018-03-30	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry for rake task fix See merge request gitlab-org/gitlab-ce!18112
\| * \| \|	Add changelog entry	Balasankar "Balu" C	2018-03-30	1	-0/+5
\|/ / /
* \| \|	Merge branch 'sh-cleanup-pages-worker' into 'master'	Nick Thomas	2018-03-30	2	-0/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Free open file descriptors and libgit2 buffers in UpdatePagesService See merge request gitlab-org/gitlab-ce!18099
\| * \| \|	Free open file descriptors and libgit2 buffers in UpdatePagesServicesh-cleanup-pages-worker	Stan Hu	2018-03-30	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In UpdatePagesService, we were seeing a large number of open pack files in production. Calling Project#cleanup removes a reference to Rugged::Repository and forces libgit2 to close file descriptors and free its internal memory cache. Relates to https://gitlab.com/gitlab-com/infrastructure/issues/3965#note_65837525
* \| \| \|	Merge branch 'rc/checkout-false-in-package-and-qa' into 'master'	Grzegorz Bizon	2018-03-30	1	-1/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't let the Runner clone/fetch prior to the package-and-qa job See merge request gitlab-org/gitlab-ce!18102
\| * \| \| \|	Don't let the Runner clone/fetch prior to the package-and-qa jobrc/checkout-false-in-package-and-qa	Rémy Coutable	2018-03-30	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do it by hand instead, that way we can still run this job even if the branch has been removed. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch '44774-migrate-upload-task-fails-for-upload-with-store-nil' ↵	Sean McGivern	2018-03-30	3	-5/+24
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Migrate upload task fails for Upload with `store: nil`" Closes #44774 See merge request gitlab-org/gitlab-ce!18082
\| * \| \| \| \|	apply feedback	Micaël Bergeron	2018-03-30	2	-2/+4
\| \| \| \| \| \|
\| * \| \| \| \|	add changelog44774-migrate-upload-task-fails-for-upload-with-store-nil	Micaël Bergeron	2018-03-29	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	fix a future conflict	Micaël Bergeron	2018-03-29	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	fix rake migration task from ignoring Upload(store: nil)	Micaël Bergeron	2018-03-29	2	-5/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '44835-doc-api-jobs-md-should-be-harmonized-between-ce-and-ee' ↵	Sean McGivern	2018-03-30	1	-5/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "doc/api/jobs.md should be harmonized between CE and EE" Closes #44835 See merge request gitlab-org/gitlab-ce!18106
\| * \| \| \| \| \|	Backport part of the doc/api/jobs.md file from EE	Rémy Coutable	2018-03-30	1	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'runner-update-doc' into 'master'	Achilleas Pipinellis	2018-03-30	1	-6/+13
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating runner docs to add specific runner to projects from the admin area-doc See merge request gitlab-org/gitlab-ce!17585
\| * \| \| \| \| \|	Updating runner docs to add specific runner to projects from the admin area-doc	Aric Buerer	2018-03-30	1	-6/+13
\|/ / / / / /
* \| \| \| \| \|	Merge branch '42593-restore-rake-task' into 'master'	Douwe Maan	2018-03-30	11	-34/+128
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tweak restore rake task to provide an option to set alternate temporary backup directory Closes #42593 See merge request gitlab-org/gitlab-ce!17516
\| * \| \| \| \| \|	Add more tests	Balasankar "Balu" C	2018-03-30	1	-3/+26
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make rubocop happy	Balasankar "Balu" C	2018-03-30	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add basic tests	Balasankar "Balu" C	2018-03-30	2	-0/+55
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move existing dirs to a temp location while restore	Balasankar "Balu" C	2018-03-30	10	-34/+51
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of renaming existing storage directories to a timestamped format, create a timestamped directory in a temporary location and move the individual files and folders inside storage directories to it. This helps us with nested storage directories.
* \| \| \| \| \|	Merge branch 'fix/projects-no-repository-placeholder' into 'master'	Rémy Coutable	2018-03-30	8	-23/+129
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update no repository placeholder See merge request gitlab-org/gitlab-ce!17964
\| * \| \| \| \|	Use translated string for breadcrumb title	George Tsiolis	2018-03-29	4	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Update translated strings	George Tsiolis	2018-03-27	3	-17/+116
\| \| \| \| \| \|
\| * \| \| \| \|	Update no repository placeholder	George Tsiolis	2018-03-26	3	-3/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ac/pages-port' into 'master'	Nick Thomas	2018-03-30	5	-14/+58
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add gitlab-pages port number to artifacts links, if needed Closes #44398 See merge request gitlab-org/gitlab-ce!18073
\| * \| \| \| \| \|	Add port number to artifacts links to gitlab-pages, if needed	Alessio Caiazza	2018-03-29	5	-14/+58
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'zj-update-charlock_holmes' into 'master'	Douwe Maan	2018-03-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update charlock_holmes to 0.76 See merge request gitlab-org/gitlab-ce!18103
\| * \| \| \| \| \| \|	Update charlock_holmes to 0.76	Zeger-Jan van de Weg	2018-03-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Didn't compile against newer icu4c versions and was fixed upstream in https://github.com/brianmario/charlock_holmes/pull/129, which was releaed in the versions its now locked to.
* \| \| \| \| \| \| \|	Merge branch 'add-milestone-path-to-dashboard-milestones-breadcrumb-link' ↵	Rémy Coutable	2018-03-30	2	-2/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Update dashboard milestones breadcrumb link See merge request gitlab-org/gitlab-ce!17933
\| * \| \| \| \| \| \| \|	Update dashboard milestones breadcrumb link	George Tsiolis	2018-03-22	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add milestone path to `/dashboard/milestones` breadcrumb link (which was causing 404 error) - Add milestone name to `/dashboard/milestones` breadcrumb - Add whitespace after the milestone name