Skip to content

Commit e8d6144

Browse files
Merge branch 'master' into include-unix-domain-sockets
2 parents 1f9ab63 + a3108f7 commit e8d6144

File tree

5 files changed

+47
-14
lines changed

5 files changed

+47
-14
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
layout: changelog
3+
title: Archived LTS Changelog
4+
show_ratings: false
5+
has_rss: false
6+
actions:
7+
<a class="app-button app-button--primary app-mobile-hide" href="/changelog-stable">
8+
<ion-icon name="arrow-back-circle-outline"></ion-icon>
9+
Back to Recent LTS Changelog
10+
</a>
11+
---
12+
13+
.ratings
14+
- # Load older changelogs (all except the most recent 25, ordered correctly)
15+
- archived_changelogs = site.changelogs[:lts].reverse.drop(25)
16+
- archived_changelogs.each do |release|
17+
%div
18+
= partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable-old')
19+
- if release.changes
20+
%div.app-releases__list__items
21+
= partial('../_partials/changelog-changes.html.haml', :changes => release.changes)
22+
- else
23+
%p No notable changes for this release.
24+
25+
.app-banner
26+
This is the changelog archive. The changelog for recent releases can be found
27+
%a{:href => '/changelog-stable/'}
28+
in the main LTS changelog page.

content/changelog-stable/index.html.haml

+16-11
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,27 @@ actions:
1111
---
1212

1313
.ratings
14-
- # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/lts.yml
15-
- site.changelogs[:lts].reverse_each do | release |
14+
- # Load the most recent 25 changelogs (latest first)
15+
- recent_changelogs = site.changelogs[:lts].reverse.take(25)
16+
- recent_changelogs.each do |release|
1617
- if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.stable)
1718
%div
18-
= partial('release-header.html.haml', :release => release, :url => 'changelog-stable')
19-
- if release.changes and release.lts_changes and release.lts_baseline
19+
= partial('../_partials/release-header.html.haml', :release => release, :url => 'changelog-stable')
20+
- if release.changes && release.lts_changes && release.lts_baseline
2021
.app-releases__notable-changes{:style => "margin-top: 15px"}
21-
-# TODO figure out how to get rid of this
2222
= "Changes since #{release.lts_baseline}"
23-
%div.app-releases__list__items
24-
= partial('changelog-changes.html.haml', :changes => release.changes)
23+
- if release.changes
24+
%div.app-releases__list__items
25+
= partial('../_partials/changelog-changes.html.haml', :changes => release.changes)
2526

26-
- if release.changes and release.lts_changes
27+
- if release.changes && release.lts_changes
2728
.app-releases__notable-changes
28-
= "Notable changes since #{release.lts_predecessor}"
29+
- if release.lts_predecessor
30+
= "Notable changes since #{release.lts_predecessor}"
2931
%div.app-releases__list__items
30-
= partial('changelog-changes.html.haml', :changes => release.lts_changes)
32+
= partial('../_partials/changelog-changes.html.haml', :changes => release.lts_changes)
3133

32-
= partial('changelog-stable.html')
34+
.app-banner
35+
The changelog of historical releases can be found
36+
%a{:href => '/changelog-stable-old/'}
37+
in the LTS changelog archive.

content/doc/developer/plugin-development/dependency-management.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ To use the Jenkins plugin BOM in your plugin:
9696
<groupId>io.jenkins.tools.bom</groupId>
9797
<artifactId>bom-2.452.x</artifactId>
9898
<!-- Latest version goes here -->
99-
<version>3761.vd922730f0fd2</version>
99+
<version>3814.v9563d972079a_</version>
100100
<scope>import</scope>
101101
<type>pom</type>
102102
</dependency>

content/doc/developer/tutorial-improve/update-base-jenkins-version.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The `git diff` might look like this:
4444
- <artifactId>bom-2.387.x</artifactId>
4545
+ <artifactId>bom-2.452.x</artifactId>
4646
- <version>2543.vfb_1a_5fb_9496d</version>
47-
+ <version>3761.vd922730f0fd2</version>
47+
+ <version>3814.v9563d972079a_</version>
4848
<type>pom</type>
4949
<scope>import</scope>
5050
</dependency>

content/doc/developer/tutorial-improve/use-plugin-bill-of-materials.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ For example, the addition might look like:
3131
<dependency>
3232
<groupId>io.jenkins.tools.bom</groupId>
3333
<artifactId>bom-2.452.x</artifactId>
34-
<version>3761.vd922730f0fd2</version>
34+
<version>3814.v9563d972079a_</version>
3535
<scope>import</scope>
3636
<type>pom</type>
3737
</dependency>

0 commit comments

Comments
 (0)