diff --git a/apps/web/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/web.yml similarity index 98% rename from apps/web/.github/ISSUE_TEMPLATE/bug.yml rename to .github/ISSUE_TEMPLATE/web.yml index 143797b983..ef995e662c 100644 --- a/apps/web/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/web.yml @@ -1,6 +1,6 @@ -name: Bug Report +name: Web Bug Report description: File a bug report -labels: [bug] +labels: [bug, web] body: - type: markdown attributes: diff --git a/README.md b/README.md index b11df364e2..21ea0566b6 100644 --- a/README.md +++ b/README.md @@ -90,3 +90,24 @@ git merge clients/master # Push to clients or your own fork ``` + +### Web + +``` +# Merge master +git merge master + +# Merge branch mono-repo-prep +git merge 02fe7159034b04d763a61fcf0200869e3209fa33 + +# Verify files are placed in apps/web + +# Add remote +git remote add clients git@github.com:bitwarden/clients.git + +# Merge against clients master +git fetch clients +git merge clients/master + +# Push to clients or your own fork +``` diff --git a/apps/web/.github/ISSUE_TEMPLATE/config.yml b/apps/web/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 61d7e2b96f..0000000000 --- a/apps/web/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,14 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: Feature Requests - url: https://community.bitwarden.com/c/feature-requests/ - about: Request new features using the Community Forums. Please search existing feature requests before making a new one. - - name: Bitwarden Community Forums - url: https://community.bitwarden.com - about: Please visit the community forums for general community discussion, support and the development roadmap. - - name: Customer Support - url: https://bitwarden.com/contact/ - about: Please contact our customer support for account issues and general customer support. - - name: Security Issues - url: https://hackerone.com/bitwarden - about: We use HackerOne to manage security disclosures. diff --git a/apps/web/.github/PULL_REQUEST_TEMPLATE.md b/apps/web/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 5ea1b6313c..0000000000 --- a/apps/web/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,28 +0,0 @@ -## Type of change - -- [ ] Bug fix -- [ ] New feature development -- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) -- [ ] Build/deploy pipeline (DevOps) -- [ ] Other - -## Objective - - - -## Code changes - - - - -- **file.ext:** Description of what was changed and why - -## Screenshots - - - -## Before you submit - -- [ ] I have checked for **linting** errors (`npm run lint`) (required) -- [ ] This change requires a **documentation update** (notify the documentation team) -- [ ] This change has particular **deployment requirements** (notify the DevOps team)