summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Store version within SUPPORTED_API_GROUPS hashrefactor_gitlab_kube_clientThong Kuah2018-10-231-41/+14
| | | | | | This removes the ability to pass in a different version. We can instead create a new entry in the SUPPORTED_API_GROUPS hash for a different version if need be.
* DRY up *_clients methodsThong Kuah2018-10-231-25/+21
| | | | | Build using `define_method` directly from the constant, saves us writing api_groups strings twice.
* Split hashed_clients into one per api_groupThong Kuah2018-10-231-11/+32
| | | | | | Essentially make #build_kubeclient do less. Should be much clearer now
* Remove api_groups from KubeClient constructorThong Kuah2018-10-231-27/+20
| | | | | | | | | | | | | We should have access to #core_client, #rbac_client, and #extensions_client without having to pass in an awkward array. Also change api_version to default_api_version, which allows us to use a different version for an individual client. Special case for apis/extensions which only go up to v1beta1 Makes #hashed_client private Removes the #clients and #discover! methods which are un-used
* 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 'ce-52112-fix-review-apps-cleanup-ce' into 'master'Nick Thomas2018-10-222-20/+96
|\ \ \ | | | | | | | | | | | | | | | | Improve HelmClient and KubernetesClient See merge request gitlab-org/gitlab-ce!22375
| * | | Improve automated Review Apps cleanupce-52112-fix-review-apps-cleanup-ceRémy Coutable2018-10-222-20/+96
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | 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 '52559-applications-api-get-delete' into 'master'Rémy Coutable2018-10-222-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Applications API endpoints for listing and deleting entries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52559 See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22296
| * | | | | Use application finder for Doorkeeper ApplicationsJB Vasseur2018-10-151-6/+3
| | | | | |
| * | | | | Do not return secret from GET /applications !22296JB Vasseur2018-10-121-1/+1
| | | | | |
| * | | | | disable CodeReuse/ActiveRecordJB Vasseur2018-10-121-0/+2
| | | | | |
| * | | | | Improve call for retrieving all applications !22296JB Vasseur2018-10-121-1/+1
| | | | | |
| * | | | | Support GET /applications and DELETE /applications/:id endpoints #52559JB Vasseur2018-10-111-0/+17
| | | | | |
| * | | | | Expose id and name attributes to Applications APIJB Vasseur2018-10-111-0/+2
| | | | | |
* | | | | | 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-22150-22/+322
| |_|_|/ / |/| | | |
* | | | | 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-195-8/+8
| | | | | |
* | | | | | Merge branch 'bvl-remove-forked-project-link' into 'master'Sean McGivern2018-10-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
| * | | | | | Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-191-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* | | | | | 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" }
* | | | | Merge branch 'bw-fix-hamllint' into 'master'Robert Speicher2018-10-181-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple spring rake commands cause "NameError: uninitialized constant HamlLint::Linter" Closes #52843 See merge request gitlab-org/gitlab-ce!22437
| * | | | | Fix uninitialized constant HamlLint::LinterBrett Walker2018-10-171-3/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Running multiple `rake` commands with `spring', such as `spring rake db:rollback` could cause a `NameError: uninitialized constant HamlLint::Linter`
* | | | | Make getting a user by the username case insensitiveWilliam George2018-10-187-21/+13
|/ / / /
* | | | [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-173-15/+250
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 explicit requires from flowdockNick Thomas2018-10-162-5/+0
| | | | |
| * | | | 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 flowdock monkeypatch into the inlined gemNick Thomas2018-10-162-53/+23
| | | | |
| * | | | Rubocop improvementsNick Thomas2018-10-162-29/+30
| | | | |
| * | | | Inline the gitlab-flowdock-git-hooks gemNick Thomas2018-10-162-0/+246
| | |_|/ | |/| | | | | | | | | | | | | | This allows us to avoid one transitive dependency on gitlab-grit. The aim is to remove all transitive dependencies.
* | | | 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-153-6/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
View Lorry Controller Status