Skip to content

Commit a52495a

Browse files
authored
Merge pull request #41180 from owncloud/issue-41179
skip new preview test on old oC10 and bump version to 10.14.0
2 parents 0f508e3 + ba16b5f commit a52495a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

sonar-project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Organization and project keys are displayed in the right sidebar of the project homepage
22
sonar.organization=owncloud-1
33
sonar.projectKey=owncloud_core
4-
sonar.projectVersion=10.13.5
4+
sonar.projectVersion=10.14.0
55
sonar.host.url=https://sonarcloud.io
66

77
# =====================================================

tests/acceptance/features/apiWebdavPreviews/previews.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ Feature: previews of files downloaded through the webdav API
277277
Then the HTTP status code should be "200"
278278
And the requested JPEG image should have a quality value of "100"
279279

280-
280+
@skipOnOcV10.12 @skipOnOcV10.13
281281
Scenario: the preview should be of content in the first page of a multi-page document
282282
Given the administrator has updated system config key "enabledPreviewProviders 0" with value "OC\Preview\PDF"
283283
And user "Alice" has uploaded file "fixtures/Preview-test.pdf" to "/Preview-test.pdf"

version.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
2626
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
2727
// when updating major/minor version number.
28-
$OC_Version = [10, 13, 5, 0];
28+
$OC_Version = [10, 14, 0, 0];
2929

3030
// The human-readable string
31-
$OC_VersionString = '10.13.5 prealpha';
31+
$OC_VersionString = '10.14.0 prealpha';
3232

3333
$OC_VersionCanBeUpgradedFrom = [[8, 2, 11],[9, 0, 9],[9, 1]];
3434

0 commit comments

Comments
 (0)