David Yip 991371af5f Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: db/schema.rb		2018-01-09 14:16:45 -06:00
..
active_model_serializers.rb	…
application_controller_renderer.rb	…
assets.rb	…
backtrace_silencers.rb	…
blacklists.rb	…
cookies_serializer.rb	…
devise.rb	Add confirmation step for email changes (#6071)	2018-01-02 16:55:00 +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	…
filter_parameter_logging.rb	…
httplog.rb	…
inflections.rb	…
instrumentation.rb	…
json_ld.rb	Use updated ActivityStreams context (added: sharedInbox) (#4764)	2017-09-02 14:00:58 +02: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	…
oembed.rb	…
oj.rb	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00
open_uri_redirection.rb	…
ostatus.rb	enforce LOCAL_HTTPS=true in production (#6061)	2017-12-22 02:17:59 +01:00
pagination.rb	…
paperclip.rb	Fix typo in paperclip.rb (#5936)	2017-12-09 13:59:59 +09:00
rack_attack.rb	Increase rate limit on protected paths (#6229)	2018-01-09 17:07:54 +01:00
redis.rb	…
session_activations.rb	…
session_store.rb	Fix enforce HTTPS in production. (#6180)	2018-01-05 20:04:22 +01:00
sidekiq.rb	Revert unique retry job (#4937)	2017-09-14 15:12:43 +02:00
simple_form.rb	…
single_user_mode.rb	…
statsd.rb	Allow specifying STATSD_NAMESPACE (#5700)	2017-11-15 07:22:43 +09:00
strong_migrations.rb	Fix migration failure due to StrongMigrations on production env (#5283)	2017-10-09 10:05:35 +02:00
timeout.rb	…
trusted_proxies.rb	…
twitter_regex.rb	Re-allow underscore on valid_url_path_ending_chars (#4999)	2017-09-18 21:25:40 +02:00
vapid.rb	…
wrap_parameters.rb	…