tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Baptiste Lemoine e50cb7160a 🐛 add icons in dropdown menu, fix style for this dropdown 
Merge remote-tracking branch 'origin'

Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>

# Conflicts:
#	.ruby-version
#	app/javascript/mastodon/components/status.js
#	app/javascript/mastodon/features/direct_timeline/components/conversation.js
#	app/javascript/mastodon/features/getting_started/components/announcements.js
#	app/javascript/mastodon/locales/fr.json
#	config/locales/kab.yml
#	config/locales/ta.yml
#	yarn.lock
2020-04-09 17:33:58 +02:00
..
environments
Add SMTP reply_to option (#11718)
2019-09-02 18:12:40 +02:00
initializers
🐛 add icons in dropdown menu, fix style for this dropdown
2020-04-09 17:33:58 +02:00
locales
🐛 add icons in dropdown menu, fix style for this dropdown
2020-04-09 17:33:58 +02:00
webpack
accept merge from upstream
2020-03-08 17:32:42 +01:00
application.rb
Fix Paperclip using deprecated URI.escape function (#13320)
2020-03-26 15:09:16 +01:00
boot.rb
Fix bootsnap cache directory being declared relatively (#9511)
2018-12-13 05:19:52 +01:00
brakeman.ignore
Add type, limit, offset, min_id, max_id, account_id to search API (#10091)
2019-02-26 15:21:36 +01:00
database.yml
config: add DB_SSLMODE for managed/remote PG (#10210)
2019-03-08 14:36:28 +01:00
deploy.rb
Bump capistrano from 3.11.2 to 3.12.1 (#13264)
2020-03-18 21:48:03 +09:00
environment.rb
Make PreviewCard records reuseable between statuses (#4642)
2017-09-01 16:20:16 +02:00
i18n-tasks.yml
Fix inconsistent interpolations test by ignoring single plural keys (#12394)
2019-11-15 21:23:03 +01:00
navigation.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
pghero.yml
Use override_csp options on pghero (#12489)
2019-11-27 05:28:11 +01:00
puma.rb
Add PERSISTENT_TIMEOUT option (#11756)
2019-09-04 20:44:08 +02:00
routes.rb
Fix background jobs not using locks like they are supposed to (#13361)
2020-03-31 21:59:03 +02:00
secrets.yml
Upgrade to Rails 5.0.0.1
2016-08-17 17:58:00 +02:00
settings.yml
stuff for messaging box
2019-12-21 15:16:13 +01:00
sidekiq.yml
Change trending hashtags to not disappear instantly after midnight (#11712)
2019-09-02 18:11:13 +02:00
themes.yml
Merge branch 'master' of https://github.com/tootsuite/mastodon
2020-02-12 10:03:28 +01:00
webpacker.yml
add config to webpacker
2019-12-13 17:13:29 +01:00