Skip to content

Commit

Permalink
Merge branch 'develop' for 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffpaul committed Jan 31, 2020
1 parent c51428c commit f0aedd1
Show file tree
Hide file tree
Showing 16 changed files with 295 additions and 19 deletions.
14 changes: 14 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Directories
/.github export-ignore
/.wordpress-org export-ignore

# Files
/.gitattributes export-ignore
/.gitignore export-ignore
/CHANGELOG.md export-ignore
/CODE_OF_CONDUCT.md export-ignore
/CONTRIBUTING.md export-ignore
/CREDITS.md export-ignore
/LICENSE.md export-ignore
/README.md export-ignore
/composer.json export-ignore
16 changes: 16 additions & 0 deletions .github/workflows/push-asset-readme-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Plugin asset/readme update
on:
push:
branches:
- master
jobs:
master:
name: Push to master
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: WordPress.org plugin asset/readme update
uses: 10up/action-wordpress-plugin-asset-update@master
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
16 changes: 16 additions & 0 deletions .github/workflows/push-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Deploy to WordPress.org
on:
push:
tags:
- "*"
jobs:
tag:
name: New tag
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: WordPress Plugin Deploy
uses: 10up/action-wordpress-plugin-deploy@master
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.idea/
.idea/
.DS_Store
Binary file added .wordpress-org/banner-1544x500.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/banner-772x250.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/icon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/icon-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions .wordpress-org/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Changelog

All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).

## [Unreleased] - TBD

