Skip to content

Commit 7b77089

Browse files
author
markzegarelli
authored
Merge branch 'master' into 1907_feedback-box-display
2 parents 4feca89 + 36e5da7 commit 7b77089

File tree

8 files changed

+173
-465
lines changed

8 files changed

+173
-465
lines changed

CODEOWNERS

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
* @segmentio/segment-doc-team
12
# The default owners for everything in
23
# the repo. Unless a later match takes precedence.
34
CODEOWNERS @segmentio/segment-doc-team @markzegarelli
45

56
# Diagram library
6-
/diagram-library @sanscontext @markzegarelli
7+
# /diagram-library @markzegarelli
78

89
# Utility scripts
9-
/scripts @segmentio/segment-doc-team
10+
# /scripts @segmentio/segment-doc-team
1011

1112
# Vale Linting
12-
/vale-styles @segmentio/segment-doc-team
13-
.vale.ini @segmentio/segment-doc-team
13+
# /vale-styles @segmentio/segment-doc-team
14+
# .vale.ini @segmentio/segment-doc-team
1415

1516

1617
# Content owners should be in the order of PM, TL (team-lead), and EM (in a crisis) for a given team.
@@ -22,10 +23,10 @@ CODEOWNERS @segmentio/segment-doc-team @markzegarelli
2223

2324

2425
# Libraries owners
25-
/src/connections/catalog/libraries @bsneed @pooyaj @juliofarah
26+
# /src/connections/catalog/libraries @bsneed @pooyaj @juliofarah
2627

2728
# Destinations owners
28-
/src/connections/destinations @segmentio/segment-doc-team
29+
# /src/connections/destinations @segmentio/segment-doc-team
2930

3031

3132
# Privacy owners TODO
@@ -36,7 +37,7 @@ CODEOWNERS @segmentio/segment-doc-team @markzegarelli
3637
# /src/protocols
3738

3839
# Partner Program owners
39-
/src/partners @misteryeo @n2parko @benhorowitz
40+
# /src/partners @misteryeo @n2parko @benhorowitz
4041

4142
# Personas owners TODO
4243

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ group :jekyll_plugins do
1919
gem "jekyll-include-cache"
2020
gem 'jekyll-algolia'
2121
gem 'jekyll-dotenv'
22-
gem 'html-proofer'
2322
end
2423

2524
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

Lines changed: 42 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
GIT
22
remote: https://github.com/jekyll/jekyll.git
3-
revision: 11ff8aa0dd610fa26689dc8d2d42decd3bba79ee
3+
revision: 5687bf97d8242feb8bb8f03cdc93991fb20847b7
44
specs:
5-
jekyll (4.1.1)
5+
jekyll (4.2.1)
66
addressable (~> 2.4)
77
colorator (~> 1.0)
88
em-websocket (~> 0.5)
99
i18n (~> 1.0)
1010
jekyll-sass-converter (~> 2.0)
1111
jekyll-watch (~> 2.0)
12-
kramdown (~> 2.3)
12+
kramdown (~> 2.3, >= 2.3.1)
1313
kramdown-parser-gfm (~> 1.0)
1414
liquid (~> 4.0)
15-
mercenary (~> 0.4.0)
15+
mercenary (>= 0.3.6, < 0.5)
1616
pathutil (~> 0.9)
1717
rouge (~> 3.0)
1818
safe_yaml (~> 1.0)
19-
terminal-table (~> 2.0)
19+
terminal-table (>= 1.8, < 4.0)
20+
webrick (~> 1.7)
2021

