Bug 1850481: Tell 5.0 git users to use 5.2 (#148)

diff --git a/THIS_BRANCH_IS_DEAD.txt b/THIS_BRANCH_IS_DEAD.txt
index c3a9b3edf6a670a3a8c2687e9ff5c5276f68702a..4e623903bd314e363802db70066653deac30ce03 100644 (file)
--- a/THIS_BRANCH_IS_DEAD.txt
+++ b/THIS_BRANCH_IS_DEAD.txt
@@ -2,5 +2,12 @@ Due to some errors with the 5.0.5 and 5.0.6 releases, which contained
 intrusive commits that should not have been made on a stable branch,
 this branch has been retired.
 
-If you came from 5.0.4 or earlier, you can continue on the 5.0.4 branch to get releases 5.0.4.1 and later.
-If you came from 5.0.5 or 5.0.6, you can continue on the 5.2 branch and pick up where this branch left off.
+If you came from 5.0.4 or earlier, you can continue on the 5.0.4 branch to get
+releases 5.0.4.1 and later by using the following command:
+   git checkout 5.0.4
+
+If you came from 5.0.5 or 5.0.6 (the fact you're reading this means this is
+probably you), you can continue on the 5.2 branch and pick up where this
+branch left off by using the following command:
+   git checkout 5.2
+

diff --git a/checksetup.pl b/checksetup.pl
index 8575849372510e365066ab1259dc18fc450197d0..8be6e5813352777635f155e5753261200f56039a 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -26,6 +26,7 @@ use Safe;
 
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;
+use Term::ANSIColor qw(colored);
 use Bugzilla::Install::Util qw(install_string get_version_and_os
   init_console success);
 
@@ -222,6 +223,15 @@ if (Bugzilla->params->{'urlbase'} eq '') {
 }
 if (!$silent) {
   success(get_text('install_success'));
+
+  print colored(<<EOF, COLOR_ERROR);
+
+NOTICE: This installation was git pulled from the 5.0 branch, which is no
+longer supported. Please run `git checkout 5.2` to pick up where this branch left
+off. Please see https://bugzilla.mozilla.org/show_bug.cgi?id=1850481 for details.
+
+EOF
+
 }
 
 __END__

diff --git a/skins/standard/global.css b/skins/standard/global.css
index be285984d723ccd07fd7cd481480285c3b719e8d..e62c70fd3043c87b75212f1ffeda39b49f5baffc 100644 (file)
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -787,6 +787,25 @@ tr.shared_search {
     text-align: center;
 }
 
+#dead_branch {
+    border: 2px solid red;
+    padding: 0.5em 1em;
+    margin: 1em;
+    font-weight: bold;
+}
+
+#dead_branch .notice {
+    font-size: 80%;
+    font-weight: normal;
+}
+
+#dead_branch code {
+    background-color: white;
+    font-size: 110%;
+    padding-left: .5em;
+    padding-right: .5em;
+}
+
 #new_release {
     border: 2px solid red;
     padding: 0.5em 1em;

diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 84a5b7d5cdda2ffd2ff054af3ac352e5210bd1f9..108c944cb4f734772a8e9841fa7c543a788c587a 100644 (file)
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -16,6 +16,14 @@
    header_addl_info = "version $constants.BUGZILLA_VERSION"
 %]
 
+[% IF user.in_group("admin") %]
+  <div id="dead_branch">
+    <p>This installation was git pulled from the 5.0 branch, which is no longer
+    supported. Please run <code>git checkout 5.2</code> to pick up where this branch left off.
+    Please see <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1850481">Bug 1850481</a> for details.</p>
+    <p class="notice">Only members of the 'admin' group can see this message.</p>
+  </div>
+[% END %]
 [% IF release %]
   <div id="new_release">
     [% IF release.data %]