diff options
| author | Starfall <us@starfall.systems> | 2021-05-11 11:19:04 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-05-11 11:19:04 -0500 |
| commit | d56731a0b9d73c48bbfbced8732e25587ba892a4 (patch) | |
| tree | d3830ce2e0292ce07336496e40882c222f455a33 /lib/tasks | |
| parent | 459a36ab7303db4ee59945b4b2121b25cc86eb38 (diff) | |
| parent | ffc3f8eebe134ca9b18af73aa29eaa1627082e40 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/db.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/emojis.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index 7e6c1c8fc..b2a0d61de 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -22,7 +22,7 @@ namespace :db do unless %w(C POSIX).include?(ActiveRecord::Base.connection.select_one('SELECT datcollate FROM pg_database WHERE datname = current_database();')['datcollate']) warn <<~WARNING Your database collation is susceptible to index corruption. - (This warning does not indicate that index corruption has occured and can be ignored) + (This warning does not indicate that index corruption has occurred and can be ignored) (To learn more, visit: https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/) WARNING end diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake index c8655cc47..a373e7652 100644 --- a/lib/tasks/emojis.rake +++ b/lib/tasks/emojis.rake @@ -91,7 +91,7 @@ namespace :emojis do desc 'Generate emoji variants with white borders' task :generate_borders do src = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json') - emojis = '🎱🐜⚫🖤⬛◼️◾◼️✒️▪️💣🎳📷📸♣️🕶️✴️🔌💂♀️📽️🍳🦍💂🔪🕳️🕹️🕋🖊️🖋️💂♂️🎤🎓🎥🎼♠️🎩🦃📼📹🎮🐃🏴🐞🕺📱📲👽⚾🐔☁️💨🕊️👀🍥👻🐐❕❔⛸️🌩️🔊🔇📃🌧️🐏🍚🍙🐓🐑💀☠️🌨️🔉🔈💬💭🏐🏳️⚪⬜◽◻️▫️' + emojis = '🎱🐜⚫🖤⬛◼️◾◼️✒️▪️💣🎳📷📸♣️🕶️✴️🔌💂♀️📽️🍳🦍💂🔪🕳️🕹️🕋🖊️🖋️💂♂️🎤🎓🎥🎼♠️🎩🦃📼📹🎮🐃🏴🐞🕺📱📲🚲👽⚾🐔☁️💨🕊️👀🍥👻🐐❕❔⛸️🌩️🔊🔇📃🌧️🐏🍚🍙🐓🐑💀☠️🌨️🔉🔈💬💭🏐🏳️⚪⬜◽◻️▫️' map = Oj.load(File.read(src)) |