Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Feature: Custom favicon #356

Merged
merged 1 commit into from
May 2, 2020
Merged

Feature: Custom favicon #356

merged 1 commit into from
May 2, 2020

Conversation

AvailCat
Copy link
Member

@codecov
Copy link

codecov bot commented Apr 28, 2020 •
edited
Loading

Codecov Report

Merging #356 into 9.x will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##              9.x     #356   +/-   ##
=======================================
  Coverage   68.16%   68.16%           
=======================================
  Files          29       29           
  Lines        1401     1401           
  Branches      203      203           
=======================================
  Hits          955      955           
  Misses        406      406           
  Partials       40       40
Flag Coverage Δ
#core 86.36% <ø> (ø)
#plugins 66.45% <ø> (ø)

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 f1268d6...edd6d1a. Read the comment docs.

sergiohgz
sergiohgz previously approved these changes Apr 28, 2020
View reviewed changes
Copy link
Member

@sergiohgz sergiohgz left a comment

Choose a reason for hiding this comment

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

LGTM

juanpicado
juanpicado previously approved these changes Apr 28, 2020
View reviewed changes
@juanpicado
Copy link
Member

We have a problem ... @sergiohgz ship this under 10.x is not viable now ...

@sergiohgz
Copy link
Member

Let me create a maintenance branch and move this there

@sergiohgz
Copy link
Member

Nothing to do, 9.x branch exists (proof here). Please @AvailCat, can you rebase onto that branch?

@juanpicado
Copy link
Member

juanpicado commented Apr 28, 2020 •
edited
Loading

Nothing to do, 9.x branch exists (proof here). Please @AvailCat, can you rebase onto that branch?

Can we safely deploy from there? are no branch filters on CircleCI only for master?

We might do default branch 9.x while 10.x still in next, otherwise future PR will come over master.

@juanpicado juanpicado changed the base branch from master to 9.x April 30, 2020 05:47
@juanpicado juanpicado dismissed stale reviews from sergiohgz and themself April 30, 2020 05:47

The base branch was changed.

juanpicado
juanpicado requested changes Apr 30, 2020
View reviewed changes
Copy link
Member

@juanpicado juanpicado left a comment

Choose a reason for hiding this comment

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

We need to rebase, I changed the base branch

@AvailCat AvailCat force-pushed the feat/custom-favicon branch from fac6204 to edd6d1a Compare May 1, 2020 18:27
@AvailCat
Copy link
Member Author

AvailCat commented May 1, 2020

Done

@sergiohgz
Copy link
Member

Nothing to do, 9.x branch exists (proof here). Please @AvailCat, can you rebase onto that branch?

Can we safely deploy from there? are no branch filters on CircleCI only for master?

We might do default branch 9.x while 10.x still in next, otherwise future PR will come over master.

As I remember, we could deploy from any maintenance branch (N.x or M.N.x), and master branch.

By the way, you are correct, we might change default branch (rename current master to next and make 9.x new master)

sergiohgz
sergiohgz approved these changes May 1, 2020
View reviewed changes
Copy link
Member

@sergiohgz sergiohgz left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Still LGTM 😉, let's wait for @juanpicado review

@juanpicado juanpicado merged commit bd78861 into 9.x May 2, 2020
@delete-merged-branch delete-merged-branch bot deleted the feat/custom-favicon branch May 2, 2020 06:00
@juanpicado
Copy link
Member

released as v9.5.0

# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@juanpicado juanpicado juanpicado approved these changes

@sergiohgz sergiohgz sergiohgz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AvailCat @juanpicado @sergiohgz @64b2b6d12bfe4baae7dad3d01