Skip to content

Commit

Permalink
Merge branch 'main' into list-pagination
Browse files Browse the repository at this point in the history
* main:
  Update Changelog
  Bump sass from 1.54.9 to 1.55.0 in /ui (#1040)
  Bump @playwright/test from 1.25.2 to 1.26.0 in /ui (#1039)
  Bump eslint from 8.23.0 to 8.23.1 in /ui (#1037)
  Bump eslint-plugin-vue from 9.4.0 to 9.5.1 in /ui (#1034)
  Bump @babel/preset-env from 7.19.0 to 7.19.1 in /ui (#1033)
  Bump @babel/core from 7.19.0 to 7.19.1 in /ui (#1032)
  Fix clone icons (#1038)
  Bump buefy from 0.9.21 to 0.9.22 in /ui (#1022)
  Mv config internal (#1036)
  Filtered GitHub webhooks (#1018)
  • Loading branch information
markphelps committed Sep 22, 2022
2 parents 8dcbab6 + 61eeba7 commit 76d58d9
Show file tree
Hide file tree
Showing 30 changed files with 269 additions and 268 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.github/
.vscode/
.task/
Dockerfile
Dockerfile*
LICENSE
bin/
examples/
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/filtered_github_webhooks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Filters GitHub webhooks to avoid noise in the Discord server.
name: Execute Filtered GitHub Webhook

on:
pull_request:
types:
- opened
- closed
- reopened

jobs:
notify_discord:
name: Notify Discord
if: ${{ !contains(github.event.pull_request.user.login, 'dependabot') }}
runs-on: ubuntu-latest
steps:
- name: Discord Webhook Action
uses: tsickert/[email protected]
with:
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
username: GitHub
avatar-url: "https://cdn.discordapp.com/avatars/999680196040982618/df91181b3f1cf0ef1592fbe18e0962d7.webp"
embed-author-name: ${{ github.event.pull_request.user.login }}
embed-author-url: ${{ github.event.pull_request.user.html_url }}
embed-author-icon-url: ${{ github.event.pull_request.user.avatar_url }}
embed-title: '[${{ github.event.repository.full_name }}] Pull request ${{ github.event.action }}: #${{ github.event.number }} ${{ github.event.pull_request.title }}'
embed-description: ${{ github.event.pull_request.body }}
embed-url: ${{ github.event.pull_request.html_url }}
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
## [v1.12.0](https://github.com/markphelps/flipt/releases/tag/v1.12.0) - 2022-09-22

### Added

Expand All @@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Configuration 'enums' are encoding correctly as JSON [#1030](https://github.com/flipt-io/flipt/pull/1030)
- Dependency updates

### Fixed

- Rendering of clone icon for variants/constraints [#1038](https://github.com/flipt-io/flipt/pull/1038)

## [v1.11.0](https://github.com/markphelps/flipt/releases/tag/v1.11.0) - 2022-09-12

### Added
Expand Down
2 changes: 1 addition & 1 deletion cmd/flipt/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/phyber/negroni-gzip/gzip"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
"go.flipt.io/flipt/internal/info"
"go.flipt.io/flipt/internal/telemetry"
pb "go.flipt.io/flipt/rpc/flipt"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/telemetry/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/gofrs/uuid"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
"go.flipt.io/flipt/internal/info"
"go.uber.org/zap"
"gopkg.in/segmentio/analytics-go.v3"
Expand Down
2 changes: 1 addition & 1 deletion internal/telemetry/telemetry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
"go.flipt.io/flipt/internal/info"
"go.uber.org/zap/zaptest"

Expand Down
2 changes: 1 addition & 1 deletion server/cache/memory/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync/atomic"

gocache "github.com/patrickmn/go-cache"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
"go.flipt.io/flipt/server/cache"
)

Expand Down
2 changes: 1 addition & 1 deletion server/cache/memory/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
)

func TestNewCache(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/cache/redis/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync/atomic"

redis "github.com/go-redis/cache/v8"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
"go.flipt.io/flipt/server/cache"
)

Expand Down
2 changes: 1 addition & 1 deletion server/cache/redis/cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/wait"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
)

func TestSet(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/middleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

"go.flipt.io/flipt/config"
"go.flipt.io/flipt/errors"
"go.flipt.io/flipt/internal/config"
flipt "go.flipt.io/flipt/rpc/flipt"
"go.flipt.io/flipt/server/cache/memory"
"go.flipt.io/flipt/storage"
Expand Down
2 changes: 1 addition & 1 deletion storage/sql/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/luna-duclos/instrumentedsql/opentracing"
"github.com/mattn/go-sqlite3"
"github.com/xo/dburl"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
)

// Open opens a connection to the db
Expand Down
2 changes: 1 addition & 1 deletion storage/sql/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/golang-migrate/migrate/database/sqlite3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
"go.flipt.io/flipt/storage"
"go.flipt.io/flipt/storage/sql/mysql"
"go.flipt.io/flipt/storage/sql/postgres"
Expand Down
2 changes: 1 addition & 1 deletion storage/sql/migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/golang-migrate/migrate/database/mysql"
"github.com/golang-migrate/migrate/database/postgres"
"github.com/golang-migrate/migrate/database/sqlite3"
"go.flipt.io/flipt/config"
"go.flipt.io/flipt/internal/config"
"go.uber.org/zap"
)

Expand Down
Loading

0 comments on commit 76d58d9

Please sign in to comment.