New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Stable13] Scss hardening #8156

Merged
merged 7 commits into from Feb 6, 2018

Conversation

Projects
None yet
3 participants
@juliushaertl
Member

juliushaertl commented Feb 2, 2018

Backport of #8078 without the typehinting.

juliushaertl added some commits Jan 26, 2018

SCSS files are only cached if their size is > 0
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Make sure that injected variables do not break the CSS generation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Only override image styles if the theming values are set
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Clear injectect variables when resetting the cache
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Do not rewrite absolute URLs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Add tests for URL rewriting
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fix theming tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@codecov

This comment has been minimized.

codecov bot commented Feb 2, 2018

Codecov Report

Merging #8156 into stable13 will increase coverage by <.01%.
The diff coverage is 57.14%.

@@              Coverage Diff               @@
##             stable13    #8156      +/-   ##
==============================================
+ Coverage       51.23%   51.23%   +<.01%     
- Complexity      24982    24984       +2     
==============================================
  Files            1607     1607              
  Lines           95050    95060      +10     
  Branches         1376     1376              
==============================================
+ Hits            48695    48702       +7     
- Misses          46355    46358       +3
Impacted Files Coverage Δ Complexity Δ
apps/theming/lib/ThemingDefaults.php 91.79% <100%> (ø) 46 <0> (ø) ⬇️
lib/private/Template/SCSSCacher.php 69.56% <50%> (-1.53%) 39 <0> (+2)
core/js/js.js 66.4% <0%> (+0.11%) 0% <0%> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️
@rullzer

rullzer approved these changes Feb 3, 2018

@MorrisJobke MorrisJobke merged commit b206870 into stable13 Feb 6, 2018

4 checks passed

codecov/patch 57.14% of diff hit (target 51.23%)
Details
codecov/project 51.23% (+<.01%) compared to b2e3e29
Details
continuous-integration/drone/pr the build was successful
Details
continuous-integration/drone/push the build was successful
Details

@MorrisJobke MorrisJobke deleted the stable13-8078 branch Feb 6, 2018

@MorrisJobke MorrisJobke referenced this pull request Mar 9, 2018

Merged

13.0.1 RC1 #8748

10 of 10 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment