Skip to content

Commit

Permalink
Merge branch 'segmentio:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mattgrosvenor-fs authored Jul 6, 2023
2 parents 563131f + 2719a35 commit d9b001d
Show file tree
Hide file tree
Showing 908 changed files with 48,153 additions and 24,784 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ CONTEXT=development
PLATFORM_API_TOKEN=generate a token from your Segment workspace
PAPI_TOKEN=generate a token from your Segment workspace
ALGOLIA_APP_ID=
ALGOLIA_SEARCH_KEY=
ALGOLIA_SEARCH_KEY=
15 changes: 15 additions & 0 deletions .github/styles/Vocab/Docs/accept.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
(?:P|p)endo
(?:P|p)odfile
(?:P|p)ostgres
(?:R|r)ealtime
(?:R|r)emarketing
(?:U|u)nlinks?\b
(?:U|u)nmaps?\b
Expand All @@ -21,6 +22,8 @@ Aampe
adset
Adwords
Aircall
Airdat(?:e|es)
Algolia
allowlist
Amberflo
API(:?s)
Expand All @@ -36,21 +39,26 @@ blocklist
Bluedot
bool
boolean
Braze's
Breyta
Chargebee
chatbot
cli
CloudFront
Cocoapods
comScore
Contentful
Cordova
Criteo
csv
Databricks
datetime
debouncing
deeplink
Dev
Doubleclick
Eloqua
Emarsys
enablement
endcapture
endfor
Expand All @@ -72,6 +80,7 @@ https
HTTPS
Hubspot
incrementality
Innovid
ios
iOS
Iterable
Expand All @@ -95,6 +104,7 @@ Marketo
Matcha
matchers
measurability
Metrix
middleware
Middleware
Mixpanel
Expand All @@ -110,15 +120,18 @@ Okta
Omnichannel
onboarding
Optimizely
Outfunnel
param(:?s)
Pardot
Passcode
performant
Pinterest
Pipedrive
Preact
Proguard
Qualtrics
reformat(:?s)
remarket
Responsys
Rokt
Sabil
Expand All @@ -140,9 +153,11 @@ Twilio
upsert
US
utm
varchar
Vero
Vidora
viewability
Voucherify
waitlist
walkthrough
WebKit
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/dlv-npm-1.1.3-187c903a21-d7381bca22.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
36 changes: 7 additions & 29 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -25,48 +25,26 @@ CODEOWNERS @segmentio/segment-doc-team


# Destinations owners
/src/connections/destinations @stayseesong @markzegarelli
# /src/connections/destinations @stayseesong @markzegarelli

# Stratconn
## Adobe
/src/connections/destinations/catalog/adobe-analytics/ @kdaswani
/src/connections/destinations/catalog/actions-adobe-target-web/ @kdaswani
/src/connections/destinations/catalog/actions-adobe-target-cloud/ @kdaswani
/src/connections/destinations/catalog/marketo-v2/ @kdaswani
/src/connections/destinations/catalog/marketo-static-lists/ @kdaswani


## Facebook
/src/connections/destinations/catalog/facebook-pixel/ @kdaswani
/src/connections/destinations/catalog/actions-facebook-conversions-api/ @kdaswani
/src/connections/destinations/catalog/facebook-app-events/ @kdaswani
/src/connections/destinations/catalog/facebook-offline-conversions/ @kdaswani
/src/connections/destinations/catalog/personas-facebook-custom-audiences/ @kdaswani


## Google
/src/connections/destinations/catalog/firebase/ @kdaswani
/src/connections/destinations/catalog/google-analytics/ @kdaswani
/src/connections/destinations/catalog/actions-google-analytics-4/ @kdaswani
/src/connections/destinations/catalog/google-tag-manager/ @kdaswani
/src/connections/destinations/catalog/actions-google-enhanced-conversions/ @kdaswani
/src/connections/destinations/catalog/doubleclick-floodlight/ @kdaswani
/src/connections/destinations/catalog/google-ads-classic/ @kdaswani
/src/connections/destinations/catalog/google-ads-gtag/ @kdaswani
/src/connections/destinations/catalog/google-cloud-function/ @kdaswani
/src/connections/destinations/catalog/google-cloud-pubsub/ @kdaswani
/src/connections/destinations/catalog/adwords-remarketing-lists/ @kdaswani
/src/connections/destinations/catalog/personas-display-video-360/ @kdaswani


## Salesforce
/src/connections/destinations/catalog/salesforce/ @kdaswani
/src/connections/destinations/catalog/actions-salesforce/ @kdaswani
/src/connections/destinations/catalog/salesforce-marketing-cloud/ @kdaswani
/src/connections/destinations/catalog/pardot/ @kdaswani


# Engage
/src/engage/ @markzegarelli @pwseg @rchinn-segment

