about summary refs log tree commit diff
path: root/nixos/doc/manual
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-03-31 00:12:29 +0000
committerGitHub <noreply@github.com>2021-03-31 00:12:29 +0000
commit4ba71fb819c13aba0c031729955765a57088e1e6 (patch)
treea5b70df2f1e1a4d8eb774dcedb9e537587cd2504 /nixos/doc/manual
parentf555f95ed8cdefbce73aa601fbd5c868004d3da7 (diff)
parentf3b5f40c81c084ab191e9af97f1e143adc599c7b (diff)
downloadnixlib-4ba71fb819c13aba0c031729955765a57088e1e6.tar
nixlib-4ba71fb819c13aba0c031729955765a57088e1e6.tar.gz
nixlib-4ba71fb819c13aba0c031729955765a57088e1e6.tar.bz2
nixlib-4ba71fb819c13aba0c031729955765a57088e1e6.tar.lz
nixlib-4ba71fb819c13aba0c031729955765a57088e1e6.tar.xz
nixlib-4ba71fb819c13aba0c031729955765a57088e1e6.tar.zst
nixlib-4ba71fb819c13aba0c031729955765a57088e1e6.zip
Merge master into staging-next
Diffstat (limited to 'nixos/doc/manual')
-rw-r--r--nixos/doc/manual/release-notes/rl-2105.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml
index ab17879ba0b8..f6d9ec9c1e43 100644
--- a/nixos/doc/manual/release-notes/rl-2105.xml
+++ b/nixos/doc/manual/release-notes/rl-2105.xml
@@ -894,6 +894,14 @@ environment.systemPackages = [
      Please test your setup and container images with containerd prior to upgrading.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The GitLab module now has support for automatic backups. A
+     schedule can be set with the
+     <link linkend="opt-services.gitlab.backup.startAt">services.gitlab.backup.startAt</link>
+     option.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>