[tests-only] merge master into edge #2417
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wkloucek
requested review from
glpatcern,
ishank011,
labkode and
a team
as code owners
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 <[email protected]> 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 <[email protected]> Date: Wed Jan 5 10:11:13 2022 +0100 update tus/tusd to version 1.8.0 (#2393) commit b804b9b Author: Willy Kloucek <[email protected]> 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)
butonic
approved these changes
Jan 6, 2022
| @@ -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"` | |||
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.