From 9a643ab892cfd7897fb7695bc158ce17ada81b1a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 22 Mar 2021 18:09:24 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../vue_shared/components/help_popover.vue | 13 +-- app/models/user.rb | 2 + .../users/in_product_marketing_email.rb | 28 +++++ .../in_product_marketing_emails_service.rb | 37 +++++-- app/views/invites/show.html.haml | 2 +- changelogs/unreleased/btn-confirm-invites.yml | 5 + ...r-record-product-email-campaign-emails.yml | 5 + ...do-not-render-empty-title-help-popover.yml | 5 + data/whats_new/202103220001_13_10.yml | 102 ++++++++++++++++++ ...4301_create_in_product_marketing_emails.rb | 33 ++++++ ...eign_key_to_in_product_marketing_emails.rb | 19 ++++ db/schema_migrations/20210317104301 | 1 + db/schema_migrations/20210317105904 | 1 + db/structure.sql | 31 ++++++ .../geo/replication/datatypes.md | 26 ++--- doc/administration/pages/index.md | 4 +- .../img/environment_auto_stop_v13_10.png | Bin 53602 -> 16265 bytes .../environments_dynamic_groups_v13_10.png | Bin 57387 -> 16869 bytes ...nments_terminal_button_on_index_v13_10.png | Bin 42113 -> 12536 bytes ...onments_terminal_button_on_show_v13_10.png | Bin 53590 -> 16161 bytes doc/development/fe_guide/graphql.md | 4 +- doc/development/pipelines.md | 32 +++--- doc/development/usage_ping/index.md | 6 +- doc/integration/elasticsearch.md | 12 +-- doc/integration/jira_development_panel.md | 30 ++---- doc/integration/vault.md | 2 +- .../img/custom_alert_mapping_v13_10.png | Bin 100141 -> 38042 bytes .../img/oncall_schedule_day_grid_v13_10.png | Bin 50188 -> 15722 bytes .../img/oncall_schedule_empty_grid_v13_10.png | Bin 76479 -> 31139 bytes doc/subscriptions/gitlab_com/index.md | 16 ++- doc/user/admin_area/credentials_inventory.md | 6 +- .../credentials_inventory_gpg_keys_v13_10.png | Bin 62501 -> 20600 bytes .../img/credentials_inventory_v13_10.png | Bin 100241 -> 30223 bytes .../create_mr_from_vulnerability_v13_4.png | Bin 49215 -> 16106 bytes doc/user/application_security/index.md | 2 +- ...roject_security_dashboard_chart_v13_10.png | Bin 51704 -> 14346 bytes .../group/epics/img/epic_board_v13_10.png | Bin 147584 -> 60672 bytes .../img/extended_value_stream_form_v13_10.png | Bin 259265 -> 82406 bytes .../img/vsa_custom_stage_v13_10.png | Bin 47083 -> 14209 bytes .../img/vsa_default_stage_v13_10.png | Bin 43974 -> 14519 bytes .../img/vsa_path_nav_v13_10.png | Bin 33148 -> 13123 bytes doc/user/packages/npm_registry/index.md | 15 +++ doc/user/permissions.md | 2 +- .../issue_board_iteration_lists_v13_10.png | Bin 61333 -> 22196 bytes .../img/issue_boards_blocked_icon_v13_10.png | Bin 42473 -> 13821 bytes .../project/integrations/jira_integrations.md | 64 ++++------- .../img/scoped_to_protected_branch_v13_10.png | Bin 39889 -> 12376 bytes .../img/update_approval_rule_v13_10.png | Bin 42956 -> 13847 bytes .../img/branch_filter_search_box_v13_10.png | Bin 48672 -> 17166 bytes .../users/in_product_marketing_email.rb | 10 ++ .../components/help_popover_spec.js | 9 +- spec/models/user_spec.rb | 1 + .../users/in_product_marketing_email_spec.rb | 43 ++++++++ .../save_designs_service_spec.rb | 2 +- ...n_product_marketing_emails_service_spec.rb | 42 +++++++- 55 files changed, 482 insertions(+), 130 deletions(-) create mode 100644 app/models/users/in_product_marketing_email.rb create mode 100644 changelogs/unreleased/btn-confirm-invites.yml create mode 100644 changelogs/unreleased/nicolasdular-record-product-email-campaign-emails.yml create mode 100644 changelogs/unreleased/vs-do-not-render-empty-title-help-popover.yml create mode 100644 data/whats_new/202103220001_13_10.yml create mode 100644 db/migrate/20210317104301_create_in_product_marketing_emails.rb create mode 100644 db/migrate/20210317105904_add_user_foreign_key_to_in_product_marketing_emails.rb create mode 100644 db/schema_migrations/20210317104301 create mode 100644 db/schema_migrations/20210317105904 create mode 100644 spec/factories/users/in_product_marketing_email.rb create mode 100644 spec/models/users/in_product_marketing_email_spec.rb diff --git a/app/assets/javascripts/vue_shared/components/help_popover.vue b/app/assets/javascripts/vue_shared/components/help_popover.vue index 051c65bae70..ff85d9afe43 100644 --- a/app/assets/javascripts/vue_shared/components/help_popover.vue +++ b/app/assets/javascripts/vue_shared/components/help_popover.vue @@ -1,5 +1,5 @@