2122
GEM
2223
remote: https://rubygems.org/
@@ -30,35 +31,40 @@ GEM
3031
httpclient (~> 2.8, >= 2.8.3)
3132
json (>= 1.5.1)
3233
colorator (1.1.0)
33-
commonmarker (0.21.0)
34-
ruby-enum (~> 0.5)
35-
concurrent-ruby (1.1.7)
34+
commonmarker (0.23.2)
35+
concurrent-ruby (1.1.9)
3636
dotenv (2.7.6)
3737
em-websocket (0.5.2)
3838
eventmachine (>= 0.12.9)
3939
http_parser.rb (~> 0.6.0)
40-
ethon (0.12.0)
41-
ffi (>= 1.3.0)
4240
eventmachine (1.2.7)
43-
faraday (1.1.0)
41+
faraday (1.8.0)
42+
faraday-em_http (~> 1.0)
43+
faraday-em_synchrony (~> 1.0)
44+
faraday-excon (~> 1.1)
45+
faraday-httpclient (~> 1.0.1)
46+
faraday-net_http (~> 1.0)
47+
faraday-net_http_persistent (~> 1.1)
48+
faraday-patron (~> 1.0)
49+
faraday-rack (~> 1.0)
4450
multipart-post (>= 1.2, < 3)
45-
ruby2_keywords
46-
ffi (1.13.1)
51+
ruby2_keywords (>= 0.0.4)
52+
faraday-em_http (1.0.0)
53+
faraday-em_synchrony (1.0.0)
54+
faraday-excon (1.1.0)
55+
faraday-httpclient (1.0.1)
56+
faraday-net_http (1.0.1)
57+
faraday-net_http_persistent (1.2.0)
58+
faraday-patron (1.0.0)
59+
faraday-rack (1.0.0)
60+
ffi (1.15.4)
4761
filesize (0.2.0)
4862
forwardable-extended (2.6.0)
49-
html-proofer (3.19.2)
50-
addressable (~> 2.3)
51-
mercenary (~> 0.3)
52-
nokogumbo (~> 2.0)
53-
parallel (~> 1.3)
54-
rainbow (~> 3.0)
55-
typhoeus (~> 1.3)
56-
yell (~> 2.0)
5763
http_parser.rb (0.6.0)
5864
httpclient (2.8.3)
59-
i18n (1.8.5)
65+
i18n (1.8.10)
6066
concurrent-ruby (~> 1.0)
61-
jekyll-algolia (1.6.0)
67+
jekyll-algolia (1.7.1)
6268
algolia_html_extractor (~> 2.6)
6369
algoliasearch (~> 1.26)
6470
filesize (~> 0.1)
@@ -94,55 +100,43 @@ GEM
94100
liquid (4.0.3)
95101
liquid-c (4.0.0)
96102
liquid (>= 3.0.0)
97-
listen (3.3.0)
103+
listen (3.7.0)
98104
rb-fsevent (~> 0.10, >= 0.10.3)
99105
rb-inotify (~> 0.9, >= 0.9.10)
100106
mercenary (0.4.0)
101-
mini_portile2 (2.5.1)
102107
multipart-post (2.1.1)
103-
nokogiri (1.11.4)
104-
mini_portile2 (~> 2.5.0)
108+
nokogiri (1.12.5-x86_64-darwin)
105109
racc (~> 1.4)
106-
nokogiri (1.11.4-x86_64-darwin)
110+
nokogiri (1.12.5-x86_64-linux)
107111
racc (~> 1.4)
108-
nokogiri (1.11.4-x86_64-linux)
109-
racc (~> 1.4)
110-
nokogumbo (2.0.5)
111-
nokogiri (~> 1.8, >= 1.8.4)
112-
parallel (1.20.1)
113112
pathutil (0.16.2)
114113
forwardable-extended (~> 2.6)
115114
posix-spawn (0.3.15)
116115
premonition (2.0.1)
117116
progressbar (1.11.0)
118117
public_suffix (4.0.6)
119118
racc (1.5.2)
120-
rainbow (3.0.0)
121-
rake (13.0.1)
122-
rb-fsevent (0.10.4)
119+
rake (13.0.6)
120+
rb-fsevent (0.11.0)
123121
rb-inotify (0.10.1)
124122
ffi (~> 1.0)
125123
rexml (3.2.5)
126-
rouge (3.25.0)
127-
ruby-enum (0.8.0)
128-
i18n
129-
ruby2_keywords (0.0.2)
124+
rouge (3.26.1)
125+
ruby2_keywords (0.0.5)
130126
safe_yaml (1.0.5)
131127
sassc (2.4.0)
132128
ffi (~> 1.9)
133-
terminal-table (2.0.0)
134-
unicode-display_width (~> 1.1, >= 1.1.1)
129+
terminal-table (3.0.2)
130+
unicode-display_width (>= 1.1.1, < 3)
135131
thread_safe (0.3.6)
136-
typhoeus (1.4.0)
137-
ethon (>= 0.9.0)
138-
tzinfo (1.2.8)
132+
tzinfo (1.2.9)
139133
thread_safe (~> 0.1)
140-
tzinfo-data (1.2020.4)
134+
tzinfo-data (1.2021.2)
141135
tzinfo (>= 1.0.0)
142-
unicode-display_width (1.7.0)
136+
unicode-display_width (2.1.0)
143137
verbal_expressions (0.1.5)
144138
wdm (0.1.1)
145-
yell (2.2.2)
139+
webrick (1.7.0)
146140

