Fix trailing whitespace

This commit is contained in:
Javi Martín
2019-06-18 01:58:23 +02:00
parent cf9e36c767
commit 347fc21cf0
7 changed files with 10 additions and 8 deletions

View File

@@ -8,6 +8,8 @@ linters:
enabled: true
SpaceInHtmlTag:
enabled: true
TrailingWhitespace:
enabled: true
Rubocop:
enabled: true
only:

View File

@@ -1,6 +1,6 @@
<% if @banner.errors.any? %>
<div id="error_explanation" data-alert class="callout alert" data-closable>
<button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
<span aria-hidden="true">&times;</span>

View File

@@ -76,7 +76,7 @@
<th></th>
<th class="name text-right">
<strong>
<%= t("admin.stats.polls.table.origin_total") %>:
<%= t("admin.stats.polls.table.origin_total") %>:
<%= ::Poll::Answer.where(question: poll.questions)
.select(:author_id).distinct.count %>
</strong>

View File

@@ -1,4 +1,4 @@
<li>
<%= link_to valuator.description_or_email,
<%= link_to valuator.description_or_email,
admin_valuator_path(valuator) %>
</li>

View File

@@ -4,10 +4,10 @@
<%= f.password_field :current_password %></p>
<%= f.label t("devise.password_expired.new_password") %>
<%= f.label t("devise.password_expired.new_password") %>
<%= f.password_field :password, label: false %></p>
<%= f.password_field :password_confirmation %></p>
<p><%= f.submit t("devise.password_expired.change_password") %></p>
<% end %>
<% end %>

View File

@@ -11,7 +11,7 @@
</h3>
<% end %>
</li>
</ul>
</div>

View File

@@ -42,7 +42,7 @@ module Devise
module PasswordExpirable
def need_change_password?
self.administrator? && password_expired?
end
end
def password_expired?
self.password_changed_at < self.expire_password_after.ago