Commit Graph

4687 Commits

Author SHA1 Message Date
Winnie cd3c8e9b12 Document how to run frontend tests 2016-10-28 14:02:17 +02:00
Rémy Coutable 4370d68f03 Merge branch 'deploykeys-api-doc' into 'master'
Document admin access requirement for /deploy_keys endpoint

Closes #23807

See merge request !7164
2016-10-28 11:51:43 +00:00
Sean McGivern 292c982e34 Merge branch 'issue_1008_1' into 'master'
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
2016-10-28 11:41:20 +00:00
winniehell 166d5b0dfb Document admin access requirement for /deploy_keys endpoint 2016-10-28 00:56:34 +02:00
Achilleas Pipinellis 4635b47a11 Merge branch 'doc/improve-coverage-badge-docs' into 'master'
Document CI pipelines settings

See merge request !5847
2016-10-27 17:43:58 +00:00
Achilleas Pipinellis 6309fbf120 Add more images for the test coverage docs 2016-10-27 19:41:09 +02:00
Achilleas Pipinellis 4392098e12 Fully document the pipelines settings page 2016-10-27 19:20:16 +02:00
Grzegorz Bizon fdd52a6b23 Improve documentation for test coverage report badge
[ci skip]
2016-10-27 19:20:16 +02:00
Rémy Coutable b3210df33e Merge branch 'patch-6' into 'master'
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
2016-10-27 16:19:20 +00:00
Achilleas Pipinellis 69ab287b36 Add note about ephemeral statuses in headings
[ci skip]
2016-10-27 08:26:35 +02:00
Felipe Artur c2d6822e94 Finish updates to use JIRA gem
Code improvements, bug fixes, finish documentation and specs
2016-10-26 15:02:16 -02:00
Drew Blessing f4bc18d237 Refactor JIRA service to use gem 2016-10-26 15:02:16 -02:00
Achilleas Pipinellis bbbb3bca5d Merge branch 'docs/jira-service-api' into 'master'
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
2016-10-26 15:24:18 +00:00
Achilleas Pipinellis 92ac24cacc Add missing API endpoints to JIRA service API documentation
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/440
2016-10-26 17:15:08 +02:00
Rémy Coutable 4482d19959 Merge branch 'users-should-remove-former-go-installation-folder' into 'master'
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
2016-10-26 10:57:46 +00:00
Achilleas Pipinellis 3e57daad58 Merge branch 'bradjones1/gitlab-ce-patch-3' into 'master'
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
2016-10-25 20:26:39 +00:00
Rémy Coutable 9c7b371a90 Merge branch 'patch-7' into 'master'
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
2016-10-25 15:49:44 +00:00
Robert Speicher 65d86e0d11 Merge branch 'improve-grape-dsl-rules' into 'master'
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
2016-10-25 15:12:43 +00:00
Achilleas Pipinellis 5dc6b65f5e Merge branch 'dklischies/gitlab-ce-master' into 'master'
Add a note regarding syncing Git submodules in CI

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7047

See merge request !7095
2016-10-25 09:39:50 +00:00
Achilleas Pipinellis 692eb3f84e Capitalize Git
[ci skip]
2016-10-25 10:50:38 +02:00
Sonmez Kartal e805253d4e
Add docker-compose environment initialization command
Signed-off-by: Sonmez Kartal <sonmez@koding.com>
2016-10-25 09:41:29 +03:00
Achilleas Pipinellis 6525671965 Merge branch 'docs/fix-link-to-monitoring' into 'master'
Fix old monitoring links to point to the new location

See merge request !7075
2016-10-24 14:54:54 +00:00
Achilleas Pipinellis d9905722f1 Merge branch 'backup-docker-docs' into 'master'
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
2016-10-24 14:47:43 +00:00
Achilleas Pipinellis 8b7634c2b6 Fix old monitoring links to point to the new location 2016-10-24 16:45:00 +02:00
Brad Jones 1e74287835 Specify which Fog storage drivers are imported by default in backup_restore.md 2016-10-24 13:04:51 +02:00
Rémy Coutable 9af0dd5ee4 Merge branch 'document-absolute-links' into 'master'
Document link syntax introduced by !5586.

