This is an automated email from the ASF dual-hosted git repository. jcabrerizo pushed a commit to branch update-stable-version-1.1.0 in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git
commit 2ae65fbd18baa402bcd827faea1120d0bbdf1a21 Merge: 8c68c94d 92bcc50a Author: Juan Cabrerizo <[email protected]> AuthorDate: Fri Apr 4 08:12:10 2025 +0200 Merge pull request #389 from niallkp/master BROOKLYN-636 FIx Issues the Brooklyn Website caused by the CSP Gemfile.lock | 1 + README.md | 3 ++- _config.yml | 12 ++++++------ _includes/head.html | 4 ++-- website/learnmore/catalog/catalog-item.html | 6 +++--- website/learnmore/catalog/index.html | 4 ++-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --cc Gemfile.lock index 05f8099a,05f8099a..947e22aa --- a/Gemfile.lock +++ b/Gemfile.lock @@@ -89,6 -89,6 +89,7 @@@ GE PLATFORMS arm64-darwin-21 ++ arm64-darwin-23 DEPENDENCIES html-proofer diff --cc README.md index f53e7435,f53e7435..56a1942e --- a/README.md +++ b/README.md @@@ -38,7 -38,7 +38,8 @@@ this project is (where this file is loc RVM should detect its configuration inside `Gemfile` and try to configure itself. Most likely it will report that the required version of Ruby is not installed, and it will show the command that you need to run to install the correct version. --Follow the instructions it shows, typically something like `rvm get master && rvm install 3.0.1`. ++Follow the instructions it shows, typically something like `rvm get master && rvm install 3.1.2` ++(confirm version on [Gemfile](./Gemfile)). Once the correct version of Ruby is installed, change to your home directory and then change back (`cd ~ ; cd -`). diff --cc _config.yml index 4f93f65e,4f93f65e..fe15b2f8 --- a/_config.yml +++ b/_config.yml @@@ -37,7 -37,7 +37,7 @@@ path guide: /guide website: /website v: /v -- ++ # Use local copies of dependencies in dev build (switched to remote using URLs for prod build) dependency_mode: local dependency_urls: @@@ -57,14 -57,14 +57,14 @@@ sass style: compressed # TODO the 0.12.0 paths must be changed! --brooklyn-stable-version: 0.12.0 ++brooklyn-stable-version: 1.1.0 pdf-default-base-url: http://brooklyn.apache.org --pdf-default-versioned-url-subpath: /v/0.12.0 ++pdf-default-versioned-url-subpath: /v/1.1.0 --pdf-rewrite-prefixes: -- '/guide' : '/v/0.12.0' ++pdf-rewrite-prefixes: ++ '/guide' : '/v/1.1.0' '/website' : '' -- ++ brooklyn-version: 1.2.0-SNAPSHOT # BROOKLYN_VERSION brooklyn-docs-version brooklyn-snapshot-git-branch: master # if line above is SNAPSHOT this should point to corresponding git branch (e.g. master, 0.4)
