merges with master

README.md

@@ -27,13 +27,13 @@ cd participacion
 bundle install
 cp config/database.yml.example config/database.yml
 cp config/secrets.yml.example config/secrets.yml
-bundle exec bin/rake db:setup
-RAILS_ENV=test bundle exec rake db:setup
+bin/rake db:setup
+RAILS_ENV=test bin/rake db:setup
 ```
 
 Para ejecutar la aplicación en local:
 ```
-bundle exec bin/rails s
+bin/rails s
 ```
 
 Prerequisitos para los tests: tener instalado PhantomJS >= 2.0
@@ -41,7 +41,7 @@ Prerequisitos para los tests: tener instalado PhantomJS >= 2.0
 Para ejecutar los tests:
 
 ```
-bundle exec bin/rspec
+bin/rspec
 ```
 
 ### OAuth

README_EN.md

@@ -28,13 +28,13 @@ cd participacion
 bundle install
 cp config/database.yml.example config/database.yml
 cp config/secrets.yml.example config/secrets.yml
-bundle exec bin/rake db:setup
-RAILS_ENV=test bundle exec rake db:setup
+bin/rake db:setup
+RAILS_ENV=test bin/rake db:setup
 ```
 
 Run the app locally:
 ```
-bundle exec bin/rails s
+bin/rails s
 ```
 
 Prerequisites for testing: install PhantomJS >= 2.0
@@ -42,7 +42,7 @@ Prerequisites for testing: install PhantomJS >= 2.0
 Run the tests with:
 
 ```
-bundle exec bin/rspec
+bin/rspec
 ```
 
 ## Licence

app/views/moderation/_menu.html.erb

@@ -7,7 +7,7 @@
     <li <%= "class=active" if controller_name == "debates" %>>
       <%= link_to moderation_debates_path do %>
         <i class="icon-debates"></i>
-        <%= t("moderation.menu.flagged_debates") %>
+        <%= t('moderation.menu.flagged_debates') %>
       <% end %>
     </li>
 

app/views/moderation/dashboard/index.html.erb

@@ -1 +1,5 @@
-<h1><%= t("moderation.dashboard.index.title") %></h1>
+<h2><%= t("moderation.dashboard.index.title") %></h2>
+
+<p>Lorem ipsum moderator sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+
+<p>Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem.</p>

app/views/shared/_tags.html.erb

@@ -10,4 +10,4 @@
       <%= link_to "#{debate.tags_count_out_of_limit(limit)}+", debate_path(debate) %>
     <% end %>
   </span>
-<% end %>
+<% end %>

config/environments/production.rb

@@ -42,7 +42,7 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  config.force_ssl = true
+  # config.force_ssl = true
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.