See merge request !7049
2016-10-24 07:57:10 +00:00
Rémy Coutable fc03440650 Merge branch '23146_19131_build-api_scope-doc' into 'master'
Fix documents and comments on Build API `scope`

Fixes #23146
Fixes #19131

See merge request !7044
2016-10-22 11:51:01 +00:00
Rémy Coutable e4937e2800 Merge branch 'patch-3' into 'master'
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
2016-10-22 11:42:02 +00:00
Achilleas Pipinellis a970f8c65d Merge branch 'docs/dynamic-envs-yaml' into 'master'
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
2016-10-22 09:22:28 +00:00
Rémy Coutable 77ea6909fa Merge branch 'fix-example-in-api-documentation' into 'master'
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
2016-10-22 03:22:47 +00:00
DJ Mountney fadaba000a Add an example of how to run the backups when using docker to the docs 2016-10-21 14:31:56 -07:00
Winnie 94ceadb4a3 Document link syntax introduced by !5586 2016-10-21 20:18:03 +00:00
Daniel Klischies 68af55c3f9 Add a note regarding syncing the git submodule conf to CI doc. 2016-10-21 18:38:11 +00:00
Lemures Lemniscati 3a29ea9da0 Fix documents and comments on Build API `scope`. #23146 #19131 2016-10-22 03:07:26 +09:00
Douwe Maan 083f9f8c0a Merge branch 'separate-sidekiq-queues' into 'master'
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
2016-10-21 17:42:50 +00:00
Rémy Coutable 9cf5b1cc99 Merge branch 'patch-6' into 'master'
Grammar fixes in docs

Some minor grammar fixes in a page in the docs

See merge request !6645
2016-10-21 16:48:44 +00:00
Rémy Coutable 4abb495f45 Merge branch 'patch-6' into 'master'
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
2016-10-21 16:47:58 +00:00
Yorick Peterse 97731760d7
Re-organize queues to use for Sidekiq
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
2016-10-21 18:17:07 +02:00
Airat Shigapov b939529c2a
Fix wrong endpoint in api/users documentation, fix same typo in spec describe blocks 2016-10-21 18:05:36 +03:00
Rémy Coutable 1e66061b1e Merge branch 'master' into 'master'
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
2016-10-21 12:40:48 +00:00
Rémy Coutable 257789e9b7 Merge branch 'patch-1' into 'master'
[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
2016-10-21 11:12:33 +00:00
Sean Packham cf837df9c0 Merge branch 'edit-glossary' into 'master'
Edit glossary

Grammar fixes & new additions to the glossary page.

See merge request !7027
2016-10-21 09:35:32 +00:00
evhoffmann 12991f84a2 added skipped definition 2016-10-20 15:47:57 -04:00
evhoffmann 8c4576418b updated some links in definitions 2016-10-20 15:00:02 -04:00
Achilleas Pipinellis f956de7c39 Refactor and add new functionality to CI yaml reference
[ci ski]
2016-10-20 20:16:35 +02:00
Takuya Noguchi a8bbe53c0c Remove pagination description from individual doc 2016-10-20 08:58:35 +09:00
Takuya Noguchi af8e06ee4c Fix a broken table in Project API doc 2016-10-20 08:57:23 +09:00
evhoffmann 373c232c05 a round of terms and edits 2016-10-19 18:30:06 -04:00
James Lopez 77b7bfd463 Fix import/export labels to cope with project and group labels. Added relevant specs. 2016-10-19 14:58:25 -02:00
Rémy Coutable a96756008a Merge branch 'fix-system-hook-api' into 'master'
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
2016-10-19 10:34:31 +00:00