summaryrefslogtreecommitdiff
path: root/spec/services
Commit message (Collapse)AuthorAgeFilesLines
* Give Knative serving permissions to service accountHordur Freyr Yngvason2019-07-112-0/+22
| | | | | | | | GitLab uses a kubernetes service account to perform deployments. For serverless deployments to work as expected with externally created clusters with their own knative installations (e.g. via Cloud Run), this account requires additional permissions in the serving.knative.dev API group.
* Merge branch 'banzai-avoid-redis-if-db-cache' into 'master'Douwe Maan2019-07-111-21/+33
|\ | | | | | | | | Banzai - avoid redis if attr is in DB cache See merge request gitlab-org/gitlab-ce!30334
| * Banzai - avoid redis if attr is in DB cachebanzai-avoid-redis-if-db-cacheMario de la Ossa2019-07-101-21/+33
| | | | | | | | | | | | | | When cache_collection_render runs we end up reading and writing things to redis even if we already have the rendered field cached in the DB. This commit avoids using redis at all whenever we have the field already rendered in the DB cache.
* | Upgrade rspec-rails to 3.8.2 and dependenciessh-bump-rspec-versionsDouglas Barbosa Alexandre2019-07-103-4/+8
| | | | | | | | | | | | | | | | This brings the rspec-core version in line with the Gitaly changes and introduces Rails 5.1/5.2 improvements. Full CHANGELOG: https://github.com/rspec/rspec-rails/blob/master/Changelog.md
* | Merge branch 'osw-bypass-push-rules-for-merge-to-ref' into 'master'Stan Hu2019-07-092-0/+26
|\ \ | | | | | | | | | | | | [CE port] Bypass push rules for merge to ref service See merge request gitlab-org/gitlab-ce!30426
| * | [CE port] Bypass push rules for merge to ref serviceosw-bypass-push-rules-for-merge-to-refOswaldo Ferreira2019-07-092-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out push rules to validate commit message does not apply in the context of automatic merge to the refs/merge-requests/:iid/merge. Mainly because if it fails to merge to it, we currently can't give enough preemptive feedback to the user and it'll turn the merge request unmergeable (given we automatically mark it as unmergeable if we can't merge to the ref). In general, it's a systematic operation, which already bypasses user authorization and git hooks. Therefore, this commit makes it bypass the push rules at EE as well.
* | | Skip spam check for task list updatesFelipe Artur2019-07-091-0/+16
| | | | | | | | | | | | Task list updates should not mark users action as spam on akismet.
* | | CE Port of Allow bulk update for group issuesFatih Acet2019-07-091-234/+262
|/ / | | | | | | | | | | | | | | This is a port MR for CE Original MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14141
* | Fix race condition on merge train ref generationrun-pipeline-for-merge-train-at-train-ref-ceShinya Maeda2019-07-081-0/+9
| | | | | | | | | | | | | | | | | | Today, Pipelines for merge train run on `refs/merge`, however, this causes a race condition that it can be overwritten by CheckMergeabilityService. This patch fixes the problem by generating `refs/train` for those pipelines.
* | Merge branch 'create-merge-train-ref-ce' into 'master'Douwe Maan2019-07-051-7/+48
|\ \ | | | | | | | | | | | | CE Port: Extend `MergeToRefService` to create merge ref from an arbitrary ref See merge request gitlab-org/gitlab-ce!30361
| * | Extend MergeToRefService for creating merge ref from the other refShinya Maeda2019-07-051-7/+48
| | | | | | | | | | | | | | | | | | | | | Currently, MergeToRefService is specifically designed for createing merge commits from source branch and target branch of merge reqeusts. We extend this behavior to source branch and any target ref paths.
* | | Merge branch 'make-explicit-endpoint-abort-in-auto-merge-ce' into 'master'Kamil Trzciński2019-07-054-5/+87
|\ \ \ | | | | | | | | | | | | | | | | CE Port: Split AutoMergeService interfaces into two `cancel` and `abort` See merge request gitlab-org/gitlab-ce!30249
| * | | Split AutoMergeService interfaces into two `cancel` and `abort`make-explicit-endpoint-abort-in-auto-merge-ceShinya Maeda2019-07-054-5/+87
| |/ / | | | | | | | | | Create explicit endpoint - abort.
* | | Refactor PositionTracer to support different typesPatrick Bajao2019-07-051-5/+19
|/ / | | | | | | This is to prepare for supporing image type position tracing
* | Merge branch '54117-transactional-rebase' into 'master'Douglas Barbosa Alexandre2019-07-041-7/+21
|\ \ | | | | | | | | | | | | | | | | | | Allow asynchronous rebase operations to be monitored Closes #54117 See merge request gitlab-org/gitlab-ce!29940
| * | Allow asynchronous rebase operations to be monitoredNick Thomas2019-07-041-7/+21
| |/ | | | | | | | | | | | | | | | | This MR introduces tracking of the `rebase_jid` for merge requests. As with `merge_ongoing?`, `rebase_in_progress?` will now return true if a rebase is proceeding in sidekiq. After one release, we should remove the Gitaly-based lookup of rebases. It is much better to track this kind of thing via the database.
* | Fix MWPS system notes shows inconsistent shafix-mwps-shows-inconsistent-sha-ceShinya Maeda2019-07-043-2/+10
|/ | | | Fix the system note service
* Merge branch 'issue/55953' into 'master'Sean McGivern2019-07-031-1/+1
|\ | | | | | | | | | | | | rename `discussion` to `thread` Closes #55953 See merge request gitlab-org/gitlab-ce!29553
| * Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953Sean McGivern2019-07-032-0/+74
| |\
| * | updated tests for !29553Michel Engelen2019-07-021-1/+1
| | |
* | | Merge branch 'jc-deprecate-diverging-count-with-max' into 'master'Jan Provaznik2019-07-031-27/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Deprecate diverging commit count with max parameter Closes gitaly#1702 See merge request gitlab-org/gitlab-ce!30275
| * | Deprecate diverging commit count with max parameterjc-deprecate-diverging-count-with-maxJohn Cai2019-07-021-27/+6
| | | | | | | | | | | | | | | | | | | | | In 12.0, we turned the feature flag on that effectively turned off the --max-count flag for the count diverging commits call. Since we have commit graphs turned on, this did not affect preformance negatively. Thus, we want to deprecate the call that passes --max-count
* | | Add username to deploy tokensKrasimir Angelov2019-07-021-0/+16
|/ / | | | | | | | | | | | | | | | | This new attribute is optional and used when set instead of the default format `gitlab+deploy-token-#{id}`. Empty usernames will be saved as null in the database. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/50228.
* | Includes logic to persist namespace statisticsMayra Cabrera2019-07-021-0/+58
|/ | | | | | | | | | | | | | | | | | | | | - Add two new ActiveRecord models: - RootNamespaceStoragestatistics will persist root namespace statistics - NamespaceAggregationSchedule will save information when a new update to the namespace statistics needs to be scheduled - Inject into UpdateProjectStatistics concern a new callback that will call an async job to insert a new row onto NamespaceAggregationSchedule table - When a new row is inserted a new job is scheduled. This job will update call an specific service to update the statistics and after that it will delete thee aggregated scheduled row - The RefresherServices makes heavy use of arel to build composable queries to update Namespace::RootStorageStatistics attributes. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows
* Merge branch '58583-confidential-mr-branch-backend' into 'master'Rémy Coutable2019-07-012-92/+145
|\ | | | | | | | | Support creating an MR/branch on a fork from an issue See merge request gitlab-org/gitlab-ce!29831
| * Fix issues when creating system notes58583-confidential-mr-branch-backendPatrick Bajao2019-06-292-10/+26
| | | | | | | | | | | | | | | | | | | | When `confidential_issue_project_id` is set and the issue is under that project, create the a note about branch creation in that project. If not, do nothing. When creating `new_merge_request` system note, set the project where the MR will be referenced from so it'll be linked to when the MR is created in another project.
| * Support branch creation from confidential issuePatrick Bajao2019-06-291-126/+51
| | | | | | | | | | | | | | | | Accept a `confidential_issue_project_id` param which will be used for the system note target. This also includes some refactoring on the spec to use shared examples.
| * Support creating an MR on a fork from an issuePatrick Bajao2019-06-291-82/+194
| |
* | Merge branch 'id-stale-branches' into 'master'Grzegorz Bizon2019-07-011-0/+52
|\ \ | |/ |/| | | | | Add endpoint for fetching diverging commit counts See merge request gitlab-org/gitlab-ce!29802
| * Add endpoint for fetching diverging commit countsid-stale-branchesIgor Drozdov2019-06-281-0/+52
| | | | | | | | Extract diverging_commit_counts into a service class
* | Replace 'JIRA' with 'Jira'Takuya Noguchi2019-06-282-4/+4
| | | | | | | | | | | | https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'Stan Hu2019-06-271-59/+0
|\ \ | | | | | | | | | | | | Move Multiple Issue Boards for Projects to Core See merge request gitlab-org/gitlab-ce!29757
| * | Move Multiple Issue Boards for Projects to Core53811-issue-boards-to-core-projects-backend-ceAlexandru Croitor2019-06-261-59/+0
| |/ | | | | | | | | Refactor code to allow multiple issue boards management for projects in CE
* | Speed up obtaining Let's Encrypt certificatesVladimir Shushlin2019-06-261-2/+10
| |
* | Disable Rails SQL query cache when applying service templatessh-service-template-bugStan Hu2019-06-251-1/+1
|/ | | | | | | | | | When the SQL query cache is active, the SELECT query for finding projects to apply service templates returns the same values. This causes an infinite loop because even though bulk INSERT queries are made, the cached results never reflect that progress. To fix this, we call `Project.uncached` around the query to ensure new data is retrieved. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63595
* Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-trackingHeinrich Lee Yu2019-06-251-0/+24
| | | | Changes migration and all other places the attribute is used
* Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-243-31/+317
|\ | | | | | | | | Automatically update MR merge-ref along merge status See merge request gitlab-org/gitlab-ce!29569
| * Avoid touching the MR status if MR is not openedOswaldo Ferreira2019-06-211-0/+24
| |
| * Only force recheck when merge-ref is outdatedOswaldo Ferreira2019-06-201-1/+44
| | | | | | | | | | | | When recheck flag is true, we make sure the merge-ref is indeed outdated. If it is, we update it along the merge status.
| * Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-203-31/+250
| | | | | | | | | | | | | | | | | | | | | | | | This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* | Merge branch '60617-enable-project-cluster-jit' into 'master'Thong Kuah2019-06-242-11/+0
|\ \ | | | | | | | | | | | | Enable JIT Kubernetes resource creation for project level clusters See merge request gitlab-org/gitlab-ce!29515
| * | Enable project-level JIT resource creation60617-enable-project-cluster-jitTiger2019-06-182-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this behaviour was only available to group and instance-level clusters, as some project clusters relied on Kubernetes credentials being passed through to the runner instead of having their resources managed by GitLab (which is not available when using JIT). These clusters have been migrated to unmanaged, so resources can be created on demand for the remaining managed clusters.
* | | Merge branch 'bw-issue-reorder' into 'master'Kamil Trzciński2019-06-212-0/+104
|\ \ \ | | | | | | | | | | | | | | | | Add ability to reorder issues See merge request gitlab-org/gitlab-ce!29012
| * | | Add reorder action to Project IssuesControllerbw-issue-reorderBrett Walker2019-06-212-0/+104
| | |/ | |/| | | | | | | to support manual sorting on the frontend
* | | Don't show private keys for letsencrypt certsVladimir Shushlin2019-06-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds enum certificate_source to pages_domains table with default manually_uploaded Mark certificates as 'gitlab_provided' if the were obtained through Let's Encrypt Mark certificates as 'user_provided' if they were uploaded through controller or api Only show private key in domain edit form if it is 'user_provided' Only show LetsEncrypt option if is enabled by application settings (and feature flag) Refactor and fix some specs to match new logic Don't show Let's Encrypt certificates as well
* | | Retry fetching Kubernetes Secret tokenDylan Griffith2019-06-211-4/+52
|/ / | | | | | | | | | | | | | | Since Kubernetes is creating the Secret and token asynchronously it is necessary that we implement some delay or retrying logic to avoid a race condition where we fetch a Secret before the token is even set. There does not appear to be any way for us to force it to be set with any synchronous API call so retrying seems to be the only option.
* | Merge branch 'revert-concurrent-pipeline-schedule-creation' into 'master'Kamil Trzciński2019-06-181-0/+32
|\ \ | | | | | | | | | | | | Revert concurrent pipeline creation for pipeline schedules See merge request gitlab-org/gitlab-ce!29794
| * | Revert concurrent pipeline schedule creationrevert-concurrent-pipeline-schedule-creationShinya Maeda2019-06-181-0/+32
| |/ | | | | | | | | | | This commit reverts the previously introduced concurrent pipeline schedule creation which was a viable solution for mitigating inconsistent pipeline schedule by Sidekiq Memory Killer.
* | Merge branch '59257-find-new-branches-harder' into 'master'Rémy Coutable2019-06-181-0/+34
|\ \ | | | | | | | | | | | | | | | | | | Look for new branches more carefully Closes #59257 See merge request gitlab-org/gitlab-ce!29761
| * | Look for new branches more carefullyNick Thomas2019-06-181-0/+34
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases, GitLab can miss a PostReceive invocation the first time a branch is pushed. When this happens, the "branch created" hooks are not run, which means various features don't work until the branch is deleted and pushed again. This MR changes the `Git::BranchPushService` so it checks the cache of existing branches in addition to the `oldrev` reported for the branch. If the branch name isn't in the cache, chances are we haven't run the service yet (it's what refreshes the cache), so we can go ahead and run it, even through `oldrev` is set. If the cache has been cleared by some other means in the meantime, then we'll still fail to run the hooks when we should. Fixing that in the general case is a larger problem, and we'd need to devote significant engineering effort to it. There's a chance that we'll run the relevant hooks *multiple times* with this change, if there's a race between the branch being created, and the `PostReceive` worker being run multiple times, but this can already happen, since Sidekiq is "at-least-once" execution of jobs. So, this should be safe.
View Lorry Controller Status