consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix trailing whitespace

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
.erb-lint.yml
View File

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

2
app/views/admin/banners/_errors.html.erb
View File

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

2
app/views/admin/stats/polls.html.erb
View File

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

2
app/views/admin/valuator_groups/_valuator.html.erb
View File

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

6
app/views/devise/password_expired/show.html.erb
View File

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

2
app/views/topics/_filter_subnav.html.erb
View File

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

2
config/initializers/devise_security_extension.rb
View File

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