Skip to content

Commit

Permalink
Merge branch 'developer' into 'master'
Browse files Browse the repository at this point in the history
Release 0.2.7

Closes #197 and #198

See merge request polemarch/ce!122
  • Loading branch information
onegreyonewhite committed Jan 23, 2019
2 parents e73a65d + b240113 commit baccab2
Show file tree
Hide file tree
Showing 28 changed files with 841 additions and 1,673 deletions.
26 changes: 26 additions & 0 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#BUG|ASK|Feature request|choose one and replace other

Replace all comments to answers.
Before adding a new issue check the tracker for similar issues.

#### What's the core of the bug?
what's the core of the bug, question or feature request in......

#### Exception output
...if exists in any logs. Try to reproduce it with log level `DEBUG`.

#### How to reproduce?
How bug we could reproduce? (if it BUG of course)

#### Current Polemarch version
`polemarchctl webserver --version`

#### Database type
Default, Mysql, etc...

#### RPC type
Default, RabbitMQ, Redis, etc...

#### Additional info
Other info that could help.
This could be your settings.ini or output of `pip freeze`.
6 changes: 6 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Fixes vstconsulting/polemarch#issue_number .

Changes:
* WhatWasChangedInFunctionality

@vstconsulting/maintainers
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ variables:
RESTORE_CACHE_ATTEMPTS: 3
DJANGO_LOG_LEVEL: 'ERROR'
TOX_ARGS: "--workdir /cache/.tox_polemarch_${CI_BUILD_REF_NAME}"
CCACHE_DIR: /cache/.ccache
CC: ccache gcc

stages:
- code_standarts
Expand Down
15 changes: 8 additions & 7 deletions .gitlab/issue_templates/Bug.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
#BUG
#BUG|ASK|Feature request|choose one and replace other

Replace all comments to answers.
Before adding a new issue check the tracker for similar issues.

#### What's the core of the bug?
what's the core of the bug in......
what's the core of the bug, question or feature request in......

#### Exception output
...if exists.
...if exists in any logs. Try to reproduce it with log level `DEBUG`.

#### How to reproduce?
How bug we could reproduce?
How bug we could reproduce? (if it BUG of course)

#### Polemarch version
`sudo -u polemarch /opt/polemarch/bin/polemarchctl webserver --version`
#### Current Polemarch version
`polemarchctl webserver --version`

#### Database type
Default, Mysql, etc...

#### RPC type
Default, RabbitMQ, etc...
Default, RabbitMQ, Redis, etc...

#### Additional info
Other info that could help.
This could be your settings.ini or output of `pip freeze`.
6 changes: 5 additions & 1 deletion .gitlab/merge_request_templates/Bugfix.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ behalf of my organization** CLA at
http://polemarch.readthedocs.io/en/stable/cla.html

Signature: ___

Organization (if none, type "NA"): ___

Email Address: ___

City: ___
Country: ___

Country: ___
6 changes: 5 additions & 1 deletion .gitlab/merge_request_templates/Documentation update.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ behalf of my organization** CLA at
http://polemarch.readthedocs.io/en/stable/cla.html

Signature: ___

Organization (if none, type "NA"): ___

Email Address: ___

City: ___
Country: ___

Country: ___
6 changes: 5 additions & 1 deletion .gitlab/merge_request_templates/New feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ behalf of my organization** CLA at
http://polemarch.readthedocs.io/en/stable/cla.html

Signature: ___

Organization (if none, type "NA"): ___

Email Address: ___

City: ___
Country: ___

Country: ___
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
See docs

https://polemarch.readthedocs.io/en/stable/contribute.html
2 changes: 1 addition & 1 deletion doc/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ This is an example of api schema, but you can find actual schema on Polemarch ho
``/api/v2/openapi/``.


.. openapi:: ./api_schema.yaml
.. vst_openapi:: ./api_schema.yaml
Loading

0 comments on commit baccab2

Please sign in to comment.