about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarcin Cieślak <saper@saper.info>2020-02-15 12:52:57 +0100
committermultiple creatures <dev@multiple-creature.party>2020-02-21 02:43:54 -0600
commit051aa86cfd0ca32c2623199becce786bbb77240c (patch)
tree70c715ac3bb9b19ae137a0be118b2a887c0d55e4
parente94fcf4351f9105cc38726fe4f4f6220c1820132 (diff)
Do not suggest to login into the GitLab database (#13084)
As pointed out on Discourse:

https://discourse.joinmastodon.org/t/obscure-wtf-error-message-running-migrations-for-3-1/2524

The message the administrators were getting was telling them
to log in to the "GitLab database" and also mentions MySQL
-rw-r--r--lib/mastodon/migration_helpers.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 146eba8ec..bf2314ecb 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -886,16 +886,12 @@ module Mastodon
 Your database user is not allowed to create, drop, or execute triggers on the
 table #{table}.
 
-If you are using PostgreSQL you can solve this by logging in to the GitLab
+If you are using PostgreSQL you can solve this by logging in to the Mastodon
 database (#{dbname}) using a super user and running:
 
     ALTER USER #{user} WITH SUPERUSER
 
-For MySQL you instead need to run:
-
-    GRANT ALL PRIVILEGES ON *.* TO #{user}@'%'
-
-Both queries will grant the user super user permissions, ensuring you don't run
+The query will grant the user super user permissions, ensuring you don't run
 into similar problems in the future (e.g. when new tables are created).
         EOF
       end