marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
mastodon/config
History
an 7126d53baf Merge branch 'master' of https://github.com/noiob/awoospace 
# Conflicts:
#	app/controllers/settings/preferences_controller.rb
#	app/helpers/settings_helper.rb
#	app/javascript/flavours/glitch/features/compose/components/compose_form.js
#	app/javascript/flavours/glitch/features/compose/components/publisher.js
#	app/javascript/flavours/glitch/styles/about.scss
#	app/javascript/flavours/glitch/styles/variables.scss
#	app/javascript/mastodon/features/ui/components/modal_root.js
#	app/javascript/styles/mastodon/variables.scss
#	app/lib/ostatus/activity/creation.rb
#	app/models/status.rb
#	app/services/pubsubhubbub/subscribe_service.rb
#	app/services/resolve_account_service.rb
#	app/services/send_interaction_service.rb
#	app/services/update_remote_profile_service.rb
#	app/validators/status_length_validator.rb
#	app/views/about/more.html.haml
#	app/views/about/show.html.haml
#	app/workers/pubsubhubbub/delivery_worker.rb
#	config/application.rb
#	config/locales/simple_form.en.yml
 		2019-12-21 22:29:34 -05:00
..
environments Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
initializers Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
locales Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
webpack Add awoospace branding 2019-12-10 20:02:47 +01:00
application.rb Add awoo locale 2019-12-10 20:02:47 +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.1 to 3.11.2 (#12012) 2019-10-04 11:11:36 +09:00
environment.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02: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 Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
secrets.yml Upgrade to Rails 5.0.0.1 2016-08-17 17:58:00 +02:00
settings.yml Merge branch 'master' of https://github.com/noiob/awoospace 2019-12-21 22:29:34 -05:00
sidekiq.yml Change trending hashtags to not disappear instantly after midnight (#11712) 2019-09-02 18:11:13 +02:00
webpacker.yml Do not try to parse gif files as CSS or JS 2019-03-16 14:23:50 +01:00