Merge pull request #5323 from offlinehacker/gitlab_i686_fix

gitlab: fix i686-linux build and module

nixos/modules/services/misc/gitlab.nix

@@ -193,6 +193,7 @@ in {
         gitAndTools.git
         ruby
         openssh
+        nodejs
       ];
       serviceConfig = {
         Type = "simple";
@@ -227,6 +228,7 @@ in {
         gitAndTools.git
         ruby
         openssh
+        nodejs
       ];
       preStart = ''
         # TODO: use env vars

nixos/tests/gitlab.nix

@@ -14,6 +14,7 @@ import ./make-test.nix {
   testScript = ''
     $gitlab->start();
     $gitlab->waitForUnit("gitlab.service");
-    $gitlab->waitUntilSucceeds("curl http://localhost:8080");
+    $gitlab->waitForUnit("gitlab-sidekiq.service");
+    $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in");
   '';
 }