Skip to content

Commit 3fc43bc

Browse files
Merge pull request #38336 from nextcloud/master-is-now-28
Master is now 28
2 parents 22e5741 + 7e45fdf commit 3fc43bc

File tree

33 files changed

+91
-67
lines changed

33 files changed

+91
-67
lines changed

.github/dependabot.yml

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ updates:
6464
day: saturday
6565
time: "03:00"
6666
timezone: Europe/Paris
67-
target-branch: stable24
67+
target-branch: stable25
6868
labels:
6969
- "3. to review"
7070
- "feature: dependencies"
@@ -74,6 +74,8 @@ updates:
7474
# ignore all GitHub linguist patch updates
7575
- dependency-name: "*"
7676
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
77+
# Disable automatic rebasing because without a build CI will likely fail anyway
78+
rebase-strategy: "disabled"
7779

7880
- package-ecosystem: npm
7981
directory: "/"
@@ -82,7 +84,7 @@ updates:
8284
day: saturday
8385
time: "03:00"
8486
timezone: Europe/Paris
85-
target-branch: stable25
87+
target-branch: stable26
8688
labels:
8789
- "3. to review"
8890
- "feature: dependencies"
@@ -92,6 +94,8 @@ updates:
9294
# ignore all GitHub linguist patch updates
9395
- dependency-name: "*"
9496
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
97+
# Disable automatic rebasing because without a build CI will likely fail anyway
98+
rebase-strategy: "disabled"
9599

96100
- package-ecosystem: npm
97101
directory: "/"
@@ -100,7 +104,7 @@ updates:
100104
day: saturday
101105
time: "03:00"
102106
timezone: Europe/Paris
103-
target-branch: stable26
107+
target-branch: stable27
104108
labels:
105109
- "3. to review"
106110
- "feature: dependencies"
@@ -110,6 +114,8 @@ updates:
110114
# ignore all GitHub linguist patch updates
111115
- dependency-name: "*"
112116
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
117+
# Disable automatic rebasing because without a build CI will likely fail anyway
118+
rebase-strategy: "disabled"
113119

114120
# Testing StableXX composer
115121
- package-ecosystem: composer
@@ -119,7 +125,7 @@ updates:
119125
day: saturday
120126
time: "03:00"
121127
timezone: Europe/Paris
122-
target-branch: stable24
128+
target-branch: stable25
123129
labels:
124130
- "3. to review"
125131
- "feature: dependencies"
@@ -137,7 +143,25 @@ updates:
137143
day: saturday
138144
time: "03:00"
139145
timezone: Europe/Paris
140-
target-branch: stable25
146+
target-branch: stable26
147+
labels:
148+
- "3. to review"
149+
- "feature: dependencies"
150+
reviewers:
151+
- "nextcloud/server-dependabot"
152+
ignore:
153+
# ignore all GitHub linguist patch updates
154+
- dependency-name: "*"
155+
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
156+
157+
- package-ecosystem: composer
158+
directory: "/build/integration"
159+
schedule:
160+
interval: weekly
161+
day: saturday
162+
time: "03:00"
163+
timezone: Europe/Paris
164+
target-branch: stable27
141165
labels:
142166
- "3. to review"
143167
- "feature: dependencies"

.github/workflows/update-cacert-bundle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
branches: ["master", "stable26", "stable25", "stable24", "stable23", "stable22"]
15+
branches: ["master", "stable27", "stable26", "stable25", "stable24", "stable23", "stable22"]
1616

1717
name: update-ca-certificate-bundle-${{ matrix.branches }}
1818

.github/workflows/update-psalm-baseline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
branches: ["master", "stable26", "stable25", "stable24", "stable23"]
17+
branches: ["master", "stable27", "stable26", "stable25"]
1818

1919
name: update-psalm-baseline-${{ matrix.branches }}
2020

apps/admin_audit/appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<name>Auditing / Logging</name>
66
<summary>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</summary>
77
<description>Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.</description>
8-
<version>1.17.0</version>
8+
<version>1.18.0</version>
99
<licence>agpl</licence>
1010
<author>Nextcloud</author>
1111
<namespace>AdminAudit</namespace>
@@ -15,7 +15,7 @@
1515
<category>monitoring</category>
1616
<bugs>https://github.com/nextcloud/server/issues</bugs>
1717
<dependencies>
18-
<nextcloud min-version="27" max-version="27"/>
18+
<nextcloud min-version="28" max-version="28"/>
1919
</dependencies>
2020
<background-jobs>
2121
<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>

