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 release 12.5 into master #9922

Merged
merged 182 commits into from
May 23, 2019
Merged

Conversation

loremattei
Copy link
Contributor

Merge release 12.5 into master

malinajirka and others added 30 commits March 26, 2019 08:41
The method `LocalDraftUploadStarter.uploadLocalDrafts` is called when:

- The internet comes back online
- The Posts activity is shown
- When the user performs a pull-to-refresh in any of the Posts tabs
- Removed unnecessary `@Provides` 🤦‍♂️
- Using a simple `getPostsForSite()` method for now. This should probably be replaced with a FluxC method
It does not need to be a singleton right now. Perhaps later.
In this way, we can guarantee that `site` is not `null`.
The `mocked*` can be misleading because the returned instances are not mocks. It is the parameters that are mocked.
jtreanor and others added 27 commits May 16, 2019 16:42
Run connected tests nightly on Firebase Test Lab
This uses the new `CONTRIBUTING.md` template reviewed by Editorial. Please see p2JRYi-41r-p2 for more information.

The only additional change here is the addition of the _Development Practices_ section which emphasizes the coding style and our other guides in the Wiki. 

The original content was moved to the Wiki for consistency with our other guides:

- [Using Android Resources](https://github.com/wordpress-mobile/WordPress-Android/wiki/Using-Android-Resources)
- [Pull Request Guidelines](https://github.com/wordpress-mobile/WordPress-Android/wiki/Pull-Request-Guidelines)
- [Subtree'd Library Projects](https://github.com/wordpress-mobile/WordPress-Android/wiki/Subtree'd-Library-Projects)
…-failure

Fix Android Test build errors caused by Gutenberg change
…uting-from-template

Update CONTRIBUTING.md based on the template
Sign app for release in tools/install-app-bundle.sh
…ia_utils

A fix for a crash when uploading media on certain devices
Update Gutenberg to the 1.5.0 release branch
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR is missing at least one label.
⚠️ PR is not assigned to a milestone.
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

@loremattei loremattei merged commit 57841fc into master May 23, 2019
@loremattei loremattei deleted the merge-release-12.5-into-master branch May 23, 2019 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.