Skip to content

Commit

Permalink
Merge pull request #41180 from owncloud/issue-41179
Browse files Browse the repository at this point in the history
skip new preview test on old oC10 and bump version to 10.14.0
  • Loading branch information
phil-davis authored Feb 12, 2024
2 parents 0f508e3 + ba16b5f commit a52495a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Organization and project keys are displayed in the right sidebar of the project homepage
sonar.organization=owncloud-1
sonar.projectKey=owncloud_core
sonar.projectVersion=10.13.5
sonar.projectVersion=10.14.0
sonar.host.url=https://sonarcloud.io

# =====================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ Feature: previews of files downloaded through the webdav API
Then the HTTP status code should be "200"
And the requested JPEG image should have a quality value of "100"


@skipOnOcV10.12 @skipOnOcV10.13
Scenario: the preview should be of content in the first page of a multi-page document
Given the administrator has updated system config key "enabledPreviewProviders 0" with value "OC\Preview\PDF"
And user "Alice" has uploaded file "fixtures/Preview-test.pdf" to "/Preview-test.pdf"
Expand Down
4 changes: 2 additions & 2 deletions version.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
$OC_Version = [10, 13, 5, 0];
$OC_Version = [10, 14, 0, 0];

// The human-readable string
$OC_VersionString = '10.13.5 prealpha';
$OC_VersionString = '10.14.0 prealpha';

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

Expand Down

0 comments on commit a52495a

Please sign in to comment.