From d1af3d46c48c971a13813cfb4a901fab2a16fe52 Mon Sep 17 00:00:00 2001 From: Godwin Date: Fri, 11 Jul 2014 21:38:01 -0600 Subject: [PATCH] Broke it --- app/views/layouts/application.html.haml | 2 +- config/application.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7b345cc..20ba05e 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,7 +11,7 @@ /[if lt IE 9] - = stylesheet_link_tag 'http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic', 'application', media: 'all' + = stylesheet_link_tag '//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,400italic,700italic', 'application', media: 'all' / Touch icons %link{ href: asset_path('favicon.ico'), rel: 'shortcut icon', type: 'image/x-icon' } diff --git a/config/application.rb b/config/application.rb index f73262d..7d3fcf6 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,7 +26,7 @@ module BikeBike # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] config.i18n.default_locale = :en #:de config.i18n.enforce_available_locales = false - config.action_controller.default_url_options = { :trailing_slash => true } + # config.action_controller.default_url_options = { :trailing_slash => true } #config.middleware.swap 'Rack::MethodOverride', 'Rack::MethodOverrideWithParams' #config.i18n.exception_handler = I18n::MissingTranslationExceptionHandler.new #require '/app/helpers/bike_bike_form_helper'