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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update CONTRIBUTING.mdaccepting-merge-requests-ux	Victor Wu	2017-09-28	1	-4/+10
\|
*	Merge branch 'acet-repo-editor-prevent-extra-request' into 'master'	Jacob Schatz	2017-09-28	3	-7/+32
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	RepoEditor: Prevent extra network call for already opened files. Closes #38256 See merge request gitlab-org/gitlab-ce!14489
\| *	RepoEditor: Prevent extra network call for already opened files.acet-repo-editor-prevent-extra-request	Fatih Acet	2017-09-27	3	-7/+32
\| \|
* \|	Merge branch 'docs-writing-overview-usecases' into 'master'	Job van der Voort	2017-09-28	1	-1/+46
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Feature overview and use cases Closes #38076 See merge request gitlab-org/gitlab-ce!14538
\| * \|	Docs: Feature overview and use cases	Marcia Ramos	2017-09-28	1	-1/+46
\|/ /
* \|	Merge branch 'docs-crosslink-pages-guides' into 'master'	Achilleas Pipinellis	2017-09-28	3	-4/+64
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: crosslink Pages guides Closes #38427 See merge request gitlab-org/gitlab-ce!14542
\| * \|	copyedit - reorg headers	Marcia Ramos	2017-09-28	1	-21/+21
\| \| \|
\| * \|	copyedit + last_updated	Marcia Ramos	2017-09-28	1	-4/+10
\| \| \|
\| * \|	add note on DNS propagation time	Marcia Ramos	2017-09-28	1	-0/+4
\| \| \|
\| * \|	add section "Add your custom domain to GitLab Pages settings"	Marcia Ramos	2017-09-28	1	-4/+24
\| \| \|
\| * \|	fixes links (html => md)docs-crosslink-pages-guides	Marcia Ramos	2017-09-27	3	-3/+3
\| \| \|
\| * \|	add intro section "Custom domains for GitLab Pages" for comprehensiveness ↵	Marcia Ramos	2017-09-27	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \|	and SEO
\| * \|	update links	Marcia Ramos	2017-09-27	1	-1/+3
\| \| \|
\| * \|	cross-link Pages references	Marcia Ramos	2017-09-27	1	-1/+16
\| \|/
* \|	Merge branch 'fix-mr-sidebar-counter-after-merge' into 'master'	Robert Speicher	2017-09-28	3	-0/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear merge requests counter cache after merge Closes gitlab-ee#3573 and #38344 See merge request gitlab-org/gitlab-ce!14563
\| * \|	Clear merge requests counter cache after merge	Sean McGivern	2017-09-28	3	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this change, the MR counter in the sidebar would be wrong if an MR had been merged since the last update, but not opened or closed, as merging did not trigger a counter cache update.
* \| \|	Merge branch 'hashed-storage-migration-path' into 'master'	Douwe Maan	2017-09-28	20	-14/+736
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hashed storage migration path Closes gitlab-ee#3118 See merge request gitlab-org/gitlab-ce!14067
\| * \| \|	Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-path	Gabriel Mazetto	2017-09-28	16	-4/+686
\| \| \| \|
\| * \| \|	[Backported from EE] Readonly flag for Projects	Gabriel Mazetto	2017-09-28	5	-11/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is used in EE for the storage migration, and we want to use this in CE as well to be able to migrate projects to hashed_storage.
* \| \| \|	Merge branch 'bvl-fix-close-issuable-link' into 'master'	Rémy Coutable	2017-09-28	4	-11/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative paths for opening and closing issuables Closes #35822 See merge request gitlab-org/gitlab-ce!14555
\| * \| \| \|	Use relative paths for opening and closing issuablesbvl-fix-close-issuable-link	Bob Van Landuyt	2017-09-28	4	-11/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The abuse reports need a full issuable URL, but linking to issuables should use the relative paths
* \| \| \| \|	Merge branch 'feature/custom-attributes' into 'master'	Rémy Coutable	2017-09-28	23	-2/+433
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support custom attributes on users See merge request gitlab-org/gitlab-ce!13038
\| * \| \| \| \|	Support custom attributes on users	Markus Koller	2017-09-28	23	-2/+433
\|/ / / / /
* \| \| \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2017-09-28	1	-7/+22
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the usage of the Docker OverlayFS driver for every build See merge request gitlab-org/gitlab-ce!14478
\| * \| \| \| \|	Document the usage of the Docker OverlayFS driver for every build	Dominik	2017-09-28	1	-7/+22
\|/ / / / /
* \| \| \| \|	Merge branch '13637-show-account-confirmation-link-in-e-mail-text' into 'master'	Phil Hughes	2017-09-28	2	-2/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed account confirmation line to e-mail text. Closes #13637 See merge request gitlab-org/gitlab-ce!14243
\| * \| \| \| \|	Changed account confirmation line to e-mail text. This MR fixes issue #13637	bitsapien	2017-09-28	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added changelog
* \| \| \| \| \|	Merge branch 'jramsay-spelling-occurred' into 'master'	Jacob Schatz	2017-09-28	17	-21/+21
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spelling of occurred See merge request gitlab-org/gitlab-ce!14488
\| * \| \| \| \|	Fix spelling of occurredjramsay-spelling-occurred	James Ramsay	2017-09-26	17	-21/+21
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dm-api-unauthorized' into 'master'	Sean McGivern	2017-09-28	4	-54/+83
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure API responds with 401 when invalid authentication info is provided Closes #38438 See merge request gitlab-org/gitlab-ce!14525
\| * \| \| \| \| \|	Make sure API responds with 401 when invalid authentication info is provideddm-api-unauthorized	Douwe Maan	2017-09-28	4	-54/+83
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'evn-add-neg-tests' into 'master'	Robert Speicher	2017-09-28	1	-0/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test for what should not be there as well [ci skip] See merge request gitlab-org/gitlab-ce!14492
\| * \| \| \| \| \| \|	Test for what should not be there as wellevn-add-neg-tests	ernstvn	2017-09-25	1	-0/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '38319-nomethoderror-undefined-method-sha-for-nil-nilclass' ↵	Douwe Maan	2017-09-28	3	-2/+90
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "NoMethodError: undefined method `sha' for nil:NilClass" Closes #38319 See merge request gitlab-org/gitlab-ce!14547
\| * \| \| \| \| \| \|	Handle error when fetching ref for MR with deleted source branch38319-nomethoderror-undefined-method-sha-for-nil-nilclass	Sean McGivern	2017-09-28	3	-2/+90
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the ref doesn't exist, and the source branch is deleted, we can't get it back easily. Previously, we ignored this error by shelling out, so replicate that behaviour.
* \| \| \| \| \| \|	Merge branch 'docs-28814-clarify-artifacts-ref' into 'master'	Grzegorz Bizon	2017-09-28	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify artifact download via the API only accepts branch or tag name for ref See merge request gitlab-org/gitlab-ce!14545
\| * \| \| \| \| \| \|	Clarify artifact download via the API only accepts branch or tag name for ref	Mark Fletcher	2017-09-28	2	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-translation-namespaces' into 'master'	Filipa Lacerda	2017-09-28	3	-9/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed missing namespaces on navigation translations See merge request gitlab-org/gitlab-ce!14472
\| * \| \| \| \| \| \| \|	Fixed missing namespaces on navigation translationsfix-translation-namespaces	Phil Hughes	2017-09-27	3	-9/+9
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mobile-images-lazy-load-check' into 'master'	Tim Zallmann	2017-09-28	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lazy load images in mobile sidebar & header Closes #38276 See merge request gitlab-org/gitlab-ce!14526
\| * \| \| \| \| \| \| \| \|	karma spec fixesmobile-images-lazy-load-check	Phil Hughes	2017-09-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Lazy load images in mobile sidebar & header	Phil Hughes	2017-09-27	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #38276
* \| \| \| \| \| \| \| \| \|	Merge branch 'commit-side-by-side-comment' into 'master'	Filipa Lacerda	2017-09-28	3	-3/+44
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes commit comments in parallel diff view Closes #38117 See merge request gitlab-org/gitlab-ce!14529
\| * \| \| \| \| \| \| \| \|	Fixes commit comments in side-by-side diff viewcommit-side-by-side-comment	Phil Hughes	2017-09-27	3	-3/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was caused by the `notes` global class not existing when the `file_comment_button` code is run. The notes class was used to check if the diff is currently in parallel view or not. To get around this I've added a check into the `file_comment_button` JS to check if the view is currently parallel or not. Closes #38117
* \| \| \| \| \| \| \| \| \|	Merge branch 'zj-repo-gitaly' into 'master'	Sean McGivern	2017-09-28	3	-19/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RepositoryExists is always called with #gitaly_migration Closes #38333 See merge request gitlab-org/gitlab-ce!14513
\| * \ \ \ \ \ \ \ \ \	Merge branch 'an-repo-gitaly' into 'zj-repo-gitaly'zj-repo-gitaly	Alejandro Rodríguez	2017-09-27	1	-7/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rolling back change to n+1 detection See merge request gitlab-org/gitlab-ce!14536
\| \| * \| \| \| \| \| \| \| \| \|	Rolling back change to n+1 detectionan-repo-gitaly	Andrew Newdigate	2017-09-27	1	-7/+1
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	RepositoryExists is always called with #gitaly_migration	Zeger-Jan van de Weg	2017-09-26	3	-19/+18
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Don't enforce gitaly request limits for distinct calls	Alejandro Rodríguez	2017-09-26	1	-1/+7
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'refactor-services' into 'master'	Grzegorz Bizon	2017-09-28	25	-57/+85
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor services to match EE signature See merge request gitlab-org/gitlab-ce!14385