summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-121-2/+2
|\
| * Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-121-2/+2
| |\
| | * Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-111-2/+2
* | | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-122-4/+68
|\ \ \ | |/ /
| * | add license approbals for nodemon dependenciesMike Greiling2017-04-101-0/+18
| * | add license approval for ansi-htmlMike Greiling2017-04-101-0/+6
| * | watch node_modules for changes when a module is missingMike Greiling2017-04-101-0/+5
| * | add license approvals for vue-loaderadd-vue-loaderMike Greiling2017-04-091-0/+30
| * | clean up webpack configMike Greiling2017-04-091-5/+6
| * | add vue-loader dependencies and basic configMike Greiling2017-04-091-0/+4
| |/
* | Add # host for development and test as wellLin Jen-Shin2017-04-111-0/+2
* | Set profiler only for postgresql not mysqlLin Jen-Shin2017-04-101-1/+1
* | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-103-0/+10
|\ \ | |/
| * Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-091-0/+1
| * Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-072-0/+3
| |\
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-063-1/+15
| | |\
| | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-062-0/+4
| | |\ \
| | * \ \ Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0612-38/+99
| | |\ \ \
| | * | | | Update bundle path for Protected Tags bundleKushal Pandya2017-04-061-1/+1
| | * | | | Protected tags copy/paste from protected branchesJames Edwards-Jones2017-03-311-0/+2
| | * | | | Add protected tags to bundle config18471-restrict-tags-push-uiKushal Pandya2017-03-211-0/+1
| * | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track applica...Paweł Chojnacki2017-04-071-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-04-0710-33/+99
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-imple...Kamil Trzciński2017-04-062-0/+6
| |\ \ \ \
| | * | | | Change configuration in gitlab.com as trigger_schedule_worker will perform tw...Shinya Maeda2017-04-061-1/+1
| | * | | | Change configuration in gitlab.com as trigger_schedule_worker will perform tw...Shinya Maeda2017-04-061-1/+1
| | * | | | Rename ScheduledTrigger to TriggerSchedule. Because table structure changed.Shinya Maeda2017-04-062-4/+4
| | * | | | Add config for workerShinya Maeda2017-04-062-0/+6
| | | |_|/ | | |/| |
| * | | | Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into feature/multi-le...feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-062-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'fix/gh-import-status-check' into 'master' Sean McGivern2017-04-061-0/+3
| | |\ \ \
| | | * | | Periodically mark projects that are stuck in importing as failedJames Lopez2017-04-051-0/+3
| | * | | | STL file viewerPhil Hughes2017-04-061-0/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-065-16/+32
| |\ \ \ \ | | |/ / /
| | * | | Issue title realtimeRegis Boudinot2017-04-062-0/+2
| | * | | Merge branch 'gitaly-prevent-autoload' into 'master' Rémy Coutable2017-04-051-13/+1
| | |\ \ \
| | | * | | Deal with Rails autoload instance variable resetsJacob Vosmaer2017-04-051-13/+1
| | * | | | Use PDFLab to render PDFs in GitLabSam Rose2017-04-051-1/+7
| | | |/ / | | |/| |
| | * | | Load a preview of Sketch 43 filessketch-preview-filesJacob Schatz2017-04-052-0/+19
| | |/ /
| | * | use a less memory-intensive sourcemap when running in CIMike Greiling2017-04-041-1/+2
| | * | Refactor test_utils bundleMike Greiling2017-04-041-1/+0
| | * | Merge branch '24187-set-git-terminal-prompt-env-var-in-initializer' into 'mas...Douwe Maan2017-04-041-0/+1
| | |\ \
| | | * | adds git terminal prompt env var to application rb24187-set-git-terminal-prompt-env-var-in-initializerTiago Botelho2017-04-031-0/+1
| * | | | Fix Rubocop offenses related to registry routesGrzegorz Bizon2017-04-051-2/+2
| * | | | Improve container repository tags controller routeGrzegorz Bizon2017-04-051-5/+4
| * | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-044-9/+12
| |\ \ \ \ | | |/ / /
| | * | | Enable the `bullet_logger` setting; enable `raise` in test environmentrs-bullet-raiseRobert Speicher2017-04-031-4/+9
| | |/ /
| | * | Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-connAhmad Sherif2017-04-032-2/+2
| | * | Relax constraint on Wiki IDs, since subdirectories can contain spacessh-relax-wiki-slug-constraintStan Hu2017-04-021-3/+1
| * | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-037-25/+64
| |\ \ \ | | |/ /
| | * | Merge branch '24784-system-notes-meta-data' into 'master' Sean McGivern2017-03-301-1/+1
| | |\ \
View Lorry Controller Status