summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'monaco-upgrade' into 'master'Tim Zallmann2018-09-063-8/+13
|\
| * Upgraded Monaco editor versionPhil Hughes2018-09-053-8/+13
* | Merge branch 'ce-5306-more-custom-templates' into 'master'Robert Speicher2018-09-066-23/+139
|\ \
| * | Backport changes to Gitlab::Tempalte::BaseTemplateNick Thomas2018-09-051-2/+6
| * | Rename BlobsHelper#dropdown_namesNick Thomas2018-09-051-6/+6
| * | Allow the TemplateFinder to handle licenses as wellNick Thomas2018-09-053-3/+28
| * | Convert global templates to vendored templates via a ::TemplateFinderNick Thomas2018-09-054-19/+79
| * | Allow repositories to be programmatically built in the specsNick Thomas2018-09-051-0/+27
* | | Merge branch 'sh-bump-browser-gem' into 'master'Robert Speicher2018-09-053-5/+5
|\ \ \
| * | | Bump browser gem to v2.5.3Stan Hu2018-09-053-5/+5
|/ / /
* | | Merge branch 'an/api-route-logger' into 'master'Stan Hu2018-09-053-0/+31
|\ \ \
| * | | Add route information to lograge structured loggingAndrew Newdigate2018-09-053-0/+31
* | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-09-051-0/+1
|\ \ \ \
| * | | | Document that when updating using a Helm chart 'helm repo update' needs to be...Reb2018-09-051-0/+1
* | | | | Merge branch 'feature/gb/allow-to-extend-keys-in-gitlab-ci-yml' into 'master'Kamil Trzciński2018-09-0512-10/+801
|\ \ \ \ \
| * | | | | Fix extended CI/CD configuration docs for `extends`Grzegorz Bizon2018-09-051-9/+5
| * | | | | Add docs for extended CI/CD config with `extends`Grzegorz Bizon2018-09-051-0/+78
| * | | | | Improve specs and error messages in extendable configGrzegorz Bizon2018-09-054-6/+33
| * | | | | Add unit test for `extends` in .gitlab-ci.ymlGrzegorz Bizon2018-09-051-1/+13
| * | | | | Add missing frozen_string_literal to some classesGrzegorz Bizon2018-09-052-0/+4
| * | | | | Improve extended CI/CD config error messagesGrzegorz Bizon2018-09-054-11/+13
| * | | | | Add changelog for extendable CI/CD configurationGrzegorz Bizon2018-09-051-0/+5
| * | | | | Simplify classes and exceptions of extendable configGrzegorz Bizon2018-09-056-46/+46
| * | | | | Limit extendable CI/CD config entry nesting levelsGrzegorz Bizon2018-09-053-9/+47
| * | | | | Add feature tests for CI/CD `extends` keywordGrzegorz Bizon2018-09-042-0/+76
| * | | | | Add support for `extends` key in CI/CD configurationGrzegorz Bizon2018-09-044-9/+54
| * | | | | Add test case describing circular dependency in `extends`Grzegorz Bizon2018-09-041-0/+11
| * | | | | Improve extended CI/CD config specs and fix a bugGrzegorz Bizon2018-09-044-11/+13
| * | | | | Use deep_dup to duplicate hash in CI/CD extendable configGrzegorz Bizon2018-09-041-1/+1
| * | | | | Add specs for extendable CI/CD hash entry classGrzegorz Bizon2018-09-043-19/+248
| * | | | | Improve extendable CI/CD config hash collectionGrzegorz Bizon2018-09-043-35/+45
| * | | | | Add test for simple ciricular dependency in `extends`Grzegorz Bizon2018-09-041-2/+20
| * | | | | Detect circular dependenies in CI/CD `extends:` entryGrzegorz Bizon2018-09-043-6/+42
| * | | | | Do not modify extensible CI/CD entries by referenceGrzegorz Bizon2018-09-042-18/+13
| * | | | | Support recursive `extends:` in `.gitlab-ci.yml`Grzegorz Bizon2018-09-045-94/+207
| * | | | | Add basic support for CI/CD config extensionGrzegorz Bizon2018-09-042-0/+94
* | | | | | Merge branch 'an/fix-multipart-error-on-rails-reload' into 'master'Stan Hu2018-09-051-1/+1
|\ \ \ \ \ \
| * | | | | | Fix multipart error on rails reloadAndrew Newdigate2018-09-051-1/+1
|/ / / / / /
* | | | | | Merge branch 'patch-28' into 'master'Stan Hu2018-09-051-1/+1
|\ \ \ \ \ \
| * | | | | | remove comma kus2018-09-051-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '45938-postgres-timeout-when-counting-number-of-ci-builds-for-us...Robert Speicher2018-09-053-48/+75
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Ensure services counts always have values in usage pingsSean McGivern2018-09-051-1/+1
| * | | | | Handle statement timeouts in usage pingSean McGivern2018-09-053-47/+74
* | | | | | Merge branch 'dz-cleanup-group-labels-page' into 'master'Rémy Coutable2018-09-051-3/+1
|\ \ \ \ \ \
| * | | | | | Remove unnecessary logic from group labels pageDmitriy Zaporozhets2018-09-051-3/+1
* | | | | | | Merge branch '50974-qa-group-filtering-fails-when-filter-text-field-is-filled...Grzegorz Bizon2018-09-058-22/+62
|\ \ \ \ \ \ \
| * | | | | | | [QA] Ensure groups filtering does not happen before the groups list is loadedRémy Coutable2018-09-058-22/+62
* | | | | | | | Merge branch 'filter-web-hooks-by-branch' into 'master'Dmitriy Zaporozhets2018-09-0525-73/+339
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Refactor: move active hook filter to TriggerableHooksDuana Saskia2018-09-056-22/+54
| * | | | | | | Refactor ProtectedRefMatcher to be more genericDuana Saskia2018-08-134-84/+56
View Lorry Controller Status