Skip to content

Commit 828a693

Browse files
authored
Merge branch 'master' into troubleshooting-guide
2 parents 43c0366 + a064ea8 commit 828a693

File tree

1,042 files changed

+30269
-13365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,042 files changed

+30269
-13365
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44

55
<!--Tell us what you did and why-->
66

7+
### Merge timing
8+
<!-- When should this get merged/published?
9+
- ASAP once approved?
10+
- On a specific date?
11+
- Depending on a specific project?-->
712

813
### Related issues (optional)
914

10-
<!--Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes #1234'.
11-
Or link to full URLs to issues or pull requests in other Github projects -->
15+
<!--Refer to related PRs or issues: #1234 or 'Closes #1234'.
16+
Or paste full URLs to issues or pull requests in other Github projects -->

.vale.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
StylesPath = vale-styles
2+
3+
Vocab = Docs
4+
5+
[*.md]
6+
BasedOnStyles = write-good, Segment

CODEOWNERS

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# The default owners for everything in
22
# the repo. Unless a later match takes precedence.
3-
CODEOWNERS @sanscontext @XavierAgostini @danielstjules @stephment
3+
CODEOWNERS @segmentio/segment-doc-team
44

55
# Diagram library
66
/diagram-library @sanscontext
77

88
# Utility scripts
9-
/scripts @sanscontext @XavierAgostini
9+
/scripts @segmentio/segment-doc-team @XavierAgostini
1010

11+
# Vale Linting
12+
/vale-styles @segmentio/segment-doc-team
13+
.vale.ini @segmentio/segment-doc-team
1114

1215
# Content owners should be in the order of PM, TL (team-lead), and EM (in a crisis) for a given team.
1316
# This team will receive review requests automatically when a PR is submitted modifying the files in
@@ -18,16 +21,14 @@ CODEOWNERS @sanscontext @XavierAgostini @danielstjules @stephment
1821

1922

2023
# Libraries owners
21-
/src/connections/catalog/libraries @osamakhn @bsneed @lubird
22-
24+
/src/connections/catalog/libraries @osamakhn @bsneed @pooyaj @juliofarah
2325

2426
# Destination owners
25-
/src/connections/destinations @n2parko @danielstjules @benhorowitz
26-
# temporary removal: @carlosmecha
27+
/src/connections/destinations @segmentio/segment-doc-team
2728

2829

2930
# Privacy owners
30-
/src/privacy @notfelineit @aliya-dossa
31+
/src/privacy @notfelineit
3132

3233

3334
# Protocols owners

Gemfile.lock

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
GIT
22
remote: https://github.com/jekyll/jekyll.git
3-
revision: 1d7d11be61196b45b4645fd8cd73776e8fe8d184
3+
revision: e739c777fc8fb63b9890c0738983af6f1d525966
44
specs:
5-
jekyll (4.0.0)
5+
jekyll (4.1.1)
66
addressable (~> 2.4)
77
colorator (~> 1.0)
88
em-websocket (~> 0.5)
9-
i18n (>= 0.9.5, < 2)
9+
i18n (~> 1.0)
1010
jekyll-sass-converter (~> 2.0)
1111
jekyll-watch (~> 2.0)
12-
kramdown (~> 2.1)
12+
kramdown (~> 2.3)
1313
kramdown-parser-gfm (~> 1.0)
1414
liquid (~> 4.0)
15-
mercenary (~> 0.3.3)
15+
mercenary (~> 0.4.0)
1616
pathutil (~> 0.9)
1717
rouge (~> 3.0)
1818
safe_yaml (~> 1.0)
@@ -24,71 +24,73 @@ GEM
2424
addressable (2.7.0)
2525
public_suffix (>= 2.0.2, < 5.0)
2626
colorator (1.1.0)
27-
commonmarker (0.20.1)
27+
commonmarker (0.21.0)
2828
ruby-enum (~> 0.5)
29-
concurrent-ruby (1.1.5)
30-
dotenv (2.7.5)
31-
em-websocket (0.5.1)
29+
concurrent-ruby (1.1.7)
30+
dotenv (2.7.6)
31+
em-websocket (0.5.2)
3232
eventmachine (>= 0.12.9)
3333
http_parser.rb (~> 0.6.0)
3434
eventmachine (1.2.7)
35-
faraday (0.17.1)
35+
faraday (1.0.1)
3636
multipart-post (>= 1.2, < 3)
37-
ffi (1.11.3)
37+
ffi (1.13.1)
3838
forwardable-extended (2.6.0)
3939
http_parser.rb (0.6.0)
40-
i18n (1.7.0)
40+
i18n (1.8.5)
4141
concurrent-ruby (~> 1.0)
4242
jekyll-commonmark (1.3.1)
4343
commonmarker (~> 0.14)
4444
jekyll (>= 3.7, < 5.0)
4545
jekyll-include-cache (0.2.0)
4646
jekyll (>= 3.7, < 5.0)
47-
jekyll-last-modified-at (1.2.1)
47+
jekyll-last-modified-at (1.3.0)
4848
jekyll (>= 3.7, < 5.0)
4949
posix-spawn (~> 0.3.9)
50-
jekyll-redirect-from (0.15.0)
50+
jekyll-redirect-from (0.16.0)
5151
jekyll (>= 3.3, < 5.0)
52-
jekyll-sass-converter (2.0.1)
52+
jekyll-sass-converter (2.1.0)
5353
sassc (> 2.0.1, < 3.0)
5454
jekyll-sitemap (1.4.0)
5555
jekyll (>= 3.7, < 5.0)
5656
jekyll-watch (2.2.1)
5757
listen (~> 3.0)
58-
kramdown (2.1.0)
58+
kramdown (2.3.0)
59+
rexml
5960
kramdown-parser-gfm (1.1.0)
6061
kramdown (~> 2.0)
6162
liquid (4.0.3)
6263
liquid-c (4.0.0)
6364
liquid (>= 3.0.0)
64-
listen (3.2.0)
65+
listen (3.2.1)
6566
rb-fsevent (~> 0.10, >= 0.10.3)
6667
rb-inotify (~> 0.9, >= 0.9.10)
67-
mercenary (0.3.6)
68+
mercenary (0.4.0)
6869
multipart-post (2.1.1)
6970
pathutil (0.16.2)
7071
forwardable-extended (~> 2.6)
71-
posix-spawn (0.3.13)
72-
premonition (2.0.0)
73-
public_suffix (4.0.1)
72+
posix-spawn (0.3.15)
73+
premonition (2.0.1)
74+
public_suffix (4.0.6)
7475
rake (13.0.1)
75-
rb-fsevent (0.10.3)
76-
rb-inotify (0.10.0)
76+
rb-fsevent (0.10.4)
77+
rb-inotify (0.10.1)
7778
ffi (~> 1.0)
78-
rouge (3.13.0)
79-
ruby-enum (0.7.2)
79+
rexml (3.2.4)
80+
rouge (3.23.0)
81+
ruby-enum (0.8.0)
8082
i18n
8183
safe_yaml (1.0.5)
82-
sassc (2.2.1)
84+
sassc (2.4.0)
8385
ffi (~> 1.9)
8486
terminal-table (1.8.0)
8587
unicode-display_width (~> 1.1, >= 1.1.1)
8688
thread_safe (0.3.6)
87-
tzinfo (1.2.5)
89+
tzinfo (1.2.7)
8890
thread_safe (~> 0.1)
89-
tzinfo-data (1.2019.3)
91+
tzinfo-data (1.2020.2)
9092
tzinfo (>= 1.0.0)
91-
unicode-display_width (1.6.0)
93+
unicode-display_width (1.7.0)
9294
wdm (0.1.1)
9395

9496
PLATFORMS

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ See the [Contributor Guide](contributors.md) for more info.
5353

5454
**At minimum you must open a PR so the docs team gets a notification. Do not merge directly to master.**
5555

56-
- **Just fixing a typo**? -> No review needed, you can admin-merge your PR with our blessings.
56+
- **Just fixing a typo**? -> No review needed, but please label it FIX in the PR subject so we know not to worry. You can then admin-merge your PR with our blessings.
5757

5858
- **Delta of <20 words or ~150 characters**? -> Yes, but a minor review. Open a PR and tag @sanscontext, who'll review mostly for formatting and copy issues.
5959

@@ -98,7 +98,7 @@ Once the PR is merged, the docs site rebuilds and the changes are live!
9898

9999
### Draft PRs
100100

101-
If you're doing a substantial change and you're going to want to spend a few weeks on it, use [Github's Draft PRs feature](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests), or add `WIP` to the title of your PR. This lets us know to ignore the PR until you're ready.
101+
If you're doing a substantial change and you're going to want to spend a few weeks on it, use [Github's Draft PRs feature](https://help.github.com/en/articles/about-pull-requests#draft-pull-requests), or add `WIP` to the title of your PR. This lets us know to ignore the PR until you're ready (otherwise Laura will ping you weekly about it!).
102102

103103

104104
## How the docs build works
@@ -134,7 +134,7 @@ The most interesting ones are:
134134

135135
### Images
136136

137-
**All images should be saved locally! No linking to 3rd party-hosted images!** Images are published to our CDN from the build step.
137+
**Save all images locally! No linking to 3rd party-hosted images!** Images are published to our CDN from the build step, and this means they won't go missing if the hosting service dujour goes out of business.
138138

139139
There are no _enforced_ naming conventions at this time. Files that start with an underscore are ignored by Jekyll. Anything you see with `asset` was dowloaded by a script to migrate it out of Contents.io.
140140

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ defaults:
3232
integration_type: source
3333
layout: integration
3434
- scope:
35-
path: "connections/warehouses/catalog"
35+
path: "connections/storage/catalog"
3636
values:
3737
integration_type: warehouse
3838
landing: true

0 commit comments

Comments
 (0)