summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Compact host and portKamil Trzcinski2016-05-161-1/+1
* Bring back port to registry configurationKamil Trzcinski2016-05-161-1/+2
* Use registry.port to construct the registry hostKamil Trzcinski2016-05-161-0/+2
* Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-142-36/+6
|\
| * Simplify registry configurationKamil Trzcinski2016-05-142-36/+6
* | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-1312-96/+60
|\ \ | |/
| * Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1312-96/+60
| |\
| | * remove extra space to fix codestylerubocop/space-around-operatorsGabriel Mazetto2016-05-131-1/+1
| | * Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-135-13/+13
| | * Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-122-2/+2
| | |\
| | | * Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-082-2/+2
| | * | Merge branch 'health-check-route'Douwe Maan2016-05-122-0/+8
| | |\ \
| | | * | Support token header for health check token, and general cleanup of the healt...DJ Mountney2016-05-112-2/+2
| | | * | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-101-1/+3
| | | * | Set the standard health_check options to include the cache check.DJ Mountney2016-05-101-28/+3
| | | * | Add the health_check gem end expose the health_check routeDJ Mountney2016-05-102-0/+31
| | * | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-0/+1
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-102-2/+2
| | | |\ \ \ | | | | |/ /
| | | * | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-0/+1
| | | | |/ | | | |/|
| | * | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-111-18/+14
| | |\ \ \
| | | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-115-15/+22
| | | |\ \ \
| | | * | | | Code improveLong Nguyen2016-05-101-7/+8
| | | * | | | Routing refactoringLong Nguyen2016-05-081-13/+10
| | | * | | | Fix routing errorLong Nguyen2016-05-081-1/+1
| | | * | | | user routings refactorLong Nguyen2016-05-081-20/+17
| | | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni...Long Nguyen2016-05-0510-31/+95
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Add snippet tab under user profileLong Nguyen2016-05-021-2/+3
| | * | | | | Remove Rails monkey-patches now that we're using Rails 4.2.6Rémy Coutable2016-05-111-48/+0
| | | |_|/ / | | |/| | |
| | * | | | Fix a few places where autoloading would failRémy Coutable2016-05-103-10/+10
| | * | | | Add eager load paths to help prevent dependency load issues with Sidekiq workersStan Hu2016-05-101-6/+13
| | | |_|/ | | |/| |
| | * | | Merge branch 'rs-remove-wall_enabled' into 'master' Dmitriy Zaporozhets2016-05-091-1/+0
| | |\ \ \
| | | * | | Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-081-1/+0
| | | | |/ | | | |/|
| | * | | Merge branch 'trusted-proxies-ip-addr' into 'master' Rémy Coutable2016-05-091-1/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Pass trusted_proxies to action_dispatch as IPAddrs instead of stringsDJ Mountney2016-04-281-1/+2
* | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix CI testsKamil Trzcinski2016-05-121-1/+1
* | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-098-31/+62
|\ \ \ \ \ | |/ / / /
| * | | | Remove unused partsKamil Trzcinski2016-05-092-2/+0
| * | | | Rename `images` to `container_registry`Kamil Trzcinski2016-05-092-6/+7
| * | | | Revert "Eager load `lib/api`"Kamil Trzcinski2016-05-092-2/+1
| * | | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-097-21/+54
| |\ \ \ \ | | |/ / /
| | * | | Use the new admin settings for gravatarArtem Sidorenko2016-05-041-1/+0
| | * | | Merge branch 'add-instrumentation-for-15137' into 'master' Yorick Peterse2016-05-041-15/+22
| | |\ \ \
| | | * | | Instrument methods used in email diffsSean McGivern2016-05-041-15/+22
| | * | | | Revert "Remove the Devise Async gem."Connor Shea2016-05-031-0/+1
| | |/ / /
| | * | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-021-3/+3
| | |\ \ \
| | | * | | Fix issue with impersonationDouwe Maan2016-04-221-3/+3
| | | | |/ | | | |/|
| | * | | Fix "remember me" sign in optionJacob Vosmaer2016-05-021-1/+1
| | * | | Merge branch 'add-parameters' into 'master' Robert Speicher2016-04-301-1/+24
| | |\ \ \
| | | * | | Add more parameters to the filter_parameters config.Connor Shea2016-04-291-1/+24
| | | | |/ | | | |/|
View Lorry Controller Status