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

Merge pull request #4525 from consul/rails_5.2.4.6

Browse Source 
Bump rails from 5.2.4.5 to 5.2.4.6
This commit is contained in:
Javi Martín
2021-05-28 15:13:47 +02:00
committed by GitHub
parent c16e29863b cb49e1c6bb
commit 2505883d00
4 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -1,6 +1,6 @@
source "https://rubygems.org"
gem "rails", "5.2.4.5"
gem "rails", "5.2.4.6"
gem "acts-as-taggable-on", "~> 6.5.0"
gem "acts_as_votable", "~> 0.12.1"

74
Gemfile.lock
View File

@@ -2,43 +2,43 @@ GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
actioncable (5.2.4.5)
actionpack (= 5.2.4.5)
actioncable (5.2.4.6)
actionpack (= 5.2.4.6)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.5)
actionpack (= 5.2.4.5)
actionview (= 5.2.4.5)
activejob (= 5.2.4.5)
actionmailer (5.2.4.6)
actionpack (= 5.2.4.6)
actionview (= 5.2.4.6)
activejob (= 5.2.4.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.5)
actionview (= 5.2.4.5)
activesupport (= 5.2.4.5)
actionpack (5.2.4.6)
actionview (= 5.2.4.6)
activesupport (= 5.2.4.6)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.5)
activesupport (= 5.2.4.5)
actionview (5.2.4.6)
activesupport (= 5.2.4.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.5)
activesupport (= 5.2.4.5)
activejob (5.2.4.6)
activesupport (= 5.2.4.6)
globalid (>= 0.3.6)
activemodel (5.2.4.5)
activesupport (= 5.2.4.5)
activerecord (5.2.4.5)
activemodel (= 5.2.4.5)
activesupport (= 5.2.4.5)
activemodel (5.2.4.6)
activesupport (= 5.2.4.6)
activerecord (5.2.4.6)
activemodel (= 5.2.4.6)
activesupport (= 5.2.4.6)
arel (>= 9.0)
activestorage (5.2.4.5)
actionpack (= 5.2.4.5)
activerecord (= 5.2.4.5)
activestorage (5.2.4.6)
actionpack (= 5.2.4.6)
activerecord (= 5.2.4.6)
marcel (~> 0.3.1)
activesupport (5.2.4.5)
activesupport (5.2.4.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@@ -462,18 +462,18 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.5)
actioncable (= 5.2.4.5)
actionmailer (= 5.2.4.5)
actionpack (= 5.2.4.5)
actionview (= 5.2.4.5)
activejob (= 5.2.4.5)
activemodel (= 5.2.4.5)
activerecord (= 5.2.4.5)
activestorage (= 5.2.4.5)
activesupport (= 5.2.4.5)
rails (5.2.4.6)
actioncable (= 5.2.4.6)
actionmailer (= 5.2.4.6)
actionpack (= 5.2.4.6)
actionview (= 5.2.4.6)
activejob (= 5.2.4.6)
activemodel (= 5.2.4.6)
activerecord (= 5.2.4.6)
activestorage (= 5.2.4.6)
activesupport (= 5.2.4.6)
bundler (>= 1.3.0)
railties (= 5.2.4.5)
railties (= 5.2.4.6)
sprockets-rails (>= 2.0.0)
rails-assets-leaflet (1.5.1)
rails-assets-markdown-it (9.0.1)
@@ -485,9 +485,9 @@ GEM
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.2.4.5)
actionpack (= 5.2.4.5)
activesupport (= 5.2.4.5)
railties (5.2.4.6)
actionpack (= 5.2.4.6)
activesupport (= 5.2.4.6)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@@ -745,7 +745,7 @@ DEPENDENCIES
pronto-rubocop (~> 0.11.0)
pronto-scss (~> 0.11.0)
puma (~> 4.3.8)
rails (= 5.2.4.5)
rails (= 5.2.4.6)
rails-assets-leaflet!
rails-assets-markdown-it (~> 9.0.1)!
recipient_interceptor (~> 0.2.0)

2
app/views/admin/widget/cards/_form.html.erb
View File

@@ -1,6 +1,6 @@
<%= render "shared/globalize_locales", resource: card %>
<%= translatable_form_for [namespace, card.cardable, card], url: local_assigns[:url] do |f| %>
<%= translatable_form_for [namespace.to_sym, card.cardable, card], url: local_assigns[:url] do |f| %>
<%= render "shared/errors", resource: card %>
<div class="row">

4
config/initializers/routes_hierarchy.rb
View File

@@ -30,9 +30,9 @@ module ActionDispatch::Routing::UrlFor
resolve = resolve_for(resource)
resolve_options = resolve.pop
polymorphic_path([namespace, *resolve], options.merge(resolve_options))
polymorphic_path([namespace.to_sym, *resolve], options.merge(resolve_options))
else
polymorphic_path([namespace, *resource_hierarchy_for(resource)], options)
polymorphic_path([namespace.to_sym, *resource_hierarchy_for(resource)], options)
end
end