]> git.pld-linux.org Git - packages/gitlab-ce.git/commitdiff
update config patch
authorElan Ruusamäe <glen@pld-linux.org>
Sun, 13 Aug 2017 12:32:07 +0000 (15:32 +0300)
committerElan Ruusamäe <glen@pld-linux.org>
Sun, 13 Aug 2017 13:48:09 +0000 (16:48 +0300)
pld.patch

index 5e0c19db7775a7dd42165a62450c39e1a96f37d9..668937f62e114fdc69d41710230bc38b23c27232 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- gitlab-ce-9.1.1/config/gitlab.yml  2017-04-30 20:23:39.245065762 +0300
-+++ gitlab-ce-9.3.3/config/gitlab.yml  2017-07-04 00:56:05.370380322 +0300
+--- gitlab-ce-9.4.4/config/gitlab.yml~ 2017-08-13 15:36:24.000000000 +0300
++++ gitlab-ce-9.4.4/config/gitlab.yml  2017-08-13 16:43:37.557515352 +0300
 @@ -30,8 +30,10 @@
    gitlab:
      ## Web server settings (note: host is the FQDN, do not include http://)
  
      ## Date & Time settings
      # Uncomment and customize if you want to change the default time zone of GitLab application.
-@@ -453,7 +455,7 @@
-     # This setting controls whether GitLab uses Gitaly (new component
-     # introduced in 9.0). Eventually Gitaly use will become mandatory and
-     # this option will disappear.
--    enabled: true
-+    enabled: false
-   #
-   # 4. Advanced settings
-@@ -463,8 +465,9 @@
+@@ -503,8 +505,9 @@
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
 -        gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
 +        path: /var/lib/gitlab/repositories/
 +        # TCP connections are supported too (e.g. tcp://host:port)
-+        # gitaly_address: unix:/var/run/gitlab/gitaly.socket
++        gitaly_address: unix:/var/run/gitlab/gitaly.socket
+         # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-   backup:
-@@ -498,12 +501,12 @@
+@@ -532,12 +535,12 @@
  
    ## GitLab Shell settings
    gitlab_shell:
This page took 0.092695 seconds and 4 git commands to generate.