Skip to content

Sync develop and master branches #577

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
Merged
merged 26 commits into from
Feb 6, 2020
Merged

Sync develop and master branches #577

merged 26 commits into from
Feb 6, 2020

Conversation

okolesnyk
Copy link
Member

Description

Fixed Issues (if relevant)

  1. magento/magento2-functional-testing-framework#<issue_number>: Issue title
  2. ...

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/verification tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)
  • Changes to Framework doesn't have backward incompatible changes for tests or have related Pull Request with fixes to tests

hickskenh and others added 26 commits January 24, 2020 11:54
@hickskenh
updated Contribution Guidelines link
bb38719 
original .github/CONTRIBUTING.html link produces 404 error. changed link to https://github.com/magento/magento2-functional-testing-framework/blob/develop/.github/CONTRIBUTING.md
@okolesnyk
Merge pull request #559 from hickskenh/patch-1
d5ce8ae 
updated Contribution Guidelines link
@jilu1
MQE-1969: Updated CHANGELOG.md and bumped MFTF package version
8266748
@jilu1
MQE-1969: Updated CHANGELOG.md and bumped MFTF package version
a1adbc1
@jilu1
MQE-1969: Updated CHANGELOG.md and bumped MFTF package version
ac9f32c
@jilu1
Merge pull request #564 from magento/MQE-1969
6deb625 
MQE-1969: Updated CHANGELOG.md and bumped MFTF package version
@jilu1
Merge remote-tracking branch 'origin/MFTF-2.6.0-RC' into MQE-1970
9f16107
@KevinBKozan
Merge pull request #565 from magento/MQE-1970
6635201 
MQE 1970 MFTF release 2.6.0 PR to master
@dobooth
Fix include
2284db9
@KevinBKozan
Merge pull request #566 from magento/dobooth-patch-1
066465a 
Fix include path to data file.
@dobooth
Adding raw tag.
93fda6b
@KevinBKozan
Merge pull request #569 from magento/dobooth-patch-2
c589521 
Adding back raw tag.
@dobooth
Adding deprecation attribute info
c8bb2de
@dobooth
Moving def to correct table
016cee6
@dobooth
Fixed table
1b0cf43
@lbajsarowicz
First cron run may fail when no Group provided.
7560bc3
@dobooth
Removing attribute
62c3a58
@dobooth
Added deprecated to metadata topic
f2d0905
@dobooth
Merge branch 'db_deprecation' of github.com:magento-devdocs/magento2-…
5494d10 
…functional-testing-framework into db_deprecation
@dobooth
Added attribute.
96413c4
@okolesnyk
Merge pull request #572 from magento-devdocs/db_deprecation
d7efde8 
Adding deprecation attribute info
@okolesnyk
Merge pull request #573 from lbajsarowicz/fix/magentocron-no-group-pr…
3ccf894 
…ovided

Quick Fix: PHP's max() requires at least 1 argument
@okolesnyk
Bump MFTF dependencies
15f8304
@okolesnyk
Merge pull request #574 from magento/bumpdeps
ce9ddad 
Update MFTF dependencies to latest possible version
@okolesnyk
MQE-1969: Updated CHANGELOG.md and bumped MFTF package version
3609f4f
@okolesnyk
Merge branch 'develop' into masternew
51f1c51
@coveralls
Copy link

coveralls commented Feb 5, 2020 •
edited
Loading

Coverage Status

Coverage decreased (-1.5%) to 50.994% when pulling 51f1c51 on masternew into fc598db on develop.

@okolesnyk okolesnyk changed the title Masternew Sync develop and master branches Feb 6, 2020
@okolesnyk okolesnyk merged commit 55ac3b8 into develop Feb 6, 2020
@okolesnyk okolesnyk deleted the masternew branch February 6, 2020 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@okolesnyk @coveralls @hickskenh @jilu1 @KevinBKozan @dobooth @lbajsarowicz