From 9df7ee454db98ef255c2e16dcb1679bf4e5eaff0 Mon Sep 17 00:00:00 2001
From: Steve Howell <steve@zulip.com>
Date: Tue, 24 Sep 2013 11:50:31 -0400
Subject: [PATCH] Eliminate transitional email forwarding flags

(imported from commit cc9305e554a381de5a36b7c353bbf53b71b2d43c)
---
 static/js/feature_flags.js               | 1 -
 static/js/subs.js                        | 6 +-----
 static/templates/subscription.handlebars | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/static/js/feature_flags.js b/static/js/feature_flags.js
index c146525b6f..8783d196b9 100644
--- a/static/js/feature_flags.js
+++ b/static/js/feature_flags.js
@@ -8,7 +8,6 @@ exports.summarize_read_while_narrowed = true;
 exports.twenty_four_hour_time = _.contains([],
                                   page_params.email);
 exports.dropbox_integration = page_params.staging || _.contains(['dropbox.com'], page_params.domain);
-exports.email_forwarding = true;
 
 exports.mandatory_topics = _.contains([
     'customer7.invalid'
diff --git a/static/js/subs.js b/static/js/subs.js
index fe4f4826e4..e2e816fba9 100644
--- a/static/js/subs.js
+++ b/static/js/subs.js
@@ -224,8 +224,7 @@ function add_email_hint(row) {
 function add_sub_to_table(sub) {
     $('#create_stream_row').after(templates.render(
         'subscription',
-        _.extend(sub, {'show_email_token': feature_flags.email_forwarding,
-                       'allow_rename': page_params.show_admin})));
+        _.extend(sub, {'allow_rename': page_params.show_admin})));
     settings_for_sub(sub).collapse('show');
     add_email_hint(sub);
 }
@@ -427,9 +426,6 @@ exports.setup_page = function () {
                 sub = create_sub(stream, {subscribed: false});
             }
             sub = _.extend(sub, {'allow_rename': page_params.show_admin});
-            if (feature_flags.email_forwarding) {
-                sub = _.extend(sub, {'show_email_token': feature_flags.email_forwarding});
-            }
             sub_rows.push(sub);
         });
 
diff --git a/static/templates/subscription.handlebars b/static/templates/subscription.handlebars
index 82cf421f00..f467678db7 100644
--- a/static/templates/subscription.handlebars
+++ b/static/templates/subscription.handlebars
@@ -44,12 +44,12 @@
           </li>
         </ul>
       </div>
-      {{#if_and show_email_token subscribed}}
+      {{#if subscribed}}
       <div>
           <p><b>Email address</b>: <span class="email-address">{{email_address}}
              <i class="icon-vector-question-sign" id="email-address-hint-{{id}}"></i></span></p>
       </div>
-      {{/if_and}}
+      {{/if}}
 
       {{#if allow_rename}}
         <div class="rename-stream">