Cleaner html

app/views/events/show.html.haml

@@ -48,7 +48,7 @@
   %p
     %em.fa.fa-external-link-alt
     %span.label= Event.human_attribute_name :url
-    = link_to @event.url, @event.url.html_safe
+    = link_to @event.url
 - if @event.contact.present?
   %p
     %em.fa.fa-envelope

app/views/orgas/show.html.haml

@@ -14,6 +14,7 @@
     %span.place_name= @orga.place_name
   - if @orga.address.present?
     %span.address= @orga.address
+  - if @orga.city.present?
     %span.city= @orga.city
   %span.region
     = t @orga.region.code.present? ? @orga.region.code : @orga.region.name,
@@ -42,7 +43,7 @@
     %dt.url
       %em.fa.fa-external-link-alt
       = Orga.human_attribute_name :url
-    %dd= link_to @orga.url, @orga.url.html_safe
+    %dd= link_to @orga.url
   - if @orga.diaspora.present?
     %dt.diaspora<
       = Orga.human_attribute_name :diaspora