summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add json extension to URL.json-back-buttonJacob Schatz2016-05-161-1/+1
* Merge branch '17227-upcoming-milestone-is-confusing-when-projects-have-differ...Douwe Maan2016-05-165-71/+161
|\
| * Return a relation with Postgres17227-upcoming-milestone-is-confusing-when-projects-have-different-milestonesSean McGivern2016-05-162-2/+4
| * Make upcoming milestone work across projectsSean McGivern2016-05-165-4/+80
| * Tidy up IssuesFinder specsSean McGivern2016-05-161-68/+80
* | Merge branch '13691-allow-admin-to-reset-user-password-and-force-password-res...Robert Speicher2016-05-164-0/+81
|\ \
| * | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-164-0/+81
| |/
* | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-1624-10/+677
|\ \
| * | Bring back port to registry configurationdocker-registryKamil Trzcinski2016-05-161-1/+2
| * | Fix offline_token http_status codeKamil Trzcinski2016-05-151-1/+1
| * | Fix http status codes for container registry authentication serviceKamil Trzcinski2016-05-152-13/+8
| * | Improve authentication service specsKamil Trzcinski2016-05-153-19/+59
| * | Update JwtController specsKamil Trzcinski2016-05-151-36/+21
| * | Added specs for JwtControllerKamil Trzcinski2016-05-141-0/+87
| * | Improve JwtControllerKamil Trzcinski2016-05-141-1/+1
| * | Rename JWT to JSONWebTokenKamil Trzcinski2016-05-148-28/+23
| * | Simplify JWT::RSAToken::kidKamil Trzcinski2016-05-141-4/+8
| * | Fix authentication serviceKamil Trzcinski2016-05-143-1/+9
| * | Add TODOKamil Trzcinski2016-05-141-0/+3
| * | Improve code design after reviewKamil Trzcinski2016-05-141-5/+2
| * | Simplify registry configurationKamil Trzcinski2016-05-142-36/+6
| * | Rename specsKamil Trzcinski2016-05-141-1/+1
| * | Use Auth::ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-144-73/+71
| * | Fix specsKamil Trzcinski2016-05-141-1/+1
| * | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-13321-3646/+3010
| |\ \
| * | | Improve JWT::RSAToken::kidKamil Trzcinski2016-05-131-4/+6
| * | | Improve JwtController codeKamil Trzcinski2016-05-131-18/+19
| * | | Move JWT to Gitlab::JWTKamil Trzcinski2016-05-132-51/+53
| * | | Fix CI testsKamil Trzcinski2016-05-128-38/+38
| * | | Added rspec for testing container registry authentication serviceKamil Trzcinski2016-05-093-0/+241
| * | | Rename DockerAuthenticationService to ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-093-18/+20
| * | | Make code more clear in what is doneKamil Trzcinski2016-05-092-13/+14
| * | | Update docs/api/projects.md with container registry enabled optionKamil Trzcinski2016-05-091-0/+3
| * | | Added CHANGELOG entryKamil Trzcinski2016-05-091-0/+1
| * | | Remove unused partsKamil Trzcinski2016-05-094-190/+0
| * | | Rename `images` to `container_registry`Kamil Trzcinski2016-05-0912-27/+35
| * | | Revert "Eager load `lib/api`"Kamil Trzcinski2016-05-095-141/+140
| * | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-09321-1356/+3895
| |\ \ \
| * | | | Split docker authentication serviceKamil Trzcinski2016-05-024-101/+162
| * | | | Added JWT controllerKamil Trzcinski2016-05-024-0/+179
| * | | | Eager load `lib/api`Timothy Andrew2016-04-295-140/+141
| * | | | Missing parameters of docker payloadKamil Trzcinski2016-04-291-2/+21
| * | | | AudienceKamil Trzcinski2016-04-291-0/+1
| * | | | Auth tokenKamil Trzcinski2016-04-293-1/+13
| * | | | Try to fix auth serviceKamil Trzcinski2016-04-291-17/+17
| * | | | Make images_enabled configurableKamil Trzcinski2016-04-294-2/+19
| * | | | Added authentication service for docker registryKamil Trzcinski2016-04-2910-2/+226
* | | | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-1610-96/+231
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update CHANGELOGDouglas Barbosa Alexandre2016-05-131-0/+1
| * | | | Remove branches that does exist on GitHub after PRs were importedDouglas Barbosa Alexandre2016-05-131-2/+3