Skip to content

Commit

Permalink
Merge branch 'master' of github.com:n8n-io/n8n into mstodo-due-date
Browse files Browse the repository at this point in the history
  • Loading branch information
Joffcom committed Apr 25, 2024
2 parents 9eab7a5 + 2dd0b32 commit 2652670
Show file tree
Hide file tree
Showing 4,091 changed files with 271,189 additions and 85,199 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 5 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@ packages/node-dev
packages/**/node_modules
packages/**/dist
packages/**/.turbo
packages/**/*.test.*
.git
.github
*.tsbuildinfo
packages/cli/dist/**/e2e.*
packages/cli/dist/ReloadNodesAndCredentials.*
docker/compose
docker/**/Dockerfile
.vscode
cypress
13 changes: 13 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Commits of large-scale changes to exclude from `git blame` results

# Set up linting and formatting (#2120)

56c4c6991fb21ba4b7bdcd22c929f63cc1d1defe

# refactor(editor): Apply Prettier (no-changelog) #4920

5ca2148c7ed06c90f999508928b7a51f9ac7a788

# refactor: Run lintfix (no-changelog) (#7537)

62c096710fab2f7e886518abdbded34b55e93f62
82 changes: 82 additions & 0 deletions .github/ISSUE_TEMPLATE/01-bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Bug Report
description: Create a bug report to help us improve
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: textarea
id: description
attributes:
label: Bug Description
description: A clear and concise description of what the bug is
placeholder: Tell us what you see!
validations:
required: true
- type: textarea
id: reproduction
attributes:
label: To Reproduce
description: Steps to reproduce the behavior
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen
validations:
required: true
- type: markdown
attributes:
value: '## Environment'
- type: input
id: os
attributes:
label: Operating System
placeholder: ex. Ubuntu Linux 22.04
validations:
required: true
- type: input
id: n8n-version
attributes:
label: n8n Version
placeholder: ex. 1.25.0
validations:
required: true
- type: input
id: nodejs-version
attributes:
label: Node.js Version
placeholder: ex. 18.16.0
validations:
required: true
- type: dropdown
id: db
attributes:
label: Database
options:
- SQLite (default)
- PostgreSQL
- MySQL
- MariaDB
default: 0
validations:
required: true
- type: dropdown
id: execution-mode
attributes:
label: Execution mode
description: '[Info](https://docs.n8n.io/hosting/scaling/execution-modes-processes/)'
options:
- main (default)
- queue
- own (deprecated)
default: 0
validations:
required: true
32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ contact_links:
- name: Question / Problem
url: https://community.n8n.io
about: Questions and problems with n8n
- name: n8n Security Vulnerability
url: https://n8n.io/legal/#vulnerability
about: Learn about our Vulnerability Disclosure Policy
10 changes: 8 additions & 2 deletions .github/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,21 @@ version: '3.9'

services:
mysql:
image: mysql:5.7-debian
image: mysql:5.7
environment:
- MYSQL_DATABASE=n8n
- MYSQL_ROOT_PASSWORD=password
ports:
- 3306:3306
ulimits:
nproc: 65535
nofile:
soft: 26677
hard: 46677

postgres:
image: postgres:11
image: postgres:16
restart: always
environment:
- POSTGRES_DB=n8n
- POSTGRES_USER=root
Expand Down
17 changes: 16 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
Github issue / Community forum post (link here to close automatically):
## Summary
> Describe what the PR does and how to test. Photos and videos are recommended.


## Related tickets and issues
> Include links to **Linear ticket** or Github issue or Community forum post. Important in order to close *automatically* and provide context to reviewers.


