delta/gitlab/gitlab-ce.git/doc/api, branch remove-main-language gitlab.com: gitlab-org/gitlab-ce.git fix group members api doc: remove emial 2016-05-21T14:33:54+00:00 Sanster cwq1913@163.com 2016-05-21T14:33:54+00:00 69a07cf4d4771b9e754ce783b7973b7898480719 






Merge branch 'master' into 'master'

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

Hannes Rosenögger
123haynes@gmail.com

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

7254fb9e2bd4e03df7f2e9f1cde5293b5f8e40c5


fix example urls for (dis)associating runners to projects



See merge request !2993





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

Rémy Coutable
remy@rymai.me

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

f7bdbc0b55dfed9f1bfabf052436bac2997e78f8

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Merge branch 'docker-registry' into 'master'

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

Douwe Maan
douwe@gitlab.com

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

59e62fc4866215eda1d291a240b6c4faaee2e961


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





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

Kamil Trzcinski
ayufan@ayufan.eu

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

0958f331d1af67514c80f0bc582c93b0ae1ed491

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





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







Change all occurrences of doc.gitlab.com to docs.gitlab.com
2016-05-13T21:26:56+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-05-13T21:17:01+00:00

9eb4569ed9330d65fb24e0272402fe5ac739b8be

[ci skip]





[ci skip]







Add API endpoints for un/subscribing from/to a label
2016-05-12T20:48:09+00:00

Ahmad Sherif
me@ahmadsherif.com

2016-05-12T20:48:09+00:00

0c22698bd4dbe7d0d3e4a6c8bc946ac6f5de1c12

Closes #15638





Closes #15638







Update docs/api/projects.md with container registry enabled option
2016-05-09T17:35:25+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-05-09T17:35:25+00:00

9f679ac2079dc1d412aaaed806c3d06bdc071046












Revert "Merge branch 'patch-1' into 'master'"
2016-05-09T15:21:23+00:00

Rémy Coutable
remy@rymai.me

2016-05-09T15:21:23+00:00

63c45fa75b2fb6519106417d58fe879db352b812

This reverts merge request !4030




This reverts merge request !4030






Expose MergeRequest#user_notes_count in the API and use the method in issues list
2016-05-09T14:08:07+00:00

Rémy Coutable
remy@rymai.me

2016-03-15T15:17:24+00:00

f5240f9703fea9902ac4304b8e12daed5c21820d

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>