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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into issue_3359_3issue_3359_3	Felipe Artur	2016-06-29	5	-21/+38
\|\
\| *	Merge branch 'inline-todos-docs' into 'master'	Robert Speicher	2016-06-22	5	-21/+38
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Todos documentation and screenshots to include new functionality. Updates documentation for todos, includes updated and new screenshots. See also !4502 and #18906 Closes #18923 [ci skip] See merge request !4840
\| \| *	Finish my sentence. [ci skip]	Connor Shea	2016-06-22	1	-2/+1
\| \| \|
\| \| *	Update Todos documentation and screenshots to include new functionality.inline-todos-docs	Connor Shea	2016-06-21	5	-21/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about manually creating Todos from issue and merge request sidebars. [ci skip]
* \| \|	merge master into issue_3359_3	Felipe Artur	2016-06-29	1	-0/+2
\|\ \ \ \| \|/ / \|/\| \|
* \| \|	Merge branch 'doc_refactor_labels' into 'master'	Achilleas Pipinellis	2016-06-22	5	-17/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor labels docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18555 See merge request !3347
\| * \| \|	Move labels documentation to new locationdoc_refactor_labels	Achilleas Pipinellis	2016-06-21	16	-116/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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]
* \| \|	Expand on Award Emoji documentation, update/add screenshots. [ci skip]award-emoji-docs	Connor Shea	2016-06-21	4	-14/+31
\|/ /
* \|	Merge branch ↵	Jacob Schatz	2016-06-20	1	-0/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'lbennett/gitlab-ce-18114-add-up-arrow-edit-shortcut-documentation' into 'master' Documented the up key shortcut ## What does this MR do? Documents the `up` key edit note shortcut in the `/help/_shortcuts.html.haml` help pane and the `/doc/workflow/shortcuts.png` screenshot. ## Are there points in the code the reviewer needs to double check? The issue and MR shortcuts should be merged, they're the same? Shall I open an issue or include here? This panel also need to be a little more responsive. Shall I open an issue or include here? Additionally, I have some conflicts regarding the screenshot. This screenshot also needs to update for !4570. ## Why was this MR needed? Everyone should know about this awesome shortcut. ## What are the relevant issue numbers? Closes #18114. ## Screenshots (if relevant) View the [updated screenshot](https://gitlab.com/gitlab-org/gitlab-ce/blob/e7221ad66efeb0f7d263ead7ed523d194243fb09/doc/workflow/shortcuts.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4758
\| * \|	Added shortcut to help shortcuts viewlbennett/gitlab-ce-18114-add-up-arrow-edit-shortcut-documentation	Luke "Jared" Bennett	2016-06-17	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated shortcuts.png for docs Updated CHANGELOG Moved CHANGELOG entry updated shortcut docs
* \| \|	Merge branch '18584-document-request-access-feature' into 'master'	Achilleas Pipinellis	2016-06-20	17	-1/+45
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document access request to project & group ## What does this MR do? Adds documentation that was missing from !3798. ## Are there points in the code the reviewer needs to double check? I've taken the opportunity to update the images in the "Project users" documentation page, I can remove the commit if it's not welcome! ## What are the relevant issue numbers? Closes #18584. ## Does this MR meet the acceptance criteria? - [ ] Tests - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) /cc @DouweM See merge request !4685
\| * \| \|	Update images for the 'Project users' documentation18584-document-request-access-feature	Rémy Coutable	2016-06-15	10	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Add documentation for the 'request access to group' feature	Rémy Coutable	2016-06-15	4	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	Add documentation for the 'request access to project' feature	Rémy Coutable	2016-06-15	4	-0/+22
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge master into issue_12758issue_12758	Felipe Artur	2016-06-17	1	-1/+1
\|\ \ \ \| \|/ /
* \| \|	Re-use notifications dropdown/modal for user profile	Felipe Artur	2016-06-17	1	-0/+0
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Add notification settings documentation and update screenshot	Felipe Artur	2016-06-13	2	-2/+4
\| \|/
* \|	Implement custom notification level options	Felipe Artur	2016-06-15	2	-2/+4
\|/
*	Add documentation for the 'only_allow_merge_if_build_succeeds.rb' feature	Rémy Coutable	2016-06-10	2	-0/+11
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'issue_9013' into 'master'	Douwe Maan	2016-05-20	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Let users set notification levels in projects which they are not members Fixes #9013 See merge request !3986
\| *	Update documentation	Felipe Artur	2016-05-17	1	-1/+1
\| \|
* \|	Merge branch 'patch-1' into 'master'	Hannes Rosenögger	2016-05-18	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	doc: fix git lfs workaround for using http instead of https the url should only point to `info/lfs` instead of `info/lfs/batch/objects` See merge request !2713
\| *	doc: fix git lfs workaround for using http instead of https	Felix Ruess	2016-02-04	1	-1/+1
\| \| \| \| \| \|	the url should only point to `info/lfs` instead of `info/lfs/batch/objects`
* \|	Change all occurrences of doc.gitlab.com to docs.gitlab.com	Achilleas Pipinellis	2016-05-13	5	-6/+6
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge pull request #9953 from cmckni3/update-lfs-documentation	Achilleas Pipinellis	2016-05-08	1	-1/+1
\|\ \ \| \| \| \| \| \|	Update git lfs initialize command
\| * \|	Updates git lfs initialize command	Chris McKnight	2016-04-07	1	-2/+2
\| \| \|
* \| \|	Update wording	Alfredo Sumaran	2016-04-26	1	-1/+1
\| \| \|
* \| \|	Add documentation for "Hide whitespace changes" button	Alfredo Sumaran	2016-04-26	4	-3/+3
\| \| \|
* \| \|	Merge branch 'issue_14904' into 'master'	Jacob Schatz	2016-04-25	1	-0/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new shortcuts Closes #14904 - On a project: `i` To navigate to New Issue page. - On a issuable: `l` To open Label dropdown on a issuable. - Global: Typing `?` multiple times now toggles the modal. See merge request !3686
\| * \ \	Merge remote-tracking branch 'origin/master' into issue_14904	Alfredo Sumaran	2016-04-20	7	-1/+54
\| \|\ \ \
\| * \| \| \|	Update shortcuts image	Alfredo Sumaran	2016-04-18	1	-0/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'doc-gh-import-additions' into 'master'	Achilleas Pipinellis	2016-04-22	1	-5/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add newest enhancements to GH importer docs [ci skip] See merge request !3867
\| * \| \| \| \|	Add newest enhancements to GH importer docs	Achilleas Pipinellis	2016-04-22	1	-5/+9
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Use new Note styleguide	Achilleas Pipinellis	2016-04-22	1	-1/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'pmq20/gitlab-ce-issue_12785'	Douwe Maan	2016-04-19	6	-0/+53
\|\ \ \ \
\| * \| \| \|	Add support to cherry-pick any commit	P.S.V.R	2016-04-18	6	-0/+53
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* \| \| \|	"git lfs init" is deprecated, use "git lfs install" instead.	Con Vissenberg	2016-04-18	1	-1/+1
\|/ / /
* \| \|	Start with iid on branch creation	Zeger-Jan van de Weg	2016-04-14	1	-1/+1
\| \| \|
* \| \|	Move 'New branch from issue' feature doc to web_editor.md	Achilleas Pipinellis	2016-04-13	2	-0/+32
\|/ / \| \| \| \| \| \|	[ci skip]
* \|	Clarify LFS configuration	Drew Blessing	2016-03-24	1	-0/+4
\| \|
* \|	Refactor award emoji doc a bit	Achilleas Pipinellis	2016-03-22	1	-4/+4
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Add award emoji docs	Achilleas Pipinellis	2016-03-22	5	-0/+48
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Use relative links in `doc`, fix broken generated HTML links	Anatoly Borodin	2016-03-17	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Links like (doc/web_hooks/web_hooks.md) work in the GitLab source code web interface, but the HTML generator produces broken links in the `doc` subdirectories: http://doc.gitlab.com/ce/hooks/doc/web_hooks/web_hooks.html instead of the right one http://doc.gitlab.com/ce/web_hooks/web_hooks.html in http://doc.gitlab.com/ce/hooks/custom_hooks.html. Fixes #14338 [ci skip] Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com>
* \|	Bring share with group feature documentation from EE	Dmitriy Zaporozhets	2016-03-12	7	-0/+45
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Added Troubleshooting information for most used services.	Patricio Cano	2016-03-03	2	-30/+63
\| \|
* \|	Add Todos documentation	Achilleas Pipinellis	2016-03-02	4	-0/+74
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2016-02-26	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add instructions for pushing tags as well as branches Current instructions will push the svn branches but not tags - add missing line to tags See merge request !2778
\| * \|	Add instructions for pushing tags as well as branches	M. Ricketts	2016-02-10	1	-0/+1
\| \|/