summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-252-0/+131
| | | | | | This allows us (and others) to test drive Puma without it affecting all users. Puma can be enabled by setting the environment variable "EXPERIMENTAL_PUMA" to a non empty value.
* 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 strings Closes #53030 See merge request gitlab-org/gitlab-ce!22527
| * 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 command See merge request gitlab-org/gitlab-ce!21719
| * | 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 performance See merge request gitlab-org/gitlab-ce!22175
| * | | Support licenses and performancesupport-license-management-and-performanceKamil Trzciński2018-10-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new syntax for all licenses and performance jobs: ```yaml job: reports: performance: performance.json license_management: gl-license-management-report.json ```
* | | | Merge branch 'add-role-binding-to-kubeclient' into 'master'Kamil Trzciński2018-10-232-0/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add RoleBinding method and class See merge request gitlab-org/gitlab-ce!22524
| * | | | Add RoleBinding methodsadd-role-binding-to-kubeclientMayra Cabrera2018-10-222-0/+54
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Includes RoleBinding methods to Kubeclient and introduce a new lib class to generate RoleBinding resources. This MR is part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011
* | | | Remove broken git storage for testingZeger-Jan van de Weg2018-10-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken storage used to be used to test situations where the Git storage wasn't being reached. These days we can just mock the Gitaly response. But given the broken storage is removed now, Gitaly can take over control of the storage being reachable. If it's not, Gitaly won't boot. That's nice for situations where a disk wasn't mounted for instance. Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675
* | | | Merge branch 'sh-pages-eof-error' into 'master'Grzegorz Bizon2018-10-231-2/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix EOF detection with CI artifacts metadata Closes #36954 See merge request gitlab-org/gitlab-ce!22479
| * | | Fix EOF detection with CI artifacts metadataStan Hu2018-10-181-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some corner cases where a perfectly correct GZIP stream may not hit the EOF until another read is attempted. We now skip the entry if we don't see any valid data, which allows the EOF check to work properly. Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22479
* | | | Merge branch 'feature/gb/improve-include-config-errors-reporting' into 'master'Douwe Maan2018-10-2211-181/+253
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve validation errors for external CI/CD configuration Closes #51369 See merge request gitlab-org/gitlab-ce!22394
| * | | | 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 model See merge request gitlab-org/gitlab-ce!22404
| * | | | | Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-modelMayra Cabrera2018-10-221-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This model will be used to persist into database Kubernetes properties, such as namespace, service account name and service account token.
* | | | | | Merge branch 'drop-allow_overflow-option-duration_in_numbers' into 'master'Grzegorz Bizon2018-10-221-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop allow overflow option duration in numbers Closes #52284 See merge request gitlab-org/gitlab-ce!22246
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RAW file format which is used to store security reports Closes gitlab-ee#7996 See merge request gitlab-org/gitlab-ce!22365
| * | | | | | Make all legacy security reports to use raw formatuse-raw-file-formatKamil Trzciński2018-10-163-46/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This introduces and uses `:raw` format for all legacy reports, the ones that do not have yet proper parsers on Backend - Raw format is needed to make Frontend be able to parse reports, without the need of decompressing, - This also extends fixtures to seed security reports with database, even though parser code is part of EE
* | | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport of changes to suppport group file templates See merge request gitlab-org/gitlab-ce!22310
| * | | | | | Backport CE to changes to support group-level file templatesNick Thomas2018-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the feature is available, this setting allows admins to choose a project as a source of custom file templates. This is in addition to any instance-wide templates, whether custom or vendored into the GitLab codebase.
* | | | | | | 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
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will add audit_json.log that writes one line per audit event. For example: { "severity":"INFO", "time":"2018-10-17T17:38:22.523Z", "author_id":3, "entity_id":2, "entity_type":"Project", "change":"visibility", "from":"Private", "to":"Public", "author_name":"John Doe4", "target_id":2, "target_type":"Project", "target_details":"namespace2/project2" }
* | | | | 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 gitlab-grit as a transitive dependency of GitLab Closes #44361 See merge request gitlab-org/gitlab-ce!22373
| * | | | Remove a dependency on gitlab-gollum-libnick.thomas/gitlab-ce-44361-remove-gitlab-gritNick Thomas2018-10-161-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inlining this code allows us to remove a dependency on gitlab_grit in gitlab-ce. We can't stop maintaining gitlab_grit yet, since gitaly-ruby still depends on this gem, but it moves us a step closer.
| * | | | Remove a dependency on gitlab-gollum-libNick Thomas2018-10-161-14/+33
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Removing this dependency also allows us to remove a transitive dependency on gitlab_grit - which is the whole point of this exercise. I don't think we can EOL gitlab_grit until it's removed as a dependency from gitaly-ruby, but this at least gets it out of gitlab-ce.
* | | | Merge branch '52650-webhook-image-urls-rewritten-incorrectly-in-issues' into ↵Douwe Maan2018-10-161-0/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Webhook Image URLs Rewritten Incorrectly in Issues" Closes #52650 See merge request gitlab-org/gitlab-ce!22361
| * | | Fix image webhook rewriting for uploadsSean McGivern2018-10-161-0/+11
| |/ / | | | | | | | | | | | | | | | | | | This rewrote URLs to be absolute URLs. However, for uploads (the most common case), we actually need them to point to not just the GitLab instance, but the project they're from. Thankfully, we can normally get that information from the object we're building the hook for.
* | | Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-152-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
| * | | Remove Koding integration and documentationStan Hu2018-10-122-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
* | | | Merge branch 'bvl-merge-base-multiple-revisions' into 'master'Douwe Maan2018-10-151-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow getting the merge base of multiple revisions Closes #52573 See merge request gitlab-org/gitlab-ce!22295
| * | | | Allow getting the merge base of multiple revisionsBob Van Landuyt2018-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | As we now support getting the merge base for multiple revisions in gitaly, we can provide this functionality in our API
* | | | | Merge branch 'zj-remove-linguist' into 'master'Robert Speicher2018-10-155-39/+182
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove dependencies on Linguist Closes #35450 See merge request gitlab-org/gitlab-ce!21008
| * | | | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-125-39/+182
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension.
* | | | Merge branch 'enable-frozen-string-lib-gitlab' into 'master'Rémy Coutable2018-10-1553-3/+115
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable some frozen string in lib/gitlab See merge request gitlab-org/gitlab-ce!22304
| * | | | Enable some frozen string in lib/gitlabgfyoung2018-10-1353-3/+115
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string for the following files: * lib/gitlab/auth/**/*.rb * lib/gitlab/badge/**/*.rb * lib/gitlab/bare_repository_import/**/*.rb * lib/gitlab/bitbucket_import/**/*.rb * lib/gitlab/bitbucket_server_import/**/*.rb * lib/gitlab/cache/**/*.rb * lib/gitlab/checks/**/*.rb Partially addresses #47424.
* | | | Merge branch 'patch-29' into 'master'Kamil Trzciński2018-10-151-20/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Android.gitlab-ci.yml for current stable SDK See merge request gitlab-org/gitlab-ce!22336
| * | | | Update Android.gitlab-ci.yml for current stable SDKOsama Bin Omar2018-10-131-20/+20
| |/ / /