Merge branch 'master' into registry-790

This commit is contained in:
Artur Beljajev 2018-06-04 04:02:33 +03:00
commit 65b40997ca
51 changed files with 556 additions and 303 deletions

View file

@ -32,7 +32,7 @@ module Admin
end
end
@domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
@domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive?
end
# rubocop: enable Metrics/PerceivedComplexity