Skip to content
Permalink
Browse files

Switch to `develop` branch for dev and deprecate `trunk` branch. Closes

  • Loading branch information...
jtsternberg committed Dec 5, 2018
1 parent 3779aed commit 1ecd45ead7a3fdcd7080db0001cdacf26c0e3b31
Showing with 15 additions and 15 deletions.
  1. +2 −2 .github/ISSUE_TEMPLATE.md
  2. +1 −1 .travis.yml
  3. +3 −3 CONTRIBUTING.md
  4. +2 −2 README.md
  5. +7 −7 init.php
@@ -2,7 +2,7 @@
Before posting a new issue:
- Please post general support and questions at https://www.wordpress.org/support/plugin/cmb2/. We will move to GitHub once a confirmed bug.
- Please check if your issue is addressed in the CMB2 Wiki Troubleshooting page: https://github.com/CMB2/CMB2/wiki/Troubleshooting
- Please review the contributing guidelines: https://github.com/CMB2/CMB2/blob/trunk/CONTRIBUTING.md.
- Please review the contributing guidelines: https://github.com/CMB2/CMB2/blob/develop/CONTRIBUTING.md.
-->
### Expected Behavior:

@@ -12,7 +12,7 @@ Before posting a new issue:



### Steps to reproduce (I have confirmed I can reproduce this issue on the trunk branch):
### Steps to reproduce (I have confirmed I can reproduce this issue on the [`develop`](https://github.com/CMB2/CMB2/tree/develop) branch):

1.
2.
@@ -55,7 +55,7 @@ after_script: ./tests/bin/after-run-wp-unit-tests.sh
branches:
only:
- master
- trunk
- develop

notifications:
slack:
@@ -9,7 +9,7 @@ Before reporting a bug
---
1. Please review the [documentation](https://github.com/CMB2/CMB2/wiki). Most questions revolve around the [field types](https://github.com/CMB2/CMB2/wiki/Field-Types), [field parameters](https://github.com/CMB2/CMB2/wiki/Field-Parameters), or are addressed in the [troubleshooting](https://github.com/CMB2/CMB2/wiki/Troubleshooting) section.
2. Search [issues](https://github.com/CMB2/CMB2/issues) to see if the issue has been previously reported.
3. Install the trunk version of CMB2 and test there.
3. Install the [`develop`](https://github.com/CMB2/CMB2/tree/develop) version of CMB2 and test there.


How to report a bug
@@ -26,8 +26,8 @@ All contributions welcome. If you would like to submit a pull request, please fo

1. Make sure you have a GitHub account.
2. Fork the repository on GitHub.
3. **Check out the trunk version of CMB2.** If you submit to the master branch, the PR will be closed with a link back to this document.
4. **Verify your issue still exists in the trunk branch.**
3. **Check out the [`develop`](https://github.com/CMB2/CMB2/tree/develop) version of CMB2.** If you submit to the master branch, the PR will be closed with a link back to this document.
4. **Verify your issue still exists in the [`develop`](https://github.com/CMB2/CMB2/tree/develop) branch.**
5. Make changes to your clone of the repository.
1. Please follow the [WordPress code standards](https://make.wordpress.org/core/handbook/coding-standards).
2. If possible, and if applicable, please also add/update unit tests for your changes.
@@ -2,8 +2,8 @@

[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CMB2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Travis](https://img.shields.io/travis/CMB2/CMB2.svg)](https://travis-ci.org/CMB2/CMB2/)
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/CMB2/CMB2.svg)](https://scrutinizer-ci.com/g/CMB2/CMB2/?branch=trunk)
[![Scrutinizer Coverage](https://img.shields.io/scrutinizer/coverage/g/CMB2/CMB2.svg)](https://scrutinizer-ci.com/g/CMB2/CMB2/?branch=trunk)
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/CMB2/CMB2.svg)](https://scrutinizer-ci.com/g/CMB2/CMB2/?branch=develop)
[![Scrutinizer Coverage](https://img.shields.io/scrutinizer/coverage/g/CMB2/CMB2.svg)](https://scrutinizer-ci.com/g/CMB2/CMB2/?branch=develop)
[![Project Stats](https://www.openhub.net/p/CMB2/widgets/project_thin_badge.gif)](https://www.openhub.net/p/CMB2)

![CMB2](https://plugins.trac.wordpress.org/export/HEAD/cmb2/assets/banner-1544x500.png)
@@ -53,7 +53,7 @@
* ***********************************************************************
*/
if ( ! class_exists( 'CMB2_Bootstrap_242_Trunk', false ) ) {
if ( ! class_exists( 'CMB2_Bootstrap_242_Develop', false ) ) {
/**
* Handles checking for and loading the newest version of CMB2
@@ -66,7 +66,7 @@
* @license GPL-2.0+
* @link https://cmb2.io
*/
class CMB2_Bootstrap_242_Trunk {
class CMB2_Bootstrap_242_Develop {
/**
* Current version number
@@ -86,17 +86,17 @@ class CMB2_Bootstrap_242_Trunk {
const PRIORITY = 9966;
/**
* Single instance of the CMB2_Bootstrap_242_Trunk object
* Single instance of the CMB2_Bootstrap_242_Develop object
*
* @var CMB2_Bootstrap_242_Trunk
* @var CMB2_Bootstrap_242_Develop
*/
public static $single_instance = null;
/**
* Creates/returns the single instance CMB2_Bootstrap_242_Trunk object
* Creates/returns the single instance CMB2_Bootstrap_242_Develop object
*
* @since 2.0.0
* @return CMB2_Bootstrap_242_Trunk Single instance object
* @return CMB2_Bootstrap_242_Develop Single instance object
*/
public static function initiate() {
if ( null === self::$single_instance ) {
@@ -188,6 +188,6 @@ public function l10ni18n() {
}
// Make it so...
CMB2_Bootstrap_242_Trunk::initiate();
CMB2_Bootstrap_242_Develop::initiate();
}// End if().

0 comments on commit 1ecd45e

Please sign in to comment.
You can’t perform that action at this time.