Merge pull request #1296 from JewelSam/master

#1040 Show email in public option

app/views/devise/registrations/edit.html.haml

@@ -8,6 +8,7 @@
       = semantic_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
         = f.input :username, required: false, input_html: { autocomplete: 'off' }
         = f.input :email, required: false, input_html: { autocomplete: 'off' }
+        = f.input :email_public
         = f.input :password, hint: "(Leave blank if you don't want to change it)", input_html: { autocomplete: 'off' }
         = f.input :password_confirmation, input_html: { autocomplete: 'off' }
         = f.inputs name: 'OpenID' do

app/views/proposals/show.html.haml

@@ -32,7 +32,7 @@
           %h3
             by
             = link_to @speaker.name, user_path(@speaker.id)
-            = "(#{@speaker.email})"
+            = "(#{@speaker.email})" if @speaker.email_public
             - if @speaker.affiliation?
               %br
               %span.muted