You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip a6fb1c58ee Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb		7 years ago
..
active_model_serializers.rb	…
application_controller_renderer.rb	…
assets.rb	…
backtrace_silencers.rb	…
blacklists.rb	…
cookies_serializer.rb	…
devise.rb	…
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	…
open_uri_redirection.rb	…
ostatus.rb	…
pagination.rb	…
paperclip.rb	…
premailer_rails.rb	…
rack_attack.rb	…
redis.rb	…
session_activations.rb	…
session_store.rb	…
sidekiq.rb	…
simple_form.rb	…
single_user_mode.rb	…
statsd.rb	…
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
timeout.rb	…
trusted_proxies.rb	…
twitter_regex.rb	…
vapid.rb	…
wrap_parameters.rb	…