delta/gitlab/gitlab-ce.git/doc/api, branch dz-code-tab

Merge branch 'doc_api_services_jira_amend' into 'master'

2016-06-01T09:09:37+00:00


Amend jira service api docs [ci skip]

## What does this MR do?

Amends the API documentation for jira service integration

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

The current documentation omits the username and password parameters

## What are the relevant issue numbers?

## Screenshots (if relevant)

See merge request !4382

Amend jira service api docs [ci skip]

2016-05-31T16:28:20+00:00

Add Application Setting to configure Container Registry token expire delay (default 5min)

2016-05-31T11:23:13+00:00

Add space after comma, add space between 'beautomatically'

2016-05-30T05:31:22+00:00

Add space between 'Criticalissue'

2016-05-30T05:30:47+00:00

fix group members api doc: remove emial

2016-05-21T14:33:54+00:00

Merge branch 'master' into 'master'

2016-05-18T21:54:01+00:00


fix example urls for (dis)associating runners to projects



See merge request !2993

Make it clearer that /licenses is the OS license templates endpoint

2016-05-18T05:07:51+00:00

Signed-off-by: Rémy Coutable

Merge branch 'docker-registry' into 'master'

2016-05-16T17:20:31+00:00


Added authentication service for docker registry

This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes.

I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry?

What do you think @jacobvosmaer @sytses @marin?

cc @marin 

See merge request !3787

Merge remote-tracking branch 'origin/master' into docker-registry

2016-05-13T22:14:46+00:00

# Conflicts:
#	config/initializers/1_settings.rb