Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tests-only] merge master into edge #2417

Merged
merged 2 commits into from
Jan 6, 2022
Merged

[tests-only] merge master into edge #2417

merged 2 commits into from
Jan 6, 2022

Conversation

wkloucek
Copy link
Contributor

@wkloucek wkloucek commented Jan 6, 2022

No description provided.

@wkloucek wkloucek changed the base branch from master to edge January 6, 2022 07:19
@wkloucek wkloucek requested review from butonic and removed request for labkode, glpatcern and ishank011 January 6, 2022 07:19
@wkloucek wkloucek changed the title Merge master into edge [tests-only] merge master into edge Jan 6, 2022
commit fa1d1fc
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Jan 5 10:59:55 2022 +0100

    [Build-deps]: Bump github.com/rs/zerolog from 1.26.0 to 1.26.1 (#2388)

commit 0f9142a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Jan 5 10:59:29 2022 +0100

    [Build-deps]: Bump github.com/aws/aws-sdk-go from 1.42.19 to 1.42.27 (#2414)

commit f953398
Author: Ishank Arora <ishank011@gmail.com>
Date:   Wed Jan 5 10:11:44 2022 +0100

    Fixes for apps in public shares, project spaces for EOS driver (#2371)

commit 2f21d4d
Author: Willy Kloucek <34452982+wkloucek@users.noreply.github.com>
Date:   Wed Jan 5 10:11:13 2022 +0100

    update tus/tusd to version 1.8.0 (#2393)

commit b804b9b
Author: Willy Kloucek <34452982+wkloucek@users.noreply.github.com>
Date:   Wed Jan 5 10:07:47 2022 +0100

    [tests-only] format .drone.star (#2411)

commit 0e9cb7d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Jan 5 10:02:57 2022 +0100

    [Build-deps]: Bump go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc (#2359)

commit 0fd4b06
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Jan 5 10:02:38 2022 +0100

    [Build-deps]: Bump github.com/ReneKroon/ttlcache/v2 (#2387)

commit cd9aa62
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Jan 5 10:02:11 2022 +0100

    [Build-deps]: Bump github.com/rs/cors from 1.8.0 to 1.8.2 (#2399)

commit 66369ba
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Jan 5 10:01:49 2022 +0100

    [Build-deps]: Bump github.com/minio/minio-go/v7 from 7.0.18 to 7.0.20 (#2408)

commit f2f4d9d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Jan 5 10:01:32 2022 +0100

    [Build-deps]: Bump github.com/mattn/go-sqlite3 from 1.14.9 to 1.14.10 (#2409)
@@ -97,7 +97,7 @@ func (m *mgr) SetFavorite(ctx context.Context, userID *user.UserId, resourceInfo
// The primary key is just the ID in the table, it should ideally be (uid, fileid_prefix, fileid, tag_key)
// For the time being, just check if the favorite already exists. If it does, return early
var id int
query := `"SELECT id FROM cbox_metadata WHERE uid=? AND fileid_prefix=? AND fileid=? AND tag_key="fav"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ohhh, nice find

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants