Skip to content

Commit

Permalink
Merge branch 'master' into safesnap_connext_integration
Browse files Browse the repository at this point in the history
  • Loading branch information
juliopavila authored Nov 14, 2023
2 parents a4436a3 + b66e9ff commit eb70b97
Show file tree
Hide file tree
Showing 146 changed files with 2,369 additions and 11,585 deletions.
3 changes: 2 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ VITE_IPFS_GATEWAY=snapshot.mypinata.cloud
VITE_DEFAULT_NETWORK=5
VITE_PUSHER_BEAMS_INSTANCE_ID=2e080021-d495-456d-b2cf-84f9fd718442
VITE_SHUTTER_EON_PUBKEY=0x0e6493bbb4ee8b19aa9b70367685049ff01dc9382c46aed83f8bc07d2a5ba3e6030bd83b942c1fd3dff5b79bef3b40bf6b666e51e7f0be14ed62daaffad47435265f5c9403b1a801921981f7d8659a9bd91fe92fb1cf9afdb16178a532adfaf51a237103874bb03afafe9cab2118dae1be5f08a0a28bf488c1581e9db4bc23ca
VITE_ENV=develop
VITE_ENV=develop
VITE_MIXPANEL_TOKEN=2ec6cd1b19e790f45cc9a9bb83980c8d
3 changes: 0 additions & 3 deletions .env.test

This file was deleted.

3 changes: 2 additions & 1 deletion .eslintrc-auto-import.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
"useFlaggedMessageStatus": true,
"useEmailSubscription": true,
"useEmailFetchClient": true,
"useStatement": true
"useStatement": true,
"useMixpanel": true
}
}
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module.exports = {
node: true
},
extends: [
'plugin:cypress/recommended',
'plugin:vue/vue3-recommended',
'eslint:recommended',
'@vue/eslint-config-typescript/recommended',
Expand Down
24 changes: 7 additions & 17 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,20 @@
### Issues
*_(Include references to issues that this PR addresses)_*
### Summary

Fixes #
<!-- Related issues, a description or list of the changes and the motivation behind them -->

### Changes
*_(Briefly describe the changes made in this PR)_*

1.
Closes: #

### How to test
*_(Explain how the changes can be tested, including any required setup steps)_*

1.
1.

### To-Do
*_(List any outstanding tasks be addressed before or after this PR is merged)_*

- [ ]

- [ ]

<!--
### Self-review checklist
- [ ] I have performed a full self-review of my changes
- [ ] I have tested my changes on a preview deployment
- [ ] I have tested my changes on different screen sizes (sm, md)
- [ ] I have tested my changes on a custom domain

### Additional notes or considerations
*_(Include any other relevant information or context that may be helpful for the reviewer)_*

-->
21 changes: 15 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: 'weekly'
- package-ecosystem: 'gitsubmodule'
directory: '/'
interval: "daily"
allow:
- dependency-name: "@snapshot-labs/*"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: 'daily'
interval: "weekly"
ignore:
- dependency-name: "@snapshot-labs/*"
groups:
production-dependencies:
dependency-type: "production"
development-dependencies:
dependency-type: "development"
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: "CodeQL"

on:
push:
branches: [ 'develop' ]
branches: [ 'master' ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ 'develop' ]
branches: [ 'master' ]
schedule:
- cron: '36 5 * * 6'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
# Checks-out repo on develop branch
- uses: actions/checkout@v3
with:
ref: 'develop'
ref: 'master'
# Overwrite target
- run: |
git checkout -b ${{ github.event.inputs.target }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Tests
on: [push]
jobs:
test:
runs-on: ubuntu-20.04
Expand All @@ -11,7 +10,6 @@ jobs:
cache: 'yarn'
- run: yarn
- run: yarn test:unit:coverage
- run: yarn test:e2e
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
with:
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/update-snapshot-submodules.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Update Snapshot submodules

on: workflow_dispatch

jobs:
update-dep:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
- uses: actions/setup-node@v1
with:
node-version: '16.x'
- name: Update submodules
run: |
git submodule update --remote
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
title: Update Snapshot submodules
body: |
- Updates from submodules

Auto-generated by Github Actions
branch: update-snapshot-submodules
7 changes: 7 additions & 0 deletions FUNDING.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"drips": {
"ethereum": {
"ownedBy": "0x8C28Cf33d9Fd3D0293f963b1cd27e3FF422B425c"
}
}
}
23 changes: 0 additions & 23 deletions cypress.config.ts

This file was deleted.

37 changes: 0 additions & 37 deletions cypress/e2e/create-proposal.spec.cy.js

This file was deleted.

163 changes: 0 additions & 163 deletions cypress/e2e/voting-proposal.spec.cy.js

This file was deleted.

Loading

0 comments on commit eb70b97

Please sign in to comment.