Skip to content

Conversation

@AurelioDeRosa
Copy link
Contributor

Added manipulation value for the touch-action property. References: [1] [2]

@AurelioDeRosa
Copy link
Contributor Author

@nschonni ping on this PR.

@XhmikosR
Copy link
Member

XhmikosR commented Jan 9, 2016

@AurelioDeRosa: please fetch, rebase and squash the patches.

@AurelioDeRosa
Copy link
Contributor Author

The branch is now made of only 1 commit and master can be merged with a fast forward only method.

@XhmikosR
Copy link
Member

XhmikosR commented Jan 9, 2016

Thanks! Before merging it I see that there are more possible values from MSDN https://developer.mozilla.org/en-US/docs/Web/CSS/touch-action.

Maybe you should add those too?

@XhmikosR XhmikosR added this to the v0.2.6 milestone Jan 9, 2016
@XhmikosR XhmikosR removed the Rebase label Jan 9, 2016
@XhmikosR XhmikosR changed the title Update Properties.js Add manipulation value for the touch-action property. Jan 9, 2016
@XhmikosR
Copy link
Member

XhmikosR commented Jan 9, 2016

@stubbornella: can you remove whatever you have added to the repo that forces merging from master? It's annoying and it blocks PRs that don't need any rebase/merging.

I'd also remove the master branch CI integration because it doesn't allow one to update the docs without skipping CI.

@AurelioDeRosa
Copy link
Contributor Author

Updated.

@XhmikosR
Copy link
Member

XhmikosR commented Jan 9, 2016

Unfortunately @AurelioDeRosa you need to fetch and rebase because of that repo setting.

@AurelioDeRosa
Copy link
Contributor Author

I've to say that this is a quite cumbersome and tedious process. Especially for small contributions this might really block people from contributing. In jQuery we usually perform these small rebases and tweaks by ourselves, and I think it saves time.

@XhmikosR
Copy link
Member

XhmikosR commented Jan 9, 2016

IMO this thing shouldn't exist. It's just useless. That is why I pinged @stubbornella above #154 (comment)

I can't change this myself; only repo owners.

XhmikosR added a commit that referenced this pull request Jan 9, 2016
Add manipulation value for the touch-action property.
@XhmikosR XhmikosR merged commit 1e1e1c9 into CSSLint:master Jan 9, 2016
@AurelioDeRosa AurelioDeRosa deleted the patch-2 branch January 9, 2016 14:00
@stubbornella
Copy link
Member

Is this a Github setting do you think?

On Sat, Jan 9, 2016 at 5:58 AM, XhmikosR notifications@github.com wrote:

Merged #154.

Reply to this email directly or view it on GitHub:
#154 (comment)

@XhmikosR
Copy link
Member

XhmikosR commented Jan 9, 2016

@stubbornella: yeah, it's in repo settings, branches. Protected branches.

@jawshooah
Copy link
Contributor

Note that you can leave master as a protected branch (disabling force-pushes) but remove required status checks, which is preventing PRs from being merged without being fully up-to-date.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants