summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-generator-templates-directory' into 'master' Jeroen van Baarsen2016-05-191-1/+3
|\
| * Move generator templates to generator_templates/Yorick Peterse2016-05-191-1/+3
* | Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan2016-05-191-0/+1
|\ \
| * | Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-171-0/+1
* | | Merge branch 'with-pipeline-view' into 'master' Douwe Maan2016-05-191-0/+7
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-163-6/+29
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-1312-96/+60
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-0910-31/+95
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-04-266-7/+28
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ci-commit-as-pipeline' into with-pipeline-viewKamil Trzcinski2016-04-135-3/+40
| |\ \ \ \ \ \ \
| * | | | | | | | Pipeline viewKamil Trzcinski2016-04-131-1/+1
| * | | | | | | | WIPKamil Trzcinski2016-04-131-0/+7
* | | | | | | | | Merge branch 'project-variables-ui' into 'master' Jacob Schatz2016-05-191-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Project variables UIPhil Hughes2016-05-161-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Revert "Merge branch 'issues/15127' into 'master'"revert-3656b5dbStan Hu2016-05-191-1/+0
* | | | | | | | Merge branch 'issues/15127' into 'master' Stan Hu2016-05-191-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix #15127 ActiveJob::DeserializationError thrownP.S.V.R2016-04-111-0/+1
* | | | | | | | | Merge branch 'master' into docker-registry-viewdocker-registry-viewKamil Trzcinski2016-05-181-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Instrument all Grape API helpersYorick Peterse2016-05-171-0/+2
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bring back port to registry configurationdocker-registryKamil Trzcinski2016-05-161-1/+2
* | | | | | | | Fix rubocop offensesKamil Trzcinski2016-05-161-1/+1
* | | | | | | | Bring back path to registry settingsKamil Trzcinski2016-05-162-0/+2
* | | | | | | | 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
| | | |_|/ / / / / | | |/| | | | | |
View Lorry Controller Status