diff options
author | reverite <samantha@chalker.io> | 2019-01-29 21:12:50 -0800 |
---|---|---|
committer | reverite <samantha@chalker.io> | 2019-01-29 21:12:50 -0800 |
commit | c2ccdad102cae9bc3dc94d1d6c6f306ca0366370 (patch) | |
tree | 85bac2a16c9c2371679d43311d9d6b069c988e94 /lib | |
parent | 50dc62ea3a36039463032aa2e712471859d9d9b6 (diff) | |
parent | 48d00ac0d9ad703fa3605337b0866c8ce6f21b28 (diff) |
Merge branch 'glitch'
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mastodon/migration_helpers.rb | 2 | ||||
-rw-r--r-- | lib/mastodon/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb index f5dc7e1c6..146eba8ec 100644 --- a/lib/mastodon/migration_helpers.rb +++ b/lib/mastodon/migration_helpers.rb @@ -889,7 +889,7 @@ table #{table}. If you are using PostgreSQL you can solve this by logging in to the GitLab database (#{dbname}) using a super user and running: - ALTER #{user} WITH SUPERUSER + ALTER USER #{user} WITH SUPERUSER For MySQL you instead need to run: diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 328159fd3..fad5b5c47 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 0 + 1 end def pre |