89 Commits (df326b8b5c0659edb2aca77690a892f228b0e099)

Author	SHA1	Message	Date
Claire	f60c99a8fb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	cbd0ee1d07	Update Mastodon to Rails 6.1 (#15910) ... * Update devise-two-factor to unreleased fork for Rails 6 support Update tests to match new `rotp` version. * Update nsa gem to unreleased fork for Rails 6 support * Update rails to 6.1.3 and rails-i18n to 6.0 * Update to unreleased fork of pluck_each for Ruby 6 support * Run "rails app:update" * Add missing ActiveStorage config file * Use config.ssl_options instead of removed ApplicationController#force_ssl Disabled force_ssl-related tests as they do not seem to be easily testable anymore. * Fix nonce directives by removing Rails 5 specific monkey-patching * Fix fixture_file_upload deprecation warning * Fix yield-based test failing with Rails 6 * Use Rails 6's index_with when possible * Use ActiveRecord::Cache::Store#delete_multi from Rails 6 This will yield better performances when deleting an account * Disable Rails 6.1's automatic preload link headers Since Rails 6.1, ActionView adds preload links for javascript files in the Links header per default. In our case, that will bloat headers too much and potentially cause issues with reverse proxies. Furhermore, we don't need those links, as we already output them as HTML link tags. * Switch to Rails 6.0 default config * Switch to Rails 6.1 default config * Do not include autoload paths in the load path	4 years ago
Claire	3ad6ef72cb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Claire	43eff898a0	Prepare Mastodon for Rails 6 (#15911) ... * Fix misuse of foreign_type * Fix use of removed "add_template_helper" * Use response.media_type instead of response.content_type in tests * Fix CSV export controller test on Rails 6 Rails 6 sets a "filename*" field in the Content-Disposition header to explicitly encode the filename as UTF-8. This changes checks the first part of the Content-Disposition header so it matches in both Rails 5 and Rails 6. * Fix emoji formatting with Rails 6 * Make emoji output more idiomatic and robust * Switch from redis-rails gem to built-in Rails redis cache storage	4 years ago
Thibaut Girka	3f60b096b5	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.	5 years ago
Tdxdxoz	376b44853f	add ssl option in smtp setting (#14309)	5 years ago
Thibaut Girka	5088eb8388	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Hugo Gameiro	5466b39c78	Add SMTP reply_to option (#11718) ... * Add SMTP_REPLY_TO in .env.production.sample * Set reply_to in SMTP options	5 years ago
Thibaut Girka	1488be7d96	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json	5 years ago
Eugen Rochko	1bc077dc74	Add HTTP signature keyId to request log (#11591)	5 years ago
Thibaut Girka	dcded13a99	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	6 years ago
Eugen Rochko	22de24b8ca	Fix missing protocol in dns-prefetch, improve code style (#8963) ... Regression from #8942	6 years ago
Thibaut Girka	00fcdebed7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.	6 years ago
aus-social	0a4739c732	lint pass 2 (#8878) ... * Code quality pass * Typofix * Update applications_controller_spec.rb * Update applications_controller_spec.rb	6 years ago
Thibaut Girka	e7a72439f1	Move CSP headers to the appropriate Rails configuration ... Also drop dev-static.glitch.social reference.	6 years ago
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	7 years ago
Eugen Rochko	63553c6b5c	Add support for separate Redis for cache (#7272) ... * Add support for separate Redis for cache CACHE_REDIS_URL to allow using a different Redis server for cache purposes, with cache-specific configuration such as key eviction * Fix code style issues	7 years ago
David Yip	ed490b781f	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock config/application.rb	7 years ago
Yamagishi Kazutoshi	50529cbceb	Upgrade Rails to version 5.2.0 (#5898)	7 years ago
Jenkins	e8aeec4fea	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	61dcb686a8	Fix i18n fallback configuration conflicts with environment configurations (#6843)	7 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	c110fa62ac	Provide default OTP_SECRET value for development environment (#6617)	7 years ago
David Yip	1b8fcd4df5	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	7 years ago
beatrix	4072b68686	remove Uglifier call from production.rb (#6568)	7 years ago
beatrix	fa361ccc5e	change referrer policy to same-origin	7 years ago
beatrix-bitrot	b75a1ce326	tighten csp	7 years ago
beatrix	254b74c71f	add memorial to production.rb ... in memory of Natalie Nguyen let her name ring through the ether	7 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	7 years ago
Eugen Rochko	35a8cafa35	Replace self-rolled statsd instrumention with localshred/nsa (#5118)	7 years ago
David Yip	932571fa22	Merge tag 'v1.6.0' into sync/upstream	7 years ago
Yamagishi Kazutoshi	3f333a8d31	Set fallback address when empty notification address (#4868)	7 years ago
Ondřej Hruška	c727eae441	Updated from tootsuite	8 years ago
Eugen Rochko	a3202fd51e	Add SMTP_TLS variable for configuring TLS when server uses non-standard port (#4227)	8 years ago
kibigo!	79d898ae0a	Merge upstream!! #64 <3 <3	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	2083000027	Set default From address in config (#3756) ... The old implementation sets default From address in mailers. It sets the address from SMTP_FROM_ADDRESS, or notifications@localhost. The behavior is occasionally undesired results. In production environment, notifications@localhost is likely to be incorrect. In testing environment, the email address should not be varied by a environment variable. After appling this change, In production environment, it will throw an exception when launching Mastodon. In testing environment, the address will be fixed with notifications@localhost.	8 years ago
beatrix-bitrot	9bc593d675	update local modifications for cors and cp	8 years ago
nullkal	b8ea28d6d0	Support multiple trusted proxy ip addresses (#3639) ... * Support multiple trusted proxy ip addresses * correct coding style	8 years ago
Matt Jankowski	2212dc4aaa	Update Rails to version 5.1.1 (#3121) ... * Update rails to version 5.1.1 * Run `rails app:update` * Remove the override of polymorphic activity relationship * Silence warning about otp_secret attribute being unknown to rails * We will only introduce form_with where we want to use remote data	8 years ago
Clworld	df92f010ad	Set config.cache_store in environments file. (#3219) ... * Set config.cache_store in application.rb * Set config.cache_store in environments. * fix code format.	8 years ago
alpaca-tc	ef226a6f22	Remove rails_12factor (#2901)	8 years ago
Eugen Rochko	b8e166894b	Fix Scheduler::SubscriptionsScheduler (#2834) ... * Fix Scheduler::SubscriptionsScheduler, add worker test for it * Change production log level of Sidekiq to "warn" instead of "info"	8 years ago
Eugen Rochko	c997091166	Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732) ... connection options instead of setting REDIS_HOST etc individually Close #1986	8 years ago
Eugen Rochko	f5bf5ebb82	Replace sprockets/browserify with Webpack (#2617) ... * Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time	8 years ago
Akihiko Odaki	26bc591572	Allow to set CA file for SMTP (#2713)	8 years ago
Matt Jankowski	a0dd90a397	Return force_ssl to the controller (#2380)	8 years ago
Matt Jankowski	57cd6546c3	Make HSTS enable optional with force_ssl (#2364)	8 years ago
Matt Jankowski	ee82d8a876	Move force_ssl check to production config (#2165) ... The force_ssl method from controllers does not add all of the options that the sitewide configuration in a config block does. For example, HSTS enforcement is not added by the controller method, but is added by this style.	8 years ago
Miguel Jacq	b79ba3db8a	Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180)	8 years ago
Miguel Jacq	e9eaf9e33c	Allow using an SMTP server without authentication (#1597) ... * Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none' * Add note in .env.production.sample about SMTP settings for servers where no auth is required * Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none	8 years ago