merges master and fixes conflicts

2015-07-29 13:00:33 +02:00
parent c71182f6a6 daa172e408
commit b87331c958
32 changed files with 391 additions and 84 deletions
--- a/app/views/debates/_form.html.erb
+++ b/app/views/debates/_form.html.erb
@@ -18,8 +18,7 @@
  <br/>
  <p><strong><%= t("debates.form.debate_text") %></strong></p>
  <p><%= t("debates.form.text_instructions") %></p>
-  <%= f.text_area  :description %>
-
+  <%= f.cktext_area :description, ckeditor: { language: I18n.locale } %>
  <div>
    <%= f.label :tag_list, t("debates.form.tags_label") %><br />
    <%= f.text_field :tag_list, value: @debate.tag_list.to_s %>