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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Changed composer installer script in the CI PHP example docimprove-ci-example-php-doc	Jeffrey Cafferata	2017-01-26	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The script will check some php.ini settings warn you if they are set incorrectly, and then download the latest composer.phar in the current directory. These lines will, in order: - Download the installer SHA-384 to the current directory - Download the installer to the current directory - Verify the installer SHA-384 which you can also cross-check https://composer.github.io/pubkeys.html - Run the installer - Remove the installer & the installer SHA-384 Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'patch-6' into 'master'	Rémy Coutable	2017-01-26	1	-2/+9
\|\ \| \| \| \| \| \| \| \|	add an other ldap configuration example See merge request !6773
\| *	Add more precision about LDAP configuration	David	2016-10-24	1	-23/+10
\| \|
\| *	add an other ldap configuration example	David	2016-10-10	1	-1/+21
\| \|
* \|	Merge branch 'mysql-sources-utf8mb4-fix' into 'master'	Rémy Coutable	2017-01-26	2	-3/+204
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7 See merge request !8508
\| * \|	Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7	Guillaume Simon	2017-01-12	2	-3/+204
\| \| \|
* \| \|	Merge branch 'patch-12' into 'master'	Sean McGivern	2017-01-25	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update enviroments.md - example CURL requests had a typo in the URL See merge request cd ../gdk-ee/
\| * \| \|	Update enviroments.md - example CURL requests had a typo in the URL	Marc van Gend	2017-01-24	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'mrchrisw/rake-redis' into 'master'	Stan Hu	2017-01-25	1	-0/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Add redis version to info rake task See merge request !8283
\| * \| \|	Add redis version to info rake taskmrchrisw/rake-redis	Chris Wilson	2017-01-24	1	-0/+1
\| \| \| \|
* \| \| \|	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]