diff options
| author | Florian Klink <flokli@flokli.de> | 2018-11-03 01:49:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 01:49:23 +0100 |
| commit | 93f8ff68eaaac6e294ec4fa918bb6d445d6c73bf (patch) | |
| tree | 289d05b11794b8d3f4fff5d49533a8a1ad5b9708 /pkgs/applications | |
| parent | 469cce069bd5e723bbdf0d9d28ec024596f343d3 (diff) | |
| parent | ec7cb84bf07ef1064a28b0b4dbb370efacd9e56e (diff) | |
| download | nixlib-93f8ff68eaaac6e294ec4fa918bb6d445d6c73bf.tar nixlib-93f8ff68eaaac6e294ec4fa918bb6d445d6c73bf.tar.gz nixlib-93f8ff68eaaac6e294ec4fa918bb6d445d6c73bf.tar.bz2 nixlib-93f8ff68eaaac6e294ec4fa918bb6d445d6c73bf.tar.lz nixlib-93f8ff68eaaac6e294ec4fa918bb6d445d6c73bf.tar.xz nixlib-93f8ff68eaaac6e294ec4fa918bb6d445d6c73bf.tar.zst nixlib-93f8ff68eaaac6e294ec4fa918bb6d445d6c73bf.zip | |
Merge pull request #49658 from mayflower/gitlab-refactor
gitlab: refactor and fix test
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index ace0df5efdfd..933db40cfc0e 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -63,17 +63,7 @@ stdenv.mkDerivation rec { --replace "ps -U" "${procps}/bin/ps -U" sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake - - # required for some gems: - cat > config/database.yml <<EOF - production: - adapter: <%= ENV["GITLAB_DATABASE_ADAPTER"] || sqlite %> - database: gitlab - host: <%= ENV["GITLAB_DATABASE_HOST"] || "127.0.0.1" %> - password: <%= ENV["GITLAB_DATABASE_PASSWORD"] || "blerg" %> - username: gitlab - encoding: utf8 - EOF + sed -ri -e '/log_level/a config.logger = Logger.new(STDERR)' config/environments/production.rb ''; buildPhase = '' |