Merge branch 'hotfix/1.0.1'

front · Jun 19, 2018 · d4f6324 · d4f6324
2 parents 5c0c115 + 1ae704e
commit d4f6324
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@
 .env
 /.yardoc/
 /.ruby-version
+/.rbenv-gemsets
 /app/views/info/styleguide.html.erb
 /config/*.yml
 /config/environments/*-local.rb

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -17,6 +17,7 @@
 
 environment_configuration(defined?(config) && config) do |config|
   # Settings specified here will take precedence over those in config/application.rb
+  config.action_controller.default_url_options = { protocol: 'https' }
 
   # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests