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: a375c4f7dec6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f0ed3dfe9c2b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 11, 2019

  1. nixos/gitlab: Don't print sensitive data to log on startup

    gitlab:db:configure prints the root user's password to stdout on
    successful setup, which means it will be logged to the
    journal. Silence this informational output. Errors are printed to
    stderr and will thus still be let through.
    
    (cherry picked from commit dc29a45)
    talyz authored and flokli committed Oct 11, 2019
    Copy the full SHA
    f0ed3df View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/misc/gitlab.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/gitlab.nix
Original file line number Diff line number Diff line change
@@ -853,7 +853,7 @@ in {
initial_root_password="$(<'${cfg.initialRootPasswordFile}')"
${gitlab-rake}/bin/gitlab-rake gitlab:db:configure GITLAB_ROOT_PASSWORD="$initial_root_password" \
GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}' > /dev/null
# We remove potentially broken links to old gitlab-shell versions
rm -Rf ${cfg.statePath}/repositories/**/*.git/hooks