summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '53030-ee-compat-check-frozen-literal' into 'master'test-review-root-passwordSean McGivern2018-10-231-4/+6
|\
| * Fix ee-compat-check by not modifying frozen strings53030-ee-compat-check-frozen-literalMario de la Ossa2018-10-231-4/+6
* | Merge branch 'mysql-migration-trigger-permissions' into 'master'Andreas Brandl2018-10-231-1/+1
|\ \
| * | Add dbname to MySQL migration GRANT commandRyan Hefner2018-09-131-1/+1
* | | Merge branch 'support-license-management-and-performance' into 'master'Grzegorz Bizon2018-10-231-1/+3
|\ \ \
| * | | Support licenses and performancesupport-license-management-and-performanceKamil Trzciński2018-10-221-1/+3
* | | | Merge branch 'add-role-binding-to-kubeclient' into 'master'Kamil Trzciński2018-10-232-0/+54
|\ \ \ \
| * | | | Add RoleBinding methodsadd-role-binding-to-kubeclientMayra Cabrera2018-10-222-0/+54
| | |_|/ | |/| |
* | | | Remove broken git storage for testingZeger-Jan van de Weg2018-10-231-1/+4
* | | | Merge branch 'sh-pages-eof-error' into 'master'Grzegorz Bizon2018-10-231-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix EOF detection with CI artifacts metadataStan Hu2018-10-181-2/+5
* | | | Merge branch 'feature/gb/improve-include-config-errors-reporting' into 'master'Douwe Maan2018-10-2211-181/+253
|\ \ \ \
| * | | | Improve error message when `include` is blockedGrzegorz Bizon2018-10-221-5/+3
| * | | | Improve remote CI/CD config file extension validationGrzegorz Bizon2018-10-191-2/+2
| * | | | Extend error message in case of HTTP errors in `include`Grzegorz Bizon2018-10-193-20/+28
| * | | | Refactor `include` code and improve error reportingGrzegorz Bizon2018-10-184-37/+94
| * | | | Extract method that fetchesremote CI/CD included configGrzegorz Bizon2018-10-182-11/+10
| * | | | Add IncludeError exception and use it in CI configGrzegorz Bizon2018-10-182-4/+5
| * | | | Move external CI config class into proper namespaceGrzegorz Bizon2018-10-166-101/+110
| * | | | Move external CI config files into Ci class contextGrzegorz Bizon2018-10-165-0/+0
* | | | | Merge branch '51716-add-kubernetes-namespace-model' into 'master'Andreas Brandl2018-10-221-0/+9
|\ \ \ \ \
| * | | | | Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-modelMayra Cabrera2018-10-221-0/+9
* | | | | | Merge branch 'drop-allow_overflow-option-duration_in_numbers' into 'master'Grzegorz Bizon2018-10-221-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Drop `allow_overflow` option in `TimeHelper.duration_in_numbers`Shinya Maeda2018-10-181-1/+1
* | | | | | Merge branch 'use-raw-file-format' into 'master'Grzegorz Bizon2018-10-223-46/+75
|\ \ \ \ \ \
| * | | | | | Make all legacy security reports to use raw formatuse-raw-file-formatKamil Trzciński2018-10-163-46/+75
* | | | | | | Enable frozen string for lib/gitlab/*.rbgfyoung2018-10-22149-21/+321
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'ce-5987-group-file-templates' into 'master'Robert Speicher2018-10-191-1/+1
|\ \ \ \ \ \
| * | | | | | Backport CE to changes to support group-level file templatesNick Thomas2018-10-191-1/+1
* | | | | | | Rename "scheduled" label/badge of delayed jobs to "delayed"Shinya Maeda2018-10-194-7/+7
* | | | | | | Catch `RedirectionTooDeep` Exception in webhooksHeinrich Lee Yu2018-10-191-0/+7
|/ / / / / /
* | | | | | Add support for JSON logging for audit eventsStan Hu2018-10-181-0/+9
| |_|_|/ / |/| | | |
* | | | | Make getting a user by the username case insensitiveWilliam George2018-10-182-2/+2
| |/ / / |/| | |
* | | | [ci skip] Fix documentation of Gitlab::Git::Diff#filter_diff_options flagsAlejandro Rodríguez2018-10-171-1/+1
* | | | Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-171-15/+38
|\ \ \ \
| * | | | Remove a dependency on gitlab-gollum-libnick.thomas/gitlab-ce-44361-remove-gitlab-gritNick Thomas2018-10-161-10/+14
| * | | | Remove a dependency on gitlab-gollum-libNick Thomas2018-10-161-14/+33
| | |/ / | |/| |
* | | | Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into ...Douwe Maan2018-10-161-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Fix image webhook rewriting for uploadsSean McGivern2018-10-161-0/+11
| |/ /
* | | Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-152-2/+0
|\ \ \
| * | | Remove Koding integration and documentationStan Hu2018-10-122-2/+0
* | | | Merge branch 'bvl-merge-base-multiple-revisions' into 'master'Douwe Maan2018-10-151-2/+2
|\ \ \ \
| * | | | Allow getting the merge base of multiple revisionsBob Van Landuyt2018-10-121-2/+2
* | | | | Merge branch 'zj-remove-linguist' into 'master'Robert Speicher2018-10-155-39/+182
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-125-39/+182
| | |/ / | |/| |
* | | | Merge branch 'enable-frozen-string-lib-gitlab' into 'master'Rémy Coutable2018-10-1553-3/+115
|\ \ \ \
| * | | | Enable some frozen string in lib/gitlabgfyoung2018-10-1353-3/+115
| |/ / /
* | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-10-151-20/+20
|\ \ \ \
| * | | | Update Android.gitlab-ci.yml for current stable SDKOsama Bin Omar2018-10-131-20/+20
| |/ / /
* | | | fix duplicated key in license management job gitlab-org/gitlab-ce#52609Adam Lemanski2018-10-121-2/+2
|/ / /