## [1.3.1] - 2020-01-31
### Added
- Check for New Relic functions before attempting to use them (props [@msaggiorato](https://github.com/msaggiorato) via [#31](https://github.com/10up/wp-newrelic/pull/31))
- Plugin banner and icon images (props [@sncampbell](https://github.com/sncampbell) via [#40](https://github.com/10up/wp-newrelic/pull/40))
- Documentation on PHP version conflict (props [@jeffpaul](https://github.com/jeffpaul) via [#41](https://github.com/10up/wp-newrelic/pull/41))

### Fixed
- Sitemap check failures where global `wp_query` was undefined (props [@msaggiorato](https://github.com/msaggiorato) via [#30](https://github.com/10up/wp-newrelic/pull/30))

## [1.3] - 2018-08-30
### Added
- Support for Yoast SEO Sitemaps (props [@allan23](https://github.com/allan23) via [#26](https://github.com/10up/wp-newrelic/pull/26))
- Issue with Beaver Builder (props [@oscarssanchez](https://github.com/oscarssanchez) via [#27](https://github.com/10up/wp-newrelic/pull/27))

## [1.2] - 2018-05-03
### Added
- Support for REST API requests (props [@Rahe](https://github.com/Rahe) via [#21](https://github.com/10up/wp-newrelic/pull/21))
- composer.json (props [@herewithme](https://github.com/herewithme) via [#22](https://github.com/10up/wp-newrelic/pull/22))

### Changed
- Better naming for transactions (props [@eugene-manuilov](https://github.com/eugene-manuilov) via [#19](https://github.com/10up/wp-newrelic/pull/19))

### Fixed
- PHP warning (props [@ninnypants](https://github.com/ninnypants) via [#18](https://github.com/10up/wp-newrelic/pull/18))

## [1.1] - 2017-04-25
### Added
- Transaction grouping (props [@nicholasio](https://github.com/nicholasio) via [#6](https://github.com/10up/wp-newrelic/pull/6))
- Constant to allow disabling of installation notice (props [@tott](https://github.com/tott) via [#15](https://github.com/10up/wp-newrelic/pull/15))

### Changed
- Disabling NREUM on AMP pages (props [@goldenapples](https://github.com/goldenapples) via [#11](https://github.com/10up/wp-newrelic/pull/11))

### Fixed
- PHP warning (props [@allan23](https://github.com/allan23) via [#13](https://github.com/10up/wp-newrelic/pull/13))

## [1.0] - 2017-01-09
### Added
- First release of WP New Relic plugin 🎉

[Unreleased]: https://github.com/10up/wp-newrelic/compare/master...develop
[1.3.1]: https://github.com/10up/wp-newrelic/compare/1.3...1.3.1
[1.3]: https://github.com/10up/wp-newrelic/compare/d70cf93...1.3
[1.2]: https://github.com/10up/wp-newrelic/compare/49f4e79...d70cf93
[1.1]: https://github.com/10up/wp-newrelic/compare/9ec2b8d...49f4e79
[1.0]: https://github.com/10up/wp-newrelic/tree/9ec2b8d5c9e72504052a98cbb76d2e4b2e1b2b29
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
43 changes: 43 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Contributing and Maintaining

First, thank you for taking the time to contribute!

The following is a set of guidelines for contributors as well as information and instructions around our maintenance process. The two are closely tied together in terms of how we all work together and set expectations, so while you may not need to know everything in here to submit an issue or pull request, it's best to keep them in the same document.

## Ways to contribute

Contributing isn't just writing code - it's anything that improves the project. All contributions for WP New Relic are managed right here on GitHub. Here are some ways you can help:

### Reporting bugs

If you're running into an issue with the plugin, please take a look through [existing issues](https://github.com/10up/wp-newrelic/issues) and [open a new one](https://github.com/10up/wp-newrelic/issues/new) if needed. If you're able, include steps to reproduce, environment information, and screenshots/screencasts as relevant.

### Suggesting enhancements

New features and enhancements are also managed via [issues](https://github.com/10up/wp-newrelic/issues).

### Pull requests

Pull requests represent a proposed solution to a specified problem. They should always reference an issue that describes the problem and contains discussion about the problem itself. Discussion on pull requests should be limited to the pull request itself, i.e. code review.

For more on how 10up writes and manages code, check out our [10up Engineering Best Practices](https://10up.github.io/Engineering-Best-Practices/).

## Workflow

The `develop` branch is the development branch which means it contains the next version to be released. `stable` contains the current latest release and `master` contains the corresponding stable development version. Always work on the `develop` branch and open up PRs against `develop`.

## Release instructions

1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
2. Version bump: Bump the version number in `newrelic-reporting-for-wordpress.php` and `readme.txt` if it does not already reflect the version being released.
3. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`
4. Props: update CREDITS.md file with any new contributors, confirm maintainers are accurate
5. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.gitattributes`.
6. Readme updates: Make any other readme changes as necessary. `CHANGELOG.md` and `README.md` are geared toward GitHub and `readme.txt` contains WordPress.org-specific content. The two are slightly different.
7. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `master` (`git checkout master && git merge --no-ff develop`). `master` contains the stable development version.
8. Push: Push your master branch to GitHub, e.g. `git push origin master`.
9. Release: Create a [new release](https://github.com/10up/wp-newrelic/releases/new), naming the tag and the release with the new version number, and targeting the `master` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the `X.Y.Z` milestone (e.g. `https://github.com/10up/wp-newrelic/milestone/2?closed=1`).
10. SVN: Wait for the [GitHub Action](https://github.com/10up/wp-newrelic/actions) to finish deploying to the WordPress.org repository. If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
11. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/wp-newrelic/. This may take a few minutes.
12. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/wp-newrelic/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close `X.Y.Z` milestone.
13. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.
19 changes: 19 additions & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
The following acknowledges the Maintainers for this repository, those who have Contributed to this repository (via bug reports, code, design, ideas, project management, translation, testing, etc.), and any Libraries utilized.

## Maintainers

The following individuals are responsible for curating the list of issues, responding to pull requests, and ensuring regular releases happen.

[Vasken Hauri (@brandwaffle)](https://github.com/brandwaffle) and [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul).

## Contributors

Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.

[Thorsten Ott (@tott)](https://github.com/tott), [Ritesh Patel (@Ritesh-patel)](https://github.com/Ritesh-patel), [Vasken Hauri (@brandwaffle)](https://github.com/brandwaffle), [John Eckman (@jeckman)](https://github.com/jeckman), [Nícholas André (@nicholasio)](https://github.com/nicholasio), [Nathaniel Taintor (@goldenapples)](https://github.com/goldenapples), [Allan Collins (@allan23)](https://github.com/allan23), [Tyrel Kelsey (@ninnypants)](https://github.com/ninnypants), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Nicolas Juen (@Rahe)](https://github.com/Rahe), [Amaury Balmer (@herewithme)](https://github.com/herewithme), [Oscar Sanchez S. (@oscarssanchez)](https://github.com/oscarssanchez), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Matias Saggiorato (@msaggiorato)](https://github.com/msaggiorato), [Stephanie Campbell (@sncampbell)](https://github.com/sncampbell).

## Libraries

The following software libraries are utilized in this repository.

n/a.
Loading

0 comments on commit f0aedd1

Please sign in to comment.