Merge lp:~cjohnston/launchpad/1324486 into lp:launchpad

[Chris Johnston]

Add the ability to not have a 'read more' in the beta banner, remove link from beta banner for IC

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/app/javascript/ui/banner.js'
--- lib/lp/app/javascript/ui/banner.js	2012-11-09 18:55:02 +0000
+++ lib/lp/app/javascript/ui/banner.js	2014-05-29 15:09:32 +0000
@@ -226,9 +226,15 @@
                                content = content + [
                                  '<span class="beta-feature">',
                                  obj.title,
-                                 '&nbsp;<a class="info-link" href="',
-                                 obj.url + '">(read more)</a>',
-                                 '</span>'
+                                 ].join('')
+                               if (obj.url !== '') {
+                                   content = content + [
+                                       '&nbsp;<a class="info-link" href="',
+                                       obj.url + '">(read more)</a>',
+                                   ].join('')
+                               }
+                               content = content + [
+                                   '</span>'
                                ].join('');
                            }
                         }

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2014-05-28 22:03:06 +0000
+++ lib/lp/services/features/flags.py	2014-05-29 15:09:32 +0000
@@ -226,7 +226,7 @@
      'If true, reviewers can comment on parts of merge proposal diffs.',
      'disabled',
      'Inline diff comments',
-     'http://blog.launchpad.net/general/diff-comments'),
+     ''),
     ])
 
 # The set of all flag names that are documented.