From 80b0669499ea5d3f9e50883095a328d89a8c086c Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Wed, 11 Dec 2024 13:42:13 +0530 Subject: [PATCH 01/16] Add archive page for older LTS changelogs and update recent changelog filtering --- content/changelog-stable/archive.html.haml | 21 +++++++++++++++++++++ content/changelog-stable/index.html.haml | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 content/changelog-stable/archive.html.haml diff --git a/content/changelog-stable/archive.html.haml b/content/changelog-stable/archive.html.haml new file mode 100644 index 000000000000..829cdd56c0d6 --- /dev/null +++ b/content/changelog-stable/archive.html.haml @@ -0,0 +1,21 @@ +--- +layout: changelog +title: Archived LTS Changelogs +show_ratings: false +has_rss: false +actions: + + + Back to Recent Changelogs + +--- + +.ratings + - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml + - archived_changelogs = site.changelogs[:lts].select { |release| release.date <= 2.years.ago }.reverse + - archived_changelogs.each do |release| + %div + = partial('release-header.html.haml', :release => release, :url => 'changelog-stable') + - if release.changes + %div.app-releases__list__items + = partial('changelog-changes.html.haml', :changes => release.changes) diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index fadbeddab41a..1776d07d9faa 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -12,7 +12,8 @@ actions: .ratings - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - site.changelogs[:lts].reverse_each do | release | + - recent_changelogs = site.changelogs[:lts].select { |release| release.date > 2.years.ago }.reverse + - recent_changelogs.each do |release| - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable) %div = partial('release-header.html.haml', :release => release, :url => 'changelog-stable') @@ -30,3 +31,7 @@ actions: = partial('changelog-changes.html.haml', :changes => release.lts_changes) = partial('changelog-stable.html') + +%a.archive-link{:href => '/changelog-stable/archive'} + View Older Changelogs + From ea24d325ef089a519d3f7fc47d806665fd3cd3e2 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Thu, 12 Dec 2024 00:42:07 +0530 Subject: [PATCH 02/16] Fix errors in PR checks --- .../index.html.haml} | 13 ++++++---- content/changelog-stable/index.html.haml | 24 ++++++++++++------- 2 files changed, 25 insertions(+), 12 deletions(-) rename content/{changelog-stable/archive.html.haml => changelog-stable-old/index.html.haml} (52%) diff --git a/content/changelog-stable/archive.html.haml b/content/changelog-stable-old/index.html.haml similarity index 52% rename from content/changelog-stable/archive.html.haml rename to content/changelog-stable-old/index.html.haml index 829cdd56c0d6..15f5106cbd2b 100644 --- a/content/changelog-stable/archive.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -6,16 +6,21 @@ has_rss: false actions: - Back to Recent Changelogs + Back to Recent LTS Changelogs --- .ratings - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - archived_changelogs = site.changelogs[:lts].select { |release| release.date <= 2.years.ago }.reverse + - archived_changelogs = site.changelogs[:lts].drop(25).reverse - archived_changelogs.each do |release| %div - = partial('release-header.html.haml', :release => release, :url => 'changelog-stable') + = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable-old') - if release.changes %div.app-releases__list__items - = partial('changelog-changes.html.haml', :changes => release.changes) + = partial('../_partials/changelog-changes.html.haml', :changes => release.changes) + - else + %p No notable changes for this release. + +.app-banner + Archived LTS changelogs are listed below, sorted by release date. diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index 1776d07d9faa..f2c87e3972fb 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -12,26 +12,34 @@ actions: .ratings - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - recent_changelogs = site.changelogs[:lts].select { |release| release.date > 2.years.ago }.reverse + - recent_changelogs = site.changelogs[:lts].take(25).reverse - recent_changelogs.each do |release| - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable) %div - = partial('release-header.html.haml', :release => release, :url => 'changelog-stable') - - if release.changes and release.lts_changes and release.lts_baseline + = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable') + - if release.changes && release.lts_changes && release.lts_baseline .app-releases__notable-changes{:style => "margin-top: 15px"} -# TODO figure out how to get rid of this = "Changes since #{release.lts_baseline}" - %div.app-releases__list__items - = partial('changelog-changes.html.haml', :changes => release.changes) + - if release.changes + %div.app-releases__list__items + = partial('../_partials/changelog-changes.html.haml', :changes => release.changes) - - if release.changes and release.lts_changes + - if release.changes && release.lts_changes .app-releases__notable-changes - = "Notable changes since #{release.lts_predecessor}" + - if release.lts_predecessor + = "Notable changes since #{release.lts_predecessor}" %div.app-releases__list__items - = partial('changelog-changes.html.haml', :changes => release.lts_changes) + = partial('../_partials/changelog-changes.html.haml', :changes => release.lts_changes) = partial('changelog-stable.html') %a.archive-link{:href => '/changelog-stable/archive'} View Older Changelogs + +.app-banner + Changelogs of historical LTS releases can be found + %a{:href => '/changelog-stable-old/'} + in the LTS changelog archive. + From 3a29486c5346ecfbea7a104d86427d4e70163caf Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Thu, 12 Dec 2024 04:12:23 +0530 Subject: [PATCH 03/16] Fix changelog pages: reverse recent and archived logic, update links for proper navigation between changelog-stable and changelog-stable-old --- content/changelog-stable-old/index.html.haml | 6 ++++-- content/changelog-stable/index.html.haml | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index 15f5106cbd2b..47094a5f08ab 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -12,7 +12,7 @@ actions: .ratings - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - archived_changelogs = site.changelogs[:lts].drop(25).reverse + - archived_changelogs = site.changelogs[:lts].take(25).reverse - archived_changelogs.each do |release| %div = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable-old') @@ -23,4 +23,6 @@ actions: %p No notable changes for this release. .app-banner - Archived LTS changelogs are listed below, sorted by release date. + Recent LTS changelogs can be found + %a{:href => '/changelog-stable/'} + in the main LTS changelog page. diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index f2c87e3972fb..304e4d27f4fb 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -12,7 +12,7 @@ actions: .ratings - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - recent_changelogs = site.changelogs[:lts].take(25).reverse + - recent_changelogs = site.changelogs[:lts].drop(25).reverse - recent_changelogs.each do |release| - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable) %div @@ -34,7 +34,7 @@ actions: = partial('changelog-stable.html') -%a.archive-link{:href => '/changelog-stable/archive'} +%a.archive-link{:href => '/changelog-stable-old/'} View Older Changelogs From a484f7fb74e6e75669c249e317140b05f60c5c0c Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Thu, 12 Dec 2024 11:38:16 +0530 Subject: [PATCH 04/16] Fix changelog logic: Stable shows latest 25 releases; Archived shows older ones and also moved the = partial('changelog-stable.html') to changelog-stable-old --- content/changelog-stable-old/index.html.haml | 4 +++- content/changelog-stable/index.html.haml | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index 47094a5f08ab..2a986ba9cd7c 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -12,7 +12,7 @@ actions: .ratings - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - archived_changelogs = site.changelogs[:lts].take(25).reverse + - archived_changelogs = site.changelogs[:lts].drop(25).reverse - archived_changelogs.each do |release| %div = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable-old') @@ -22,6 +22,8 @@ actions: - else %p No notable changes for this release. + = partial('changelog-stable.html') + .app-banner Recent LTS changelogs can be found %a{:href => '/changelog-stable/'} diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index 304e4d27f4fb..0b39f1bb4af7 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -12,7 +12,7 @@ actions: .ratings - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - recent_changelogs = site.changelogs[:lts].drop(25).reverse + - recent_changelogs = site.changelogs[:lts].take(25).reverse - recent_changelogs.each do |release| - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable) %div @@ -32,7 +32,6 @@ actions: %div.app-releases__list__items = partial('../_partials/changelog-changes.html.haml', :changes => release.lts_changes) - = partial('changelog-stable.html') %a.archive-link{:href => '/changelog-stable-old/'} View Older Changelogs From d6a12ae339cb5d25ae684ab57374277267ec4add Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Thu, 12 Dec 2024 11:57:36 +0530 Subject: [PATCH 05/16] fix the reversing of changelog-stable and changelog-stable-old --- content/changelog-stable-old/index.html.haml | 2 +- content/changelog-stable/index.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index 2a986ba9cd7c..6352a9e5d09c 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -12,7 +12,7 @@ actions: .ratings - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - archived_changelogs = site.changelogs[:lts].drop(25).reverse + - archived_changelogs = site.changelogs[:lts].take(25).reverse - archived_changelogs.each do |release| %div = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable-old') diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index 0b39f1bb4af7..aa5200594418 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -12,7 +12,7 @@ actions: .ratings - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - recent_changelogs = site.changelogs[:lts].take(25).reverse + - recent_changelogs = site.changelogs[:lts].drop(25).reverse - recent_changelogs.each do |release| - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable) %div From fe3ac3b179768834987b63c56951c891010df942 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Fri, 13 Dec 2024 11:35:49 +0530 Subject: [PATCH 06/16] corrected the changelog-stable and changelog-stable-old to show the needed changes --- content/changelog-stable-old/index.html.haml | 6 ++---- content/changelog-stable/index.html.haml | 7 ++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index 6352a9e5d09c..c476548562f9 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -11,8 +11,8 @@ actions: --- .ratings - - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - archived_changelogs = site.changelogs[:lts].take(25).reverse + - # Load older changelogs (all except the most recent 25, ordered correctly) + - archived_changelogs = site.changelogs[:lts].reverse.drop(27) - archived_changelogs.each do |release| %div = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable-old') @@ -22,8 +22,6 @@ actions: - else %p No notable changes for this release. - = partial('changelog-stable.html') - .app-banner Recent LTS changelogs can be found %a{:href => '/changelog-stable/'} diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index aa5200594418..303d7f3bdc09 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -11,15 +11,14 @@ actions: --- .ratings - - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml - - recent_changelogs = site.changelogs[:lts].drop(25).reverse + - # Load the most recent 25 changelogs (latest first) + - recent_changelogs = site.changelogs[:lts].reverse.take(27) - recent_changelogs.each do |release| - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable) %div = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable') - if release.changes && release.lts_changes && release.lts_baseline .app-releases__notable-changes{:style => "margin-top: 15px"} - -# TODO figure out how to get rid of this = "Changes since #{release.lts_baseline}" - if release.changes %div.app-releases__list__items @@ -32,7 +31,6 @@ actions: %div.app-releases__list__items = partial('../_partials/changelog-changes.html.haml', :changes => release.lts_changes) - %a.archive-link{:href => '/changelog-stable-old/'} View Older Changelogs @@ -41,4 +39,3 @@ actions: Changelogs of historical LTS releases can be found %a{:href => '/changelog-stable-old/'} in the LTS changelog archive. - From 2072f3bb6ab65405278993db1c334d894133d304 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Fri, 13 Dec 2024 12:50:09 +0530 Subject: [PATCH 07/16] Update content/changelog-stable/index.html.haml Co-authored-by: Kris Stern --- content/changelog-stable/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index 303d7f3bdc09..4fbd41990c62 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -36,6 +36,6 @@ actions: .app-banner - Changelogs of historical LTS releases can be found + Changelogs of LTS releases of more than two years old can be found %a{:href => '/changelog-stable-old/'} in the LTS changelog archive. From e936bcd820198dabe924b0a34de50eeb381cf72c Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Fri, 13 Dec 2024 13:01:16 +0530 Subject: [PATCH 08/16] Update content/changelog-stable-old/index.html.haml Co-authored-by: Kris Stern --- content/changelog-stable-old/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index c476548562f9..3d22c3830344 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -23,6 +23,6 @@ actions: %p No notable changes for this release. .app-banner - Recent LTS changelogs can be found + More recent LTS changelogs of less than two years old can be found %a{:href => '/changelog-stable/'} in the main LTS changelog page. From 5e874219910b7b1d8e25e82d7b317f678145f4b6 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Fri, 13 Dec 2024 20:53:40 +0530 Subject: [PATCH 09/16] Updated content/changelog-stable-old/index.html.haml Co-authored-by: Kris Stern --- content/changelog-stable-old/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index 3d22c3830344..cc219cbfe9b1 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -1,6 +1,6 @@ --- layout: changelog -title: Archived LTS Changelogs +title: Archived LTS Changelog show_ratings: false has_rss: false actions: From 8bdd0c7c7620ea69f2a37f993c07955d5d120763 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Fri, 13 Dec 2024 21:07:53 +0530 Subject: [PATCH 10/16] updated all the required suggestions Co-authored-by: Kris Stern --- content/changelog-stable-old/index.html.haml | 4 ++-- content/changelog-stable/index.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index cc219cbfe9b1..848e25c8e07c 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -6,7 +6,7 @@ has_rss: false actions: - Back to Recent LTS Changelogs + Back to Recent LTS Changelog --- @@ -23,6 +23,6 @@ actions: %p No notable changes for this release. .app-banner - More recent LTS changelogs of less than two years old can be found + More recent LTS changelog of less than two years old can be found %a{:href => '/changelog-stable/'} in the main LTS changelog page. diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index 4fbd41990c62..eb54b5b351e0 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -32,10 +32,10 @@ actions: = partial('../_partials/changelog-changes.html.haml', :changes => release.lts_changes) %a.archive-link{:href => '/changelog-stable-old/'} - View Older Changelogs + View Older Changelog .app-banner - Changelogs of LTS releases of more than two years old can be found + Changelog of LTS releases of more than two years old can be found %a{:href => '/changelog-stable-old/'} in the LTS changelog archive. From 6297a12f62a75d787fe4078f63bb24ec9b168655 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Fri, 13 Dec 2024 22:49:08 +0530 Subject: [PATCH 11/16] changed 27 to 25 in main codes Co-authored-by: Kris Stern --- content/changelog-stable-old/index.html.haml | 2 +- content/changelog-stable/index.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index 848e25c8e07c..c9835c55ea37 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -12,7 +12,7 @@ actions: .ratings - # Load older changelogs (all except the most recent 25, ordered correctly) - - archived_changelogs = site.changelogs[:lts].reverse.drop(27) + - archived_changelogs = site.changelogs[:lts].reverse.drop(25) - archived_changelogs.each do |release| %div = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable-old') diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index eb54b5b351e0..e1ca0a9d6b5c 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -12,7 +12,7 @@ actions: .ratings - # Load the most recent 25 changelogs (latest first) - - recent_changelogs = site.changelogs[:lts].reverse.take(27) + - recent_changelogs = site.changelogs[:lts].reverse.take(25) - recent_changelogs.each do |release| - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable) %div From 76a2721ba06726831747b74a2f77a0e08f3db034 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Sat, 14 Dec 2024 00:32:53 +0530 Subject: [PATCH 12/16] changed spells in index.html.haml Co-authored-by: Zbynek Konecny --- content/changelog-stable-old/index.html.haml | 2 +- content/changelog-stable/index.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index c9835c55ea37..03694d12ba21 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -23,6 +23,6 @@ actions: %p No notable changes for this release. .app-banner - More recent LTS changelog of less than two years old can be found + This is the changelog archive. Changelog for recent releases can be found %a{:href => '/changelog-stable/'} in the main LTS changelog page. diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index e1ca0a9d6b5c..c182b02111fd 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -36,6 +36,6 @@ actions: .app-banner - Changelog of LTS releases of more than two years old can be found + Changelog of historical releases can be found %a{:href => '/changelog-stable-old/'} in the LTS changelog archive. From 72eeac4b7ad77967e7849718ed37af1e21dbd3a2 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Sat, 14 Dec 2024 00:57:37 +0530 Subject: [PATCH 13/16] Applied suggestions from code review Co-authored-by: Kevin Martens <99040580+kmartens27@users.noreply.github.com> --- content/changelog-stable-old/index.html.haml | 2 +- content/changelog-stable/index.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml index 03694d12ba21..e79503cb3b0e 100644 --- a/content/changelog-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -23,6 +23,6 @@ actions: %p No notable changes for this release. .app-banner - This is the changelog archive. Changelog for recent releases can be found + This is the changelog archive. The changelog for recent releases can be found %a{:href => '/changelog-stable/'} in the main LTS changelog page. diff --git a/content/changelog-stable/index.html.haml b/content/changelog-stable/index.html.haml index c182b02111fd..f77874297f25 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -36,6 +36,6 @@ actions: .app-banner - Changelog of historical releases can be found + The changelog of historical releases can be found %a{:href => '/changelog-stable-old/'} in the LTS changelog archive. From 2f798c33723323e03680b9fce2392c85996f18f2 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Sat, 14 Dec 2024 01:18:26 +0530 Subject: [PATCH 14/16] Remove duplicate archive link and Renamed files for consistency with plural usage --- .../index.html.haml | 0 .../{changelog-stable => changelogs-stable}/badge.json.haml | 0 .../{changelog-stable => changelogs-stable}/index.html.haml | 4 ---- content/{changelog-stable => changelogs-stable}/rss.xml.haml | 0 4 files changed, 4 deletions(-) rename content/{changelog-stable-old => changelogs-stable-old}/index.html.haml (100%) rename content/{changelog-stable => changelogs-stable}/badge.json.haml (100%) rename content/{changelog-stable => changelogs-stable}/index.html.haml (95%) rename content/{changelog-stable => changelogs-stable}/rss.xml.haml (100%) diff --git a/content/changelog-stable-old/index.html.haml b/content/changelogs-stable-old/index.html.haml similarity index 100% rename from content/changelog-stable-old/index.html.haml rename to content/changelogs-stable-old/index.html.haml diff --git a/content/changelog-stable/badge.json.haml b/content/changelogs-stable/badge.json.haml similarity index 100% rename from content/changelog-stable/badge.json.haml rename to content/changelogs-stable/badge.json.haml diff --git a/content/changelog-stable/index.html.haml b/content/changelogs-stable/index.html.haml similarity index 95% rename from content/changelog-stable/index.html.haml rename to content/changelogs-stable/index.html.haml index f77874297f25..94a6c09ce793 100644 --- a/content/changelog-stable/index.html.haml +++ b/content/changelogs-stable/index.html.haml @@ -31,10 +31,6 @@ actions: %div.app-releases__list__items = partial('../_partials/changelog-changes.html.haml', :changes => release.lts_changes) -%a.archive-link{:href => '/changelog-stable-old/'} - View Older Changelog - - .app-banner The changelog of historical releases can be found %a{:href => '/changelog-stable-old/'} diff --git a/content/changelog-stable/rss.xml.haml b/content/changelogs-stable/rss.xml.haml similarity index 100% rename from content/changelog-stable/rss.xml.haml rename to content/changelogs-stable/rss.xml.haml From e6290a4944a0a331ab0d2c41899a549ca539ca7e Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Sat, 14 Dec 2024 01:22:09 +0530 Subject: [PATCH 15/16] updated both index.html.haml to maintain the changed file names,Renamed files for consistency with plural usage and Remove duplicate archive link --- content/changelogs-stable-old/index.html.haml | 4 ++-- content/changelogs-stable/index.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/changelogs-stable-old/index.html.haml b/content/changelogs-stable-old/index.html.haml index e79503cb3b0e..03640ba7b318 100644 --- a/content/changelogs-stable-old/index.html.haml +++ b/content/changelogs-stable-old/index.html.haml @@ -15,7 +15,7 @@ actions: - archived_changelogs = site.changelogs[:lts].reverse.drop(25) - archived_changelogs.each do |release| %div - = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable-old') + = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelogs-stable-old') - if release.changes %div.app-releases__list__items = partial('../_partials/changelog-changes.html.haml', :changes => release.changes) @@ -24,5 +24,5 @@ actions: .app-banner This is the changelog archive. The changelog for recent releases can be found - %a{:href => '/changelog-stable/'} + %a{:href => '/changelogs-stable/'} in the main LTS changelog page. diff --git a/content/changelogs-stable/index.html.haml b/content/changelogs-stable/index.html.haml index 94a6c09ce793..1b43661d6a97 100644 --- a/content/changelogs-stable/index.html.haml +++ b/content/changelogs-stable/index.html.haml @@ -16,7 +16,7 @@ actions: - recent_changelogs.each do |release| - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable) %div - = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable') + = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelogs-stable') - if release.changes && release.lts_changes && release.lts_baseline .app-releases__notable-changes{:style => "margin-top: 15px"} = "Changes since #{release.lts_baseline}" @@ -33,5 +33,5 @@ actions: .app-banner The changelog of historical releases can be found - %a{:href => '/changelog-stable-old/'} + %a{:href => '/changelogs-stable-old/'} in the LTS changelog archive. From ef57af618bd697c7bfa89c3beb59fb1f158fedf4 Mon Sep 17 00:00:00 2001 From: Birajit Saikia Date: Sat, 14 Dec 2024 02:19:20 +0530 Subject: [PATCH 16/16] reverted the files back to original and updated their index files again --- .../index.html.haml | 4 ++-- .../{changelogs-stable => changelog-stable}/badge.json.haml | 0 .../{changelogs-stable => changelog-stable}/index.html.haml | 4 ++-- content/{changelogs-stable => changelog-stable}/rss.xml.haml | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename content/{changelogs-stable-old => changelog-stable-old}/index.html.haml (91%) rename content/{changelogs-stable => changelog-stable}/badge.json.haml (100%) rename content/{changelogs-stable => changelog-stable}/index.html.haml (94%) rename content/{changelogs-stable => changelog-stable}/rss.xml.haml (100%) diff --git a/content/changelogs-stable-old/index.html.haml b/content/changelog-stable-old/index.html.haml similarity index 91% rename from content/changelogs-stable-old/index.html.haml rename to content/changelog-stable-old/index.html.haml index 03640ba7b318..e79503cb3b0e 100644 --- a/content/changelogs-stable-old/index.html.haml +++ b/content/changelog-stable-old/index.html.haml @@ -15,7 +15,7 @@ actions: - archived_changelogs = site.changelogs[:lts].reverse.drop(25) - archived_changelogs.each do |release| %div - = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelogs-stable-old') + = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable-old') - if release.changes %div.app-releases__list__items = partial('../_partials/changelog-changes.html.haml', :changes => release.changes) @@ -24,5 +24,5 @@ actions: .app-banner This is the changelog archive. The changelog for recent releases can be found - %a{:href => '/changelogs-stable/'} + %a{:href => '/changelog-stable/'} in the main LTS changelog page. diff --git a/content/changelogs-stable/badge.json.haml b/content/changelog-stable/badge.json.haml similarity index 100% rename from content/changelogs-stable/badge.json.haml rename to content/changelog-stable/badge.json.haml diff --git a/content/changelogs-stable/index.html.haml b/content/changelog-stable/index.html.haml similarity index 94% rename from content/changelogs-stable/index.html.haml rename to content/changelog-stable/index.html.haml index 1b43661d6a97..94a6c09ce793 100644 --- a/content/changelogs-stable/index.html.haml +++ b/content/changelog-stable/index.html.haml @@ -16,7 +16,7 @@ actions: - recent_changelogs.each do |release| - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable) %div - = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelogs-stable') + = partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable') - if release.changes && release.lts_changes && release.lts_baseline .app-releases__notable-changes{:style => "margin-top: 15px"} = "Changes since #{release.lts_baseline}" @@ -33,5 +33,5 @@ actions: .app-banner The changelog of historical releases can be found - %a{:href => '/changelogs-stable-old/'} + %a{:href => '/changelog-stable-old/'} in the LTS changelog archive. diff --git a/content/changelogs-stable/rss.xml.haml b/content/changelog-stable/rss.xml.haml similarity index 100% rename from content/changelogs-stable/rss.xml.haml rename to content/changelog-stable/rss.xml.haml