Skip to content

Commit

Permalink
Merge pull request #1822 from denny/release/24.11
Browse files Browse the repository at this point in the history
Release gem updates since 2021 as 24.11
  • Loading branch information
denny authored Nov 25, 2024
2 parents daa957d + 3fbb04b commit 6a6b09e
Show file tree
Hide file tree
Showing 22 changed files with 54 additions and 30 deletions.
2 changes: 1 addition & 1 deletion db/seeds.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ShinyCMS ~ https://shinycms.org
#
# Copyright 2009-2021 Denny de la Haye ~ https://denny.me
# Copyright 2009-2024 Denny de la Haye ~ https://denny.me
#
# ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)

Expand Down
2 changes: 1 addition & 1 deletion docs/Licensing/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ShinyCMS: Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye (https://denny.me)
ShinyCMS is copyright 2009-2024 Denny de la Haye (https://denny.me)

ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). There are copies of both v2 and v3 of the GPL included with the ShinyCMS code, or you can read them online:
* [GNU GPL v2](gnu-gpl-v2.0.md) / https://opensource.org/licenses/gpl-2.0
Expand Down
29 changes: 27 additions & 2 deletions docs/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,31 @@

This file contains information about changes (particularly breaking changes) between releases - with the most recent release first.

### 2024-11-25 24.11 November 2024: The 'Three Years Off Dead For Tax Reasons' Release

GitHub tag: https://github.com/denny/ShinyCMS-ruby/releases/tag/v24.11

Sorry for the unexpected hiatus in releases. In my defence, I nearly died shortly after the last one.

TL;DR, I turn out to have a massive arteriovenous malformation very near my brain stem, which ruptured on 18 June 2021, causing a haemorrhagic stroke that nearly killed me. In hindsight, that probably explains the insomnia and headaches between 2019 and 2021... I thought they were 'just' work stress.

Anyway, I have been busy learning how to talk again, and then walk again, and then recovering from six months of hospital-food-induced starvation (mostly by eating properly once I was home again, but some exercise too) - so all-in-all typing and coding have had to wait their turn. I'm getting there.

I don't think I've added or removed any features in this release, but there have been many many MANY gem updates - a lot of which were languishing in the dependabot queue while I recovered, and then more that flooded in once I cleared the initial backlog :)

Some highlights include:
* Ruby, from 3.0.1 to 3.1.6
* Rails, from 6.1.3.1 to 6.1.7.10
* Puma, from 5.6.7 to 6.4.3
* Pg, from 1.2.3 to 1.5.9
* pundit, from 2.1.0 to 2.4.0
* packwerk, from 1.1.3 to 3.2.2
* view_component, from 2.83.0 to 3.20.0
* Plus: bcrypt, capybara, persistent_dmnd, acts_as_votable, acts-as-taggable-on, sidekiq, codecov, mjml, recapcha, bugsnag, mutant-rspec, parallel_tests, yarn, factorybot-rails, rubocop, rubocop_rails, rubocop-performance, and many many many more.

I'm working on a ShinyShop plugin for the CMS as part of my rehab currently, hopefully that will be ready for initial release some time next year.


### 2021-06-02 21.06 June 2021: The 'Happy Birthday, Fliss!' Edition

GitHub tag: https://github.com/denny/ShinyCMS-ruby/releases/tag/v21.06
Expand Down Expand Up @@ -34,12 +59,12 @@ Changed:
* Moved various top-level methods into classes, to reduce pollution
* Helper methods for Gemfile also moved from main_app to core plugin
* Gemfile picks up Ruby version from .ruby-version (using helper method)
* Moved `credits.md` to 'Contributors.md` which seems more common
* Moved `credits.md` to `Contributors.md` which seems more common
* Changed inheritance from core by feature plugin controllers/mailers/etc
* They now load common behaviour etc from a XyzBase module rather than inheriting it from a BaseXyz class, which feels like looser coupling

