Ubuntu Help App

Merge lp:~dholbach/help-app/1446493-pt2 into lp:help-app

  1. 1446493-pt2
  2. Merge into trunk
Proposed by Daniel Holbach
Status: Merged
Approved by: Daniel Holbach
Approved revision: 133
Merged at revision: 133
Proposed branch: lp:~dholbach/help-app/1446493-pt2
Merge into: lp:help-app
Diff against target: 20 lines (+3/-3)
1 file modified
static/themes/web/templates/_head.html (+3/-3)
To merge this branch: bzr merge lp:~dholbach/help-app/1446493-pt2
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+258848@code.launchpad.net

Commit message

Reference assets as https, not http. Fixes part 2 of bug 1446493.

Description of the change

Reference assets as https, not http. Fixes part 2 of bug 1446493.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:133
http://91.189.93.70:8080/job/help-app-ci/25/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/help-app-utopic-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/help-app-vivid-amd64-ci/27

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/help-app-ci/25/rebuild

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'static/themes/web/templates/_head.html'
2--- static/themes/web/templates/_head.html 2015-03-10 10:56:31 +0000
3+++ static/themes/web/templates/_head.html 2015-05-12 09:01:31 +0000
4@@ -12,7 +12,7 @@
5 <link rel="stylesheet" type="text/css" media="screen" href="{{ THEME_STATIC_DIR }}/css/global-responsive.css" />
6 <link rel="stylesheet" type="text/css" media="print" href="{{ THEME_STATIC_DIR }}/css/core-print.css" />
7 -->
8- <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css"/>
9+ <link rel="stylesheet" type="text/css" media="all" href="https://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css"/>
10 <link rel="stylesheet" type="text/css" media="all" href="{{ THEME_STATIC_DIR }}/css/help-app.css" />
11
12 <!-- javascript -->
13@@ -20,6 +20,6 @@
14 <script src="{{ THEME_STATIC_DIR }}/js/plugins/modernizr.2.7.1.js"></script>
15 <script src="{{ THEME_STATIC_DIR }}/js/plugins/Imager.js"></script>
16
17- <script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/yui-min.js"></script>
18- <script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/core.js"></script>
19+ <script src="https://assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/yui-min.js"></script>
20+ <script src="https://assets.ubuntu.com/sites/ubuntu/latest/u/js/core.js"></script>
21

Subscribers

People subscribed via source and target branches