Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ switch_case_indent = true

[*.{yaml,yml}]
indent_size = 2

[*.md]
indent_size = 2
max_line_length = 80
15 changes: 14 additions & 1 deletion .github/workflows/dockerfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,21 @@ jobs:

- name: Run helm-docs
uses: losisin/helm-docs-github-action@v1

- name: Run prettier over the re-generated docs
uses: creyD/prettier_action@v4.6
with:
fail-on-diff: true
prettier_options: --write kubernetes/chart/zulip/README.md
no_commit: True

- name: Check for any diff
run: |
if ! git diff --exit-code; then
echo "Changes found!"
git status
git diff
exit 1
fi

helm-test:
runs-on: ubuntu-latest
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/prettier.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Lint markdown files prettier

on:
pull_request:
branches:
- main

jobs:
prettier:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v5
- uses: creyD/prettier_action@v4.6
with:
dry: true
prettier_options: "--write **/*.md"
- name: Check for any diff
run: |
if ! git diff --exit-code; then
echo "Changes found!"
git status
git diff
exit 1
fi
20 changes: 10 additions & 10 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo

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
- 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
- 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

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,15 @@ proxies][other-proxy].
[other-proxy]: https://zulip.readthedocs.io/en/latest/production/reverse-proxies.html#other-proxies

**Outgoing proxy**: Zulip uses [Smokescreen][smokescreen] to proxy all
outgoing HTTP connections and prevent SSRF attacks. If you have
outgoing HTTP connections and prevent SSRF attacks. If you have
private IPs (e.g., outgoing webhook hosts on private IPs), you can set
`PROXY_ALLOW_ADDRESSES` or `PROXY_ALLOW_RANGES` to comma-separated
lists of IP addresses or CIDR ranges.

[smokescreen]: https://zulip.readthedocs.io/en/latest/production/deployment.html#customizing-the-outgoing-http-proxy

**Incoming email**: The Docker image exposes port 25, which is already
configured with Zulip's incoming email server. To use it, publish
configured with Zulip's incoming email server. To use it, publish
port 25 of the Docker container, set `SETTING_EMAIL_GATEWAY_PATTERN`,
and add an MX record to your DNS configuration pointing to the Docker
container's public hostname (or wherever you chose to publicly expose
Expand Down
2 changes: 1 addition & 1 deletion custom_zulip_files/README.custom_zulip_files.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The custom_zulip_files mechanism allows you to test edits to Zulip
before making changes in the upstream repo. It works by copying the
before making changes in the upstream repo. It works by copying the
contents of this directory on top of the main zulip/zulip checkout as
part of the Docker build process.

Expand Down
1 change: 0 additions & 1 deletion kubernetes/chart/zulip/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@
## [0.3.0] - 2022-04-21

- Update dependencies:

- Helm charts:

| Repository | Name | Version |
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/chart/zulip/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
## incremented each time you make changes to the chart and its
## templates, including the app version. Versions are expected to
## follow Semantic Versioning (https://semver.org/)
version: 0.11.41
version: 0.11.42

## This is the version number of the application being deployed. This
## version number should be incremented each time you make changes to
Expand Down
Loading