apps/cloud_federation_api/appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<name>Cloud Federation API</name>
66
<summary>Enable clouds to communicate with each other and exchange data</summary>
77
<description>The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.</description>
8-
<version>1.10.0</version>
8+
<version>1.11.0</version>
99
<licence>agpl</licence>
1010
<author>Bjoern Schiessle</author>
1111
<namespace>CloudFederationAPI</namespace>
@@ -15,6 +15,6 @@
1515
<category>files</category>
1616
<bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
1717
<dependencies>
18-
<nextcloud min-version="27" max-version="27"/>
18+
<nextcloud min-version="28" max-version="28"/>
1919
</dependencies>
2020
</info>

apps/comments/appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<name>Comments</name>
66
<summary>Files app plugin to add comments to files</summary>
77
<description>Files app plugin to add comments to files</description>
8-
<version>1.17.0</version>
8+
<version>1.18.0</version>
99
<licence>agpl</licence>
1010
<author>Arthur Schiwon</author>
1111
<author>Vincent Petry</author>
@@ -16,7 +16,7 @@
1616
<category>social</category>
1717
<bugs>https://github.com/nextcloud/server/issues</bugs>
1818
<dependencies>
19-
<nextcloud min-version="27" max-version="27"/>
19+
<nextcloud min-version="28" max-version="28"/>
2020
</dependencies>
2121

2222
<activity>

apps/contactsinteraction/appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<name>Contacts Interaction</name>
66
<summary>Manages interaction between users and contacts</summary>
77
<description>Collect data about user and contacts interactions and provide an address book for the data</description>
8-
<version>1.8.0</version>
8+
<version>1.9.0</version>
99
<licence>agpl</licence>
1010
<author>Christoph Wurst</author>
1111
<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
@@ -17,7 +17,7 @@
1717
<category>social</category>
1818
<bugs>https://github.com/nextcloud/server/issues</bugs>
1919
<dependencies>
20-
<nextcloud min-version="27" max-version="27"/>
20+
<nextcloud min-version="28" max-version="28"/>
2121
</dependencies>
2222
<background-jobs>
2323
<job>OCA\ContactsInteraction\BackgroundJob\CleanupJob</job>

apps/dashboard/appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
The Nextcloud Dashboard is your starting point of the day, giving you an overview of your upcoming appointments, urgent emails, chat messages, incoming tickets, latest tweets and much more! Users can add the widgets they like and change the background to their liking.]]>
1010
</description>
11-
<version>7.7.0</version>
11+
<version>7.8.0</version>
1212
<licence>agpl</licence>
1313
<author>Julius Härtl</author>
1414
<namespace>Dashboard</namespace>
@@ -18,7 +18,7 @@ The Nextcloud Dashboard is your starting point of the day, giving you an overvie
1818
<bugs>https://github.com/nextcloud/server/issues</bugs>
1919

2020
<dependencies>
21-
<nextcloud min-version="27" max-version="27"/>
21+
<nextcloud min-version="28" max-version="28"/>
2222
</dependencies>
2323

2424
<navigations>

apps/dav/appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<name>WebDAV</name>
66
<summary>WebDAV endpoint</summary>
77
<description>WebDAV endpoint</description>
8-
<version>1.27.0</version>
8+
<version>1.28.0</version>
99
<licence>agpl</licence>
1010
<author>owncloud.org</author>
1111
<namespace>DAV</namespace>
@@ -15,7 +15,7 @@
1515
<category>integration</category>
1616
<bugs>https://github.com/nextcloud/server/issues</bugs>
1717
<dependencies>
18-
<nextcloud min-version="27" max-version="27"/>
18+
<nextcloud min-version="28" max-version="28"/>
1919
</dependencies>
2020

2121
<background-jobs>

apps/encryption/appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ In order to use this encryption module you need to enable server-side encryption
99
The module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system.
1010
Please read the documentation to know all implications before you decide to enable server-side encryption.
1111
</description>
12-
<version>2.15.0</version>
12+
<version>2.16.0</version>
1313
<licence>agpl</licence>
1414
<author>Bjoern Schiessle</author>
1515
<author>Clark Tomlinson</author>
@@ -26,7 +26,7 @@ Please read the documentation to know all implications before you decide to enab
2626

2727
<dependencies>
2828
<lib>openssl</lib>
29-
<nextcloud min-version="27" max-version="27"/>
29+
<nextcloud min-version="28" max-version="28"/>
3030
</dependencies>
3131

3232
<repair-steps>

0 commit comments

Comments
 (0)