summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Add GitLab cluster id to jupyter configdz-expose-cluster-id-to-jupyterDmitriy Zaporozhets2018-09-181-0/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch ↵Douwe Maan2018-09-181-0/+28
|\ | | | | | | | | | | | | | | | | '45754-open-issues-from-archived-project-listed-in-group-issue-board' into 'master' Resolve "Open issues from archived project listed in group issue board" Closes #45754 See merge request gitlab-org/gitlab-ce!21721
| * Filter out archived projects from issue/mr countBrett Walker2018-09-171-0/+28
| | | | | | | | Pass the 'non_archived' flag to finder methods
* | Merge branch 'select-from-union' into 'master'Robert Speicher2018-09-171-0/+40
|\ \ | | | | | | | | | | | | | | | | | | Replace direct use of Gitlab::SQL::Union with a "from_union" method Closes #51307 See merge request gitlab-org/gitlab-ce!21672
| * | Added FromUnion to easily select from a UNIONYorick Peterse2018-09-171-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the module `FromUnion`, which provides the class method `from_union`. This simplifies the process of selecting data from the result of a UNION, and reduces the likelihood of making mistakes. As a result, instead of this: union = Gitlab::SQL::Union.new([foo, bar]) Foo.from("(#{union.to_sql}) #{Foo.table_name}") We can now write this instead: Foo.from_union([foo, bar]) This commit also includes some changes to make this new setup work properly. For example, a bug in Rails 4 (https://github.com/rails/rails/issues/24193) would break the use of `from("sub-query-here").includes(:relation)` in certain cases. There was also a CI query which appeared to repeat a lot of conditions from an outer query on an inner query, which isn't necessary. Finally, we include a RuboCop cop to ensure developers use this new module, instead of using Gitlab::SQL::Union directly. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
* | | Merge branch '44596-double-title-merge-request-message' into 'master'Grzegorz Bizon2018-09-171-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix double title in merge request chat messages Closes #44586 See merge request gitlab-org/gitlab-ce!21670
| * | Fix double title in merge request chat messagesKukovskii Vladimir2018-09-111-4/+4
| | |
* | | Merge branch '50460-send-deployment-information-in-job-api' into 'master'Kamil Trzciński2018-09-171-0/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Send deployment information in job API" Closes #50460 See merge request gitlab-org/gitlab-ce!21307
| * | | Add deployment information in job APISteve Azzopardi2018-09-131-0/+42
| | | | | | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50460
* | | | Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'Kamil Trzciński2018-09-171-0/+18
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters Closes #29398 See merge request gitlab-org/gitlab-ce!21401
| * | | Create a GKE cluster with legacy_abac disabled when the `:rbac_clusters` ↵Thong Kuah2018-09-141-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | feature flag is enabled Explicitly persist the legacy_abac value of the cluster_provider_gcp so that we can disable abac if the `:rbac_clusters` feature flag is enabled
* | | | Cleaned up CI runner administration codeYorick Peterse2018-09-141-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19625 some changes were introduced that do not meet our abstraction reuse rules. This commit cleans up some of these changes so the requirements are met. Most notably, sorting of the runners in Admin::RunnersFinder has been delegated to Ci::Runner.order_by, similar to how we order data in models that include the Sortable module. If we need more sort orders in the future we can include Sortable and have Ci::Runner.order_by call `super` to delegate to Sortable.order_by.
* | | | Resolve "Add functionality to change what email address online actions ↵Nick Thomas2018-09-141-1/+49
| | | | | | | | | | | | | | | | commit using"
* | | | Merge branch 'revert-f87809f7' into 'master'Dmitriy Zaporozhets2018-09-141-9/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'dz-add-project-id-to-jupyter' into 'master'" See merge request gitlab-org/gitlab-ce!21722
| * | | | Revert "Merge branch 'dz-add-project-id-to-jupyter' into 'master'"Dmitriy Zaporozhets2018-09-131-9/+0
| |/ / / | | | | | | | | This reverts merge request !21341
* | | | Merge branch 'feature/runner-state-filter-for-admin-view' into 'master'Grzegorz Bizon2018-09-141-1/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Feature: State filter for admin runners view See merge request gitlab-org/gitlab-ce!19625
| * | | add offline scope to Ci::RunnerAlexis Reigel2018-08-201-1/+12
| | | |
* | | | Add project to jupyter cluster app factory specDmitriy Zaporozhets2018-09-131-5/+1
| |/ / |/| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch ↵Grzegorz Bizon2018-09-132-5/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master' Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre" Closes #42861 See merge request gitlab-org/gitlab-ce!21603
| * | | Reconcile differences in spec/models/blob_viewerMatija Čupić2018-09-081-1/+1
| | | |
| * | | Stub http request on specs intead of mocking HTTPartyMatija Čupić2018-09-071-4/+6
| | | | | | | | | | | | | | | | CE mirror of bb2a9fde8e6a4d1df13638fe336f641b9c72ef59
| * | | Improve external architectureMatija Čupić2018-09-072-4/+4
| | | | | | | | | | | | | | | | CE mirror of 4f17c7b2c30188302e6a73421acbf5a09fb2c823
* | | | Strip whitespace from Sentry URLStan Hu2018-09-121-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding extra whitespace in the DSN could prevent the server from starting due to InvalidURIErrors in sentry-raven. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49621
* | | | Merge branch 'clean-gitlab-git' into 'master'Douwe Maan2018-09-121-243/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Rugged and shell code from Gitlab::Git Closes gitaly#1124 See merge request gitlab-org/gitlab-ce!21488
| * | | | Remove Rugged and shell code from Gitlab::GitAlejandro Rodríguez2018-09-121-243/+0
| | |_|/ | |/| |
* | | | Merge branch 'dz-add-project-id-to-jupyter' into 'master'Dmitriy Zaporozhets2018-09-121-0/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Add GitLab project id to jupyter config installed via cluster apps See merge request gitlab-org/gitlab-ce!21341
| * | | Add cluster project id to jupyter configDmitriy Zaporozhets2018-08-221-0/+13
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Synchronize the default branch when updating a remote mirrorDouglas Barbosa Alexandre2018-09-101-0/+34
| |/ / |/| |
* | | Ask user explicitly about usage stats agreementJan Provaznik2018-09-071-0/+42
| | |
* | | Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master'Douwe Maan2018-09-072-95/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove old storage logic from Import/Export" Closes #51144, #50109, #48778, and #51079 See merge request gitlab-org/gitlab-ce!21409
| * | | refactor code based on feedbackJames Lopez2018-09-071-1/+1
| | | |
| * | | refactor code based on feedbackJames Lopez2018-09-071-1/+1
| | | |
| * | | Refactor code to remove object storage flag from Import/ExportJames Lopez2018-09-062-95/+2
| | | | | | | | | | | | | | | | | | | | | | | | Updated docs, refactor import/export code Fix AvatarUploader path issue Fix project export upload webhook error
* | | | Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-072-3/+72
| | | |
* | | | Merge branch 'alerts-for-built-in-metrics' into 'master'Grzegorz Bizon2018-09-071-0/+98
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import common metrics into database. Closes gitlab-ee#6948 See merge request gitlab-org/gitlab-ce!21459
| * \ \ \ Merge branch 'master' into 'alerts-for-built-in-metrics'Kamil Trzciński2018-09-0615-195/+324
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | Fix query_series specsKamil Trzciński2018-09-051-1/+1
| | | | | |
| * | | | | Fix specsKamil Trzciński2018-09-051-2/+1
| | | | | |
| * | | | | Add `# frozen_string_literal: true`Kamil Trzciński2018-09-041-0/+2
| | | | | |
| * | | | | Import common metrics into database.Kamil Trzciński2018-09-041-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR backports PrometheusMetric model to CE and adds: common, identifier to figure out what kind of metric is used.
* | | | | | Merge branch 'issue_50488' into 'master'Stan Hu2018-09-072-3/+30
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Move project services log to a separate file See merge request gitlab-org/gitlab-ce!21316
| * | | | | Move project services log to a separate fileFelipe Artur2018-09-062-3/+30
| | |/ / / | |/| | |
* | | | | Automatically disable Auto DevOps for project upon first pipeline failureMayra Cabrera2018-09-061-0/+24
| | | | |
* | | | | Merge branch 'bvl-codeowners-file-ce' into 'master'Douwe Maan2018-09-062-169/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port changes for CODEOWNERS to CE See merge request gitlab-org/gitlab-ce!21309
| * | | | | Port changes for CODEOWNERS to CEBob Van Landuyt2018-09-062-169/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ports the changes for the CODEOWNERS feature to CE: - It adds the CODEOWNERS file. - It adds the mention of the `with-codeowners` branch in TestEnv
* | | | | | Enable Kubernetes RBAC for GitLab Managed Apps for existing clustersThong Kuah2018-09-067-18/+86
| |/ / / / |/| | | |
* | | | | Merge branch 'filter-web-hooks-by-branch' into 'master'Dmitriy Zaporozhets2018-09-054-8/+144
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Filter web hooks by branch See merge request gitlab-org/gitlab-ce!19513
| * | | | Refactor: move active hook filter to TriggerableHooksDuana Saskia2018-09-053-21/+46
| | | | |
| * | | | Filter project hooks by branchDuana Saskia2018-08-133-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow specificying a branch filter for a project hook and only trigger a project hook if either the branch filter is blank or the branch matches. Only supported for push_events for now.
| * | | | Refactor tests for executing project hooksDuana Saskia2018-08-131-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | So that they test the negative case of hooks that don't have the specified hook scope
View Lorry Controller Status