David Yip ed490b781f Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	Gemfile.lock
 	config/application.rb

2018-04-13 16:36:46 -05:00

..

active_model_serializers.rb

…

application_controller_renderer.rb

…

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

Upgrade Rails to version 5.2.0 (#5898)

2018-04-12 14:45:17 +02:00

cookies_serializer.rb

…

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

…

fast_blank.rb

…

filter_parameter_logging.rb

…

httplog.rb

…

inflections.rb

…

instrumentation.rb

…

json_ld.rb

…

kaminari_config.rb

…

locale.rb

…

mime_types.rb

…

oembed.rb

…

oj.rb

…

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

…

ostatus.rb

…

pagination.rb

…

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_logging.rb

Log rate limit hits (#7096)

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

rack_attack.rb

…

redis.rb

…

session_activations.rb

…

session_store.rb

…

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

…

single_user_mode.rb

…

statsd.rb

…

stoplight.rb

Add a circuit breaker for ActivityPub deliveries (#7053)

2018-04-07 21:36:58 +02:00

strong_migrations.rb

…

suppress_csrf_warnings.rb

…

timeout.rb

…

trusted_proxies.rb

…

twitter_regex.rb

Fix URLs incorrectly having trailing hyphen removed (#6465)

2018-02-11 23:49:18 +01:00

vapid.rb

…

wrap_parameters.rb

…