## Review / Merge checklist
- [ ] PR title and summary are descriptive. **Remember, the title automatically goes into the changelog. Use `(no-changelog)` otherwise.** ([conventions](https://github.com/n8n-io/n8n/blob/master/.github/pull_request_title_conventions.md))
- [ ] [Docs updated](https://github.com/n8n-io/n8n-docs) or follow-up ticket created.
- [ ] Tests included.
> A bug is not considered fixed, unless a test is added to prevent it from happening again.
> A feature is not complete without tests.
112 changes: 112 additions & 0 deletions .github/pull_request_title_conventions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
# PR Title Convention

We have very precise rules over how Pull Requests (to the `master` branch) must be formatted. This format basically follows the [Angular Commit Message Convention](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit). It leads to easier to read commit history and allows for automated generation of release notes:

A PR title consists of these elements:

```
<type>(<scope>): <summary>
│ │ │
│ │ └─⫸ Summary: In imperative present tense.
| | Capitalized
| | No period at the end.
│ │
│ └─⫸ Scope: API|core|editor|* Node
└─⫸ Type: build|ci|docs|feat|fix|perf|refactor|test
```

- PR title
- type
- scope (*optional*)
- summary
- PR description
- body (optional)
- blank line
- footer (optional)

The structure looks like this:

### **Type**

Must be one of the following:

- `feat` - A new feature
- `fix` - A bug fix
- `perf` - A code change that improves performance
- `test` - Adding missing tests or correcting existing tests
- `docs` - Documentation only changes
- `refactor` - A code change that neither fixes a bug nor adds a feature
- `build` - Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
- `ci` - Changes to our CI configuration files and scripts (e.g. Github actions)

If the prefix is `feat``fix` or `perf`, it will appear in the changelog. However if there is any BREAKING CHANGE (see Footer section below), the commit will always appear in the changelog.

### **Scope (optional)**

The scope should specify the place of the commit change as long as the commit clearly addresses one of the following supported scopes. (Otherwise, omit the scope!)

- `API` - changes to the *public* API
- `core` - changes to the core / private API / backend of n8n
- `editor` - changes to the Editor UI
- `* Node` - changes to a specific node or trigger node (”`*`” to be replaced with the node name, not its display name), e.g.
- mattermost → Mattermost Node
- microsoftToDo → Microsoft To Do Node
- n8n → n8n Node

### **Summary**

The summary contains succinct description of the change:

- use the imperative, present tense: "change" not "changed" nor "changes"
- capitalize the first letter
- *no* dot (.) at the end
- do *not* include Linear ticket IDs etc. (e.g. N8N-1234)
- suffix with “(no-changelog)” for commits / PRs that should not get mentioned in the changelog.

### **Body (optional)**

Just as in the **summary**, use the imperative, present tense: "change" not "changed" nor "changes". The body should include the motivation for the change and contrast this with previous behavior.

### **Footer (optional)**

The footer can contain information about breaking changes and deprecations and is also the place to [reference GitHub issues](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), Linear tickets, and other PRs that this commit closes or is related to. For example:

```
BREAKING CHANGE: <breaking change summary>
<BLANK LINE>
<breaking change description + migration instructions>
<BLANK LINE>
<BLANK LINE>
Fixes #<issue number>
```

or

```
DEPRECATED: <what is deprecated>
<BLANK LINE>
<deprecation description + recommended update path>
<BLANK LINE>
<BLANK LINE>
Closes #<pr number>
```

A Breaking Change section should start with the phrase "`BREAKING CHANGE:` " followed by a summary of the breaking change, a blank line, and a detailed description of the breaking change that also includes migration instructions.

> 💡 A breaking change can additionally also be marked by adding a “`!`” to the header, right before the “`:`”, e.g. `feat(editor)!: Remove support for dark mode`
>
> This makes locating breaking changes easier when just skimming through commit messages.
> 💡 The breaking changes must also be added to the [packages/cli/BREAKING-CHANGES.md](https://github.com/n8n-io/n8n/blob/master/packages/cli/BREAKING-CHANGES.md) file located in the n8n repository.
Similarly, a Deprecation section should start with "`DEPRECATED:` " followed by a short description of what is deprecated, a blank line, and a detailed description of the deprecation that also mentions the recommended update path.

### **Revert commits**

If the commit reverts a previous commit, it should begin with `revert:` , followed by the header of the reverted commit.

The content of the commit message body should contain:

- information about the SHA of the commit being reverted in the following format: `This reverts commit <SHA>`,
- a clear description of the reason for reverting the commit message.
2 changes: 1 addition & 1 deletion .github/scripts/bump-versions.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ for (const packageName in packageMap) {

packageJson.version = packageMap[packageName].nextVersion =
isDirty ||
Object.keys(packageJson.dependencies).some(
Object.keys(packageJson.dependencies || {}).some(
(dependencyName) => packageMap[dependencyName]?.isDirty,
)
? semver.inc(version, releaseType)
Expand Down
Loading

0 comments on commit 2652670

Please sign in to comment.