summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Removes idenfitication by commit from Gitlab::Identifier51335-fail-early-when-user-cannot-be-identifiedTiago Botelho2018-10-252-20/+5
| | | | | | | Before we would need to identify a user when pushing through the GitLab UI. Since this is no longer the case we can remove the identification by commit and instead, use the identify_using_user
* User not defined in PostReceive#process_project_changesTiago Botelho2018-10-251-1/+1
| | | | | | | When Gitlab::GitPostReceive#changes_refs is empty user would not get defined and nil would be passed to PostReceive#after_project_changes_hooks which would then throw an error.
* Convert parser warnings to stdout in haml_lintsh-bump-ruby-2.4.5Lin Jen-Shin2018-10-241-0/+11
| | | | | | This was used in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16648 and this could happen from time to time, so let's just keep it.
* 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 '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
| | | | |