Conflict resolution #1300
Merged
Conflict resolution #1300
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
* fix(1205): Resource fetching performance improvement for OVH * Update civo.mdx update to test mintlify workflow * fix: Resource fetching performance improvement for Scaleway (tailwarden#1212) Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * [KOM-38]: Resource fetching performance improvement for CIVO, DigitalOcean, OCI, Linode, K8s, Tencent (tailwarden#1215) * making fetching resources parallelized for all providers Signed-off-by: bishal7679 <bishalhnj127@gmail.com> * updating fetching resources for civo and tencent Signed-off-by: bishal7679 <bishalhnj127@gmail.com> --------- Signed-off-by: bishal7679 <bishalhnj127@gmail.com> Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * fix: no OVH in docs (tailwarden#1218) Signed-off-by: Azanul <azanulhaque@gmail.com> * Update hello-to-new-contributors.yml * [FEAT-1092]: Update color names and box-shadows to match Design-System (tailwarden#1143) * feat: update colors in tailwind config * fix: update color class-names to match new palette * fix: update primary & secondary color class-names to match new palette * fix: update box-shadows to match design system * fix: update tailwind config and class-names * feat: add aws codebuild resource (tailwarden#1216) Co-authored-by: amal richwin <richwin@munat.Dlink> Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * feat: add aws codedeploy resource (tailwarden#1228) * Fix accidental loop capture (tailwarden#1252) * chore: remove dot import Signed-off-by: Azanul <azanulhaque@gmail.com> * fix: capture of the loop variable Signed-off-by: Azanul <azanulhaque@gmail.com> * chore: remove duplicate import Signed-off-by: Azanul <azanulhaque@gmail.com> --------- Signed-off-by: Azanul <azanulhaque@gmail.com> * feat: add aws codecommit resource (tailwarden#1229) * feat: add aws codecommit resource * chore: remove unused code * chore: remove commented code --------- Co-authored-by: amal richwin <richwin@munat.Dlink> * Check for nil VpcId and SubnetId before use (tailwarden#1254) Fixes tailwarden#1250 Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * Migration Nextjs 13 to 14 (tailwarden#1217) * Migration Nextjs 13 to 14 * fix: next export * add output export property --------- Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * Rebase to master (tailwarden#1268) * fix(1205): Resource fetching performance improvement for OVH * Update civo.mdx update to test mintlify workflow * fix: Resource fetching performance improvement for Scaleway (tailwarden#1212) Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * [KOM-38]: Resource fetching performance improvement for CIVO, DigitalOcean, OCI, Linode, K8s, Tencent (tailwarden#1215) * making fetching resources parallelized for all providers Signed-off-by: bishal7679 <bishalhnj127@gmail.com> * updating fetching resources for civo and tencent Signed-off-by: bishal7679 <bishalhnj127@gmail.com> --------- Signed-off-by: bishal7679 <bishalhnj127@gmail.com> Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * fix: no OVH in docs (tailwarden#1218) Signed-off-by: Azanul <azanulhaque@gmail.com> * Update hello-to-new-contributors.yml * [FEAT-1092]: Update color names and box-shadows to match Design-System (tailwarden#1143) * feat: update colors in tailwind config * fix: update color class-names to match new palette * fix: update primary & secondary color class-names to match new palette * fix: update box-shadows to match design system * fix: update tailwind config and class-names * feat: add aws codebuild resource (tailwarden#1216) Co-authored-by: amal richwin <richwin@munat.Dlink> Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * feat: add aws codedeploy resource (tailwarden#1228) * Fix accidental loop capture (tailwarden#1252) * chore: remove dot import Signed-off-by: Azanul <azanulhaque@gmail.com> * fix: capture of the loop variable Signed-off-by: Azanul <azanulhaque@gmail.com> * chore: remove duplicate import Signed-off-by: Azanul <azanulhaque@gmail.com> --------- Signed-off-by: Azanul <azanulhaque@gmail.com> * feat: add aws codecommit resource (tailwarden#1229) * feat: add aws codecommit resource * chore: remove unused code * chore: remove commented code --------- Co-authored-by: amal richwin <richwin@munat.Dlink> * Check for nil VpcId and SubnetId before use (tailwarden#1254) Fixes tailwarden#1250 Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * Migration Nextjs 13 to 14 (tailwarden#1217) * Migration Nextjs 13 to 14 * fix: next export * add output export property --------- Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> --------- Signed-off-by: bishal7679 <bishalhnj127@gmail.com> Signed-off-by: Azanul <azanulhaque@gmail.com> Co-authored-by: LABOUARDY Mohamed <mohamed@labouardy.com> Co-authored-by: tanbirali <tanbirali2004@gmail.com> Co-authored-by: Jake Page <38757612+jakepage91@users.noreply.github.com> Co-authored-by: Tanbir Ali <124070023+tanbirali@users.noreply.github.com> Co-authored-by: Bishal Das <70086051+bishal7679@users.noreply.github.com> Co-authored-by: Avinesh Tripathi <73980067+AvineshTripathi@users.noreply.github.com> Co-authored-by: Umar Abid <75561750+umrkhn@users.noreply.github.com> Co-authored-by: Richwin <39644816+AmalRichwin@users.noreply.github.com> Co-authored-by: amal richwin <richwin@munat.Dlink> Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com> Co-authored-by: Josh VanderLinden <codekoala@users.noreply.github.com> Co-authored-by: Shivam Sharma <meshivam81@gmail.com> * fix: wrong slack guide url (tailwarden#1264) This commit fixes tailwarden#1259 Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> --------- Signed-off-by: bishal7679 <bishalhnj127@gmail.com> Signed-off-by: Azanul <azanulhaque@gmail.com> Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> Co-authored-by: tanbirali <tanbirali2004@gmail.com> Co-authored-by: LABOUARDY Mohamed <mohamed@labouardy.com> Co-authored-by: Jake Page <38757612+jakepage91@users.noreply.github.com> Co-authored-by: Tanbir Ali <124070023+tanbirali@users.noreply.github.com> Co-authored-by: Bishal Das <70086051+bishal7679@users.noreply.github.com> Co-authored-by: Avinesh Tripathi <73980067+AvineshTripathi@users.noreply.github.com> Co-authored-by: Umar Abid <75561750+umrkhn@users.noreply.github.com> Co-authored-by: Richwin <39644816+AmalRichwin@users.noreply.github.com> Co-authored-by: amal richwin <richwin@munat.Dlink> Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com> Co-authored-by: Josh VanderLinden <codekoala@users.noreply.github.com> Co-authored-by: Shivam Sharma <meshivam81@gmail.com> Co-authored-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com>
Signed-off-by: Azanul <azanulhaque@gmail.com>
Signed-off-by: Azanul <azanulhaque@gmail.com>
Signed-off-by: Azanul <azanulhaque@gmail.com>
Azanul
added a commit
that referenced
this pull request
Dec 28, 2023
* v3.1.6 release 🚀 (#1265) * fix(1205): Resource fetching performance improvement for OVH * Update civo.mdx update to test mintlify workflow * fix: Resource fetching performance improvement for Scaleway (#1212) Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * [KOM-38]: Resource fetching performance improvement for CIVO, DigitalOcean, OCI, Linode, K8s, Tencent (#1215) * making fetching resources parallelized for all providers Signed-off-by: bishal7679 <bishalhnj127@gmail.com> * updating fetching resources for civo and tencent Signed-off-by: bishal7679 <bishalhnj127@gmail.com> --------- Signed-off-by: bishal7679 <bishalhnj127@gmail.com> Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * fix: no OVH in docs (#1218) Signed-off-by: Azanul <azanulhaque@gmail.com> * Update hello-to-new-contributors.yml * [FEAT-1092]: Update color names and box-shadows to match Design-System (#1143) * feat: update colors in tailwind config * fix: update color class-names to match new palette * fix: update primary & secondary color class-names to match new palette * fix: update box-shadows to match design system * fix: update tailwind config and class-names * feat: add aws codebuild resource (#1216) Co-authored-by: amal richwin <richwin@munat.Dlink> Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * feat: add aws codedeploy resource (#1228) * Fix accidental loop capture (#1252) * chore: remove dot import Signed-off-by: Azanul <azanulhaque@gmail.com> * fix: capture of the loop variable Signed-off-by: Azanul <azanulhaque@gmail.com> * chore: remove duplicate import Signed-off-by: Azanul <azanulhaque@gmail.com> --------- Signed-off-by: Azanul <azanulhaque@gmail.com> * feat: add aws codecommit resource (#1229) * feat: add aws codecommit resource * chore: remove unused code * chore: remove commented code --------- Co-authored-by: amal richwin <richwin@munat.Dlink> * Check for nil VpcId and SubnetId before use (#1254) Fixes #1250 Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * Migration Nextjs 13 to 14 (#1217) * Migration Nextjs 13 to 14 * fix: next export * add output export property --------- Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * Rebase to master (#1268) * fix(1205): Resource fetching performance improvement for OVH * Update civo.mdx update to test mintlify workflow * fix: Resource fetching performance improvement for Scaleway (#1212) Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * [KOM-38]: Resource fetching performance improvement for CIVO, DigitalOcean, OCI, Linode, K8s, Tencent (#1215) * making fetching resources parallelized for all providers Signed-off-by: bishal7679 <bishalhnj127@gmail.com> * updating fetching resources for civo and tencent Signed-off-by: bishal7679 <bishalhnj127@gmail.com> --------- Signed-off-by: bishal7679 <bishalhnj127@gmail.com> Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * fix: no OVH in docs (#1218) Signed-off-by: Azanul <azanulhaque@gmail.com> * Update hello-to-new-contributors.yml * [FEAT-1092]: Update color names and box-shadows to match Design-System (#1143) * feat: update colors in tailwind config * fix: update color class-names to match new palette * fix: update primary & secondary color class-names to match new palette * fix: update box-shadows to match design system * fix: update tailwind config and class-names * feat: add aws codebuild resource (#1216) Co-authored-by: amal richwin <richwin@munat.Dlink> Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * feat: add aws codedeploy resource (#1228) * Fix accidental loop capture (#1252) * chore: remove dot import Signed-off-by: Azanul <azanulhaque@gmail.com> * fix: capture of the loop variable Signed-off-by: Azanul <azanulhaque@gmail.com> * chore: remove duplicate import Signed-off-by: Azanul <azanulhaque@gmail.com> --------- Signed-off-by: Azanul <azanulhaque@gmail.com> * feat: add aws codecommit resource (#1229) * feat: add aws codecommit resource * chore: remove unused code * chore: remove commented code --------- Co-authored-by: amal richwin <richwin@munat.Dlink> * Check for nil VpcId and SubnetId before use (#1254) Fixes #1250 Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> * Migration Nextjs 13 to 14 (#1217) * Migration Nextjs 13 to 14 * fix: next export * add output export property --------- Co-authored-by: Azanul Haque <42029519+Azanul@users.noreply.github.com> --------- Signed-off-by: bishal7679 <bishalhnj127@gmail.com> Signed-off-by: Azanul <azanulhaque@gmail.com> Co-authored-by: LABOUARDY Mohamed <mohamed@labouardy.com> Co-authored-by: tanbirali <tanbirali2004@gmail.com> Co-authored-by: Jake Page <38757612+jakepage91@users.noreply.github.com> Co-authored-by: Tanbir Ali <124070023+tanbirali@users.noreply.github.com> Co-authored-by: Bishal Das <70086051+bishal7679@users.noreply.github.com> Co-authored-by: Avinesh Tripathi <73980067+AvineshTripathi@users.noreply.github.com> Co-authored-by: Umar Abid <75561750+umrkhn@users.noreply.github.com> Co-authored-by: Richwin <39644816+AmalRichwin@users.noreply.github.com> Co-authored-by: amal richwin <richwin@munat.Dlink> Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com> Co-authored-by: Josh VanderLinden <codekoala@users.noreply.github.com> Co-authored-by: Shivam Sharma <meshivam81@gmail.com> * fix: wrong slack guide url (#1264) This commit fixes #1259 Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> --------- Signed-off-by: bishal7679 <bishalhnj127@gmail.com> Signed-off-by: Azanul <azanulhaque@gmail.com> Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> Co-authored-by: tanbirali <tanbirali2004@gmail.com> Co-authored-by: LABOUARDY Mohamed <mohamed@labouardy.com> Co-authored-by: Jake Page <38757612+jakepage91@users.noreply.github.com> Co-authored-by: Tanbir Ali <124070023+tanbirali@users.noreply.github.com> Co-authored-by: Bishal Das <70086051+bishal7679@users.noreply.github.com> Co-authored-by: Avinesh Tripathi <73980067+AvineshTripathi@users.noreply.github.com> Co-authored-by: Umar Abid <75561750+umrkhn@users.noreply.github.com> Co-authored-by: Richwin <39644816+AmalRichwin@users.noreply.github.com> Co-authored-by: amal richwin <richwin@munat.Dlink> Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com> Co-authored-by: Josh VanderLinden <codekoala@users.noreply.github.com> Co-authored-by: Shivam Sharma <meshivam81@gmail.com> Co-authored-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> * merge: rebase Signed-off-by: Azanul <azanulhaque@gmail.com> * lint: unused Signed-off-by: Azanul <azanulhaque@gmail.com> --------- Signed-off-by: bishal7679 <bishalhnj127@gmail.com> Signed-off-by: Azanul <azanulhaque@gmail.com> Signed-off-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com> Co-authored-by: tanbirali <tanbirali2004@gmail.com> Co-authored-by: LABOUARDY Mohamed <mohamed@labouardy.com> Co-authored-by: Jake Page <38757612+jakepage91@users.noreply.github.com> Co-authored-by: Tanbir Ali <124070023+tanbirali@users.noreply.github.com> Co-authored-by: Bishal Das <70086051+bishal7679@users.noreply.github.com> Co-authored-by: Avinesh Tripathi <73980067+AvineshTripathi@users.noreply.github.com> Co-authored-by: Umar Abid <75561750+umrkhn@users.noreply.github.com> Co-authored-by: Richwin <39644816+AmalRichwin@users.noreply.github.com> Co-authored-by: amal richwin <richwin@munat.Dlink> Co-authored-by: Vanshul Bhatia <98731471+VanshulB@users.noreply.github.com> Co-authored-by: Josh VanderLinden <codekoala@users.noreply.github.com> Co-authored-by: Shivam Sharma <meshivam81@gmail.com> Co-authored-by: Shikhar Vashistha <51105234+shikharvashistha@users.noreply.github.com>
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.