Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/gitlab: move custom_hooks_dir into gitaly config #107174

Merged
1 commit merged into from Dec 26, 2020
Merged

nixos/gitlab: move custom_hooks_dir into gitaly config #107174

1 commit merged into from Dec 26, 2020

Conversation

jslight90
Copy link
Contributor

Motivation for this change

Gitaly 13.1 changed the location to specify the custom_hooks_dir configuration option.

From https://about.gitlab.com/releases/2020/06/22/gitlab-13-1-released/#upgrade:

Configuration values used by server-side Git hooks in Gitaly were stored in gitlab-shell/config.yml. They are now stored in Gitaly’s config.toml file under the [gitlab] and [hooks] TOML sections.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jslight90
Copy link
Contributor Author

@petabyteboy, @talyz, @fpletz, @globin, @kalbasit please review.

@ghost ghost merged commit 4bc2573 into NixOS:master Dec 26, 2020
globin pushed a commit to mayflower/nixpkgs that referenced this pull request Mar 27, 2021
@jslight90 @globin
nixos/gitlab: move custom_hooks_dir into gitaly config (NixOS#107174)
c721b07 
(cherry picked from commit 4bc2573)
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@jslight90