Skip to content

Commit

Permalink
Merge branch 'telemetry' of https://github.com/markphelps/flipt into …
Browse files Browse the repository at this point in the history
…telemetry

* 'telemetry' of https://github.com/markphelps/flipt:
  Bump @playwright/test from 1.19.2 to 1.20.2 in /ui (#783)
  Bump playwright from 1.20.1 to 1.20.2 in /ui (#784)
  Bump @babel/plugin-transform-modules-commonjs in /ui (#781)
  Bump chalk from 5.0.0 to 5.0.1 in /ui (#782)
  Bump bufbuild/buf-setup-action from 1.3.0 to 1.3.1 (#780)
  Bump prettier from 2.5.1 to 2.6.2 in /ui (#785)
  Update README.md
  Bump alpine from 3.15.3 to 3.15.4 in /build (#787)
  Discord (#786)
  Update CODE_OF_CONDUCT.md
  • Loading branch information
markphelps authored Apr 6, 2022
2 parents ee9aa1e + a0fa9d6 commit 41aff80
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 157 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/buf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: bufbuild/buf-setup-action@v1.3.0
- uses: bufbuild/buf-setup-action@v1.3.1
with:
version: "latest"

Expand Down
5 changes: 5 additions & 0 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,8 @@ dockers:
extra_files:
- config/migrations/
- config/default.yml

announce:
discord:
enabled: true

2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at mark.aaron.phelps@gmail.com. All
reported by contacting the project team at hi@markphelps.me. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<a href="https://github.com/avelino/awesome-go">
<img src="https://awesome.re/mentioned-badge.svg" alt="Mentioned in Awesome Go" />
</a>
<a href="https://twitter.com/mark_a_phelps">
<img src="https://img.shields.io/twitter/url?label=Follow%20Me&url=https%3A%2F%2Ftwitter.com%2Fmark_a_phelps" />
<a href="https://discord.gg/fjPVc5JuyE">
<img alt="Discord" src="https://img.shields.io/discord/960634591000014878?color=%238440f1&label=Discord&logo=discord&logoColor=%238440f1&style=flat">
</a>
</div>

Expand All @@ -43,8 +43,8 @@
<a href="https://flipt.io/docs/getting_started/">Documentation</a> |
<a href="#features">Features</a> |
<a href="#values">Values</a> |
<a href="#examples">Examples</a> |
<a href="#enterprise">Enterprise</a>
<a href="#integration">Integration</a> |
<a href="#community">Community</a>
</h4>
</div>

Expand Down Expand Up @@ -173,6 +173,10 @@ Need more features or support using Flipt within your Enterprise?

Please help me prioritize an Enterprise version of Flipt by filling out this [short survey](https://forms.gle/a4UBnv8LADYirA4c9)!

## Community

For help and discussion around Flipt, feature flag best practices, and more, join us on [Discord](https://discord.gg/fjPVc5JuyE).

## Author

| [![twitter/mark_a_phelps](https://secure.gravatar.com/avatar/274e2d4b1bbb9f86b454aebabad2cba1)](https://twitter.com/intent/user?screen_name=mark_a_phelps "Follow @mark_a_phelps on Twitter") |
Expand Down
3 changes: 2 additions & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

ARG BINARY=flipt

FROM alpine:3.15.3
FROM alpine:3.15.4

LABEL maintainer="mark@markphelps.me"
LABEL org.opencontainers.image.name="flipt"
LABEL org.opencontainers.image.source="https://github.com/markphelps/flipt"
Expand Down
10 changes: 5 additions & 5 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"jpeg-js": "0.4.3",
"lodash": "^4.17.21",
"node-sass": "^6.0.0",
"playwright": "^1.20.1",
"playwright": "^1.20.2",
"sass-loader": "^10.1.1",
"uuid": "^8.2.0",
"vue": "^2.6.14",
Expand All @@ -41,19 +41,19 @@
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-syntax-import-meta": "^7.0.0",
"@babel/plugin-syntax-jsx": "^7.14.5",
"@babel/plugin-transform-modules-commonjs": "^7.16.8",
"@babel/plugin-transform-modules-commonjs": "^7.17.7",
"@babel/plugin-transform-runtime": "^7.17.0",
"@babel/preset-env": "^7.16.11",
"@babel/runtime-corejs2": "^7.17.8",
"@playwright/test": "^1.19.2",
"@playwright/test": "^1.20.2",
"@webpack-cli/serve": "^1.6.0",
"autoprefixer": "^9.6.1",
"babel-eslint": "^10.0.1",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-jest": "^27.5.1",
"babel-loader": "^8.2.4",
"babel-plugin-transform-vue-jsx": "^4.0.1",
"chalk": "^5.0.0",
"chalk": "^5.0.1",
"copy-webpack-plugin": "^6.4.1",
"css-loader": "^5.1.4",
"eslint": "^7.32.0",
Expand Down Expand Up @@ -86,7 +86,7 @@
"postcss-import": "^12.0.1",
"postcss-loader": "^3.0.0",
"postcss-url": "^9.0.0",
"prettier": "^2.5.1",
"prettier": "^2.6.2",
"rimraf": "^3.0.0",
"semver": "^7.3.5",
"shelljs": "^0.8.5",
Expand Down
Loading

0 comments on commit 41aff80

Please sign in to comment.