Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into bugfix/fragment-caching-after-deleting-page
- Loading branch information
Showing
11 changed files
with
133 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,25 @@ | ||
| -----BEGIN CERTIFICATE----- | ||
| MIIEMjCCApqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhnZW1z | ||
| L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMTgxMDI5MDk0MjQ5WhcNMTkxMDI5MDk0 | ||
| MjQ5WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G | ||
| CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQClF0/voptshDoTILFgUjvkViCOPe3W | ||
| uuDwfSep+gc5AI83MmrmonN3L/dwm60D3HhZOtVt9el1n5E5b5aPzJngjdF9sFPX | ||
| OIx3UlYde+WkzbG4iR2U0/8dMZ6DYuz6ijgPEpU1UKodUJVqEmt3Vc+rzDET9zoK | ||
| TkIALNbSaV2G32ZDhoabeQJoJ0ce/2vjDqhM7awG7CYGRqRq4c0NOKKm0bGh+LOo | ||
| vQNDvRjXPs0yp5i3keCgf6IcQ26nluqILYGPjuTExJj+k6AKfq6SPWDVtzSqdfiH | ||
| STs/W85rwrKdLfEzfXxNsHvJ6Ryx+0A0hsNbfTTOhp4dkYm/6fyOejp7Of7qWRw/ | ||
| kJhI/PTq1gqh+Irpr+wUz04xItGE8WglKv1ydTUqBlCz2l9NfVTChtUpYlrk4FvN | ||
| r7s6fcXH5cNX1ll2D1X2XLxmYEUgbAv5xApspvmpdRY5zlmSXZapi2KbW5iqpOV2 | ||
| luxRjhjfcOKfMugvGrMUFiqDaDi5IXS25KECAwEAAaNxMG8wCQYDVR0TBAIwADAL | ||
| BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFLzeU7GH0rvnvDchSWtJhceiUDDTMBoGA1Ud | ||
| L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMjAwNTEwMjIxOTQ2WhcNMjEwNTEwMjIx | ||
| OTQ2WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G | ||
| CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDT+JzHYPGMYJt9ct2DCsbIymn1uJJp | ||
| HnDkQESfsGe40jTC90oF2iVbVOkaacNc1N3CSWUZvZjuygUuS86P6/kpBILGdO2+ | ||
| bkXXKtfGC2YGGx9TdNLpCb4925vQHvdFeKXGpQDZdDw1SNC6zraZou47CvOE1cl2 | ||
| Bp+1QMZuGRZ4+5CzOEWDWurjqce3O1jUEbyBB7z5H0h/YEaxfXipxhL1Dhi0sgkH | ||
| qP/e6SxzifdifdZCksJFQ06a1ji9hJY6eM23qbv/aaluVHAZSVBAQBS7rYniLo+N | ||
| G4vpFhoubQO5u8UluUtCaPUpI/qOvVcSaZn3ZkzlMwC8b1RwAeXBQmtFE2wnrv2i | ||
| ovTwoN7rHchwhgaHbkuFh4Wr92wGbrWL7J+X8rWKk1f8RF4kvtNE/NA6YrkxTpVh | ||
| QMyDmekt7rTxvcq2NneLGroWIUVCx/JID+Jw492LKQ6Sl1/P2TRzdEDtqZAZL0gt | ||
| xlWeMUfGG2D/gLnhs5qnaFaWQwGTmBnTgHcCAwEAAaNxMG8wCQYDVR0TBAIwADAL | ||
| BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEqtAyQVxPgKsrgoTQ1YmaIu/fmvMBoGA1Ud | ||
| EQQTMBGBD2dlbXNAcC5hcm5kdC5pbzAaBgNVHRIEEzARgQ9nZW1zQHAuYXJuZHQu | ||
| aW8wDQYJKoZIhvcNAQELBQADggGBABMRA737G23Oiy1xBgVJsDW5LgGbeK9JQCC9 | ||
| eRdx22TDyrJ5vviqB22k13+zp/tq5fgeCsrk5iLAt5F/GgcP82p7pPm3qKi1QWip | ||
| cnQvy5fLKcl+PaIX/+PYGVKUfV/wA+NuP06RSnzvNPepcUvbTJdAr6nQVdIh/ftB | ||
| 64QhOWuk2CuGlt+tLMGbjR65W3SppBkvVd4yYHArbl4Z0qPG+TVrVrj2JEjo82rT | ||
| jIUDLkdUlQ/FmH5fHhbrtn5PMCXjto414YBC7aQUxQsiNCN2qhsjwiyzVBbBTjnA | ||
| 1sA043YnGOd1XylVtnrARK5eT7DhFGrMGMp/KvOg+T7q19+65jaopvHH4zFXzBcY | ||
| MxlH/7tMQ5+DdHcqbu3SOAe1/VaaRk28J0CdPZS6Y60YuRqL17Zg2WOODiBkA9WE | ||
| JjcyzdERZXsSPh+DT5PrllEbTNTZPbBcnAWjqdEWLtBIxD3JpgZHTmYP4I2ExAeu | ||
| 2Oqsxsw30MIZnh2Cw/xLRkc1I50luA== | ||
| aW8wDQYJKoZIhvcNAQELBQADggGBALu2HM50B8xqlAXkCwavJDvWWtV9pG1igFUg | ||
| friZRWprUQ5nTaNmAd8p8qbJQwaIK2gt+DfYWfB9LtKnQTfbhLRBbmJ7zYw8LjKY | ||
| PwCs4RWjDAiuyCO3ppfsz+1bsMUXPLgWlaUkXsUy3nr2NruEFTO9zu3wGYQQ93Tt | ||
| vYSHOnP35UB4QjsjNrOO7FBaQfy6O909PP+GnVcJ62s9c26voJz63RSolwY7Jydw | ||
| XUlG68jjJKSoDHRzVTmNB7sX8rs8P2kvYkpIUXPHyls3mWBWjBWbdEYWESZrxI2x | ||
| dS7jY3AnfqhvsWra2pSREb2IDqPnJrHVOejnEI/zuuufUxLwDx3AC6SMdsyWkZ7V | ||
| 9OmLt2rg75Sct6h2220lO5ySqYtqAXuOMBDGv5L0zLalx1g8LACA7uILTKVWh8B8 | ||
| Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX | ||
| /HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ== | ||
| -----END CERTIFICATE----- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| # Encoding: UTF-8 | ||
| require File.expand_path('../../core/lib/refinery/version', __FILE__) | ||
| # frozen_string_literal: true | ||
|
|
||
| require File.expand_path('../core/lib/refinery/version', __dir__) | ||
|
|
||
| version = Refinery::Version.to_s | ||
| rails_version = ['>= 6.0.0', '< 7'] | ||
|
|
||
| Gem::Specification.new do |s| | ||
| s.platform = Gem::Platform::RUBY | ||
| s.name = %q{refinerycms-core} | ||
| s.name = 'refinerycms-core' | ||
| s.version = version | ||
| s.summary = %q{Core extension for Refinery CMS} | ||
| s.description = %q{The core of Refinery CMS. This handles the common functionality and is required by most extensions} | ||
| s.email = %q{refinerycms@p.arndt.io} | ||
| s.homepage = %q{https://www.refinerycms.com} | ||
| s.rubyforge_project = %q{refinerycms} | ||
| s.authors = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski'] | ||
| s.license = %q{MIT} | ||
| s.require_paths = %w(lib) | ||
| s.summary = 'Core extension for Refinery CMS' | ||
| s.description = 'The core of Refinery CMS. This handles the common functionality and is required by most extensions' | ||
| s.email = 'gems@p.arndt.io' | ||
| s.homepage = 'https://www.refinerycms.com' | ||
| s.authors = ['Philip Arndt', 'David Jones', 'Uģis Ozols', 'Brice Sanchez'] | ||
| s.license = 'MIT' | ||
| s.require_paths = %w[lib] | ||
|
|
||
| s.files = `git ls-files`.split("\n") | ||
| s.test_files = `git ls-files -- spec/*`.split("\n") | ||
|
|
||
| s.required_ruby_version = Refinery::Version.required_ruby_version | ||
|
|
||
| s.add_dependency 'refinerycms-i18n', ['~> 5.0', '>= 5.0.1'] | ||
| s.add_dependency 'railties', rails_version | ||
| s.add_dependency 'activerecord', rails_version | ||
| s.add_dependency 'actionpack', rails_version | ||
| s.add_dependency 'truncate_html', '~> 0.9' | ||
| s.add_dependency 'will_paginate', '~> 3.1', '>= 3.1.0' | ||
| s.add_dependency 'sass-rails', '>= 4.0', '< 7' | ||
| s.add_dependency 'font-awesome-sass', '>= 4.3.0', '< 5.0' | ||
| s.add_dependency 'activerecord', rails_version | ||
| s.add_dependency 'coffee-rails', ['~> 4.0', '>= 4.0.0'] | ||
| s.add_dependency 'decorators', '~> 2.0', '>= 2.0.0' | ||
| s.add_dependency 'font-awesome-sass', '>= 4.3.0', '< 5.0' | ||
| s.add_dependency 'jquery-rails', '~> 4.3', '>= 4.3.1' | ||
| s.add_dependency 'jquery-ui-rails', '~> 6.0', '>= 6.0.0' | ||
| s.add_dependency 'decorators', '~> 2.0', '>= 2.0.0' | ||
| s.add_dependency 'railties', rails_version | ||
| s.add_dependency 'refinerycms-i18n', ['~> 5.0', '>= 5.0.1'] | ||
| s.add_dependency 'sass-rails', '>= 4.0', '< 7' | ||
| s.add_dependency 'truncate_html', '~> 0.9' | ||
| s.add_dependency 'will_paginate', '~> 3.1', '>= 3.1.0' | ||
| s.add_dependency 'zilch-authorisation', '~> 0', '>= 0.0.1' | ||
|
|
||
| s.cert_chain = [File.expand_path("../../certs/parndt.pem", __FILE__)] | ||
| if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__) | ||
| s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") | ||
| s.cert_chain = [File.expand_path('../certs/parndt.pem', __dir__)] | ||
| if $PROGRAM_NAME =~ /gem\z/ && ARGV.include?('build') && ARGV.include?(__FILE__) | ||
| s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,37 @@ | ||
| # Encoding: UTF-8 | ||
| require File.expand_path('../../core/lib/refinery/version', __FILE__) | ||
| # frozen_string_literal: true | ||
|
|
||
| require File.expand_path('../core/lib/refinery/version', __dir__) | ||
|
|
||
| version = Refinery::Version.to_s | ||
|
|
||
| Gem::Specification.new do |s| | ||
| s.platform = Gem::Platform::RUBY | ||
| s.name = %q{refinerycms-pages} | ||
| s.name = 'refinerycms-pages' | ||
| s.version = version | ||
| s.summary = %q{Pages extension for Refinery CMS} | ||
| s.description = %q{The default content extension of Refinery CMS. This extension handles the administration and display of user-editable pages.} | ||
| s.email = %q{refinerycms@p.arndt.io} | ||
| s.homepage = %q{https://www.refinerycms.com} | ||
| s.rubyforge_project = %q{refinerycms} | ||
| s.authors = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski'] | ||
| s.license = %q{MIT} | ||
| s.require_paths = %w(lib) | ||
| s.summary = 'Pages extension for Refinery CMS' | ||
| s.description = 'The default content extension of Refinery CMS. This extension handles the administration and display of user-editable pages.' | ||
| s.email = 'gems@p.arndt.io' | ||
| s.homepage = 'https://www.refinerycms.com' | ||
| s.authors = ['Philip Arndt', 'David Jones', 'Uģis Ozols', 'Brice Sanchez'] | ||
| s.license = 'MIT' | ||
| s.require_paths = %w[lib] | ||
|
|
||
| s.files = `git ls-files`.split("\n") | ||
| s.test_files = `git ls-files -- spec/*`.split("\n") | ||
|
|
||
| s.add_dependency 'refinerycms-core', version | ||
| s.add_dependency 'awesome_nested_set', '~> 3.1', '>= 3.1.0' | ||
| s.add_dependency 'babosa', '~> 1.0' | ||
| s.add_dependency 'diffy', '~> 3.1', '>= 3.1.0' | ||
| s.add_dependency 'friendly_id', ['>= 5.1.0', '< 5.3'] | ||
| s.add_dependency 'friendly_id-mobility', '~> 0.5' | ||
| s.add_dependency 'awesome_nested_set', '~> 3.1', '>= 3.1.0' | ||
| s.add_dependency 'refinerycms-core', version | ||
| s.add_dependency 'seo_meta', '~> 3.0', '>= 3.0.0' | ||
| s.add_dependency 'babosa', '~> 1.0' | ||
| s.add_dependency 'speakingurl-rails', '~> 8.0', '>= 8.0.0' | ||
| s.add_dependency 'diffy', '~> 3.1', '>= 3.1.0' | ||
|
|
||
| s.required_ruby_version = Refinery::Version.required_ruby_version | ||
|
|
||
| s.cert_chain = [File.expand_path("../../certs/parndt.pem", __FILE__)] | ||
| if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__) | ||
| s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") | ||
| s.cert_chain = [File.expand_path('../certs/parndt.pem', __dir__)] | ||
| if $PROGRAM_NAME =~ /gem\z/ && ARGV.include?('build') && ARGV.include?(__FILE__) | ||
| s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem') | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.