summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-08-21 20:37:23 +0200
committerAzul <azul@leap.se>2013-08-21 20:37:23 +0200
commit41de2179c67fc09e1558280c5601cc07b2e40b43 (patch)
tree9e9a54ca6f063ecbe121926c8f8a16f9b3bfcff4 /users/app
parente325de14dd0d9878a3392051dc98a14d9811d2c9 (diff)
parentc073099f0283492b30e702d833721206ab9986cc (diff)
Merge remote-tracking branch 'jessib/js_warning'
Diffstat (limited to 'users/app')
-rw-r--r--users/app/views/users/_warnings.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/users/app/views/users/_warnings.html.haml b/users/app/views/users/_warnings.html.haml
index 7e0b2ce..79ab103 100644
--- a/users/app/views/users/_warnings.html.haml
+++ b/users/app/views/users/_warnings.html.haml
@@ -1,5 +1,5 @@
%noscript
- %div.alert.alert-error=t :js_required
+ %div.alert.alert-error=t :js_required_html
#cookie_warning.alert.alert-error{:style => "display:none"}
=t :cookie_disabled_warning
:javascript