Canonical SSO provider

Merge lp:~barryprice/canonical-identity-provider/update_irc_channel into lp:canonical-identity-provider/release

  1. update_irc_channel
  2. Merge into trunk
Proposed by Barry Price
Status: Merged
Approved by: Colin Watson
Approved revision: no longer in the source branch.
Merge reported by: Ubuntu One Auto Pilot
Merged at revision: not available
Proposed branch: lp:~barryprice/canonical-identity-provider/update_irc_channel
Merge into: lp:canonical-identity-provider/release
Diff against target: 24 lines (+2/-2)
2 files modified
po/webui/webui.pot (+1/-1)
src/webui/templates/device/device-help.html (+1/-1)
To merge this branch: bzr merge lp:~barryprice/canonical-identity-provider/update_irc_channel
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+302989@code.launchpad.net

Commit message

Direct people with problems to the appropriate IRC channel

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

A commit message is needed before tarmac will merge this MP.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/webui/webui.pot'
2--- po/webui/webui.pot 2016-07-20 23:30:46 +0000
3+++ po/webui/webui.pot 2016-08-16 08:29:21 +0000
4@@ -951,7 +951,7 @@
5 "We need to remove the device from your account to prevent\n"
6 " someone using it to gain access to your account. Please contact us\n"
7 " immediately to resolve this! You can reach ISD in the #isd channel on\n"
8-" IRC, or IS in the #is channel, or phone the IS emergency helpline.\n"
9+" IRC, or IS in the #webops channel, or phone the IS emergency helpline.\n"
10 " "
11 msgstr ""
12
13
14=== modified file 'src/webui/templates/device/device-help.html'
15--- src/webui/templates/device/device-help.html 2014-12-09 21:32:43 +0000
16+++ src/webui/templates/device/device-help.html 2016-08-16 08:29:21 +0000
17@@ -29,7 +29,7 @@
18 {% blocktrans %}We need to remove the device from your account to prevent
19 someone using it to gain access to your account. Please contact us
20 immediately to resolve this! You can reach ISD in the #isd channel on
21- IRC, or IS in the #is channel, or phone the IS emergency helpline.
22+ IRC, or IS in the #webops channel, or phone the IS emergency helpline.
23 {% endblocktrans %}
24 </p>
25