Also updated:
* `bundle update` and 'yarn upgrade`
* `bundle update` and `yarn upgrade`
* Fixed pagy, which was pinned due to breaking changes a few releases back
* But had to pin view_components this time :(

Expand Down
2 changes: 1 addition & 1 deletion lib/templates/shiny/plugin/README.md.tt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it
under the terms of the GPL (version 2 or later). You should have copies of both
Expand Down
2 changes: 1 addition & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ site_name: ShinyCMS
site_url: http://docs.shinycms.org/
site_description: Documentation for users and developers of ShinyCMS (Ruby version)
site_author: Denny de la Haye
copyright: ShinyCMS is copyright 2009-2021 Denny de la Haye (denny.me)
copyright: ShinyCMS is copyright 2009-2024 Denny de la Haye (denny.me)

repo_url: https://github.com/denny/ShinyCMS-ruby/
edit_uri: ''
Expand Down
2 changes: 1 addition & 1 deletion plugins/ShinyAccess/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in your ShinyCMS docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0
2 changes: 1 addition & 1 deletion plugins/ShinyBlog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it
under the terms of the GPL (version 2 or later). You should have copies of both
Expand Down
2 changes: 1 addition & 1 deletion plugins/ShinyCMS/.rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ShinyCMS ~ https://shinycms.org
#
# Copyright 2009-2021 Denny de la Haye ~ https://denny.me
# Copyright 2009-2024 Denny de la Haye ~ https://denny.me
#
# ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)

Expand Down
7 changes: 4 additions & 3 deletions plugins/ShinyCMS/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@ rails shinycms:db:seed

## Contributing

See the ShinyCMS developer documentation for information on contributing to this plugin or any other part of the ShinyCMS project.
See the developer documentation for information on ShinyCMS features
[in progress](docs/Developer/Progress.md) and [to-do](docs/Developer/TODO.md)

Please read the Code of Conduct as well.
Please read the [Code of Conduct](docs/code-of-conduct.md) as well.


## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in the included docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ShinyCMS ~ https://shinycms.org
#
# Copyright 2009-2021 Denny de la Haye ~ https://denny.me
# Copyright 2009-2024 Denny de la Haye ~ https://denny.me
#
# ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ShinyCMS ~ https://shinycms.org
#
# Copyright 2009-2021 Denny de la Haye ~ https://denny.me
# Copyright 2009-2024 Denny de la Haye ~ https://denny.me
#
# ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
This website is powered by <a href="https://shinycms.org/">ShinyCMS</a>
(<a href="https://shinycms.org/ruby">Ruby version</a>).
ShinyCMS is <a href="http://www.opensource.org/">open source software</a>,
&copy; 2009-2021 <a href="https://denny.me/">Denny de la Haye</a>. You can
&copy; 2009-2024 <a href="https://denny.me/">Denny de la Haye</a>. You can
<a href="https://github.com/denny/ShinyCMS-ruby">download it from GitHub</a>.
</p>
2 changes: 1 addition & 1 deletion plugins/ShinyCMS/config/initializers/assets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later)

# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '2021.06.01.0300'
Rails.application.config.assets.version = '2024.11.25.1700'

# Add theme images and stylesheets to the asset load path
class ShinyCMS::ThemeAssetsSetup
Expand Down
10 changes: 4 additions & 6 deletions plugins/ShinyForms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ See the developer documentation for information on ShinyCMS features
Please read the [Code of Conduct](docs/code-of-conduct.md) as well.


## License
## Copyright and Licensing

This ShinyCMS plugin is free software; you can redistribute it and/or modify it
under the terms of the GPL (version 2 or later). You should have copies of both
v2 and v2 of the GPL in your ShinyCMS docs folder, or you can read them online:
https://opensource.org/licenses/gpl-2.0
https://opensource.org/licenses/gpl-3.0
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

ShinyCMS is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in the included docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0
2 changes: 1 addition & 1 deletion plugins/ShinyInserts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it
under the terms of the GPL (version 2 or later). You should have copies of both
Expand Down
2 changes: 1 addition & 1 deletion plugins/ShinyLists/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in your ShinyCMS docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0
2 changes: 1 addition & 1 deletion plugins/ShinyNews/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it
under the terms of the GPL (version 2 or later). You should have copies of both
Expand Down
2 changes: 1 addition & 1 deletion plugins/ShinyNewsletters/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in your ShinyCMS docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0
2 changes: 1 addition & 1 deletion plugins/ShinyPages/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in your ShinyCMS docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0
2 changes: 1 addition & 1 deletion plugins/ShinyProfiles/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it
under the terms of the GPL (version 2 or later). You should have copies of both
Expand Down
2 changes: 1 addition & 1 deletion plugins/ShinySEO/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in your ShinyCMS docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0
2 changes: 1 addition & 1 deletion plugins/ShinySearch/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ Please read the Code of Conduct as well.

## Copyright and Licensing

ShinyCMS is copyright 2009-2021 Denny de la Haye https://denny.me
ShinyCMS is copyright 2009-2024 Denny de la Haye https://denny.me

This ShinyCMS plugin is free software; you can redistribute it and/or modify it under the terms of the GPL (version 2 or later). You should have copies of both v2 and v2 of the GPL in your ShinyCMS docs folder, or you can read them online: https://opensource.org/licenses/gpl-2.0 / https://opensource.org/licenses/gpl-3.0

0 comments on commit 6a6b09e

Please sign in to comment.