Skip to content
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

[stable10] Sync code for 'add events for user preference changes' 31266 and 31307 #34820

Merged
merged 1 commit into from
Mar 19, 2019

Conversation

phil-davis
Copy link
Contributor

@phil-davis phil-davis commented Mar 19, 2019

Description

PR #31266 "Add events for user preference changes" happened in stable10
PR #31307 was the forward-port to master
But these had some lines different (formatting and PHPdoc...)

This PR syncs the code in stable10 to match the "good stuff" in master

(see PR #34819 for code going the other way)

Between the 2 PRs, this gets the code in sync.

Motivation and Context

Make code the same in stable10 and master

How Has This Been Tested?

CI

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@codecov
Copy link

codecov bot commented Mar 19, 2019

Codecov Report

Merging #34820 into stable10 will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##             stable10   #34820   +/-   ##
===========================================
  Coverage       64.23%   64.23%           
  Complexity      19895    19895           
===========================================
  Files            1277     1277           
  Lines           76243    76243           
  Branches         1292     1292           
===========================================
  Hits            48971    48971           
  Misses          26893    26893           
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 53.2% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.39% <100%> (ø) 19895 <0> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
lib/private/AllConfig.php 94.52% <100%> (ø) 43 <0> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 31f2764...e6337ee. Read the comment docs.

Copy link
Member

@individual-it individual-it left a comment

Choose a reason for hiding this comment

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

only formatting changes

@phil-davis phil-davis merged commit 1f38f9e into stable10 Mar 19, 2019
@delete-merged-branch delete-merged-branch bot deleted the stable10-sync-add-events-for-user-preferences branch March 19, 2019 11:07
@PVince81 PVince81 added this to the QA milestone Apr 12, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Apr 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants