Skip to content

Commit

Permalink
Merge pull request #291 from internetee/dependabot/bundler/rails-6.1.3.2
Browse files Browse the repository at this point in the history 
Bump rails from 6.0.3.3 to 6.1.3.2
  • Loading branch information
@yulgolem
yulgolem authored May 31, 2021
2 parents 4fae305 + e1618f4 commit bd474db
Show file tree
Hide file tree
Showing 7 changed files with 88 additions and 80 deletions.
148 changes: 78 additions & 70 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,65 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (6.0.3.3)
actionpack (= 6.0.3.3)
actioncable (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.3)
actionpack (= 6.0.3.3)
activejob (= 6.0.3.3)
activerecord (= 6.0.3.3)
activestorage (= 6.0.3.3)
activesupport (= 6.0.3.3)
actionmailbox (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
mail (>= 2.7.1)
actionmailer (6.0.3.3)
actionpack (= 6.0.3.3)
actionview (= 6.0.3.3)
activejob (= 6.0.3.3)
actionmailer (6.1.3.2)
actionpack (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activesupport (= 6.1.3.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.3.3)
actionview (= 6.0.3.3)
activesupport (= 6.0.3.3)
rack (~> 2.0, >= 2.0.8)
actionpack (6.1.3.2)
actionview (= 6.1.3.2)
activesupport (= 6.1.3.2)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.3.3)
actionpack (= 6.0.3.3)
activerecord (= 6.0.3.3)
activestorage (= 6.0.3.3)
activesupport (= 6.0.3.3)
actiontext (6.1.3.2)
actionpack (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
nokogiri (>= 1.8.5)
actionview (6.0.3.3)
activesupport (= 6.0.3.3)
actionview (6.1.3.2)
activesupport (= 6.1.3.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.3)
activesupport (= 6.0.3.3)
activejob (6.1.3.2)
activesupport (= 6.1.3.2)
globalid (>= 0.3.6)
activemodel (6.0.3.3)
activesupport (= 6.0.3.3)
activerecord (6.0.3.3)
activemodel (= 6.0.3.3)
activesupport (= 6.0.3.3)
activestorage (6.0.3.3)
actionpack (= 6.0.3.3)
activejob (= 6.0.3.3)
activerecord (= 6.0.3.3)
marcel (~> 0.3.1)
activesupport (6.0.3.3)
activemodel (6.1.3.2)
activesupport (= 6.1.3.2)
activerecord (6.1.3.2)
activemodel (= 6.1.3.2)
activesupport (= 6.1.3.2)
activestorage (6.1.3.2)
actionpack (= 6.1.3.2)
activejob (= 6.1.3.2)
activerecord (= 6.1.3.2)
activesupport (= 6.1.3.2)
marcel (~> 1.0.0)
mini_mime (~> 1.0.2)
activesupport (6.1.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
apparition (0.6.0)
Expand Down Expand Up @@ -91,7 +95,7 @@ GEM
rexml
crass (1.0.6)
docile (1.3.2)
erubi (1.9.0)
erubi (1.10.0)
execjs (2.7.0)
ffi (1.15.1)
figaro (1.2.0)
Expand All @@ -109,26 +113,30 @@ GEM
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.7.0)
loofah (2.9.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.1)
method_source (1.0.0)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mina (0.3.8)
open4 (~> 1.3.4)
rake
mini_mime (1.1.0)
mini_portile2 (2.5.1)
mini_mime (1.0.3)
mini_portile2 (2.5.2)
net-ftp (~> 0.1)
minitest (5.14.4)
msgpack (1.3.3)
net-ftp (0.1.2)
net-protocol
time
net-protocol (0.1.0)
nio4r (2.5.7)
nokogiri (1.11.4)
nokogiri (1.11.6)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
open4 (1.3.4)
Expand All @@ -146,34 +154,34 @@ GEM
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.3.3)
actioncable (= 6.0.3.3)
actionmailbox (= 6.0.3.3)
actionmailer (= 6.0.3.3)
actionpack (= 6.0.3.3)
actiontext (= 6.0.3.3)
actionview (= 6.0.3.3)
activejob (= 6.0.3.3)
activemodel (= 6.0.3.3)
activerecord (= 6.0.3.3)
activestorage (= 6.0.3.3)
activesupport (= 6.0.3.3)
bundler (>= 1.3.0)
railties (= 6.0.3.3)
rails (6.1.3.2)
actioncable (= 6.1.3.2)
actionmailbox (= 6.1.3.2)
actionmailer (= 6.1.3.2)
actionpack (= 6.1.3.2)
actiontext (= 6.1.3.2)
actionview (= 6.1.3.2)
activejob (= 6.1.3.2)
activemodel (= 6.1.3.2)
activerecord (= 6.1.3.2)
activestorage (= 6.1.3.2)
activesupport (= 6.1.3.2)
bundler (>= 1.15.0)
railties (= 6.1.3.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.0.3.3)
actionpack (= 6.0.3.3)
activesupport (= 6.0.3.3)
railties (6.1.3.2)
actionpack (= 6.1.3.2)
activesupport (= 6.1.3.2)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
thor (~> 1.0)
raindrops (0.19.2)
rake (13.0.1)
rake (13.0.3)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -207,10 +215,10 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.9)
thread_safe (~> 0.1)
time (0.1.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicorn (6.0.0)
Expand All @@ -220,7 +228,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.3)
websocket-driver (0.7.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
Expand Down
2 changes: 1 addition & 1 deletion app/presenters/contact_presenter.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def last_update
unmasked = whitelisted_user? || (whois_record.registrant.legal_person? && captcha_solved?)

if unmasked
view.l(contact.last_update, default: nil)
view.l(contact.last_update.to_datetime, default: nil)
else
whois_record.registrant.private_person? ? undisclosable_mask : disclosable_mask
end
Expand Down
2 changes: 1 addition & 1 deletion app/views/whois_records/show/_dnssec_keys.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<dl>
<dt><%= DnssecKey.human_attribute_name :last_update %></dt>
<dd><%= l @whois_record.json['dnssec_changed'], default: nil %></dd>
<dd><%= l @whois_record.json['dnssec_changed']&.to_datetime, default: nil %></dd>
</dl>
</section>
<% end %>
10 changes: 5 additions & 5 deletions app/views/whois_records/show/_domain.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
<%= render 'whois_records/show/statuses', statuses: domain.statuses %>
<% if domain.active? %>
<dt><%= Domain.human_attribute_name :registered %></dt>
<dd><%= l domain.registered, default: nil %></dd>
<dd><%= l domain.registered&.to_datetime, default: nil %></dd>

<dt><%= Domain.human_attribute_name :changed %></dt>
<dd><%= l domain.changed, default: nil %></dd>
<dd><%= l domain.changed&.to_datetime, default: nil %></dd>

<dt><%= Domain.human_attribute_name :expire %></dt>
<dd><%= l domain.expire, default: nil %></dd>
<dd><%= l domain.expire&.to_datetime, default: nil %></dd>

<dt><%= Domain.human_attribute_name :outzone %></dt>
<dd><%= l domain.outzone, default: nil %></dd>
<dd><%= l domain.outzone&.to_datetime, default: nil %></dd>

<dt><%= Domain.human_attribute_name :delete %></dt>
<dd><%= l domain.delete, default: nil %></dd>
<dd><%= l domain.delete&.to_datetime, default: nil %></dd>
<% else %>
<% if domain.registration_deadline.present? %>
<dt><%= Domain.human_attribute_name :registration_deadline %></dt>
Expand Down
2 changes: 1 addition & 1 deletion app/views/whois_records/show/_nameservers.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<dl>
<dt><%= Nameserver.human_attribute_name :last_update %></dt>
<dd><%= l @whois_record.json['nameservers_changed'], default: nil %></dd>
<dd><%= l @whois_record.json['nameservers_changed']&.to_datetime, default: nil %></dd>
</dl>
</section>
<% end %>
2 changes: 1 addition & 1 deletion app/views/whois_records/show/_registrar.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<dd><%= registrar.phone %></dd>

<dt><%= Registrar.human_attribute_name :last_update %></dt>
<dd><%= l registrar.last_update, default: nil %></dd>
<dd><%= l registrar.last_update.to_datetime, default: nil %></dd>
</dl>
</section>
2 changes: 1 addition & 1 deletion config/environments/test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
config.active_support.deprecation = :raise

# Raises error for missing translations
config.action_view.raise_on_missing_translations = true
config.i18n.raise_on_missing_translations = true

config.time_zone = 'UTC'
end

0 comments on commit bd474db

Please sign in to comment.