This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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		2018-05-03 17:23:44 -05:00
..
active_model_serializers.rb	Add recursive object support to API response (#4095)	2017-07-07 14:12:16 +02:00
application_controller_renderer.rb	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
assets.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
backtrace_silencers.rb	Initial commit	2016-02-20 22:53:20 +01:00
blacklists.rb	Quick best practice cleanup of views/helpers (#1546)	2017-04-12 18:24:18 +02:00
chewy.rb	Fix #6509: Use pull queue for chewy jobs (#6513)	2018-02-20 17:25:16 +01:00
content_security_policy.rb	Upgrade Rails to version 5.2.0 (#5898)	2018-04-12 14:45:17 +02:00
cookies_serializer.rb	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
cors.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-13 16:36:46 -05:00
devise.rb	Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)	2018-03-20 19:41:51 +01:00
doorkeeper.rb	When OAuth password verification fails, return 401 instead of redirect (#5111)	2017-09-27 23:42:49 +02:00
fast_blank.rb	fix can toot whitespace (#2218)	2017-04-22 19:48:55 +02:00
filter_parameter_logging.rb	Added optional two-factor authentication	2017-01-27 20:35:16 +01:00
http_client_proxy.rb	HTTP proxy support for outgoing request, manage access to hidden service (#7134)	2018-04-25 02:14:49 +02:00
httplog.rb	Version bumps for ruby and misc gems (#1159)	2017-04-10 22:47:41 +02:00
inflections.rb	Add ActivityPub inbox (#4216)	2017-08-08 21:52:15 +02:00
instrumentation.rb	Improve StatsD instrumentation	2017-01-26 19:08:05 +01:00
kaminari_config.rb	adjust public profile pages 2 (#5223)	2017-10-04 22:49:36 +02:00
locale.rb	Ruby intl8n for themes	2017-12-10 11:08:04 -08:00
mime_types.rb	Set correct content-type for ActivityPub JSON (#4592)	2017-08-14 04:16:43 +02:00
oj.rb	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00
omniauth.rb	Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)	2018-03-07 06:19:10 +01:00
open_uri_redirection.rb	Federate header images, fix open-uri http->https redirection error	2017-03-18 22:51:20 +01:00
ostatus.rb	enforce LOCAL_HTTPS=true in production (#6061)	2017-12-22 02:17:59 +01:00
pagination.rb	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
paperclip.rb	Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)	2018-03-24 12:52:45 +01:00
premailer_rails.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
rack_attack.rb	Add a missing question mark in rack_attack.rb (#7338)	2018-05-03 18:51:00 +02:00
rack_attack_logging.rb	Log rate limit hits (#7096)	2018-04-10 01:20:18 +02:00
redis.rb	Set config.cache_store in environments file. (#3219)	2017-05-22 15:01:02 +02:00
session_activations.rb	Revocable sessions (#3616)	2017-06-23 18:50:53 +02:00
session_store.rb	Fix enforce HTTPS in production. (#6180)	2018-01-05 20:04:22 +01:00
sidekiq.rb	Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)	2018-04-10 16:08:28 +02:00
simple_form.rb	Improve UI of admin site settings (#4163)	2017-07-12 03:24:04 +02:00
single_user_mode.rb	Add single user mode	2016-12-06 17:19:26 +01:00
statsd.rb	Allow specifying STATSD_NAMESPACE (#5700)	2017-11-15 07:22:43 +09:00
stoplight.rb	Add a circuit breaker for ActivityPub deliveries (#7053)	2018-04-07 21:36:58 +02:00
strong_migrations.rb	Fix migration failure due to StrongMigrations on production env (#5283)	2017-10-09 10:05:35 +02:00
suppress_csrf_warnings.rb	Suppress CSRF token warnings (#6240)	2018-01-15 06:51:23 +01:00
timeout.rb	Add proper error page for request timeouts	2017-04-02 19:43:44 +02:00
trusted_proxies.rb	Fix error	2017-01-22 23:07:31 +01:00
twitter_regex.rb	Fix URLs incorrectly having trailing hyphen removed (#6465)	2018-02-11 23:49:18 +01:00
vapid.rb	Add Rake task for generate VAPID key (#4195)	2017-07-14 12:13:43 +02:00
wrap_parameters.rb	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00