Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c15006d410d0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b899df4f3fa7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 12, 2018

  1. add custom hooks directory to gitlab-shell 

    Add custom_hooks_dir to gitlab-shell yml config file.
    Jeff Slight committed Oct 12, 2018
    Copy the full SHA
    7bafe25 View commit details

Commits on Oct 13, 2018

  1. Merge pull request #48292 from jslight90/gitlab 

    nixos/gitlab: add custom hooks directory for gitlab-shell
    @Mic92
    Mic92 authored Oct 13, 2018
    Copy the full SHA
    b899df4 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 nixos/modules/services/misc/gitlab.nix
4 changes: 4 additions & 0 deletions nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ let
repos_path: "${cfg.statePath}/repositories"
secret_file: "${cfg.statePath}/config/gitlab_shell_secret"
log_file: "${cfg.statePath}/log/gitlab-shell.log"
custom_hooks_dir: "${cfg.statePath}/custom_hooks"
redis:
bin: ${pkgs.redis}/bin/redis-cli
host: 127.0.0.1
@@ -562,6 +563,9 @@ in {
mkdir -p ${cfg.statePath}/shell
mkdir -p ${cfg.statePath}/db
mkdir -p ${cfg.statePath}/uploads
mkdir -p ${cfg.statePath}/custom_hooks/pre-receive.d
mkdir -p ${cfg.statePath}/custom_hooks/post-receive.d
mkdir -p ${cfg.statePath}/custom_hooks/update.d
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
mkdir -p ${cfg.statePath}/config