Skip to content

Commit

Permalink
Merge branch 'main' into development-main
Browse files Browse the repository at this point in the history
  • Loading branch information
John-Moore-UOA authored Apr 2, 2024
2 parents 2933548 + 4adf05a commit 2ada56b
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 3 deletions.
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Feature template
about: For issues relating to new features
title: ''
labels: ''
assignees: ''

---

### User story:

As a **<user>**,
I want to **<unit of work>**,
So that **<context>**.

### Description:

### Acceptance Criteria:
- [ ] Sub task 1
- [ ] Sub task 2
- [ ] Testing task

### Definition of Done:
- [ ] AC met
- [ ] Applicable tests written
- [ ] Applicable documentation is written in GH wiki
- [ ] PR reviewed
- [ ] Merged into main/feature branch

### Notes / Links
6 changes: 3 additions & 3 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ FERN

1. install node v21.6.2 (or >= v14.17.3)
2. install yarn
3. in ./api run yarn build, then yarn dev (local host backend)
4. in ./web run yarn build, then yarn dev (local host frontend)
3. in ./api run yarn, then yarn build, then yarn dev (local host backend)
4. in ./web run yarn, then yarn build, then yarn dev (local host frontend)

## Branch convensions
1. One Branch per Task
2. Name branch VLT-<task_number>/what-is-being-done, e.g. VLT-001/add-user-authentication
2. Name branch VOL-<task_number>/what-is-being-done, e.g. VLT-001/add-user-authentication
3. Pull Requests will be into 'development-main' branch as 'main' is deployed

## Setup Runbook
Expand Down

0 comments on commit 2ada56b

Please sign in to comment.