← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~jugmac00/launchpad:remove-links-to-qastaging into launchpad:master

 

Jürgen Gmach has proposed merging ~jugmac00/launchpad:remove-links-to-qastaging into launchpad:master.

Commit message:
Remove public facing links to qastaging

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jugmac00/launchpad/+git/launchpad/+merge/473139

As a second commit, I also improved the wording regarding the use of our staging environments a bit.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~jugmac00/launchpad:remove-links-to-qastaging into launchpad:master.
diff --git a/lib/lp/app/templates/root-index.pt b/lib/lp/app/templates/root-index.pt
index bf7d58f..9b80663 100644
--- a/lib/lp/app/templates/root-index.pt
+++ b/lib/lp/app/templates/root-index.pt
@@ -121,9 +121,7 @@
             <div class="u-fixed-width u-clearfix">
               <span>
                 Learn more about Launchpad in the
-                <a href="https://help.launchpad.net/";>user guide</a>
-                or try it for yourself in our
-                <a href="https://qastaging.launchpad.net/";>sandbox environment</a>.
+                <a href="https://help.launchpad.net/";>user guide</a>.
               </span>
                 If you're ready, you can:
 
diff --git a/lib/lp/services/profile/profile.pt b/lib/lp/services/profile/profile.pt
index 16eb332..e9c5233 100644
--- a/lib/lp/services/profile/profile.pt
+++ b/lib/lp/services/profile/profile.pt
@@ -76,7 +76,7 @@ a.clicktext {font-weight: normal;}
     <code>++profile++show&pstats</code> or others, with each action separated
     with ampersands).</tal:block></p>
     <p>The <code>++profile++sqltrace</code> can take too much time to let a
-    page practically render, especially on qastaging and staging.  You can
+    page practically render, especially on our staging environments.  You can
     filter to only get the stacktraces you want in this case; see information
     in the &quot;SQL trace&quot; section below on how to do this.</p>
     <p>The "++profile++" path segment can usually go anywhere in the URL
diff --git a/lib/lp/services/profile/tests.py b/lib/lp/services/profile/tests.py
index b34aa7e..f98f639 100644
--- a/lib/lp/services/profile/tests.py
+++ b/lib/lp/services/profile/tests.py
@@ -716,8 +716,8 @@ class TestBeforeTraverseHandler(TestCleanupProfiler):
 
     def test_can_enable_profiling_over_config(self):
         # The flag profiling.enabled wins over a config that has
-        # disabled profiling. This permits the use of profiling on qastaging
-        # and similar systems.
+        # disabled profiling. This permits the use of profiling on our staging
+        # environments.
         self.pushProfilingConfig(
             profiling_allowed="False",
             profile_all_requests="True",