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.

Sign up for GitHub

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

Jump to bottom

[stable22] Only add the vue exeption to actual button elements #30010

Merged
merged 1 commit into from
Dec 7, 2021
Merged

[stable22] Only add the vue exeption to actual button elements #30010

merged 1 commit into from
Dec 7, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Dec 1, 2021 •
edited by st3iny
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #29905

@backportbot-nextcloud backportbot-nextcloud bot added the design Design, UI, UX, etc. label Dec 1, 2021
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 22.2.4 milestone Dec 1, 2021
MichaIng
MichaIng previously requested changes Dec 1, 2021
View reviewed changes
Copy link
Member

@MichaIng MichaIng left a comment

Choose a reason for hiding this comment

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

Some .button:not(.button-vue) cases are missing in this backport.

@st3iny st3iny dismissed MichaIng’s stale review December 7, 2021 11:01

It's fine because the original change to this line wasn't backported in the first place. This line looks like the same as it is on master.

st3iny
st3iny approved these changes Dec 7, 2021
View reviewed changes
Copy link
Member

@st3iny st3iny 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.

Conflicts are irrelevant. See my other comment.

EDIT: Nvm, @MichaIng was right. I was on the wrong branch.

st3iny
st3iny requested changes Dec 7, 2021
View reviewed changes
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

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

Conflicts!

@marcoambrosini @st3iny
Only add the vue exeption to actual button elements
10056ff 
Signed-off-by: marco <marcoambrosini@pm.me>
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
@skjnldsv skjnldsv added the 3. to review Waiting for reviews label Dec 7, 2021
@st3iny st3iny force-pushed the backport/29905/stable22 branch from 1f4717b to 10056ff Compare December 7, 2021 11:12
st3iny
st3iny approved these changes Dec 7, 2021
View reviewed changes
Copy link
Member

@st3iny st3iny left a comment

Choose a reason for hiding this comment

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

I added the missing change and tested again.

@MichaIng
Copy link
Member

MichaIng commented Dec 7, 2021

The jsunit failures are unrelated. But someone with insights should have a look: Looks like a formal thing where a template has changed, now containing style="display: block;", while the check still expect the HTML without style="display: block;" attribute.

@GretaD GretaD mentioned this pull request Dec 7, 2021
Closed
@GretaD
Copy link
Contributor

GretaD commented Dec 7, 2021

@marcoambrosini please have a look at this one so we can merge it as people that are on NC v22 are reporting problems

@st3iny st3iny merged commit 3d8a610 into stable22 Dec 7, 2021
@st3iny st3iny deleted the backport/29905/stable22 branch December 7, 2021 13:36
@skjnldsv skjnldsv mentioned this pull request Jan 7, 2022
Merged
9 tasks
This was referenced Jan 20, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@st3iny st3iny st3iny approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@MichaIng MichaIng MichaIng approved these changes

@Valdnet Valdnet Valdnet approved these changes

@GretaD GretaD Awaiting requested review from GretaD

@marcoambrosini marcoambrosini Awaiting requested review from marcoambrosini

Assignees
No one assigned
Labels
3. to review Waiting for reviews design Design, UI, UX, etc.
Projects
None yet
Milestone
Nextcloud 22.2.4
Development

Successfully merging this pull request may close these issues.
6 participants
@MichaIng @GretaD @st3iny @skjnldsv @Valdnet @marcoambrosini