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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '24923_nested_tasks' into 'master'	Sean McGivern	2017-01-24	1	-3/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix nested tasks in ordered list Closes #24923 See merge request !8626
\| *	fix nested tasks in ordered list	Jarka Kadlecova	2017-01-24	1	-3/+17
\| \|
* \|	Merge branch 'patch-12' into 'master'	Rémy Coutable	2017-01-24	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in link to "Services Templates" page. See merge request !8709
\| * \|	Fix typo in link to "Services Templates" page.	Arnd	2017-01-23	1	-1/+1
\| \| \|
* \| \|	Add docs for resolve conflicts editor	Achilleas Pipinellis	2017-01-24	2	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge the two 2FA docs into one	Achilleas Pipinellis	2017-01-24	11	-215/+224
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Add due dates docs	Achilleas Pipinellis	2017-01-24	9	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'patch-12' into 'master'	James Lopez	2017-01-24	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix hash of ruby in update documentation See merge request !8735
\| * \| \|	Fix hash of ruby archive in documentation	Maximilien Cuony	2017-01-24	2	-2/+2
\| \| \| \|
* \| \| \|	Add link to confidential issues MR	Achilleas Pipinellis	2017-01-24	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Add docs for confidential issues	Achilleas Pipinellis	2017-01-24	9	-14/+86
\|/ / / \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'no-more-bosses' into 'master' 27019-merge-when-pipeline-succeeds-visible-if-approvals-are-pending	Stan Hu	2017-01-23	2	-10/+10
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Rename endboss -> maintainer, miniboss -> reviewer See merge request !8719
\| * \|	Rename endboss -> maintainer, miniboss -> reviewerno-more-bosses	Sean McGivern	2017-01-13	2	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want to describe these roles in a way that is more understandable to people not familiar with GitLab.
* \| \|	correct the prometheus feature configuration according to ↵	Marcello	2017-01-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template#L1147
* \| \|	Merge branch 'docs/prometheus' into 'master'	Achilleas Pipinellis	2017-01-22	3	-1/+109
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Prometheus docs See merge request !8699
\| * \| \|	Add information on the dashboard and exporter ports	Achilleas Pipinellis	2017-01-22	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Expose Prometheus docs to the main README	Achilleas Pipinellis	2017-01-22	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Add Prometheus docs	Achilleas Pipinellis	2017-01-22	1	-0/+97
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1237 Omnibus MR: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1227 Omnibus issue: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1481
* \| \| \|	Merge branch '25851-document-token-scopes' into 'master'	Rémy Coutable	2017-01-20	2	-3/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation around OAuth/Personal Access Token scopes. Closes #25851 See merge request !8226
\| * \| \| \|	Add documentation around OAuth/Personal Access Token scopes.	Timothy Andrew	2017-01-19	2	-3/+13
\| \| \| \| \|
* \| \| \| \|	Make university more prominent.	sytses	2017-01-19	1	-1/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ci-submodule-doc-update' into 'master'	Tomasz Maczukin	2017-01-19	2	-1/+47
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document GIT_SUBMODULE_STRATEGY See merge request !8586
\| * \| \| \| \|	Document GIT_SUBMODULE_STRATEGY	Jonathon Reinhart	2017-01-16	2	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This documents the `GIT_SUBMODULE_STRATEGY` feature added in gitlab-ci-multi-runner version 1.10. [ci skip]
* \| \| \| \| \|	Add an image to the public access documentation and fix wrong profile path	Rémy Coutable	2017-01-19	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'patch-9' into 'master'	Fatih Acet	2017-01-19	1	-10/+68
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for possible causes of JS-related test failures. See merge request !8214
\| * \| \| \| \| \|	Fix markdown errors.patch-9	Bryce Johnson	2016-12-21	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add documentation for possible causes of JS-related test failures.	Bryce Johnson	2016-12-21	1	-10/+68
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'document-auto_link_ldap_user' into 'master'	Achilleas Pipinellis	2017-01-19	1	-0/+10
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the `auto_link_ldap_user` setting See merge request !8568
\| * \| \| \| \| \|	Document the `auto_link_ldap_user` setting	Nick Thomas	2017-01-13	1	-0/+10
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Add Slack slash commands to project services list index	Achilleas Pipinellis	2017-01-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'time-tracking-api' into 'master'	Sean McGivern	2017-01-18	2	-0/+279
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Time tracking API Closes #25861 See merge request !8483
\| * \| \| \| \| \|	Add some API endpoints for time tracking.	Ruben Davila	2017-01-18	2	-0/+279
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New endpoints are: POST :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/time_estimate" POST :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/reset_time_estimate" POST :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/add_spent_time" POST :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/reset_spent_time" GET :project_id/(issues\|merge_requests)/(:issue_id\|:merge_request_id)/time_stats"
* \| \| \| \| \| \|	Merge branch 'backport-time-tracking-ce' into 'master'	Douwe Maan	2017-01-18	5	-0/+78
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport timetracking to CE See merge request !8195
\| * \| \| \| \| \|	Slight modification to the doc	Regis Freyd	2017-01-15	1	-5/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Backport backend work for time tracking.	Ruben Davila	2017-01-15	5	-0/+81
\| \|/ / / / /
* \| \| \| \| \|	Fixing typo	Cristian Thiago Moecke	2017-01-18	1	-1/+1
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge branch '24915_merge_slash_command' into 'master'	Sean McGivern	2017-01-17	1	-0/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support `/merge` slash command for MRs Closes #24915 See merge request !7746
\| * \| \| \|	support `/merge` slash comand for MRs	Jarka Kadlecova	2017-01-11	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-fix-broken-link-docs' into 'master'	Robert Speicher	2017-01-13	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in docs Closes #26544 [ci skip] See merge request !8529
\| * \| \| \| \|	Fix broken link in docszj-fix-broken-link-docs	Z.J. van de Weg	2017-01-11	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'env-var-in-redis-config' into 'master'	Rémy Coutable	2017-01-13	1	-0/+6
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to use ENV variables in redis config See merge request !8073
\| * \| \| \|	Allow to use ENV variables in redis config	Semyon Pupkov	2017-01-13	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	API: Implement project issues iid param with IssuesFinder and add tests23194-fix-no-milestone-option-for-projects-endpoint	David Eisner	2017-01-12	1	-0/+3
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use IssuesFinder for the /issues API resouce - Tests for iid filter in project issues API resource - Tests for No Milestone filter in issues API resources The "No Milestone" case was not previously tested, and the `/issues` resource did not support the the `milestone` parameter. - Return issues where all labels match from the issues and project issues API resources, like the group issues resource already does. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6825#note_17474533 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Add support for PlantUML diagrams in Asciidoc.	Horacio Sanson	2017-01-12	4	-2/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with src pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
* \| \| \|	Merge branch 'backup-restore-documentation-tips' into 'master'	Marin Jankovski	2017-01-11	1	-1/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Add detail to backup_restore omnibus remote storage docs See merge request !8306
\| * \| \|	Add detail to backup_restore remote storage docs	Daniel Guilak	2016-12-24	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Location in which to add `gitlab_rails` configurations - Reminder to run `gitlab-ctl reconfigure` after changing gitlab_rails
* \| \| \|	Merge branch 'patch-8' into 'master'	Achilleas Pipinellis	2017-01-10	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify instructions for importing Wiki/Merge Request data See merge request !8075
\| * \| \| \|	Update html link to markdown linkpatch-8	Lee Matos	2016-12-15	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	applying style guide fixes	Lee Matos	2016-12-15	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Clarify instructions for importing Wiki/Merge Request data	Lee Matos	2016-12-13	1	-0/+2
\| \| \| \| \|