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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'improve_weight_icon' into 'master'	Dmitriy Zaporozhets	2016-01-05	2	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve weight icon The scale as an icon for issue weight seems a little easier to recognize. I also removed the icon from the issuable form because none of the other fields have icons. We have similar icons for assignee and milestone, but they are not present here. If we want the weight icon, I propose we add the respective icons for each field. Screenshots: ### Issue list ![Screen_Shot_2015-12-21_at_3.10.56_PM](/uploads/1578b649a7481fcc99e098ccde59d846/Screen_Shot_2015-12-21_at_3.10.56_PM.png) ![Screen_Shot_2015-12-21_at_3.08.37_PM](/uploads/f58e87c615ff68d97b509f0974833619/Screen_Shot_2015-12-21_at_3.08.37_PM.png) ### Form ![Screen_Shot_2015-12-21_at_3.12.15_PM](/uploads/54338e7c65cc9ee2645f4c7a27a0be7b/Screen_Shot_2015-12-21_at_3.12.15_PM.png) ![Screen_Shot_2015-12-21_at_3.07.19_PM](/uploads/61761287d261dfa1b37d4a1f98a9a442/Screen_Shot_2015-12-21_at_3.07.19_PM.png) ### Sidebar ![Screen_Shot_2015-12-21_at_3.13.01_PM](/uploads/2e69888e7438946df45eb988e16c65f0/Screen_Shot_2015-12-21_at_3.13.01_PM.png) ![Screen_Shot_2015-12-21_at_3.13.15_PM](/uploads/78ffcbf426f71cddbff731dd04a48687/Screen_Shot_2015-12-21_at_3.13.15_PM.png) See merge request !88
\| *	Improve weight icon	Drew Blessing	2015-12-22	2	-1/+1
\| \|
* \|	Merge remote-tracking branch 'origin/master' into ce_upstream	Valery Sizov	2015-12-25	12	-21/+322
\|\ \
\| * \|	Clean up CRIME security doc [ci skip]	Achilleas Pipinellis	2015-12-25	1	-37/+41
\| \| \|
\| * \|	Merge branch 'master' into adding_crime_security	Achilleas Pipinellis	2015-12-25	20	-21/+435
\| \|\ \
\| \| * \	Merge branch 'ci_triggers_docs' into 'master'	Achilleas Pipinellis	2015-12-25	7	-20/+197
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation on CI triggers Closes #3432 ## Notes * Implement build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/229 * Build trigger API - https://gitlab.com/gitlab-org/gitlab-ci/issues/257 * Build pipeline - https://dev.gitlab.org/gitlab/gitlab-ci/issues/282 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3743 * Dependent builds - https://dev.gitlab.org/gitlab/gitlab-ci/issues/328 * Travis docs - https://docs.travis-ci.com/user/triggering-builds/ * Custom variables Circle CI example - https://circleci.com/docs/nightly-builds * Triggers API (CI) will be done in a separate MR * Notify https://gitlab.com/gitlab-org/gitlab-ci/issues/368 once done ## Docs needed to change - [x] `doc/ci/README.md` - [x] `doc/README.md` See merge request !2161
\| \| \| * \|	Add examples for triggers [ci skip]	Achilleas Pipinellis	2015-12-25	1	-5/+76
\| \| \| \| \|
\| \| \| * \|	Merge branch 'master' into ci_triggers_docsci_triggers_docs	Achilleas Pipinellis	2015-12-25	11	-4/+192
\| \| \| \|\ \
\| \| \| * \| \|	Add images and examples	Achilleas Pipinellis	2015-12-25	5	-2/+95
\| \| \| \| \| \|
\| \| \| * \| \|	Remove triggers from yaml doc [ci skip]	Achilleas Pipinellis	2015-12-24	1	-27/+0
\| \| \| \| \| \|
\| \| \| * \| \|	Add triggers doc in top level readme [ci skip]	Achilleas Pipinellis	2015-12-24	1	-5/+6
\| \| \| \| \| \|
\| \| \| * \| \|	Document triggers in yaml/README.md [ci skip]	Achilleas Pipinellis	2015-12-21	1	-0/+27
\| \| \| \| \| \|
\| \| \| * \| \|	Init documentation on Triggers [ci skip]	Achilleas Pipinellis	2015-12-21	2	-19/+31
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'support-api-lookup-by-username' into 'master'	Dmitriy Zaporozhets	2015-12-25	1	-1/+11
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API support for looking up a user by username Needed to support Huboard See merge request !2089
\| \| \| * \| \| \|	Add API support for looking up a user by username	Stan Hu	2015-12-24	1	-1/+11
\| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Needed to support Huboard
\| \| * \| \| \|	Fixed codestyle and added 2FA documentationfeature/force-tfa	Gabriel Mazetto	2015-12-24	2	-0/+39
\| \| \|/ / /
\| \| * \| \|	Merge branch 'add-project-permissions' into 'master'	Dmitriy Zaporozhets	2015-12-23	1	-0/+10
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add project permissions to all project API endpoints This standardizes all the project API formats. Also needed to support Huboard. See merge request !2090
\| \| \| * \| \|	Add project permissions to all project API endpoints	Stan Hu	2015-12-22	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This standardizes all the project API formats. Also needed to support Huboard.
\| \| * \| \| \|	Merge branch 'meta-example' into 'master'	Sytse Sijbrandij	2015-12-23	1	-0/+1
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to the gitlab-ci.yml file of GitLab itself. I'm hunting for this link from time to time in customer demo's so I think it is useful to add. /cc @ayufan See merge request !1993
\| \| \| * \| \|	Link to the gitlab-ci.yml file of GitLab itself.meta-example	Sytse Sijbrandij	2015-12-05	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Adding how we manage CRIME vulnerability to security docs [ci skip]adding_crime_security	Jose Torres	2015-12-19	2	-0/+60
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'ldap_docs' into 'master'	Achilleas Pipinellis	2015-12-25	1	-2/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify LDAP group sync This documents LDAP group sync details. When group sync is enabled, non LDAP users will not be removed. They may leave on their own. However, no one can add or remove users manually. cc/ @balameb @axil See merge request !85
\| * \| \| \| \|	[ci skip] Clarify LDAP group sync	Drew Blessing	2015-12-22	1	-2/+4
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'license-docs' into 'master'	Robert Speicher	2015-12-24	5	-0/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add license upload docs Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/113 [ci skip] See merge request !89
\| * \| \| \| \|	Tweak license docs.	Douwe Maan	2015-12-24	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Add license upload docs	Douwe Maan	2015-12-22	5	-0/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into ce_upstream	Valery Sizov	2015-12-23	4	-4/+66
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'tduehr/gitlab-ce-cas-support'	Douwe Maan	2015-12-21	2	-0/+63
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Add link to CAS doc	Douwe Maan	2015-12-21	2	-3/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	add CAS authentication support	tduehr	2015-12-14	1	-0/+62
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'backport_jira' into 'master'	Dmitriy Zaporozhets	2015-12-21	8	-0/+114
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport JIRA service Fixes #3839 Move EE JIRA functionality back to CE. - [x] Make it function in manual testing - [x] Migrate JIRA-specific tests - [x] Tests pass - [x] Migrate documentation - [x] Rollback to previous CE JIRA integration locally, activate on a project then try to migrate db and see if integration still works. - [x] Final EE search for JIRA references See merge request !2146
\| \| * \| \| \| \|	Backport JIRA service	Drew Blessing	2015-12-18	8	-0/+114
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'removeNonDefinedVariableFromCIDoc' into 'master'	Achilleas Pipinellis	2015-12-19	1	-2/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove CI_BUILD_BEFORE_SHA from CI documentation As pointed in #3210, the environment variable isn't usable any more. See merge request !2118
\| \| * \| \| \| \| \|	Remove CI_BUILD_BEFORE_SHA from CI documentation	Cauan Cabral	2015-12-16	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As pointed in #3210, the environment variable isn't usable any more.
\| * \| \| \| \| \| \|	Merge branch 'update_artifact_runner_docs' into 'master'	Achilleas Pipinellis	2015-12-19	1	-1/+2
\| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify Windows shell executor artifact upload support @ayufan noted that the runner does not support artifact upload for Windows shell executor. This adds a note so users aren't confused. See merge request !2142
\| \| * \| \| \| \| \|	Clarify Windows shell executor artifact upload support	Drew Blessing	2015-12-17	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add missing dot in .gitlab-ci.yml [ci skip]	Achilleas Pipinellis	2015-12-22	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Clarify some things in Pages [ci skip]	Achilleas Pipinellis	2015-12-22	1	-8/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Pages are enabled by default on each project * Add note about using the `only` parameter
* \| \| \| \| \| \| \|	Add note about shared runners [ci skip]	Achilleas Pipinellis	2015-12-22	1	-0/+3
\| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Add plain HTML to the GitLab pages docs.	Douwe Maan	2015-12-22	1	-3/+21
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'pages_example_url' into 'master'	Marin Jankovski	2015-12-22	2	-13/+13
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the example.com domain for consistency See merge request !87
\| * \| \| \| \| \|	Use the example.com domain for consistency [ci skip]	Achilleas Pipinellis	2015-12-21	2	-13/+13
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jenkins_gitlab_plugin' into 'master'	Robert Speicher	2015-12-21	4	-9/+91
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Jenkins GitLab Plugin Fixes #106 Deprecate the existing Jenkins service, which uses GitLab Hook plugin. Adds support for GitLab Plugin which utilizes the GitLab commit status API. The overall experience is much better. See merge request !79
\| * \| \| \| \| \|	Use Jenkins GitLab Plugin	Drew Blessing	2015-12-18	4	-9/+91
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue-weight' into 'master'	Douwe Maan	2015-12-19	3	-0/+16
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add weight field to the issue Fixes #70 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !76
\| * \| \| \| \| \|	Minor clean up and rewording	Achilleas Pipinellis	2015-12-18	1	-4/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	update issue_weights documentation	Job van der Voort	2015-12-18	1	-7/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make draft docs for issue weight feature	Dmitriy Zaporozhets	2015-12-18	3	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Typo fixes, remove unnecessary information about pages path [ci skip]	Achilleas Pipinellis	2015-12-18	2	-14/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Refer to server_name with regex	Kamil Trzcinski	2015-12-18	1	-3/+8
\| \| \| \| \| \| \|