Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

2018-12-23 11:28:28 +01:00

..

0_post_deployment_migrations.rb

…

1_hosts.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-05 15:23:57 +02:00

active_model_serializers.rb

…

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

…

blacklists.rb

…

chewy.rb

Fix #6509: Use pull queue for chewy jobs (#6513)

2018-02-20 17:25:16 +01:00

content_security_policy.rb

Remove form_action from CSP

2018-12-14 08:02:06 +01:00

cookies_serializer.rb

…

cors.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-15 10:45:53 +01:00

delivery_job.rb

Skip mailer job retries when a record no longer exists (#9590)

2018-12-21 06:16:17 +01:00

devise.rb

feat(cookies): Use the same-site attribute to lax (#8626)

2018-09-08 23:54:28 +02:00

doorkeeper.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-22 17:51:38 +02:00

fast_blank.rb

fix can toot whitespace (#2218)

2017-04-22 19:48:55 +02:00

ffmpeg.rb

add ffmpeg initializer (#8855)

2018-10-09 03:02:52 +02:00

filter_parameter_logging.rb

…

http_client_proxy.rb

lint pass 2 (#8878)

2018-10-04 17:38:04 +02:00

httplog.rb

Version bumps for ruby and misc gems (#1159)

2017-04-10 22:47:41 +02:00

inflections.rb

…

instrumentation.rb

…

json_ld.rb

Preload common JSON-LD contexts (#9412)

2018-12-02 16:46:13 +01:00

kaminari_config.rb

…

locale.rb

…

mime_types.rb

…

oj.rb

…

omniauth.rb

lint pass 2 (#8878)

2018-10-04 17:38:04 +02:00

open_uri_redirection.rb

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +02:00

pagination.rb

…

paperclip.rb

Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)

2018-08-25 13:27:08 +02:00

premailer_rails.rb

…

rack_attack_logging.rb

Log rate limit hits (#7096)

2018-04-10 01:20:18 +02:00

rack_attack.rb

lint pass 2 (#8878)

2018-10-04 17:38:04 +02:00

redis.rb

…

session_activations.rb

…

session_store.rb

feat(cookies): Use the same-site attribute to lax (#8626)

2018-09-08 23:54:28 +02:00

sidekiq.rb

lint pass 2 (#8878)

2018-10-04 17:38:04 +02:00

simple_form.rb

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

single_user_mode.rb

…

statsd.rb

Fix that Rails.cache information could not be sent via StatsD (#8831)

2018-09-30 00:05:59 +02:00

stoplight.rb

…

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

…

trusted_proxies.rb

…

twitter_regex.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

vapid.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

wrap_parameters.rb

…