diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-12 22:16:40 +0300 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-19 17:38:39 +0300 |
| commit | b54faeb9527d61a89c999dc77c2af119942110ec (patch) | |
| tree | 6bdc4c1448c7a787738ce7707e4f65082d573981 /changelogs | |
| parent | d0b92f929ff71a92877d39ea21335be125f4323f (diff) | |
Merge branch 'disable-usage-ping' into 'master'
Usage ping updates
Closes #31741 and #31453
See merge request !11231
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/disable-usage-ping-2.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/disable-usage-ping.yml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/unreleased/disable-usage-ping-2.yml b/changelogs/unreleased/disable-usage-ping-2.yml new file mode 100644 index 00000000000..4abd325f120 --- /dev/null +++ b/changelogs/unreleased/disable-usage-ping-2.yml @@ -0,0 +1,4 @@ +--- +title: Add hostname to usage ping +merge_request: +author: diff --git a/changelogs/unreleased/disable-usage-ping.yml b/changelogs/unreleased/disable-usage-ping.yml new file mode 100644 index 00000000000..5438eb56dba --- /dev/null +++ b/changelogs/unreleased/disable-usage-ping.yml @@ -0,0 +1,4 @@ +--- +title: Allow usage ping to be disabled completely in gitlab.yml +merge_request: +author: |