From e39015a6159f0937426c4da02f3c1d8b5761452e Mon Sep 17 00:00:00 2001
From: Kamil Dziemianowicz <kamil.dziemianowicz@amberbit.com>
Date: Wed, 17 Sep 2014 16:42:10 +0200
Subject: [PATCH] Use https for external assets (bootstrap,gravatar)

---
 app/assets/templates/account.html      | 4 ++--
 app/models/user.rb                     | 2 +-
 app/views/layouts/application.html.erb | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/templates/account.html b/app/assets/templates/account.html
index c010067..8b9fd03 100644
--- a/app/assets/templates/account.html
+++ b/app/assets/templates/account.html
@@ -6,12 +6,12 @@ <h4><a ng-href="/#/account">Account</a></h4>
   </div>
 
   <div class="small-12 columns">
-    <div class="row"> 
+    <div class="row">
       <div class="small-12 large-12 columns panel">
         <h4 class="subheader">User details</h4>
         <div class="small-12 large-5 columns panel secondary">
         <div class="left">
-          <a ng-href="http://gravatar.com/profile/{{gravatar_url.split('/')[4]}}" target="_blank"><img ng-src="{{gravatar_url}}?s=42&d=mm" title="Gravatar image" /></a>
+          <a ng-href="https://gravatar.com/profile/{{gravatar_url.split('/')[4]}}" target="_blank"><img ng-src="{{gravatar_url}}?s=42&d=mm" title="Gravatar image" /></a>
         </div>
         <div class="small-10 large-10 columns">
           <label>E-mail:
diff --git a/app/models/user.rb b/app/models/user.rb
index e8529d7..11cda84 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -43,7 +43,7 @@ def generate_token(column)
   end
 
   def gravatar_url
-    @gravatar_url ||= "http://www.gravatar.com/avatar/" + Digest::MD5.hexdigest(self.email)
+    @gravatar_url ||= "https://www.gravatar.com/avatar/" + Digest::MD5.hexdigest(self.email)
   end
 
   def send_password_reset(host)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 58cf10f..d1b81d2 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,14 +16,12 @@
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 
-
-
     <title><%= content_for?(:title) ? yield(:title) : "KarmaTracker" %></title>
     <link rel="shortcut icon" ng-href="/assets/favicon.ico" />
     <link rel ="apple-touch-icon" ng-href="/assets/i144.png">
     <link rel ="apple-touch-icon-precomposed" ng-href="/assets/i152.png">
 
-  	<%= stylesheet_link_tag    "http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" %>
+    <%= stylesheet_link_tag    "//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" %>
   	<%= stylesheet_link_tag    "application" %>
     <%= csrf_meta_tags %>
   	<%= javascript_include_tag "vendor/custom.modernizr" %>