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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-06-22	324	-1798/+3805
\|\ \| \| \| \| \| \|	fix/import-url-validator
\| *	Merge branch 'doc_refactor_labels' into 'master'	Achilleas Pipinellis	2016-06-22	20	-18/+150
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor labels docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18555 See merge request !3347
\| \| *	Refactor labels documentation	Achilleas Pipinellis	2016-06-22	14	-26/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add new images to match the new UI - Document the new prioritize feature
\| \| *	Move labels documentation to new locationdoc_refactor_labels	Achilleas Pipinellis	2016-06-21	18	-117/+120
\| \| \| \| \| \| \| \| \| \| \| \|	Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
\| \| *	Add info on tooltips	Achilleas Pipinellis	2016-06-21	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| *	Refactor labels docs	Achilleas Pipinellis	2016-06-21	12	-9/+101
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Merge branch 'expiry' into 'master'	Achilleas Pipinellis	2016-06-22	1	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify artifact expiry ## What does this MR do? Clarifies documentation about artifact expiry. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## Screenshots (if relevant) See merge request !4831
\| \| * \|	Clarify artifact expiryexpiry	Mark Pundsack	2016-06-21	1	-2/+2
\| \| \| \|
\| * \| \|	Merge branch 'ci-git' into 'master'	Achilleas Pipinellis	2016-06-22	1	-23/+80
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document `GIT_STRATEGY` and `GIT_DEPTH` ## What does this MR do? Documents `GIT_STRATEGY` and `GIT_DEPTH`. Also fixes the TOC since the anchors weren't working. ## Are there points in the code the reviewer needs to double check? The TOC and the location of the new entries. ## Why was this MR needed? ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/188 ## Screenshots (if relevant) ![image](/uploads/eccfd60199d81e6588c13aab817f0eb5/image.png) ![image](/uploads/bbbffe61db64ef17f1fa52907275f3d4/image.png) /cc @axil @ayufan See merge request !4720
\| \| * \| \|	Update GIT_DEPTH wordingci-git	Mark Pundsack	2016-06-17	1	-8/+26
\| \| \| \| \|
\| \| * \| \|	Clean up TOC	Mark Pundsack	2016-06-17	1	-23/+23
\| \| \| \| \|
\| \| * \| \|	Add to TOC	Mark Pundsack	2016-06-17	1	-0/+2
\| \| \| \| \|
\| \| * \| \|	Add GIT_STRATEGY and GIT_DEPTH	Mark Pundsack	2016-06-17	1	-0/+37
\| \| \| \| \|
\| * \| \| \|	Merge branch '18855-wrap-code-in-activities-and-todos' into 'master'	Dmitriy Zaporozhets	2016-06-22	3	-0/+9
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wrap code blocks on Activies and Todos page ## What does this MR do? wrap code blocks on Activities and Todos page ## Are there points in the code the reviewer needs to double check? Can `white-space: pre-wrap` be used for code blocks everywhere? ## Why was this MR needed? Content of code blocks is cut on small screen sizes. ## What are the relevant issue numbers? closes #18855 ## Screenshots ![activities-code](/uploads/83eb5100dbcc34ade8892e9f68bf767f/activities-code.png) ![todos-code](/uploads/80efbf4875c9f5db1f1a3790fc8afa3b/todos-code.png) See merge request !4783
\| \| * \| \| \|	wrap code blocks on Activies and Todos page	winniehell	2016-06-20	3	-0/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'feature/import-export-docs' into 'master'	Achilleas Pipinellis	2016-06-22	10	-1/+121
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	import/export docs Added documentation for and closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3050 Also added a couple of rake tasks that might be useful. See merge request !4732
\| \| * \ \ \ \	Merge branch 'master' into feature/import-export-docs	Achilleas Pipinellis	2016-06-22	99	-745/+826
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Give images proper names	Achilleas Pipinellis	2016-06-22	6	-5/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add note about the shared directory	Achilleas Pipinellis	2016-06-22	2	-2/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add colons in item lists	Achilleas Pipinellis	2016-06-22	1	-7/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add note about enabling import/export in existing installations	Achilleas Pipinellis	2016-06-22	2	-2/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove old doc	Achilleas Pipinellis	2016-06-22	1	-65/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add note about settingsfeature/import-export-docs	James Lopez	2016-06-22	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Refactor project import/export documentation	Achilleas Pipinellis	2016-06-21	3	-38/+66
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Move to new location	Achilleas Pipinellis	2016-06-21	7	-1/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to https://gitlab.com/gitlab-org/gitlab-ce/issues/3349
\| \| * \| \| \| \| \|	updated based on feedback	James Lopez	2016-06-21	1	-5/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	update screenshot with new changes	James Lopez	2016-06-21	1	-0/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	deleted images no longer needed	James Lopez	2016-06-21	6	-0/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	moved link to bottom of the page	James Lopez	2016-06-21	1	-2/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	added nice to have - rake task and some changes to docs	James Lopez	2016-06-21	3	-4/+18
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	added some extra nice tasks to have	James Lopez	2016-06-21	1	-4/+22
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	update docs	James Lopez	2016-06-21	1	-22/+20
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	import/export docs	James Lopez	2016-06-21	7	-0/+50
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'award-emoji-docs' into 'master'	Achilleas Pipinellis	2016-06-22	4	-14/+31
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expand on Award Emoji documentation, update/add screenshots. Adds documentation for award emoji now that comments can be awarded with emojis. See also !4291 and #18906 Closes #9091 cc: @virtuacreative @axil See merge request !4839
\| \| * \| \| \| \| \|	Expand on Award Emoji documentation, update/add screenshots. [ci skip]award-emoji-docs	Connor Shea	2016-06-21	4	-14/+31
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'hotfix/better-container-registry-documentation' into 'master'	Achilleas Pipinellis	2016-06-22	1	-0/+11
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some docs for Docker Registry configuration - Relatively important for anyone installing from source There have been a few issues created because of the lack of documentation for how to configure Docker Registry when installing from source, specifically what the `realm` needs to be and the `service` These 2 bits of info will stop a lot of headaches :+1: Issues: https://gitlab.com/gitlab-org/gitlab-ce/issues/17957 https://gitlab.com/gitlab-org/gitlab-ce/issues/17991 See merge request !4738
\| \| * \| \| \| \| \|	Oops ... Typo	Chris Wright	2016-06-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add some docs for Docker Registry configuration	Chris Wright	2016-06-17	1	-0/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix/error-typo' into 'master'	Rémy Coutable	2016-06-22	3	-7/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix import/export error typo Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18948 See merge request !4847
\| \| * \| \| \| \| \| \|	refactor to use haml insteadfix/error-typo	James Lopez	2016-06-22	2	-6/+6
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	fix typo	James Lopez	2016-06-22	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'ci-wording' into 'master'	Achilleas Pipinellis	2016-06-22	7	-45/+88
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Adds pipelines page to CI docs. * Adds image of pipelines list (although currently missing border that is on other images). * Changes CI to CI/CD in `/doc` and `/doc/ci` * Sorts user documentation in `/doc` Partially fixes #17733. See merge request !4660
\| \| * \| \| \| \| \| \| \|	Fix linkci-wording	Mark Pundsack	2016-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add 'and builds'	Mark Pundsack	2016-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Move Pipelines and Builds definitions to their own page	Mark Pundsack	2016-06-20	1	-0/+38
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Move Pipelines and Builds definitions to their own page	Mark Pundsack	2016-06-20	3	-55/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add CD	Mark Pundsack	2016-06-20	2	-13/+13
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add pipeline image	Mark Pundsack	2016-06-20	2	-19/+23
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add definitions and tweak some docs. Partially fixes #17733	Mark Pundsack	2016-06-20	4	-14/+67
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'custom-registry-storage-docs' into 'master'	Marin Jankovski	2016-06-22	1	-2/+73
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation and examples for configuring cloud storage for registry images. ## What does this MR do? Adds documentation and examples for configuring cloud storage for registry images. Waits for backend config to get merged in: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/816 ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1320 ## Does this MR meet the acceptance criteria? - [ ] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] ~~API support added~~ - [ ] Tests - [ ] ~~Added for this feature/bug~~ - [x] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc\ @marin See merge request !4812