Merge branch 'master' into features/publicity

# Conflicts: # .gitignore
2017-04-18 16:22:36 +02:00
parent 93dc7b0c50 cb1bf34588
commit 8cb8aea9ca
13 changed files with 11 additions and 81 deletions
@@ -23,8 +23,6 @@
            dd == t("age_category.#{current_supporter.age_category}")
            dt = Supporter.human_attribute_name(:language)
            dd = t("languages.#{current_supporter.language}")
-            dt = Supporter.human_attribute_name(:unsubscribed)
-            dd = current_supporter.unsubscribed? ?  t('shared.yes') : t('shared.no')
      
          p
            = link_to t('.edit'), edit_supporter_registration_path(), class: 'pull-right'