summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Run least expensive method first - has_metrics?reduce_prometheus_adapterThong Kuah2019-06-201-1/+1
| | | | | Success is relatively cheap compared to prometheus_adapter which can invoke deployment_platform which does a lot of work
* Run least expensive method first - #has_terminals?Thong Kuah2019-06-201-1/+1
| | | | available? is much cheaper than deployment_platform
* Run least expensive method firstThong Kuah2019-06-201-1/+1
| | | | | If environment is not available, then no point running the more expensive `prometheus_adapter`.
* #57815 Password authentication disabled for UltraAuth usersKartikey Tanna2019-06-181-2/+10
| | | | | Disabled password authentication for the users registered using omniauth-ultraauth strategy
* Merge branch ↵Thong Kuah2019-06-181-2/+11
|\ | | | | | | | | | | | | | | | | '60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters' into 'master' Allow switching clusters between managed/unmanaged Closes #60617 See merge request gitlab-org/gitlab-ce!29322
| * Allow switching clusters between managed/unmanagedTiger2019-06-181-2/+11
| | | | | | | | | | | | Any resources created while the cluster was managed will be untouched, allowing users to set/unset this flag as they please.
* | Make KubernetesService readonlyJames Fargher2019-06-183-57/+47
| | | | | | | | | | | | | | | | We are deprecating this service in favor of instance wide clusters. Therefore we removed some code that is not anymore needed for a readonly cluster and also we added some flags to allow for this deprecation. These flags are to be removed in the next release when we finally completelly remove KubernetesService.
* | Merge branch 'migrate_k8s_service_integration' into 'master'Thong Kuah2019-06-171-1/+1
|\ \ | |/ |/| | | | | Migrate Kubernetes service integration templates to clusters See merge request gitlab-org/gitlab-ce!28534
| * Allow a user defined namespace on non-gitlab managed clustersJames Fargher2019-05-301-1/+1
| | | | | | | | | | Since they are not GitLab managed we wont make assumptions about the namespaces used
* | Merge branch '63079-exclude-k8s-namespaces-with-no-service-account-token' ↵Thong Kuah2019-06-171-3/+22
|\ \ | | | | | | | | | | | | | | | | | | into 'master' Don't use Kubernetes namespaces with no token See merge request gitlab-org/gitlab-ce!29643
| * | Don't use Kubernetes namespaces with no token63079-exclude-k8s-namespaces-with-no-service-account-tokenTiger2019-06-171-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever we are selecting a namespace to use for a deployment or to query a cluster we want to exclude Kubernetes namespace records that don't have a token set as they will not have the required permissions. However when configuring clusters, we want to use the original namespace record even if it has no token, as a namespace has to be unique on a cluster.
* | | Merge branch '56737-commits-and-mr-events-on-jira-api' into 'master'Stan Hu2019-06-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose currently supported events properly on services API Closes #56737 See merge request gitlab-org/gitlab-ce!29736
| * | | 56737 Expose currently supported events properly on services APIZsolt Kovari2019-06-161-2/+2
| | | |
* | | | Merge branch '58886-issue-tracker-fields' into 'master'Sean McGivern2019-06-174-0/+66
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Create models for issue trackers data See merge request gitlab-org/gitlab-ce!28598
| * | | | Create models for issue trackers data58886-issue-tracker-fieldsJarka Košanová2019-06-134-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | - create tables for storing issue trackers properties - add model and basic logic & spec
* | | | | Merge branch '9490-record-repository_type-on-lfs_objects_projects-ce' into ↵Grzegorz Bizon2019-06-173-3/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE backport for gitlab-ee!13894 (Save repository_type to LfsObjectsProject) See merge request gitlab-org/gitlab-ce!29179
| * | | | | CE backport for changes in EE MR 138949490-record-repository_type-on-lfs_objects_projects-ceLuke Duncalfe2019-06-173-3/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports to CE changes that allow the recording of the repository_type in the table lfs_objects_projects. This is in order to allow future pruning of unreferenced LFS objects, as we will need to know which repository to look in for the LFS pointer file. The EE MR that contains the original code and a full explanation of the changes is https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894 EE Issue https://gitlab.com/gitlab-org/gitlab-ee/issues/9490 Note that there was a lot of CE code changed in the EE MR because we want to allow the wiki repository to also use LFS. See https://gitlab.com/gitlab-org/gitlab-ce/issues/43721. As the wiki is an unlicensed feature, a full backport is required to enable this.
* | | | | Merge branch 'sh-fix-issue-63158' into 'master'Rémy Coutable2019-06-171-1/+17
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix inability to set visibility_level on project via API Closes #63158 See merge request gitlab-org/gitlab-ce!29578
| * | | | Fix inability to set visibility_level on project via APIsh-fix-issue-63158Stan Hu2019-06-141-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the scenario: 1. The default visibility level is set to internal 2. A user attempts to create a private project within a private group Previously this would always fail because default_value_for would overwrite the private visibility setting, no matter what visibility_level were specified. This was happening because default_value_for was confused by the default value of 0 specified by the database schema. default_value_for attempts to assign the default value in the block by checking whether the attribute has changed. The problem is that since the default value by the database was 0, and the user requested 0, this appeared as though no changes were made. As a result, default_value_for would always overwrite the user's preference. To fix this, we remove the use of default_value_for and only set the visibility level to the default application setting when no preference has been given at creation time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63158
* | | | | Merge branch 'bvl-comments-graphql' into 'master'Jan Provaznik2019-06-143-10/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose comments on Noteables in GraphQL Closes #62825 See merge request gitlab-org/gitlab-ce!29212
| * | | | | Expose comments on Noteables in GraphQLBob Van Landuyt2019-06-143-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exposes `Note`s on Issues & MergeRequests using a `Types::Notes::NoteableType` in GraphQL. Exposing notes on a new type can be done by implementing the `NoteableType` interface on the type. The presented object should be a `Noteable`.
* | | | | | Renumber a new UserCallout enum for EE compatibility12173-renumber-user-callout-enumNick Thomas2019-06-141-1/+4
| | | | | |
* | | | | | Added diff suggestion popoverPhil Hughes2019-06-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
* | | | | | Merge branch 'feature/require-2fa-for-all-entities-in-group' into 'master'Thong Kuah2019-06-141-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | inherit require 2fa for all subgroups and projects See merge request gitlab-org/gitlab-ce!24965
| * | | | | refactor: do not apply setting "require 2FA" for ancestor group membersRoger Meier2019-06-131-1/+1
| | | | | |
| * | | | | refactor: apply "require 2FA" to all subgroup and ancestor group members, ↵Roger Meier2019-06-132-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | when changing
| * | | | | remove experiments for 2fa requirements and fix testsRoger Rüttimann2019-06-132-3/+3
| | | | | |
| * | | | | second try: fix mysql problem (not all users found)Roger Rüttimann2019-06-131-2/+2
| | | | | |
| * | | | | first try: fix mysql problem (not all users found)Roger Rüttimann2019-06-131-1/+1
| | | | | |
| * | | | | require update_two_factor_requirement on all sub-entities usersRoger Rüttimann2019-06-132-2/+3
| | |_|/ / | |/| | |
* | | | | Speed up merge request loads by disabling BatchLoader replace_methodsStan Hu2019-06-131-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In production, we've seen the rendering times of the merge request widget increase as a result of loading commit data. BatchLoader attempts to call replace_methods on the lazy object, but this has a significant performance penalty for modules that have many methods. Disabling this mode (https://github.com/exAspArk/batch-loader/pull/45) appears to cut load times by about 50% for MergeRequestsController#show. Relates to https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6941
* | | | Raise an error if creating the MergeRequestDiff failsNick Thomas2019-06-131-1/+1
| | | |
* | | | Revert "Avoid loading objects from DB in ES results"Nick Thomas2019-06-131-2/+0
|/ / / | | | | | | | | | This reverts commit d9cb907c3e987363065136bafb2156e86bc5de26.
* | | Resolve "Email notifications do not work properly (issue due date)"Eugenia Grieff2019-06-121-2/+3
| | |
* | | Merge branch 'expose-project-git-depth-via-api' into 'master'Kamil Trzciński2019-06-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose default_git_depth via project API Closes #62908 See merge request gitlab-org/gitlab-ce!29353
| * | | Expose ci_default_git_depth via project APIexpose-project-git-depth-via-apiFabio Pitino2019-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Get and Update of ci_default_git_depth for Project API. Renaming Project#default_git_depth to :ci_default_git_depth to give more context through the API usage. Add API documentation
* | | | Merge branch 'revert-28513' into 'master'Douwe Maan2019-06-111-15/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Automatically update MR merge-ref along merge status" See merge request gitlab-org/gitlab-ce!29492
| * | | | Revert "Automatically update MR merge-ref along merge status"Oswaldo Ferreira2019-06-111-15/+21
| | | | |
* | | | | Use Time.zone.now for Ci::PipelineSchedule#ideal_next_run_atLin Jen-Shin2019-06-111-1/+2
|/ / / /
* | | | Merge branch 'add-default-reactive-cache-key' into 'master'Nick Thomas2019-06-114-5/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a default reactive cache key See merge request gitlab-org/gitlab-ce!29337
| * | | | Add a default reactive cache keyadd-default-reactive-cache-keyTiger2019-06-074-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Aligns with the other reactive cache options by providing a default that can be overridden if necessary.
* | | | | Merge branch 'dz-cleanup-deprecated-code' into 'master'Kamil Trzciński2019-06-112-12/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Remove some deprecated code See merge request gitlab-org/gitlab-ce!29222
| * | | | Remove some deprecated codedz-cleanup-deprecated-codeDmitriy Zaporozhets2019-06-072-12/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Move project default git depth behind feature flagsFabio Pitino2019-06-101-0/+2
| | | | |
* | | | | Fix nil coercion updating storage size on project statisticsAlessio Caiazza2019-06-101-1/+1
| |_|/ / |/| | |
* | | | Merge branch ↵Stan Hu2019-06-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'thomas-nilsson-irfu/gitlab-ce-thomas-nilsson-irfu-master-patch-13137' into 'master' Allow masking if 8 or more characters in base64 See merge request gitlab-org/gitlab-ce!29143
| * | | | Allow masking if 8 or more characters in base64Thomas Nilsson2019-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should allow for private ssh-keys to remain private. Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/60790.
* | | | | Merge branch '51636-task-list-api-pderichs' into 'master'Sean McGivern2019-06-071-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add task count and completed count to responses of Issue and MR See merge request gitlab-org/gitlab-ce!28859
| * | | | | Add task count and completed count to responses of Issue and MRPatrick Derichs2019-06-071-0/+7
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for task_completion_status Add test cases for task_completion_status result Extracted shared samples Add new spec file for task completion status response Fix style errors Add changelog entry Changed samples to Hashes Remove test for successful request Remove not nil expectation Add task_completion_status to api documentation for issues Add task_completion_status to api documentation for merge_requests Refactor spec so it just requests one specific item Add task_completion_status to Taskable Simplified task completion status in entities Refactor spec so it separates status code check and content check Fix spec description text and field name
* | | | | Merge branch '58297-remove-extraneous-gitaly-calls-from-md-rendering' into ↵Dmitriy Zaporozhets2019-06-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Remove extraneous DiffNote#supports_suggestion? calls See merge request gitlab-org/gitlab-ce!29027