webbrowser-app

Merge lp:~ahayzen/webbrowser-app/fix-calendar-ua-override-001 into lp:webbrowser-app

  1. fix-calendar-ua-override-001
  2. Merge into trunk
Proposed by Andrew Hayzen
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1536
Merged at revision: 1541
Proposed branch: lp:~ahayzen/webbrowser-app/fix-calendar-ua-override-001
Merge into: lp:webbrowser-app
Diff against target: 12 lines (+1/-1)
1 file modified
src/Ubuntu/Web/ua-overrides-desktop.js.in (+1/-1)
To merge this branch: bzr merge lp:~ahayzen/webbrowser-app/fix-calendar-ua-override-001
Reviewer Review Type Date Requested Status
Olivier Tilloy Approve
system-apps-ci-bot continuous-integration Needs Fixing
Review via email: mp+306360@code.launchpad.net

Commit message

* Modify calendar ua-override to allow anything before google.com (allowing calendar.google.com)

Description of the change

* Modify calendar ua-override to allow anything before google.com (allowing calendar.google.com)

Before the override had (www\.)? before the google.com which meant that it would capture www.google.com/calendar and google.com/calendar but not calendar.google.com/calendar. Now it allows anything to the before the .google.com/calendar. This likely broke as google changed the redirect at their end not to match the previous regex.

TESTING:
Please test all of these work:
calendar.google.com
google.com/calendar
www.google.com/calendar
calendar.google.com/calendar

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1536
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/653/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1593/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1593
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1441
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1441/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1441
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1441/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1441/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1441
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1441/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1441
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1441/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1441
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1441/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1441
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1441/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1441
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1441/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1441
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1441/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/653/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) 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 'src/Ubuntu/Web/ua-overrides-desktop.js.in'
2--- src/Ubuntu/Web/ua-overrides-desktop.js.in 2016-08-19 10:10:12 +0000
3+++ src/Ubuntu/Web/ua-overrides-desktop.js.in 2016-09-21 16:28:35 +0000
4@@ -19,7 +19,7 @@
5 .pragma library
6
7 var overrides = [
8- ["^https?:\/\/(www\.)?google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/@CHROMIUM_VERSION@ Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
9+ ["^https?:\/\/.+\.google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/@CHROMIUM_VERSION@ Chrome/@CHROMIUM_VERSION@ Safari/537.36"],
10 ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1284158
11 ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1412880
12 ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/@CHROMIUM_VERSION@ Safari/537.36"], // http://pad.lv/1503506, http://pad.lv/1551649

Subscribers

People subscribed via source and target branches

to status/vote changes: