Skip to content

[13] Remove base url from global cache prefix - #8745

Merged
MorrisJobke merged 7 commits into
stable13from
stable13-8716
Mar 9, 2018
Merged

[13] Remove base url from global cache prefix#8745
MorrisJobke merged 7 commits into
stable13from
stable13-8716

Conversation

@juliusknorr

Copy link
Copy Markdown
Member

backport of #8716

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorrjuliusknorr added this to the Nextcloud 13.0.1 milestone Mar 9, 2018
@juliusknorrjuliusknorr changed the title Remove base url from global cache prefix[13] Remove base url from global cache prefixMar 9, 2018
@MorrisJobkeMorrisJobke mentioned this pull request Mar 9, 2018
10 tasks
@MorrisJobke

Copy link
Copy Markdown
Member

CI failure :/

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix CI failure.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@codecov

codecovBot commented Mar 9, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8745 into stable13 will increase coverage by 0.11%.
The diff coverage is 66.66%.

@@ Coverage Diff @@## stable13 #8745 +/- ##
==============================================
+ Coverage 51.3% 51.41% +0.11% - Complexity 25017 25089 +72 
==============================================
Files 1609 1609 Lines 95285 95431 +146 Branches 1376 1376 ==============================================
+ Hits 48882 49064 +182 + Misses 46403 46367 -36
Impacted FilesCoverage ΔComplexity Δ
lib/private/TemplateLayout.php0% <0%> (ø)48 <0> (ø)⬇️
apps/theming/lib/ThemingDefaults.php91.79% <100%> (ø)46 <0> (ø)⬇️
lib/private/Server.php80.66% <33.33%> (+0.11%)134 <0> (ø)⬇️
lib/private/Template/JSCombiner.php91.48% <75%> (+2.38%)35 <0> (+5)⬆️
lib/private/Template/SCSSCacher.php71.73% <75%> (+0.2%)36 <0> (ø)⬇️
...b/private/Files/ObjectStore/ObjectStoreStorage.php66.39% <0%> (-0.56%)75% <0%> (+1%)
core/js/js.js66.4% <0%> (+0.11%)0% <0%> (ø)⬇️
apps/files_trashbin/lib/Trashbin.php72.53% <0%> (+0.24%)136% <0%> (ø)⬇️
apps/dav/lib/Upload/ChunkingPlugin.php96.55% <0%> (+0.25%)8% <0%> (ø)⬇️
... and 4 more

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 9, 2018
@MorrisJobke

Copy link
Copy Markdown
Member

Still one failure:

There was 1 failure:
57s
177
57s
178
1) Test\Template\SCSSCacherTest::testResetCache
57s
179
Expectation failed for method name is equal to <string:clear> when invoked 1 time(s).
57s
180
Method was expected to be called 1 times, actually called 0 times.

Let me look into it.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
MorrisJobke merged commit b0f0c26 into stable13Mar 9, 2018
@MorrisJobke
MorrisJobke deleted the stable13-8716 branch March 9, 2018 15:15
@juliusknorr

Copy link
Copy Markdown
MemberAuthor

Thanks for fixing the tests @rullzer@MorrisJobke 👍

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: scss

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@juliusknorr@MorrisJobke@rullzer