diff --git a/AUTHORS.md b/AUTHORS.md index 08b7bbf..87a22dc 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: -@myii|[@myii](https://github.com/myii)|80 +@myii|[@myii](https://github.com/myii)|82 @aboe76|[@aboe76](https://github.com/aboe76)|46 @gravyboat|[@gravyboat](https://github.com/gravyboat)|27 @nmadhok|[@nmadhok](https://github.com/nmadhok)|24 @@ -49,6 +49,7 @@ Avatar|Contributor|Contributions @garrettw|[@garrettw](https://github.com/garrettw)|2 @ErisDS|[@ErisDS](https://github.com/ErisDS)|2 @myoung34|[@myoung34](https://github.com/myoung34)|2 +@sticky-note|[@sticky-note](https://github.com/sticky-note)|2 @bebosudo|[@bebosudo](https://github.com/bebosudo)|1 @aanriot|[@aanriot](https://github.com/aanriot)|1 @andrew-vant|[@andrew-vant](https://github.com/andrew-vant)|1 @@ -78,4 +79,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-12-16. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-01-04. diff --git a/CHANGELOG.md b/CHANGELOG.md index 0425bc6..c1a27ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +# [2.5.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.4.1...v2.5.0) (2021-01-04) + + +### Continuous Integration + +* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([0ecd767](https://github.com/saltstack-formulas/nginx-formula/commit/0ecd767e8691ba14b8c3ab7311fa7ae78e71d575)) +* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([5c9f6d4](https://github.com/saltstack-formulas/nginx-formula/commit/5c9f6d4d7144452145d06b95643a34f7fde3d35e)) + + +### Features + +* **context:** pass `nginx` to snippets and server_config contexts ([8641f0d](https://github.com/saltstack-formulas/nginx-formula/commit/8641f0d79a073b870a386ba9b494339c8e53b255)) + ## [2.4.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.4.0...v2.4.1) (2020-12-16) diff --git a/FORMULA b/FORMULA index f97df9b..0dc428b 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: nginx os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 2.4.1 +version: 2.5.0 release: 1 minimum_version: 2017.3 summary: nginx formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 0b4ab50..57a4015 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - Contributions * - :raw-html-m2r:`@myii` - `@myii `_ - - 80 + - 82 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - 46 @@ -148,6 +148,9 @@ This list is sorted by the number of commits per contributor in *descending* ord * - :raw-html-m2r:`@myoung34` - `@myoung34 `_ - 2 + * - :raw-html-m2r:`@sticky-note` + - `@sticky-note `_ + - 2 * - :raw-html-m2r:`@bebosudo` - `@bebosudo `_ - 1 @@ -230,4 +233,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2020-12-16. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2021-01-04. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 7998092..a0e38f1 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,22 @@ Changelog ========= +`2.5.0 `_ (2021-01-04) +------------------------------------------------------------------------------------------------------- + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **commitlint:** ensure ``upstream/master`` uses main repo URL [skip ci] (\ `0ecd767 `_\ ) +* **gitlab-ci:** add ``rubocop`` linter (with ``allow_failure``\ ) [skip ci] (\ `5c9f6d4 `_\ ) + +Features +^^^^^^^^ + + +* **context:** pass ``nginx`` to snippets and server_config contexts (\ `8641f0d `_\ ) + `2.4.1 `_ (2020-12-16) -------------------------------------------------------------------------------------------------------