147141
PLATFORMS
148142
ruby
@@ -152,7 +146,6 @@ PLATFORMS
152146
DEPENDENCIES
153147
dotenv
154148
faraday
155-
html-proofer
156149
jekyll!
157150
jekyll-algolia
158151
jekyll-commonmark

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permalink: /:categories/:title/
1010

1111
exclude: ['js', '_site', '*.sketch']
1212
# Build settings
13-
os_links: false
13+
os_links: true
1414
markdown: kramdown
1515
highlighter: rouge
1616
defaults:

src/_includes/sidebar/edit-tools.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{% if site.os_links %}
22
<div>
3-
<a href="https://github.com/segmentio/segment-docs/edit/master/src/{{ page.path }}" class="button edit flex no-icon" target="_blank">
3+
<a href="{{site.env.REPOSITORY_URL}}/edit/master/src/{{ page.path }}" class="button edit flex no-icon" target="_blank">
44
<span class="button__icon">{% include icons/symbols/edit.svg %}</span>
55

66
<span class="button__text">Edit this page</span>
77
</a>
88

9-
<a href="https://github.com/segmentio/segment-docs/issues/new?body=File:%20[{{ page.path }}](https://segment.com/docs/)" class="button edit no-icon" target="_blank">
9+
<a href="{{site.env.REPOSITORY_URL}}/issues/new/choose?body=File:%20[{{ page.path }}](https://segment.com/docs/)" class="button edit no-icon" target="_blank">
1010
<span class="button__icon">{% include icons/symbols/plus.svg %}</span>
1111

1212
<span class="button__text">Request docs change</span>

src/connections/destinations/catalog/google-analytics/ga4-plans.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ strat: google
66
Google introduced the new version of Google Analytics, called Google Analytics 4 (GA4), in October 2020. GA4 has some distinct differences from Universal Analytics (UA), which are important to understand before considering migration and the data schema changes that might require.
77

88
> success ""
9-
> Segment expects to release a beta GA4 destination in Q3 2021. Fill out the Segment GA4 [Beta Sign-up Form](https://forms.gle/WzC1dsbxmNVDsYNJ6) to be notified when the destination is available.
9+
> Segment expects to release a beta GA4 destination in Q4 2021. Fill out the Segment GA4 [Beta Sign-up Form](https://forms.gle/WzC1dsbxmNVDsYNJ6) to be notified when the destination is available.
1010
1111
We’ll update this page to share the latest on our GA4 destination.
1212

src/connections/storage/catalog/postgres/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This guide explains how to set up a Postgres database with Heroku. Heroku is a c
4747

4848
For the fastest sync times, choose the US East region.
4949

50-
After you configur these settings, click "Login to Install" and/or "Visit Heroku Dashboard to create your first app".
50+
After you configure these settings, click "Login to Install" and/or "Visit Heroku Dashboard to create your first app".
5151

5252
![](images/heroku3.png)
5353

0 commit comments

Comments
 (0)