Merge branch 'fix-plans-migration' into 'master'

Fix `ci_project_subscriptions` plan limits

See merge request gitlab-org/gitlab!26693

db/migrate/20200225123228_insert_project_subscriptions_plan_limits.rb

@@ -6,28 +6,20 @@ class InsertProjectSubscriptionsPlanLimits < ActiveRecord::Migration[6.0]
   DOWNTIME = false
 
   def up
-    return if Rails.env.test?
+    return unless Gitlab.com?
 
-    if Gitlab.com?
-      create_or_update_plan_limit('ci_project_subscriptions', 'free', 2)
-      create_or_update_plan_limit('ci_project_subscriptions', 'bronze', 2)
-      create_or_update_plan_limit('ci_project_subscriptions', 'silver', 2)
-      create_or_update_plan_limit('ci_project_subscriptions', 'gold', 2)
-    else
-      create_or_update_plan_limit('ci_project_subscriptions', 'default', 2)
-    end
+    create_or_update_plan_limit('ci_project_subscriptions', 'free', 2)
+    create_or_update_plan_limit('ci_project_subscriptions', 'bronze', 2)
+    create_or_update_plan_limit('ci_project_subscriptions', 'silver', 2)
+    create_or_update_plan_limit('ci_project_subscriptions', 'gold', 2)
   end
 
   def down
-    return if Rails.env.test?
+    return unless Gitlab.com?
 
-    if Gitlab.com?
-      create_or_update_plan_limit('ci_project_subscriptions', 'free', 0)
-      create_or_update_plan_limit('ci_project_subscriptions', 'bronze', 0)
-      create_or_update_plan_limit('ci_project_subscriptions', 'silver', 0)
-      create_or_update_plan_limit('ci_project_subscriptions', 'gold', 0)
-    else
-      create_or_update_plan_limit('ci_project_subscriptions', 'default', 0)
-    end
+    create_or_update_plan_limit('ci_project_subscriptions', 'free', 0)
+    create_or_update_plan_limit('ci_project_subscriptions', 'bronze', 0)
+    create_or_update_plan_limit('ci_project_subscriptions', 'silver', 0)
+    create_or_update_plan_limit('ci_project_subscriptions', 'gold', 0)
   end
 end

doc/development/application_limits.md

@@ -33,18 +33,28 @@ limit values. It's recommended to create separate migration script files.
    `create_or_update_plan_limit` migration helper, eg:
 
    ```ruby
-   create_or_update_plan_limit('project_hooks', 'free', 10)
-   create_or_update_plan_limit('project_hooks', 'bronze', 20)
-   create_or_update_plan_limit('project_hooks', 'silver', 30)
-   create_or_update_plan_limit('project_hooks', 'gold', 100)
+   def up
+     return unless Gitlab.com?
+
+     create_or_update_plan_limit('project_hooks', 'free', 100)
+     create_or_update_plan_limit('project_hooks', 'bronze', 100)
+     create_or_update_plan_limit('project_hooks', 'silver', 100)
+     create_or_update_plan_limit('project_hooks', 'gold', 100)
+   end
+
+   def down
+     return unless Gitlab.com?
+
+     create_or_update_plan_limit('project_hooks', 'free', 0)
+     create_or_update_plan_limit('project_hooks', 'bronze', 0)
+     create_or_update_plan_limit('project_hooks', 'silver', 0)
+     create_or_update_plan_limit('project_hooks', 'gold', 0)
+   end
    ```
 
 NOTE: **Note:** Some plans exist only on GitLab.com. You can check if the
 migration is running on GitLab.com with `Gitlab.com?`.
 
-NOTE: **Note:** The test environment doesn't have any plans. You can check if a
-migration is running in a test environment with `Rails.env.test?`
-
 ### Plan limits validation
 
 #### Get current limit