summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-151-1/+1
|\
| * Improve JwtControllerKamil Trzcinski2016-05-141-1/+1
| * Rename JWT to JSONWebTokenKamil Trzcinski2016-05-141-1/+1
| * Add TODOKamil Trzcinski2016-05-141-0/+3
* | Change abilities from container_registry to container_imageKamil Trzcinski2016-05-141-2/+2
* | Add TODOKamil Trzcinski2016-05-141-0/+3
* | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-141-5/+2
|\ \ | |/
| * Improve code design after reviewKamil Trzcinski2016-05-141-5/+2
* | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-141-1/+1
|\ \ | |/
| * Use Auth::ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-141-1/+1
* | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-1314-11/+83
|\ \ | |/
| * Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1314-11/+83
| |\
| | * Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-132-2/+2
| | * Merge branch 'health-check-route'Douwe Maan2016-05-123-0/+33
| | |\
| | | * Add Changelog entryhealth-check-routeDJ Mountney2016-05-121-5/+1
| | | * Support token header for health check token, and general cleanup of the healt...DJ Mountney2016-05-111-3/+12
| | | * Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-103-0/+28
| | * | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-121-1/+8
| | |\ \
| | | * | delete the enabled_oauth_sign_in_sources after getting it's value into enable...Andrei Gliga2016-05-121-3/+1
| | | * | Array(enabled_oauth_sign_in_sources) instead of the ifAndrei Gliga2016-05-121-1/+1
| | | * | enabled_oauth_sign_in_sources param doesn't need permitAndrei Gliga2016-05-121-1/+0
| | | * | On Application Settings Page let the user select the enabled OAuth Sign in so...Andrei Gliga2016-05-121-8/+8
| | | * | disabled_oauth_sign_in_sources parameter handling in ApplicationSettingsContr...Andrei Gliga2016-05-121-1/+11
| | * | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-0/+8
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-101-1/+1
| | | |\ \ \
| | | * | | | Encode state as base64 stringKamil Trzcinski2016-05-091-8/+1
| | | * | | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-0/+15
| | | | |_|/ | | | |/| |
| | * | | | Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' Rémy Coutable2016-05-122-2/+2
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Share form editable attributes mf runner via modelGrzegorz Bizon2016-05-102-2/+2
| | | |/ /
| | * | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-112-1/+23
| | |\ \ \
| | | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-111-1/+1
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | user routings refactorLong Nguyen2016-05-081-2/+20
| | | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-0513-70/+110
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Remove unused view and update redirect when destroy snippetLong Nguyen2016-05-051-1/+1
| | | * | | Remove unused code, update spec, and update changelogLong Nguyen2016-05-051-19/+1
| | | * | | Add snippet tab under user profileLong Nguyen2016-05-021-0/+22
| | * | | | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-111-2/+4
| | |\ \ \ \
| | | * | | | Always mention HTTP statusJacob Vosmaer2016-05-031-1/+1
| | | * | | | Inform user about questionable hook successJacob Vosmaer2016-05-031-2/+4
| | | * | | | Improve documentation and web test for web hooksJacob Vosmaer2016-05-031-1/+1
| | * | | | | Merge branch '17249-starred' into 'master' Robert Speicher2016-05-112-2/+2
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Restrict starred projects to viewable onesSean McGivern2016-05-102-2/+2
| | | | |_|/ | | | |/| |
| | * | | | Merge branch 'issue_15673' into 'master' Jacob Schatz2016-05-101-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Add to label :id to responseissue_15673Alfredo Sumaran2016-05-031-1/+1
| | | |/ /
* | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-131-19/+20
|\ \ \ \ \ | |/ / / /
| * | | | Improve JwtController codeKamil Trzcinski2016-05-131-18/+19
| * | | | Move JWT to Gitlab::JWTKamil Trzcinski2016-05-131-1/+1
| * | | | Fix CI testsKamil Trzcinski2016-05-121-1/+1
* | | | | Fix CI testsKamil Trzcinski2016-05-121-1/+0
* | | | | Added Docker Registry View testsKamil Trzcinski2016-05-091-1/+1