Skip to content
Snippets Groups Projects

BE: Allow customers to extend or reactivate their trial on gitlab.com [RUN ALL RSPEC] [RUN AS-IF-FOSS]

Merged Qingyu Zhao requested to merge 290278-allow-extend-or-reactivate-trial-on-gitlab-com into master
All threads resolved!

What does this MR do?

Related to issue #290278 (closed)

There are 4 MRs for issue #290278 (closed)

Note: the issue's Data requirement has not confirmed yet, so please ignore data requirement during review.

This MR add a put method extend_reactivate in trials controller

  • it requires params[:trial_extension_type] as one params
  • it validates params[:trial_extension_type] against the namespace
  • if the request is valid, it calls GitlabSubscriptions::ExtendReactivateTrialService
  • GitlabSubscriptions::ExtendReactivateTrialService will send a put request to CustomersDot

Screenshots (strongly suggested)

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Related to #290278 (closed)

Edited by 🤖 GitLab Bot 🤖

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Qingyu Zhao changed milestone to %13.10

    changed milestone to %13.10

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 48fe588a - 1 commit from branch migration-add-trial-extension-type-to-gitlab-subscriptions

    Compare with previous version

  • 1 Warning
    :warning: 0abe8e8f: Commits that change 30 or more lines across at least 3 files must describe these changes in the commit body. For more information, take a look at our Commit message guidelines.
    1 Message
    :book: You're adding or removing a feature flag, your MR title needs to include [RUN ALL RSPEC] [RUN AS-IF-FOSS] (we may have updated it automatically for you and started a new MR pipeline) to ensure everything is covered.

    Reviewer roulette

    Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category (e.g. frontend or backend), and by a maintainer in all other categories.

    To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.

    To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.

    Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.

    Category Reviewer Maintainer
    backend Michał Zając (@Quintasan) (UTC+2, 9 hours behind @qzhaogitlab) James Fargher (@proglottis) (UTC+13, 2 hours ahead of @qzhaogitlab)

    If needed, you can retry the danger-review job that generated this comment.

    Generated by :no_entry_sign: Danger

    Edited by 🤖 GitLab Bot 🤖
  • Qingyu Zhao added 2 commits

    added 2 commits

    • f635b911 - Draft only extend_trial. Todo: combine reactivate trial
    • 395634a9 - Reactivate trial works

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 68dc830a - Clean up comments debug info

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    • a07d530c - Add test cases. With some refactor

    Compare with previous version

  • Qingyu Zhao added 328 commits

    added 328 commits

    • 935ea225 - Uses eager loading to avoid N+1 queries
    • 761b2ec7 - Hide MR count and link in project list where MRs are disabled
    • 0a58615d - Add Paul Slaughter as DRI to GraphQL API
    • f238f2d6 - Update the release of the jacoco2cobertura image
    • b62039c7 - Bump vue-jest to 4.0.1
    • 420fe763 - Add Domain Experts to DRI in GraphQL API
    • a9ace612 - Replaces openjdk-alpine with slim image on docs
    • 09f60a7d - Merge branch 'master' into pipeline_vulnerabilities_finder_n_1_fix
    • 9062eda8 - Should have even better performance now
    • d5fec7ff - Remove join with Vulnerability model
    • 135889dd - Remove unused 'with_vulnerabilities_for_state'
    • fe13d053 - Adds index for vulnerability findings
    • 4d93cf99 - Nest Geo::VerifiableRegistry module
    • d8cc4f9a - Include VerificationState once for registries
    • ce6a183e - Elasticsearch migration to add permission data to notes documents
    • 828a4d18 - Refetch count list when vulnerabilities are updated
    • dc9ee8e2 - Harden Prometheus client wrapper
    • 0ae3fc6b - Include suite errors in test summary
    • 51aa7028 - Refactor specs and add documentation
    • 5e73c044 - Update doc/development/fe_guide/security.md
    • 3b5f46c4 - ci: fix $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX for non-lowercase groups
    • 05c01c0a - Include file digests in package detail presenter
    • b1521591 - Merge branch 'master' into pipeline_vulnerabilities_finder_n_1_fix
    • db93e95c - Upgrade Pages to v1.36.0
    • 36099e54 - Add changelog entry
    • 4c018043 - Update signup_enabled metric definition
    • bcb0cb52 - Update IDE to alert when gpg commits required
    • 45be0009 - Update gitaly to 2aa99877186
    • cb6daab9 - Corrected generated maven repository config
    • e928f65e - Review merge request project settings
    • 4dbccdda - Update gitaly to 5379be27793
    • 9b1e0e4e - Optimize branch commit resolution
    • 6d044520 - Add CHANGELOG entry
    • 6e931ae1 - Add check if user is bot to Users API
    • 59cb9301 - Don't process payload_attribute_mapping when it's blank
    • 1de7d11e - Add a changelog entry
    • ae79a7c1 - Set the payload_example to empty JSON when nil
    • 4bdeae68 - Added changelog entry
    • f7f36b35 - Check custom mapping params from the response
    • dc082d8f - Fixed Gradle Groovy DSL unittest
    • 9696318a - Prevent watcher from being triggered unnecessarily
    • e38e4220 - Remove obsolete DOMContentLoadedEventListener
    • 5820da2e - Apply 3 suggestion(s) to 1 file(s)
    • 61e9b5f8 - Remove obsolete DOMContentLoadedEventListener
    • 4349d6ba - Remove obsolete DOMContentLoadedEventListener
    • cd6aac17 - Fix call on nil for in-product marketing email
    • 1f1ace5e - Ensure that StandardContext comes first in the list of contexts
    • 7071e1b1 - Add tier badge
    • 35c0b51f - Don’t push to client layer if not tracking
    • 9b13634f - Fixes an issue with spring load order
    • bfb8d0d5 - Update GitLab UI/SVG
    • 812dde9b - Fixing typos in example JSON within group_boards.md
    • 0d7473d0 - Replace jest specific glob with *.config.*.js
    • 95165a57 - Simplify view for trial status widget & popover
    • 9b4f5801 - Include toolbox for the trends chart
    • a46d85a0 - Fix a typo in Feature Flag Roll Out template
    • 96ada461 - Fix crashing in-product-marketing email worker
    • 2f90f954 - Add methods to collect data on git fetch requests
    • 6b845ad7 - Add plan limit for Terraform Module package file size
    • 4be97295 - Link to maintenance mode docs from read only docs
    • 9c59a1e8 - Extend dast profile instance variable with branch
    • 7ac98184 - Adds a pure N+1 example to the spec
    • 7b257c7c - Use the custom RoundRobin strategy directly
    • ad96546c - Remove rollout concepts from ApplicationExperiment
    • aad5cbcb - Don't use HTTPS port for SSH
    • e963bebf - Use string/varchar until Geo uses structure.sql
    • ec83cfe8 - Revert to previous scss and instead use gl class
    • ac2438d9 - Fix subscription banner on New Project page
    • 502d6539 - Replace files that don't work on review apps
    • e04a76b2 - Merge branch 'philipcunningham-update-dast-profile-ivar' into 'master'
    • 8a9609d4 - Hide archived projects
    • 17c23766 - Revert "Merge branch 'board_args_consolidation' into 'master'"
    • 65cb85e2 - Merge branch 'furkanayhan-master-patch-54771' into 'master'
    • db55b4a1 - Set max-nesting-depth to 5 in stylelint
    • 8af7ad94 - Merge branch 'jdalrymple-master-patch-91705' into 'master'
    • f2146d14 - Break text instead of wrapping it in perf bar
    • a26b163e - Merge branch 'msj-settings-merge-requests' into 'master'
    • 0bf611d3 - Merge branch 'revert-8d0ec9fb' into 'master'
    • dfb687d6 - Enable dast_branch_selection by default
    • a0650ee8 - Merge branch 'jnnkl-remove-eventlistener-admin-index' into 'master'
    • 66a0ea9d - DORA metrics API
    • d0f48240 - Merge branch '19977-max-nesting-depth-5-stylelint' into 'master'
    • f09394cf - Remove Jira Issue username
    • 31d0ee36 - Revert "Merge branch 'chore/unknown-sign-in-info-text' into 'master'"
    • 6512cd4d - Linked GraphQL docs output
    • a773c2ea - Merge branch '322638-remove--jira-entity-username' into 'master'
    • 7726ce69 - Merge branch 'mk/dry-up-verification-state-include' into 'master'
    • a8a217b7 - Merge branch '297484-use-utility-class-in-file-blame' into 'master'
    • 587851e5 - Merge branch...
    • 95a3801f - Use the gitlab-dangerfiles gem
    • ea3272d4 - Merge branch 'ajk-linked-graphql-docs' into 'master'
    • dc21769e - Merge branch '321101-dont-wipe-payloadAttributeMappings-when-omitted' into 'master'
    • 7e378cca - Add selected state for chart button in vulnerabilities dashboard
    • e035e2bd - Merge branch 'seleced-state-vulnerabilities-dashboard' into 'master'
    • e5e6b0d2 - Merge branch '323709-add-file-hash-to-presenter' into 'master'
    • 69b760c0 - Merge branch 'revert-07b19ec0' into 'master'
    • 86bbb60c - Improve ref name
    • 14cba850 - app: add helper function to computer a group's Dependency Proxy URL
    • 65f3844a - spec/helpers/groups: drop unnecessary `save!` right after group creation
    • 8e73c5a1 - Add Prometheus metrics to ActionCable subscription events
    • a33dd1ce - Merge branch '213581-ide-alert-user-when-reject-unsigned-commits' into 'master'
    • 86bd650c - Rename describe block in specs
    • e4a377ad - Update Specs
    • 2cc869a4 - Update Specs
    • 02d83508 - Replace wiki#find_file RPC with Gitaly call
    • 8b902393 - Merge branch 'aa-harden-with-prometheus-callback' into 'master'
    • 2c5a74d0 - Update CI template examples to default branch
    • 6775651e - Merge branch 'update-ci-template-default-branch-2' into 'master'
    • 3ec5c3e1 - Use sprite_icon in failed builds tab
    • 6722462e - Enhanced Specs
    • 355c64fb - Merge branch 'nicolasdular/fix-in-product-marketing-crash' into 'master'
    • 8b71f667 - Merge branch 'nhxnguyen-remove-temp-read-only-docs' into 'master'
    • c6833727 - Merge branch 'docs-gitlab-com-tier' into 'master'
    • d2c8865e - Geo Node Status 2.0 - Node Header Details
    • cac675ca - Merge branch '287978_04-geo-beta-node-header-details' into 'master'
    • 33ab9605 - Clarify zero-downtime upgrade docs
    • 2a14bc00 - Merge branch '323113-clarify-documentation-for-skip-version-upgrades' into 'master'
    • a9d7ef80 - Improving github mirror spec flakiness
    • 579ce053 - Merge branch '322819-fix-project-namespace-not-found' into 'master'
    • d51ecaaa - Add error/loading state to Jira Issues detail
    • 08b19204 - Merge branch 'jira-issue-detail-error-state' into 'master'
    • f7151e8b - Apply 1 suggestion(s) to 1 file(s)
    • 018e58eb - Merge branch...
    • ff38a286 - Apply new GitLab UI for buttons on GitLab Import page
    • 975b3d14 - Merge branch 'gl-button-gl-import' into 'master'
    • e5aa7613 - Merge branch 'dora-metrics-rest-api' into 'master'
    • bf19a0ed - Merge branch 'fix-CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX-for-non-lowercase-groups' into 'master'
    • b53aec54 - Merge branch 'vs-wrap-long-line-perf-bar' into 'master'
    • a9762c79 - Merge branch 'board_args_consolidation' into 'master'
    • cffdff1f - Merge branch 'cherry-pick-8d0ec9fb' into 'master'
    • f5bb85b9 - Refine Sentry reporting
    • b1c95db1 - Don't track JiraImport::UsersImporter errors in Sentry
    • 01fe8d78 - Add a changelog for Group Wiki Geo replication
    • 18e84556 - Migrate mr_widget_related_links to VTU
    • cdf5ca42 - Merge branch 'renovate/gitlab-uisvg' into 'master'
    • 0603678a - Merge branch 'nicolasdular/fix-in-product-email' into 'master'
    • b44226c6 - Merge branch...
    • 0fec9b6a - Add more settings to group MR approval settings
    • eba97db0 - Merge branch 'mk/use-varchar-until-geo-structure-sql' into 'master'
    • 4cb4ac66 - Merge branch...
    • a52f1b6f - Merge branch '263819-update-severity-counts-after-bulk-update' into 'master'
    • 8cfe7d61 - Merge branch 'ali/update-ordering-of-standardcontext' into 'master'
    • a378e3b9 - Merge branch '322395-hide-archived-projects-from-select-project' into 'master'
    • 2dd750f9 - User danger helper for all_changed_files
    • 4e7c724e - Remove redundant no-param-reassign
    • 56a6b2b5 - Merge branch 'vs-allow-to-reassign-immer-draft' into 'master'
    • cce0487c - Remove the cache option for stylelint
    • 67809477 - Add database helpers for setting statement timeouts in specs
    • 2940e3fd - Implement usage ping `histogram`
    • be509ff2 - Usage ping: Histogram for enabled integrations per project
    • d884d14c - Docs(troubleshooting): add core-js issue + remedy
    • 8bc3ba7a - Merge branch 'mlunoe-core-js-issue-to-troubleshooting' into 'master'
    • 3e060c30 - Merge branch '324165-fj-replace-wiki-find-file-call-with-gitaly' into 'master'
    • 3a54e151 - Merge branch 'fix-danger-use-helper' into 'master'
    • 2d3fd526 - Change status for depcrecated metrics
    • c8e73acd - Merge branch 'jnnkl-removeeventlistener-project-list' into 'master'
    • ad479b66 - Merge branch '301199-with-tabs-ci-status-icon-failed' into 'master'
    • 04860816 - Update CI/CD template devleopment guideline
    • 0ea839f1 - Merge branch 'docs-update-cicd-tempalte-guideline' into 'master'
    • 6a03e7cd - Merge branch '298781/collect_data_on_git_fetch_requests_from_prometheus' into 'master'
    • dbdbf9e2 - Display in progess for duration
    • 1b4048ab - Update e2e checkbox functionality
    • be7b38c4 - Merge branch 'qa-update-checkbox-e2e-functionality' into 'master'
    • 70462f71 - Fetch only detected and confirmed vulnerabilities
    • d03347fc - Disable policy DAST scan/site profile changes
    • af8a8978 - Connect backend to scans referenced in policies
    • c9d2f0ee - Fix forEach tests for all formGroups
    • ab040aee - Clean up dast profile code
    • ef35231e - Remove unnecessary graphql fields
    • 998b460e - Clean up tests
    • 4abb1f05 - Wrap disabled form groups in a disabled parent
    • a3a75dea - Update dependency dompurify to ^2.2.7
    • e5d6b8d9 - Move from btn-success to btn-confirm milestones directory
    • 9b633640 - Merge branch 'btn-confirm-project-milestones' into 'master'
    • 2b416e9f - Move from btn-success to btn-confirm in projects/mirrors directory
    • 554bf955 - Merge branch 'btn-confirm-project-mirrors' into 'master'
    • 3f074de4 - Move tooltip placement on dast profile to bottom
    • 0d6349c7 - Delete zero width spaces from docs
    • ba8bd0de - Merge branch 'docs-zero-width-space' into 'master'
    • 72313516 - BulkImports: Add fields to track concurrent work
    • f8e7c520 - Do not mark bot users as pending approval when User Cap is enabled
    • dda009be - Remove obsolete DOMContentLoadedEventListener
    • 2d32f226 - Remove obsolete DOMContentLoadedEventListener
    • 5192f606 - Extracts cache initialization to collection class
    • c9698236 - Add pull by digest example to the dependency proxy
    • f1ce497f - Merge branch 'trizzi-master-patch-34790' into 'master'
    • 71385691 - Merge branch...
    • 852c41fe - Add feature flag to block gitlab.com top-level group creation via api
    • 69401726 - Merge branch '323573-limit-creating-top-level-groups' into 'master'
    • 2f62d2af - Merge branch 'hide-mr-counts-in-project-list-where-mrs-disabled' into 'master'
    • 6dcc1acd - Merge branch 'pb-add-hourglass-icon-to-empty-duration-cell' into 'master'
    • 34fda0b6 - Change the throughput label link in GitLab Bot warning
    • f7c2e86d - Updated the approvers rule removal modal to use new danger variant
    • 9bdc7789 - Merge branch 'fix-remove-approval-button-type' into 'master'
    • afa5c2a9 - Merge branch 'vs-migrate-mr-widget-related-links-to-vtu' into 'master'
    • bfd4805e - Default enable the extended VSA form
    • df76f97d - Merge branch '294190-default-on-extended-create-value-stream-form-ff' into 'master'
    • d52ccb0e - Add background migration to copy container_registry_enabled
    • 447317b2 - Merge branch '321886-disable-policy-dast-profile' into 'master'
    • 06935da7 - Merge branch 'renovate/dompurify-2.x' into 'master'
    • 712121c3 - Merge branch 'sentry-3-you-and-me' into 'master'
    • 5918bf63 - Add link to epic in the new sidebar
    • 06155c81 - Merge branch 'fix-project-epic-swimlane-sidebar-epic' into 'master'
    • 64c91698 - Merge branch 'cromefire_-master-patch-00495' into 'master'
    • b1552cdd - Fix 2 typos where identify should be indentity
    • 18cac7f3 - Merge branch 'eb-test-summary-suite-error' into 'master'
    • 84017f29 - Merge branch '323919-feature-flag-rollout-of-geo_group_wiki_repository_replication' into 'master'
    • 3c3df75c - Merge branch 'thaoyeager-master-patch-84544' into 'master'
    • f48c4170 - Remove unnecessary parameter from API test
    • dc50c789 - Merge branch 'doc-API-line-range-is-optional' into 'master'
    • ff675bdd - Merge branch 'philipcunningham-enable-dast-branch-selection-by-default-322672' into 'master'
    • 0715c3a7 - Prevent daylight-savings-related failures in oncall specs
    • 5b1070d0 - Merge branch 'kassio/bulkimports-add-new-fields-to-trackers' into 'master'
    • 858a3387 - Move `grouped_test_reports_app` components
    • 12b22df9 - Merge branch 'skr-refact-comp' into 'master'
    • 2c7652a9 - Merge branch 'mc/backstage/optimize-branch-loading' into 'master'
    • 87943223 - Merge branch '18792-background-migration' into 'master'
    • d071b6ae - Merge branch '321664-log-jira-import-exceptions' into 'master'
    • ceb700b6 - Convert mattermost alert to pajamas
    • 396ef600 - Fix styling of "Enabled OAuth sign-in sources" checkboxes
    • f3da5cad - Merge branch...
    • 1c44fed6 - Allow user to commit new files in pipeline editor
    • 581de7ae - Merge branch 'pipeline-editor-empty-state-3' into 'master'
    • 9063b71f - Add note about code snippets in the registry
    • 4b1356a5 - Merge branch 'sy-prevent-oncall-test-failures' into 'master'
    • a8861f34 - Update tier badging
    • 731c40a0 - Refactor: Extract JobArtifactsDestroyAsyncService
    • f900f184 - Merge branch 'refactor-parallel-destroy-service' into 'master'
    • 868a5e9d - Merge branch 'trizzi-master-patch-95660' into 'master'
    • ecbb279a - Merge branch 'docs-user-tier-badge' into 'master'
    • fc54e469 - Merge branch 'jnnkl-bot-popover-be-info' into 'master'
    • 45fd1cb8 - Edits to style and CTRT
    • c0c4b64b - Merge branch 'selhorn-user-acct-edits1' into 'master'
    • 7cd1c304 - Mention the snippets dashboard early on
    • 68016c39 - Merge branch 'docs-aqualls-snippet-followup' into 'master'
    • 6cc0f7c5 - Merge branch 'pipeline_vulnerabilities_finder_n_1_fix' into 'master'
    • 44e3a884 - Update tier badge and versions
    • a291193c - Merge branch '323127-add-more-mr-approval-settings-to-group-level' into 'master'
    • 2cfd0c6f - Remove dast_saved_scans feature flag
    • 9cc80435 - Docs Added introducing in for api audit events
    • ed3074d8 - Remove security & compliance config page feature flag
    • 8b396589 - Merge branch 'remove-secure_security_and_compliance_configuration_page_on_ce-flag' into 'master'
    • 91fab7c4 - Merge branch '285476-add-icons-to-trends-chart' into 'master'
    • bb0f22fe - Merge branch 'mmora-master-patch-93763' into 'master'
    • 6d0d5324 - Merge branch 'jj-clean-application-experiment' into 'master'
    • a36e2684 - Update mailroom to v0.0.9
    • d023c595 - Update MobSF to version 3.3.3 in the SAST template
    • 8379fd26 - Merge branch 'ssarka-master-patch-48911' into 'master'
    • 6131d5c5 - Merge branch '324199-prevent-api-spam-branch-selector' into 'master'
    • b87cfbc6 - Revert "Merge branch 'approvers-use-new-project-api-fe' into 'master'"
    • ecb0c75d - Merge branch 'revert-a15a6f06' into 'master'
    • eed46dd7 - Add clause to fixing security issue message
    • 5430a99b - Merge branch 'sstern-master-patch-98531' into 'master'
    • f974964d - Merge branch 'jnnkl-remove-eventlistener-admin-runner-token' into 'master'
    • b2afa834 - Apply reviewer feedback
    • 3b9f5648 - Merge branch 'vs-bump-vue-jest-pkg' into 'master'
    • c142c6f6 - Merge branch 'ps-add-dri-to-grpahql-api' into 'master'
    • b5212aed - Align "default SSH config" warning text with docs
    • 5dd14a02 - Merge branch 'docs-update-ssh-default-warning' into 'master'
    • 96ae08d2 - Update keybindings.js to be tree-shakeable
    • 2a9367fd - Merge branch 'nfriend-make-keybindings-tree-shakeable' into 'master'
    • 4b455de3 - Merge branch '321102-terraform-module-registry-iteration-1' into 'master'
    • 7663e254 - Merge branch '296845-cablett-actioncable-prometheus-metrics' into 'master'
    • 22a117e6 - Merge branch 'sh-update-mailroom-0.0.9' into 'master'
    • c22f7e2c - Add explicit warning not to copy .gitaly-metadata
    • 35d10237 - Merge branch 'wc-gitaly-metadata-warn' into 'master'
    • feff2c24 - Merge branch 'docs-pipelines-tier' into 'master'
    • 0c4ed5e9 - Merge branch '323898-remove-dependency-to-alpine-based-openjdk-from-docs' into 'master'
    • 68e4e87d - Merge branch 'docs/jacoco2cobertura_update' into 'master'
    • e33e86a3 - Docs: run manual git fsck
    • a02b5cf5 - Merge branch 'docs-bprescott/20210310-gitfsck' into 'master'
    • 395233b7 - Merge branch '322546-fix-subscription-banner-for-new-project' into 'master'
    • 0952b747 - Merge branch 'ml-replace-design-test-files' into 'master'
    • fca15c1f - Merge branch 'ml-fix-2fa-ssh-test-on-review-apps' into 'master'
    • fa7685ef - Merge branch 'furkanayhan-master-patch-39600' into 'master'
    • c5d01326 - Refactor docs and UI for embedding Grafana panels
    • ffb09b69 - Merge branch 'eread/refactor-embedded-grafana-panels' into 'master'
    • 857acccb - Render large math diagram with lazy loading
    • 586070ae - Merge branch 'jnnkl-remove-eventlistener-admin-app-settings' into 'master'
    • d5c31b6f - Remove duplicate content from the Vulnerability Report docs
    • 232a28e0 - Merge branch 'russell/remove-project-vulnerability-report' into 'master'
    • 489d9d9e - Show CSV has been exported banner on export
    • 2063350e - Merge branch 'ps-config-with-stars-on-thars' into 'master'
    • e75cb930 - Merge branch '233678-pajamas-mattermost-alert' into 'master'
    • 15d25bd8 - Epic Boards - Fix mentions of issues to epics
    • b77a2f73 - Merge branch 'epic-boards/fix-mentions-of-issues' into 'master'
    • e0bd8382 - Merge branch '295252-remove-dast-saved-scans-ff' into 'master'
    • db9606da - Merge branch 'katex-dos' into 'master'
    • c2d881c2 - Update schema for DAST site profile form
    • 2c640ee6 - Move constants to a separate file
    • 77f8b9fa - Handle case when exclude urls are empty
    • a5db2cc5 - Move parsing to computed property
    • 9b046ea8 - Improve security dashboard/vulnerability report empty state messages
    • a055ce94 - Merge branch '287631-update-security-dashboard-empty-states' into 'master'
    • 0af2acc8 - Start refactoring issues list page with `issuable_list` component
    • e705da85 - Merge branch '322755-add-issuable_list-to-issues-list-page' into 'master'
    • 8feb7756 - Fix broken pipeline
    • 72e2fa8a - Update gitaly to 2518b0d69df
    • 273691f7 - Merge branch 'show-banner-export' into 'master'
    • 05ed8fa2 - Merge branch '288302-fix-vulnerability-query' into 'master'
    • b0c1ebfd - Sanitize issue description in search result
    • ffcbbe06 - Merge branch '281046-image-rendered-in-search-result' into 'master'
    • ac4cd4c6 - Merge branch 'upgrade-pages-1-36' into 'master'
    • 9b101bf3 - Merge branch 'release-tools/update-gitaly' into 'master'
    • 975be5c7 - Merge branch 'lm-extract-seed-build-into-collection-class' into 'master'
    • 154739d7 - Merge branch '323191-user-cap-do-not-block-bot-users' into 'master'
    • cec9440d - Move to btn-confirm from btn-success in views/import directory
    • 293b4964 - Merge branch 'btn-confirm-imports' into 'master'
    • 2a553a98 - Merge branch 'jj-respect-tracking-better' into 'master'
    • 6e1acecf - Merge branch 'jnnkl-admin-event-listener-index' into 'master'
    • 417f8d17 - Merge branch 'vs-remove-cache-option-for-stylelint' into 'master'
    • b2f43329 - Merge branch 'mrincon-improve-ref-name' into 'master'
    • 36ce3b5d - Added reference Apollo component
    • dadd7d9f - Merge branch '300659-refactor-project-reference-sidebar-component-to-use-vue-apollo' into 'master'
    • a048fcf4 - Merge branch 'update-deprecated-metrics' into 'master'
    • 54b19ad1 - Remove the cache option for stylelint
    • 1cfc8982 - Merge branch 'vs-reduce-max-nesting-depth-to-previous-valye' into 'master'
    • 4050e772 - Merge branch 'djadmin-exclude-url-schema-update' into 'master'
    • eb3361ba - Update oncall grid UX
    • 859295d6 - Merge branch '322137-oncall-early-start-mvc' into 'master'
    • ca16b26f - Add removed_at to oncall participants table
    • 178e9234 - Merge branch '262862-edit-rotation-service' into 'master'
    • 3c539e8a - Migration: add trial extension type to gitlab_subscription
    • ac93b13c - Draft only extend_trial. Todo: combine reactivate trial
    • fad01589 - Reactivate trial works
    • ceb091f9 - Clean up comments debug info
    • a87c00bf - Add test cases. With some refactor
    • dd7db7e4 - Fix rubocop error

    Compare with previous version

  • 🤖 GitLab Bot 🤖 changed title from BE: Allow customers to extend or reactivate their trial on gitlab.com to BE: Allow customers to extend or reactivate their trial on gitlab.com [RUN ALL RSPEC] [RUN AS-IF-FOSS]

    changed title from BE: Allow customers to extend or reactivate their trial on gitlab.com to BE: Allow customers to extend or reactivate their trial on gitlab.com [RUN ALL RSPEC] [RUN AS-IF-FOSS]

  • Qingyu Zhao added 6 commits

    added 6 commits

    • 5d9e50b9 - 1 commit from branch migration-add-trial-extension-type-to-gitlab-subscriptions
    • e489d6f9 - Draft only extend_trial. Todo: combine reactivate trial
    • 828aa639 - Reactivate trial works
    • 277cc2c7 - Clean up comments debug info
    • 669ce56f - Add test cases. With some refactor
    • 57648d3e - Fix rubocop error

    Compare with previous version

  • removed frontend label

  • removed documentation label

  • removed database label

  • Qingyu Zhao removed QA label

    removed QA label

  • Qingyu Zhao changed title from BE: Allow customers to extend or reactivate their trial on gitlab.com [RUN ALL RSPEC] [RUN AS-IF-FOSS] to BE: Allow customers to extend or reactivate their trial on gitlab.com

    changed title from BE: Allow customers to extend or reactivate their trial on gitlab.com [RUN ALL RSPEC] [RUN AS-IF-FOSS] to BE: Allow customers to extend or reactivate their trial on gitlab.com

  • assigned to @rdavila

  • Qingyu Zhao changed the description

    changed the description

  • Rubén Dávila
  • Rubén Dávila
  • Rubén Dávila
  • Qingyu Zhao changed the description

    changed the description

  • assigned to @rdavila

  • Qingyu Zhao added 1 commit

    added 1 commit

    Compare with previous version

  • Qingyu Zhao mentioned in issue #324852

    mentioned in issue #324852

  • Tyler Amos resolved all threads

    resolved all threads

  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Qingyu Zhao deleted the migration-add-trial-extension-type-to-gitlab-subscriptions branch. This merge request now targets the master branch

    deleted the migration-add-trial-extension-type-to-gitlab-subscriptions branch. This merge request now targets the master branch

  • Qingyu Zhao added 1 commit

    added 1 commit

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 6c5cfba9 - Address review comment batch two

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    Compare with previous version

  • Qingyu Zhao added 564 commits

    added 564 commits

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    • e9ea84b3 - Check namespace owner for user namespace

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 0fdccd81 - Add feature flag allow_extend_reactivate_trial

    Compare with previous version

  • 🤖 GitLab Bot 🤖 changed title from BE: Allow customers to extend or reactivate their trial on gitlab.com to BE: Allow customers to extend or reactivate their trial on gitlab.com [RUN ALL RSPEC] [RUN AS-IF-FOSS]

    changed title from BE: Allow customers to extend or reactivate their trial on gitlab.com to BE: Allow customers to extend or reactivate their trial on gitlab.com [RUN ALL RSPEC] [RUN AS-IF-FOSS]

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 9e340794 - Use enum for trial_extension_type

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    Compare with previous version

  • assigned to @tyleramos

  • Qingyu Zhao added 1 commit

    added 1 commit

    • d4106625 - Remove sync_to_gl since it always true

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 61839c01 - Correct the mis-change for applytrial

    Compare with previous version

  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • Tyler Amos
  • assigned to @mikolaj_wawrzyniak and @Alexand and unassigned @tyleramos

  • João Alexandre Cunha approved this merge request

    approved this merge request

  • requested review from @Alexand and @tigerwnz

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 2c31d6d1 - Apply 3 suggestion(s) to 2 file(s)

    Compare with previous version

  • changed milestone to %13.11

  • Tiger Watson removed review request for @tigerwnz

    removed review request for @tigerwnz

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 23563eca - Update the endpoint since we changed in CustomersDot

    Compare with previous version

  • Mikołaj Wawrzyniak
  • requested review from @mikolaj_wawrzyniak

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 49dfd03d - Apply 2 suggestion(s) to 2 file(s)

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    • 0616de0d - Use ServiceReponse to return ExtendReactivateTrialService response

    Compare with previous version

  • Qingyu Zhao added 2 commits

    added 2 commits

    • 79ff5e71 - Allow extend or reactivate trial on gitlab.com
    • 27cb6962 - Use ServiceReponse to return ExtendReactivateTrialService response

    Compare with previous version

  • Qingyu Zhao added 1299 commits

    added 1299 commits

    • 27cb6962...97d7e378 - 1297 commits from branch master
    • 0abe8e8f - Allow extend or reactivate trial on gitlab.com
    • 6ac30e8f - Use ServiceReponse to return ExtendReactivateTrialService response

    Compare with previous version

  • Qingyu Zhao added 1 commit

    added 1 commit

    Compare with previous version

  • mentioned in issue #326193 (closed)

  • Mikołaj Wawrzyniak approved this merge request

    approved this merge request

  • Mikołaj Wawrzyniak resolved all threads

    resolved all threads

  • Mikołaj Wawrzyniak enabled an automatic merge when the pipeline for 79e49300 succeeds

    enabled an automatic merge when the pipeline for 79e49300 succeeds

  • mentioned in commit 19be1668

  • mentioned in issue #290278 (closed)

  • Please register or sign in to reply
    Loading