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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Support for post deployment migrationsbackground-migrations	Yorick Peterse	2016-10-31	2	-0/+76
\| \| \| \| \| \| \| \|	These are regular Rails migrations that are executed by default. A user can opt-out of these migrations by setting an environment variable during the deployment process. Fixes gitlab-org/gitlab-ce#22133
*	Merge branch 'patch-4' into 'master'	Sean McGivern	2016-10-31	1	-4/+4
\|\ \| \| \| \| \| \| \| \|	Improve docs on `gitlab-ci-token` user See merge request !6002
\| *	improve docs on gitlab-ci-token user	Ben Bodenmiller	2016-09-21	1	-4/+4
\| \|
* \|	Document how to run frontend tests	Winnie	2016-10-28	1	-0/+14
\| \|
* \|	Merge branch 'deploykeys-api-doc' into 'master'	Rémy Coutable	2016-10-28	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document admin access requirement for /deploy_keys endpoint Closes #23807 See merge request !7164
\| * \|	Document admin access requirement for /deploy_keys endpoint	winniehell	2016-10-28	1	-1/+1
\| \| \|
* \| \|	Merge branch 'issue_1008_1' into 'master'	Sean McGivern	2016-10-28	24	-249/+198
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jira refactoring to jira gem part of gitlab-org/gitlab-ee#1008 Original MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2572/commits See merge request !6598
\| * \|	Finish updates to use JIRA gem	Felipe Artur	2016-10-26	23	-307/+134
\| \| \| \| \| \| \| \| \| \| \| \|	Code improvements, bug fixes, finish documentation and specs
\| * \|	Refactor JIRA service to use gem	Drew Blessing	2016-10-26	3	-39/+161
\| \| \|
* \| \|	Merge branch 'doc/improve-coverage-badge-docs' into 'master'	Achilleas Pipinellis	2016-10-27	8	-40/+123
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document CI pipelines settings See merge request !5847
\| * \| \|	Add more images for the test coverage docs	Achilleas Pipinellis	2016-10-27	4	-6/+18
\| \| \| \|
\| * \| \|	Fully document the pipelines settings page	Achilleas Pipinellis	2016-10-27	5	-40/+111
\| \| \| \|
\| * \| \|	Improve documentation for test coverage report badge	Grzegorz Bizon	2016-10-27	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'patch-6' into 'master'	Rémy Coutable	2016-10-27	1	-0/+16
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documents that users with two-factor authentication enabled may also need to create a personal access token to use git over HTTPS. To address a support issue (gitlab-com/support-forum#980) about why passwords don't work in git when two-factor auth is enabled. gitlab-com/support-forum#980 See merge request !6616
\| * \| \|	Add info about creating a personal access token	Lucas	2016-09-30	1	-0/+16
\| \| \| \|
* \| \| \|	Add note about ephemeral statuses in headings	Achilleas Pipinellis	2016-10-27	1	-1/+3
\| \|/ / \|/\| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'docs/jira-service-api' into 'master'	Achilleas Pipinellis	2016-10-26	1	-19/+27
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add all endoints to JIRA service API documentation ## What does this MR do? Add missing API endpoints to the JIRA service. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/440 See merge request !7122
\| * \| \|	Add missing API endpoints to JIRA service API documentation	Achilleas Pipinellis	2016-10-26	1	-19/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/440
* \| \| \|	Merge branch 'users-should-remove-former-go-installation-folder' into 'master'	Rémy Coutable	2016-10-26	1	-0/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	users should remove former Go installation folder ## What does this MR do? It ensure users installing or updating from source will remove their former Go installation folder in `/usr/local/go`, to avoid raising errors that could lead to new issues being created. ## Are there points in the code the reviewer needs to double check? 1. The `rm -rf` should not be verbose if folder does not exists. 1. May a user have some kind of configuration files in this folder ? ## Why was this MR needed? I did faced the error, that led me to the solution stated here : https://gitlab.com/gitlab-org/gitlab-workhorse/issues/29#note_4155517 gitlab-org/gitlab-workhorse#29 See merge request !6602
\| * \| \|	users should remove former Go installation folder	Pierre-Alexandre Clorichel	2016-09-29	1	-0/+3
\| \|/ /
* \| \|	Merge branch 'bradjones1/gitlab-ce-patch-3' into 'master'	Achilleas Pipinellis	2016-10-25	1	-2/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specify which Fog storage drivers are imported by default in backup_restore.md Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5783 See merge request !7072
\| * \| \|	Specify which Fog storage drivers are imported by default in backup_restore.md	Brad Jones	2016-10-24	1	-2/+5
\| \| \| \|
* \| \| \|	Merge branch 'patch-7' into 'master'	Rémy Coutable	2016-10-25	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will change the update process to checkout gitlab-shell version 3.6.6 instead of 3.6.3 as currently described in the update document See merge request !6976
\| * \| \| \|	Changing gitlab-shell version to 3.6.6 instead of 3.6.3, later on the ↵	Tobias Genberg	2016-10-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	upgrade process it will complain about running 3.6.3 instead of 3.6.6.
* \| \| \| \|	Merge branch 'improve-grape-dsl-rules' into 'master'	Robert Speicher	2016-10-25	3	-6/+98
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an API styleguide This adds a styleguide for API development. Spinned-of from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6860#note_16922017. [ci skip] See merge request !6864
\| * \| \| \| \|	Improve copyimprove-grape-dsl-rules	Rémy Coutable	2016-10-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	More improvements	Rémy Coutable	2016-10-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Fix typo	Rémy Coutable	2016-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Move the Grape DSL part from Doc styleguide to API styleguide	Rémy Coutable	2016-10-13	2	-11/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also improve API styleguide Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Add an API styleguide	Rémy Coutable	2016-10-13	2	-0/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'dklischies/gitlab-ce-master' into 'master'	Achilleas Pipinellis	2016-10-25	1	-0/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a note regarding syncing Git submodules in CI Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7047 See merge request !7095
\| * \| \| \| \| \|	Capitalize Gitdklischies/gitlab-ce-master	Achilleas Pipinellis	2016-10-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Add a note regarding syncing the git submodule conf to CI doc.	Daniel Klischies	2016-10-21	1	-0/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add docker-compose environment initialization command	Sonmez Kartal	2016-10-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Sonmez Kartal <sonmez@koding.com>
* \| \| \| \| \| \|	Merge branch 'docs/fix-link-to-monitoring' into 'master'	Achilleas Pipinellis	2016-10-24	5	-5/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix old monitoring links to point to the new location See merge request !7075
\| * \| \| \| \| \| \|	Fix old monitoring links to point to the new locationdocs/fix-link-to-monitoring	Achilleas Pipinellis	2016-10-24	5	-5/+5
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'backup-docker-docs' into 'master'	Achilleas Pipinellis	2016-10-24	1	-0/+4
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an example of how to run the backups when using docker to the docs ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1616 See merge request !7046
\| * \| \| \| \| \|	Add an example of how to run the backups when using docker to the docsbackup-docker-docs	DJ Mountney	2016-10-21	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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