Skip to content

Commit

Permalink
Merge branch 'development' into flag--ext
Browse files Browse the repository at this point in the history
  • Loading branch information
wallet77 authored Aug 17, 2018
2 parents 8e491bf + bbcc85a commit 79ab924
Show file tree
Hide file tree
Showing 99 changed files with 2,157 additions and 3,192 deletions.
8 changes: 4 additions & 4 deletions .changelogrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"app_name": "",
"logo": "",
"intro": "",
"branch" : "master",
"branch" : "development",
"repo_url": "https://github.com/Unitech/pm2",
"version_name" : "2.10.4",
"tag": "2.10.3",
"version_name" : "3.0.1",
"tag": "3.0.0",
"file": "currentTagChangelog.md",
"template": "changelogTemplate.md",
"sections": [
Expand All @@ -19,7 +19,7 @@
},
{
"title": "Features",
"grep": "^feat"
"grep": "^feature"
},
{
"title": "Documentation",
Expand Down
4 changes: 2 additions & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ pipeline:
- ./packager/publish_deb_rpm.sh
secrets: ['packagecloud_token']
when:
event: tag
event: tag
build_apk:
group: build
image: keymetrics/alpine-pm2-builder:latest
environment:
- AWS_REPO_BUCKET=alpine-apk.pm2.io
secrets: ['apk_rsa_priv_key', 'apk_rsa_pub_key', 'aws_access_key_id', 'aws_secret_access_key']
when:
event: tag
event: tag
22 changes: 3 additions & 19 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,6 @@ insert_final_newline = true
indent_style = space
indent_size = 2

# JavaScript
[*.js]
indent_style = space
indent_size = 2

# YAML
[*.yml]
indent_style = space
indent_size = 3

# JSON
[*.json]
indent_style = space
indent_size = 2

# SHELL
[*.sh]
indent_style = space
indent_size = 2
# Makefile
[Makefile]
indent_style = tab
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ We 'd like to keep our master branch as clean as possible, please avoid PRs on m

## Fire an issue

When you got an issue by using pm2, you will fire an issue on [github](https://github.com/Unitech/pm2). We'll be glad to help or to fix it but the more data you give the most fast it would be resolved.
When you got an issue by using pm2, you will fire an issue on [github](https://github.com/Unitech/pm2). We'll be glad to help or to fix it but the more data you give the most fast it would be resolved.
Please try following these rules it will make the task easier for you and for us:

#### 1. Search through issues if it hasn't been resolved yet
#### 2. Make sure that you provide following informations:
#### 2. Make sure that you provide following informations:
- pm2 version `pm2 --version`
- nodejs version `node --version`
- operating system
Expand All @@ -27,7 +27,7 @@ Please try following these rules it will make the task easier for you and for us
- How may I reproduce this? (this isn't easy in some cases)
- Are you using a cluster module? Are you trying to catch SIGTERM signals? With `code` if possible.

#### 4. Think global
#### 4. Think global
If your issue is too specific we might not be able to help and stackoverflow might be a better place to seak for an answer

#### 5. Be clear and format issues with [markdown](http://daringfireball.net/projects/markdown/)
Expand All @@ -37,4 +37,4 @@ Note that we might understand english, german and french but english is prefered

```DEBUG=pm2:* PM2_DEBUG=true ./bin/pm2 --no-daemon start my-buggy-thing.js```

If your issue is flagged as `need data` be sure that there won't be any upgrade unless we can have enough data to reproduce.
If your issue is flagged as `need data` be sure that there won't be any upgrade unless we can have enough data to reproduce.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ package-lock.json
currentTagChangelog.md
joblog-X
test/fixtures/path-check*.txt
yarn.lock
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
test
apps
doc
pres
/pres
*.log
*.pid
examples
Expand Down
465 changes: 464 additions & 1 deletion CHANGELOG.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ npm install git-changelog -g

### usage

Edit .changelogrc
Change "version_name" to the next version to release (example 1.1.2).
Edit .changelogrc
Change "version_name" to the next version to release (example 1.1.2).
Change "tag" to the latest existing tag (example 1.1.1).

Run the following command into pm2 directory
Expand Down
Loading

0 comments on commit 79ab924

Please sign in to comment.