# Personas owners
/src/personas @pwseg @rchinn-segent
# Unify
/src/unify @rchinn-segment

# Protocols owners
/src/protocols @forstisabella
Expand Down
105 changes: 40 additions & 65 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,68 +1,54 @@
GIT
remote: https://github.com/jekyll/jekyll.git
revision: 26a949df85a1f9577e8080e19f2196c8a3db17ec
revision: 58a1f62b2349bb477fc9999c40331cecdca577d8
specs:
jekyll (4.2.1)
jekyll (4.3.2)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (~> 3.0)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)

GEM
remote: https://rubygems.org/
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
algolia_html_extractor (2.6.4)
json (~> 2.0)
nokogiri (~> 1.10)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
colorator (1.1.0)
commonmarker (0.23.6)
concurrent-ruby (1.1.9)
dotenv (2.7.6)
em-websocket (0.5.2)
commonmarker (0.23.9)
concurrent-ruby (1.2.2)
dotenv (2.8.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
http_parser.rb (~> 0)
eventmachine (1.2.7)
faraday (1.8.0)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
multipart-post (>= 1.2, < 3)
faraday (2.7.5)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
ffi (1.15.4)
faraday-net_http (3.0.2)
ffi (1.15.5)
filesize (0.2.0)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
google-protobuf (3.23.2-x86_64-darwin)
http_parser.rb (0.8.0)
httpclient (2.8.3)
i18n (1.8.10)
i18n (1.13.0)
concurrent-ruby (~> 1.0)
jekyll-algolia (1.7.1)
algolia_html_extractor (~> 2.6)
Expand All @@ -73,9 +59,8 @@ GEM
nokogiri (~> 1.6)
progressbar (~> 1.9)
verbal_expressions (~> 0.1.5)
jekyll-commonmark (1.3.1)
commonmarker (~> 0.14)
jekyll (>= 3.7, < 5.0)
jekyll-commonmark (1.4.0)
commonmarker (~> 0.22)
jekyll-dotenv (0.2.0)
dotenv (~> 2.7)
jekyll (~> 4)
Expand All @@ -86,67 +71,57 @@ GEM
posix-spawn (~> 0.3.9)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
json (2.6.0)
kramdown (2.3.1)
json (2.6.3)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.7.0)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.8.0)
multipart-post (2.1.1)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.10-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.10-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.10-x86_64-linux)
nokogiri (1.15.2-x86_64-darwin)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
posix-spawn (0.3.15)
premonition (2.0.1)
progressbar (1.11.0)
public_suffix (4.0.6)
racc (1.6.1)
progressbar (1.13.0)
public_suffix (5.0.1)
racc (1.6.2)
rake (13.0.6)
rb-fsevent (0.11.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.26.1)
rouge (4.1.2)
ruby2_keywords (0.0.5)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sass-embedded (1.62.1-x86_64-darwin)
google-protobuf (~> 3.21)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thread_safe (0.3.6)
tzinfo (1.2.10)
tzinfo (1.2.11)
thread_safe (~> 0.1)
tzinfo-data (1.2021.4)
tzinfo-data (1.2023.3)
tzinfo (>= 1.0.0)
unicode-display_width (2.1.0)
unicode-display_width (2.4.2)
verbal_expressions (0.1.5)
wdm (0.1.1)
webrick (1.7.0)
webrick (1.8.1)

PLATFORMS
arm64-darwin-20
ruby
x86_64-darwin-19
x86_64-darwin-20
x86_64-linux

DEPENDENCIES
dotenv
Expand All @@ -166,4 +141,4 @@ DEPENDENCIES
wdm (~> 0.1.0)

BUNDLED WITH
2.2.2
2.2.18
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ seed:

.PHONY: node_modules
node_modules: package.json yarn.lock
yarn --frozen-lockfile
yarn --immutable

.PHONY: vendor/bundle
vendor/bundle:
Expand Down
2 changes: 1 addition & 1 deletion diagram-library/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The library file was built by Tonik, and is in Sketch. You'll need a Sketch lice

You can also export the file, or diagrams you make with it, to `.svg` format for storage.

![](sample-diagram.png)
![Diagram showing how data is transferred from Segment Tracking API to a customer's AWS S3 bucket.](sample-diagram.png)

## Using the Library

Expand Down
8 changes: 4 additions & 4 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
to = "/assets/docs.bundle.js"
status = 200

[[plugins]]
package = "netlify-plugin-jekyll-cache"
# [[plugins]]
# package = "netlify-plugin-jekyll-cache"

[plugins.inputs]
jekyllSource = "/src"
# [plugins.inputs]
# jekyllSource = "/src"


[[headers]]
Expand Down
Loading

0 comments on commit d9b001d

Please sign in to comment.