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: e8880627e842
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53a8634ad57c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 12, 2017

  1. gitlab service: fix uploading artifacts from gitlab-runner 

    Add the binaries from gitlab-workhorse to the path of the
gitlab-workhorse service, as gitlab-zip-metadata is needed
by the service
    Michał Pałka committed May 12, 2017
    Copy the full SHA
    8aa756b View commit details

Commits on May 13, 2017

  1. Merge pull request #25726 from michalpalka/gitlab-runner-fix 

    gitlab service: fix uploading artifacts from gitlab-runner
    @Mic92
    Mic92 authored May 13, 2017
    Copy the full SHA
    53a8634 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 nixos/modules/services/misc/gitlab.nix
1 change: 1 addition & 0 deletions nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -440,6 +440,7 @@ in {
path = with pkgs; [
gitAndTools.git
openssh
gitlab-workhorse
];
preStart = ''
mkdir -p /run/gitlab