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

Merge 1.7.6.x to develop - 11/07/2019 #14592

Merged
merged 4 commits into from Jul 11, 2019

Conversation

@matks
Copy link
Contributor

commented Jul 11, 2019

Questions Answers
Branch? develop
Description? Merge of bug fixes from 1.7.6.x branch to develop as we are in code freeze
Type? bug fix
Category? ME
BC breaks? no
Deprecations? no
Fixed ticket?
How to test? Travis should be green

This change is Reviewable

eternoendless and others added some commits Jul 10, 2019

Many things that were supposed to be removed weren't:
- Anything under admin, because the folder was renamed before cleaning it up
- Legacy tests
- .estlintignore, .eslintrc.js, .php_cs.dist, .docker-compose.yml, .webpack, .composer-lock, .package-lock.json...
Fix many things that were supposed to be removed during build not bei…
…ng removed (#14579)

Fix many things that were supposed to be removed during build not being removed

@matks matks requested a review from PrestaShop/prestashop-core-developers as a code owner Jul 11, 2019

@prestonBot

This comment has been minimized.

Copy link
Collaborator

commented Jul 11, 2019

Hi!

Your pull request description seems to be incomplete or malformed:

  • The category should be one of: FO, BO, CO, IN, TE, WS, LO

Would you mind completing the contribution table ? This would help us understand how interesting your contribution is.

Thank you!

(note: this is an automated message, but answering it will reach a real human )

@matks

This comment has been minimized.

Copy link
Contributor Author

commented Jul 11, 2019

Will be the last of its kind, if no patch version is released for branch 1.7.6.x 😄

@jolelievre jolelievre merged commit ddb5f48 into PrestaShop:develop Jul 11, 2019

2 checks passed

PrettyCI Code formatting
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

mbadrani added a commit to mbadrani/PrestaShop that referenced this pull request Jul 18, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.