From 2c2abf0b8a96ff4d193b872a025497515ce6837c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= Date: Wed, 12 Jun 2019 18:36:54 +0000 Subject: Backport of gitlab-ee!13735 --- ...4128_add_last_ci_minutes_notification_at_to_namespaces.rb | 12 ++++++++++++ db/schema.rb | 1 + doc/user/admin_area/settings/continuous_integration.md | 10 +++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190606014128_add_last_ci_minutes_notification_at_to_namespaces.rb diff --git a/db/migrate/20190606014128_add_last_ci_minutes_notification_at_to_namespaces.rb b/db/migrate/20190606014128_add_last_ci_minutes_notification_at_to_namespaces.rb new file mode 100644 index 00000000000..c264a23cda0 --- /dev/null +++ b/db/migrate/20190606014128_add_last_ci_minutes_notification_at_to_namespaces.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddLastCiMinutesNotificationAtToNamespaces < ActiveRecord::Migration[5.1] + DOWNTIME = false + + def change + add_column :namespaces, :last_ci_minutes_notification_at, :datetime_with_timezone + end +end diff --git a/db/schema.rb b/db/schema.rb index c57a73c66da..392edf89430 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1440,6 +1440,7 @@ ActiveRecord::Schema.define(version: 20190611161641) do t.string "runners_token_encrypted" t.integer "project_creation_level" t.boolean "auto_devops_enabled" + t.datetime_with_timezone "last_ci_minutes_notification_at" t.index ["created_at"], name: "index_namespaces_on_created_at", using: :btree t.index ["name", "parent_id"], name: "index_namespaces_on_name_and_parent_id", unique: true, using: :btree t.index ["name"], name: "index_namespaces_on_name_trigram", using: :gin, opclasses: {"name"=>"gin_trgm_ops"} diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md index 6c4abce83c2..d2605cbfb5e 100644 --- a/doc/user/admin_area/settings/continuous_integration.md +++ b/doc/user/admin_area/settings/continuous_integration.md @@ -134,6 +134,14 @@ to a different Group. be deducted from your Additional Minutes quota immediately after your purchase of additional minutes. +## What happens when my CI minutes quota run out + +When the CI minutes quota run out, an email is sent automatically to notifies the owner(s) of the group/namespace which +includes a link to [purchase more minutes](https://customers.gitlab.com/plans). + +If you are not the owner of the group, you will need to contact them to let them know they need to +[purchase more minutes](https://customers.gitlab.com/plans). + ## Archive jobs **[CORE ONLY]** Archiving jobs is useful for reducing the CI/CD footprint on the system by @@ -160,4 +168,4 @@ questions that you know someone might ask. Each scenario can be a third-level heading, e.g. `### Getting error message X`. If you have none to add when creating a doc, leave this section in place -but commented out to help encourage others to add to it in the future. --> \ No newline at end of file +but commented out to help encourage others to add to it in the future. --> -- cgit v1.2.1