diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-11-13 09:40:13 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2021-11-13 09:40:13 +0100 |
commit | 2cda8be805f51497044575e9d3be69bd62e703c2 (patch) | |
tree | a35d367237f740ad03a3f2c6e81a11ddb419087a /lib | |
parent | 8b8d58c6702032d1ed9dfd6f6392d4b6eadf2407 (diff) | |
parent | ef8deb08784948975f59ce2311b79e5ac85b1307 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mastodon/version.rb | 2 | ||||
-rw-r--r-- | lib/tasks/mastodon.rake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 00762f342..66c0c1c33 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 1 + 3 end def flags diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 9146f78e1..d905a07da 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -350,11 +350,11 @@ namespace :mastodon do end end.join("\n") - generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n" + generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n".dup if incompatible_syntax - generated_header << "Some variables in this file will be interpreted differently whether you are\n" - generated_header << "using docker-compose or not.\n\n" + generated_header << "# Some variables in this file will be interpreted differently whether you are\n" + generated_header << "# using docker-compose or not.\n\n" end File.write(Rails.root.join('.env.production'), "#{generated_header}#{env_contents}\n") |