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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bump Git version requirement to 2.8.4update-git-version-in-doc	Rémy Coutable	2016-12-01	1	-4/+4
\| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'docs/container-registry-2fa' into 'master'	Achilleas Pipinellis	2016-12-01	3	-21/+43
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Document the need to use a PAT with Registry when 2FA is on Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22465 See merge request !7874
\| *	Document the need to use a PAT with Registry when 2FA is on	Achilleas Pipinellis	2016-12-01	3	-21/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab 8.12 introduced a new permissions model which tightened the security of Container Registry. It is now required to use a personal token if 2FA is enabled. [ci skip]
* \|	Small refactor of webhooks docs	Achilleas Pipinellis	2016-12-01	2	-35/+46
\|/ \| \| \|	[ci skip]
*	Merge branch 'docs/triggers-ref-clarify' into 'master'	Achilleas Pipinellis	2016-12-01	1	-3/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Clarify that a commit SHA doesn't work for CI triggers Related https://gitlab.com/gitlab-org/gitlab-ce/issues/22029 See merge request !7871
\| *	Clarify that a commit SHA doesn't work for CI triggers	Achilleas Pipinellis	2016-12-01	1	-3/+7
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'docs/fix-typo-build-artifacts' into 'master'	Achilleas Pipinellis	2016-12-01	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong link in builds artifacts admin docs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23168 See merge request !7870
\| * \|	Fix wrong link in builds artifacts admin docs	Achilleas Pipinellis	2016-12-01	1	-1/+1
\| \|/ \| \| \| \| \| \|	[ci skip]
* \|	Merge branch '23718/backup-rake-task-human-readable' into 'master'	Douwe Maan	2016-12-01	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	23718/backup rake task human readable ## What does this MR do? Add the human readable format to the backup tar file. From `1477317140_gitlab_backup.tar` to `1477317140_2016_10_24_gitlab_backup.tar`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? #23718 issue ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? 23718 See merge request !7188
\| * \|	Add Human Readable Timestamp to backup tar file	David Gerő	2016-11-30	1	-1/+1
\| \| \|
* \| \|	Merge branch ↵	Robert Speicher	2016-12-01	3	-10/+222
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install' into 'master' New `gitlab:workhorse:install` rake task ## Why was this MR needed? Because with this we can remove the "Ensure the gitlab-workhorse version in Install gitlab-workhorse matches the required version." step from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1! MR is ready: gitlab-org/release-tools!57 Closes #22719 See merge request !6574
\| * \|	Move task helpers to a module22719-provide-a-new-gitlab-workhorse-install-rake-task-similar-to-gitlab-shell-install	Rémy Coutable	2016-11-30	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Add #run_command! to task helpers to raise a TaskFailedError if status is not 0	Rémy Coutable	2016-11-30	2	-1/+203
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	New `gitlab:workhorse:install` rake task	Rémy Coutable	2016-11-30	2	-10/+20
\| \|/ \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'docs/git-submodules-with-ci' into 'master'	Achilleas Pipinellis	2016-11-30	4	-110/+96
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor the Git submodules with CI docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22567 See merge request !7856
\| * \|	Refactor the Git submodules with CI docs	Achilleas Pipinellis	2016-11-30	4	-110/+96
\| \|/ \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'api-branch-status' into 'master'	Rémy Coutable	2016-11-30	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Expose branch status Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938 See merge request !7796
\| * \|	API: Expose branch statusapi-branch-status	Robert Schilling	2016-11-30	1	-0/+5
\| \| \|
* \| \|	Merge branch 'grapify-files-api' into 'master'	Rémy Coutable	2016-11-30	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the files API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7806
\| * \| \|	Grapify the files APIgrapify-files-api	Robert Schilling	2016-11-30	1	-2/+2
\| \|/ /
* \| \|	Merge branch 'grapify-projects-api' into 'master'	Rémy Coutable	2016-11-30	1	-0/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the projects API Related to #22928 See merge request !7456
\| * \|	Grapify the projects APIgrapify-projects-api	Robert Schilling	2016-11-28	1	-0/+1
\| \|/
* \|	Merge branch 'add-stackprof' into 'master'	Robert Speicher	2016-11-30	1	-0/+110
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add StackProf to the Gemfile, along with a utility to get a profile for a spec The test suite needs speeding up significantly. This is one tool for investigating it. Related to #23034 See merge request !7784
\| * \|	Add StackProf to the Gemfile, along with a utility to get a profile for a spec	Nick Thomas	2016-11-29	1	-0/+110
\| \|/
* \|	Merge branch 'docs/fix-bitbucket-integration-typos' into 'master'	Achilleas Pipinellis	2016-11-29	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in Bitbucket integration docs [ci skip] See merge request !7823
\| * \|	Fixing typo & Clarifying Key name	Lee Matos	2016-11-29	1	-2/+2
\| \|/
* \|	Merge branch 'refactor-issuable-description-and-metadata' into 'master'	Robert Speicher	2016-11-29	1	-29/+82
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor issuable description and metadata form sections Continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/23864. Brother of gitlab-org/gitlab-ee!916. See merge request !7758
\| * \|	Refactor issuable description and metadata form sectionsrefactor-issuable-description-and-metadata	Rémy Coutable	2016-11-25	1	-29/+82
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Remove `memberOf` OID in LDAP `user_filter` docs ldap_user_filter_update2	Drew Blessing	2016-11-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While not technically invalid, it is not necessary to have the `memberOf` OID in the `user_filter`. It clutters things up and causes confusion for users so it's better if we remove it from the docs.
* \| \|	Add guidelines in doc linking with HAML	Achilleas Pipinellis	2016-11-28	1	-0/+71
\| \|/ \|/\| \| \| \| \|	[ci skip]
* \|	[ci skip] UX Guide: Anchor hover guidance include color changeux-guide-anchor-hover	awhildy	2016-11-26	2	-13/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Primary and secondary links should be dark blue on hover Update anchor image to dark blue for secondary Clean up markdown Fix anchorlinks image
* \|	[ci skip] UX Guide: add guidance for max height for dropdownsux-guide-dropdown-max-height	awhildy	2016-11-25	1	-0/+2
\| \| \| \| \| \| \| \|	Fix spelling
* \|	Merge branch 'workhorse-v1.0.1' into 'master'	Rémy Coutable	2016-11-25	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Workhorse to v1.0.1 v1.0.0 was wrongly tagged, causing compiled gitlab-workhorse binaries to misreport their version number. Closes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/77 See merge request !7759
\| * \|	Update GitLab Workhorse to v1.0.1	Nick Thomas	2016-11-25	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	v1.0.0 was mistakenly tagged with a lightweight, rather than annotated, tag, which caused compiled versions of workhorse to wrongly report their version.
* \| \|	Merge branch 'zj-expose-coverage-pipelines' into 'master'	Rémy Coutable	2016-11-25	1	-6/+12
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose coverage on GET pipelines/:id Closes gitlab-org/gitlab-ce#24801 See merge request !7670
\| * \|	Add docs for pipeline coverage	Z.J. van de Weg	2016-11-25	1	-6/+12
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'issue-24534' into 'master'	Rémy Coutable	2016-11-25	14	-158/+44
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary sentences for return codes in the API documentation Closes #24534 See merge request !7511
\| * \|	Remove unnecessary sentences for status codes in the API documentation	Luis Alonso Chavez Armendariz	2016-11-24	14	-158/+44
\| \| \|
* \| \|	Merge branch 'issue_24748' into 'master'	Fatih Acet	2016-11-25	3	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix title case to sentence case in "Add Todo" ## What does this MR do? Implements sentence case for `Add Todo` ## Are there points in the code the reviewer needs to double check? I changed the images used in the file `doc/workflow/todos.md` to show the new look. ## Why was this MR needed? #24748 ## Screenshots (if relevant) Before ![Screen_Shot_2016-11-21_at_12.03.21_PM](/uploads/225abe2901aacccea697596853bdc52c/Screen_Shot_2016-11-21_at_12.03.21_PM.png) ![Screen_Shot_2016-11-21_at_11.58.17_AM](/uploads/3a5997eb6bb037f1c581d9925fa288ce/Screen_Shot_2016-11-21_at_11.58.17_AM.png) After ![Screen_Shot_2016-11-21_at_12.03.38_PM](/uploads/3be4d58e5adaa10fab759f8726a4d257/Screen_Shot_2016-11-21_at_12.03.38_PM.png) ![Screen_Shot_2016-11-21_at_11.58.37_AM](/uploads/016cdb32cb1e87e9e3cfd89309b53a4a/Screen_Shot_2016-11-21_at_11.58.37_AM.png) ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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 it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #24748 See merge request !7724
\| * \| \|	Fix title case to sentence case	Luis Alonso Chavez Armendariz	2016-11-23	3	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'rephrase-system-notes' into 'master'	Robert Speicher	2016-11-25	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rephrase some system notes to be compatible with new system note style See merge request !7692
\| * \| \| \|	Rephrase some system notes to be compatible with new system note stylerephrase-system-notes	Douwe Maan	2016-11-24	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'remove-backup-strategies' into 'master'	Stan Hu	2016-11-24	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop supporting Google Cloud and Azure as backup strategies ## What does this MR do? It removes support for Azure and Google Cloud as backup strategies (via Fog). Motivation behind this decision can be found in !4928, !6713 but basically they require a lot of gems that are unrelated to the backup use-case. ## Are there points in the code the reviewer needs to double check? Am I missing any other location where we'd use these gems? See merge request !7739
\| * \| \| \| \|	Stop supporting Google and Azure as backup strategiesremove-backup-strategies	Rémy Coutable	2016-11-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The amount of gems required is quite high compared to the usefulness of the features. Related to !4928, !6713 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	You can only assign default_branch when editing a project or when creating a ↵	Robert Schilling	2016-11-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	project for a specified user [ci skip] You can only assign default_branch when editing a project [ci skip]
* \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2016-11-24	1	-5/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24908-install-instructions-seem-to-have-two-database-steps-out-of-order' into 'master' Fix documentation to create the `pg_trm` extension before creating the DB Closes #24908 See merge request !7735
\| * \| \| \| \|	Fix documentation to create the `pg_trm` extension before creating the DB24908-install-instructions-seem-to-have-two-database-steps-out-of-order	Rémy Coutable	2016-11-24	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2016-11-24	1	-0/+58
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing documentation. ## What does this MR do? Add documentation to Build events on webhooks See merge request !7717
\| * \| \| \| \| \|	Add missing documentation.	PotHix	2016-11-23	1	-0/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build was being triggered but there was no documentation about it, so I'm adding what I was receiving from webhooks when implementing the Rocketchat integration (https://github.com/PotHix/rocketchat-gitlab-hook).
* \| \| \| \| \| \|	Merge branch 'update-project-api-doc' into 'master'	Sean McGivern	2016-11-24	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add default_branch attr to Project API payload in docs. See merge request !7726