[fix bug 1221643] Remove /whatsnew/b/ from bedrock

reemhamz · Nov 11, 2015 · db11bf7 · db11bf7
1 parent 3a16155
commit db11bf7
Show file tree

Hide file tree

Showing 23 changed files with 0 additions and 459 deletions.
diff --git a/bedrock/firefox/templates/firefox/whatsnew_42/variant-b.html b/bedrock/firefox/templates/firefox/whatsnew_42/variant-b.html
diff --git a/bedrock/firefox/urls.py b/bedrock/firefox/urls.py
@@ -17,7 +17,6 @@
 firstrun_re = latest_re % (version_re, 'firstrun')
 firstrun_learnmore_re = latest_re % (version_re, 'firstrun/learnmore')
 whatsnew_re = latest_re % (version_re, 'whatsnew')
-whatsnew_b_re = latest_re % (version_re, 'whatsnew/b')
 tour_re = latest_re % (version_re, 'tour')
 hello_start_re = latest_re % (version_re, 'hello/start')
 tracking_protection_re = latest_re % (version_re, 'tracking-protection/start')
@@ -83,7 +82,6 @@
     url(firstrun_learnmore_re, views.FirstrunLearnMoreView.as_view(),
         name='firefox.firstrun.learnmore'),
     url(whatsnew_re, views.WhatsnewView.as_view(), name='firefox.whatsnew'),
-    url(whatsnew_b_re, views.WhatsnewTestView.as_view(), name='firefox.whatsnew.b'),
     url(tour_re, views.TourView.as_view(), name='firefox.tour'),
     url(hello_start_re, views.HelloStartView.as_view(), name='firefox.hello.start'),
     url(r'^firefox/partners/$', views.firefox_partners,

diff --git a/bedrock/firefox/views.py b/bedrock/firefox/views.py
@@ -523,10 +523,6 @@ class FirstrunLearnMoreView(LatestFxView):
     template_name = 'firefox/whatsnew_42/learnmore.html'
 
 
-class WhatsnewTestView(LatestFxView):
-    template_name = 'firefox/whatsnew_42/variant-b.html'
-
-
 class WhatsnewView(LatestFxView):
 
     pocket_locales = ['en-US', 'es-ES', 'ru', 'ja', 'de']

diff --git a/bedrock/settings/static_media.py b/bedrock/settings/static_media.py
@@ -545,13 +545,6 @@
         ),
         'output_filename': 'css/firefox_whatsnew_42_a-bundle.css',
     },
-    'firefox_whatsnew_42_b': {
-        'source_filenames': (
-            'css/firefox/whatsnew_42/common.less',
-            'css/firefox/whatsnew_42/variant-b.less',
-        ),
-        'output_filename': 'css/firefox_whatsnew_42_b-bundle.css',
-    },
     'firefox_win10_welcome': {
         'source_filenames': (
             'css/firefox/win10-welcome.less',
@@ -1445,14 +1438,6 @@
         ),
         'output_filename': 'js/firefox_whatsnew_42_a-bundle.js',
     },
-    'firefox_whatsnew_42_b': {
-        'source_filenames': (
-            'js/firefox/australis/australis-uitour.js',
-            'js/base/mozilla-highlight-target.js',
-            'js/firefox/whatsnew_42/variant-b.js',
-        ),
-        'output_filename': 'js/firefox_whatsnew_42_b-bundle.js',
-    },
     'firefox_firstrun_42_learnmore': {
         'source_filenames': (
             'js/firefox/australis/australis-uitour.js',

diff --git a/etc/httpd/global.conf b/etc/httpd/global.conf
@@ -273,9 +273,6 @@ RewriteRule ^(/(?:\w{2,3}(?:-\w{2})?/)?mobile/customize(?:/.*)?)$ /b$1 [PT]
 # bug 773739
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox(/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?:[a|b]?)(?:\d*)(?:pre)?(?:\d)?))?/whatsnew(/?)$ /b/$1firefox$2/whatsnew$3 [PT]
 
-# bug 1196532
-RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox(/(?:\d+\.\d+\.?(?:\d+)?\.?(?:\d+)?(?:[a|b]?)(?:\d*)(?:pre)?(?:\d)?))?/whatsnew/b(/?)$ /b/$1firefox$2/whatsnew/b$3 [PT]
-
 # bug 736934, 860865, 1101220, 1153351
 RewriteRule ^(/(?:\w{2,3}(?:-\w{2})?/)?mobile/(?:(?:beta|aurora)/)?notes/?)$ /b$1 [PT]
 RewriteRule ^/(\w{2,3}(?:-\w{2})?/)?firefox/(android/)?((?:beta|aurora|developer|organizations)/)?notes(/?)$ /b/$1firefox/$2$3notes$4 [PT]