diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index dd84ea7..9fa08a6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -4,35 +4,32 @@ about: Create a report to help us improve title: '' labels: '' assignees: '' - --- -**Describe the bug** -A clear and concise description of what the bug is. +**Describe the bug** A clear and concise description of what the bug is. + +**To Reproduce** Steps to reproduce the behavior: -**To Reproduce** -Steps to reproduce the behavior: 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' 4. See error -**Expected behavior** -A clear and concise description of what you expected to happen. +**Expected behavior** A clear and concise description of what you expected to happen. -**Screenshots** -If applicable, add screenshots to help explain your problem. +**Screenshots** If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] + +- OS: [e.g. iOS] +- Browser [e.g. chrome, safari] +- Version [e.g. 22] **Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] -**Additional context** -Add any other context about the problem here. +- Device: [e.g. iPhone6] +- OS: [e.g. iOS8.1] +- Browser [e.g. stock browser, safari] +- Version [e.g. 22] + +**Additional context** Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index bbcbbe7..e1cf2ee 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -4,17 +4,12 @@ about: Suggest an idea for this project title: '' labels: '' assignees: '' - --- -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] +**Is your feature request related to a problem? Please describe.** A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -**Describe the solution you'd like** -A clear and concise description of what you want to happen. +**Describe the solution you'd like** A clear and concise description of what you want to happen. -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. +**Describe alternatives you've considered** A clear and concise description of any alternative solutions or features you've considered. -**Additional context** -Add any other context or screenshots about the feature request here. +**Additional context** Add any other context or screenshots about the feature request here. diff --git a/.github/workflows/merge-to-master.yml b/.github/workflows/merge-to-master.yml index ca759f7..a5cace4 100644 --- a/.github/workflows/merge-to-master.yml +++ b/.github/workflows/merge-to-master.yml @@ -1,12 +1,12 @@ ######################################################## -# Action to run on pullrequest merge to master # +# Action to run on pullrequest merge to main # # Staging build and deployment # ######################################################## -name: Action on Pullrequest push to master +name: Action on Pullrequest push to main on: push: branches: - - 'master' + - 'main' jobs: install: diff --git a/contributing.md b/contributing.md index 2d3ed09..c711119 100644 --- a/contributing.md +++ b/contributing.md @@ -15,4 +15,4 @@ In order to keep working on this project as efficient as possible, please follow 1. Assign the task to you. 2. Create a branch for the task you want to work on. Branches should be named by schema you find under naming conventions. 3. Commit changes to this branch -4. Once you finished your task, create a merge request to `master`. A merge request needs at least one approval by another team member. +4. Once you finished your task, create a merge request to `main`. A merge request needs at least one approval by another team member. diff --git a/readme.md b/readme.md index 9c6bf5f..61655cb 100644 --- a/readme.md +++ b/readme.md @@ -156,7 +156,7 @@ The following variables should be added to your cloned version of Lara. - run `serverless deploy —stage [stage]` - For remote deployment: - set all GitHub Actions environment variables - - for a staging deployment create a push on master + - for a staging deployment create a push on main - for a production deployment create a tag #### Set the correct url's