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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'document-absolute-links' into 'master'	Rémy Coutable	2016-10-24	1	-0/+8
\|\ \| \| \| \| \| \| \| \|	Document link syntax introduced by !5586. See merge request !7049
\| *	Document link syntax introduced by !5586document-absolute-links	Winnie	2016-10-21	1	-0/+8
\| \|
* \|	Merge branch '23146_19131_build-api_scope-doc' into 'master'	Rémy Coutable	2016-10-22	1	-4/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix documents and comments on Build API `scope` Fixes #23146 Fixes #19131 See merge request !7044
\| * \|	Fix documents and comments on Build API `scope`. #23146 #19131	Lemures Lemniscati	2016-10-22	1	-4/+4
\| \| \|
* \| \|	Merge branch 'patch-3' into 'master'	Rémy Coutable	2016-10-22	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix docker.sock reference in config.toml ## What does this MR do? `config.toml` sample did not correctly represent the `/var/run/docker.sock` mapping, causing it to be created as a volume instead. ## Why was this MR needed? It was broken. See merge request !5172
\| * \| \|	Fix docker.sock reference in config.toml	Niels Keurentjes	2016-07-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Mapping was omitted so it would just create a temp volume.
* \| \| \|	Merge branch 'docs/dynamic-envs-yaml' into 'master'	Achilleas Pipinellis	2016-10-22	1	-25/+135
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and add new environment functionality to CI yaml reference ## What does this MR do? Add new `environment` functionality to the yaml reference. ## What are the relevant issue numbers? Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23484 See merge request !7026
\| * \| \| \|	Refactor and add new functionality to CI yaml referencedocs/dynamic-envs-yaml	Achilleas Pipinellis	2016-10-20	1	-25/+135
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci ski]
* \| \| \| \|	Merge branch 'fix-example-in-api-documentation' into 'master'	Rémy Coutable	2016-10-22	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong example in api/users documentation ## What does this MR do? Just a small typo fix in API docs. While greping for this typo I also found couple more places with same mistake and included them in the MR too. See merge request !7043
\| * \| \| \|	Fix wrong endpoint in api/users documentation, fix same typo in spec ↵	Airat Shigapov	2016-10-21	1	-1/+1
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	describe blocks
* \| \| \|	Merge branch 'separate-sidekiq-queues' into 'master'	Douwe Maan	2016-10-21	2	-1/+40
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use separate queues for all Sidekiq workers ## What does this MR do? This MR updates all workers so that they (mostly) use their own Sidekiq queues. This in turn allows us to monitor queues more accurately and in the future impose queue specific throttles, limits, etc. This is a critical part we need in 8.13, despite it being so close to release day. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 for more information. ## 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] 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/23370 See merge request !7006
\| * \| \| \|	Re-organize queues to use for Sidekiqseparate-sidekiq-queues	Yorick Peterse	2016-10-21	2	-1/+40
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dumping too many jobs in the same queue (e.g. the "default" queue) is a dangerous setup. Jobs that take a long time to process can effectively block any other work from being performed given there are enough of these jobs. Furthermore it becomes harder to monitor the jobs as a single queue could contain jobs for different workers. In such a setup the only reliable way of getting counts per job is to iterate over all jobs in a queue, which is a rather time consuming process. By using separate queues for various workers we have better control over throughput, we can add weight to queues, and we can monitor queues better. Some workers still use the same queue whenever their work is related. For example, the various CI pipeline workers use the same "pipeline" queue. This commit includes a Rails migration that moves Sidekiq jobs from the old queues to the new ones. This migration also takes care of doing the inverse if ever needed. This does require downtime as otherwise new jobs could be scheduled in the old queues after this migration completes. This commit also includes an RSpec test that blacklists the use of the "default" queue and ensures cron workers use the "cronjob" queue. Fixes gitlab-org/gitlab-ce#23370
* \| \| \|	Merge branch 'patch-6' into 'master'	Rémy Coutable	2016-10-21	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grammar fixes in docs Some minor grammar fixes in a page in the docs See merge request !6645
\| * \| \| \|	Grammar fixes in docs	Wilfred Hughes	2016-10-03	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-6' into 'master'	Rémy Coutable	2016-10-21	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed gitlab-shell version to avoid warning when precompiling the assets. ## What does this MR do? Changes installation instructions from source to install v3.6.1 of gitlab-shell to avoid a pre-compile warning on gitlab. See merge request !6747
\| * \| \| \|	Changed gitlab-shell version to avoid warning when precompiling the assets.	Ismael Arenzana	2016-10-07	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2016-10-21	1	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Documentation image when configuring Build emails in Services ## What does this MR do? Replace old GitLab image in documentation with a new image showing the new position of Services and the module 'Build emails' ## Why was this MR needed? GitLab's layout changed with version 8.9 and the buttons were moved. See merge request !5139
\| * \| \| \| \|	Replace builds_emails_service.png to fit to new layout of GitLab	Christian Meter	2016-07-07	1	-0/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Rémy Coutable	2016-10-21	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Doc] Fix `ref` parameter name for `commits/statuses` The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`). Tested on Gitlab CE 8.9. See merge request !4876
\| * \| \| \| \| \|	Fix `ref` parameter name for `commits/statuses`	Pierre de La Morinerie	2016-06-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The attribute to filter by branch or tag needs to be named `ref`, not `ref_name`. And indeed the attribute in the JSON response is `ref` (and not `ref_name`). Tested on Gitlab CE 8.9.
* \| \| \| \| \| \|	Merge branch 'edit-glossary' into 'master'	Sean Packham	2016-10-21	1	-139/+246
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edit glossary Grammar fixes & new additions to the glossary page. See merge request !7027
\| * \| \| \| \| \|	added skipped definitionedit-glossary	evhoffmann	2016-10-20	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	updated some links in definitions	evhoffmann	2016-10-20	1	-11/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	a round of terms and edits	evhoffmann	2016-10-19	1	-137/+230
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove pagination description from individual doc	Takuya Noguchi	2016-10-20	1	-2/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix a broken table in Project API doc	Takuya Noguchi	2016-10-20	1	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix import/export labels to cope with project and group labels. Added ↵	James Lopez	2016-10-19	1	-1/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	relevant specs.
* \| \| \| \| \|	Merge branch 'fix-system-hook-api' into 'master'	Rémy Coutable	2016-10-19	1	-5/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Fix Sytem hooks delete behavior ## What does this MR do? This corrects the delete API for system hooks. Returning 200 is not the right way indicating a hooks is not found. ## What are the relevant issue numbers? Discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6861/diffs#609af00c90e3d5241064d1404e3e018a3235634a_64_62 See merge request !6883
\| * \| \| \| \| \|	API: Fix Sytem hooks delete behaviorfix-system-hook-api	Robert Schilling	2016-10-14	1	-5/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dz-rename-user-routes' into 'master'	Robert Speicher	2016-10-17	13	-87/+87
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename users routing from /u/:username to /users/:username for consistency with other routes Renames /u/:username to /users/:username To follow consistency with other routes (like groups) and UsersController name. Now when you can use `/:username` for accessing user page there is no need in shortcut like `/u/` See merge request !6851
\| * \| \| \| \| \| \|	Remove /u/ prefix from user pages in documentation	Dmitriy Zaporozhets	2016-10-13	13	-87/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Updated logo from @luke	Matt Lee	2016-10-17	1	-0/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Convert CHANGELOG to Markdown	Robert Speicher	2016-10-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All this does is convert the version sections into headers. The list items shouldn't really be indented by two spaces, but it makes no difference to the rendering and this way we retain authorship history for the actual changes. Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
* \| \| \| \| \| \| \|	Merge branch 'master' into 'docs/change-docs-reviewers'	Achilleas Pipinellis	2016-10-16	13	-8/+160
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/development/doc_styleguide.md
\| * \ \ \ \ \ \ \	Merge branch '23353-add-bookclub-to-university' into 'master'	Achilleas Pipinellis	2016-10-16	3	-0/+133
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added book club to university ## What does this MR do? Adds the old University Book Club to the new University content ## What are the relevant issue numbers? Closes #23353 See merge request !6888
\| \| * \| \| \| \| \| \| \|	Added book club to university23353-add-bookclub-to-university	Sean Packham	2016-10-14	3	-0/+133
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'clarify-cache-and-artifact-paths' into 'master'	Achilleas Pipinellis	2016-10-16	1	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes a note on valid paths for cache and artifacts in the place users are most likely to learn about the feature. ## Why was this MR needed? We get regular support requests relating to cache and artifacts not being picked up outside the project root. It's intended behaviour, and should be documented. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1792 See merge request !6892
\| \| * \| \| \| \| \| \| \| \|	Document restrictions on cache and artifact paths	Nick Thomas	2016-10-14	1	-3/+4
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1792
\| * \| \| \| \| \| \| \| \|	remove ashley since she no longer works here	De Wet Blomerus	2016-10-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add docs for request profilingfix/request-profiler-docs	Ahmad Sherif	2016-10-14	5	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23239
\| * \| \| \| \| \| \| \| \|	Use gitlab-workhorse 0.8.5	Nick Thomas	2016-10-14	2	-2/+2
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'patch-6' into 'master'	Achilleas Pipinellis	2016-10-14	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grafana_configuration.md move link See merge request !6871
\| \| * \| \| \| \| \| \|	fix grafana_configuration.md move link	Ben Bodenmiller	2016-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add the tech writers usernames in the doc_sytleguide docdocs/change-docs-reviewers	Achilleas Pipinellis	2016-10-16	1	-4/+4
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch '23332-fix-missing-glossary-link' into 'master'	Achilleas Pipinellis	2016-10-14	1	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Fix missing Glossary link" ## What does this MR do? Fixes broken links in University. ## What are the relevant issue numbers? Closes #23332 See merge request !6880
\| * \| \| \| \| \| \| \|	Fixed missing links	Sean Packham	2016-10-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed missing links	Sean Packham	2016-10-14	1	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/clarify-new-ci-permissions-some-more' into 'master'	Achilleas Pipinellis	2016-10-14	1	-18/+37
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more info on the new CI permissions model From discussion in issue https://gitlab.com/gitlab-org/gitlab-ce/issues/22484 See merge request !6843
\| * \| \| \| \| \| \| \| \|	Add link to update docs for source installations	Achilleas Pipinellis	2016-10-14	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add more info on the new CI permissions modeldocs/clarify-new-ci-permissions-some-more	Achilleas Pipinellis	2016-10-13	1	-18/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]