Skip to content

Use https for external assets (bootstrap,gravatar) #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dziemian007 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use https for external assets (bootstrap,gravatar) #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/assets/templates/account.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>
Expand Down