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

Commits on Jul 19, 2017

  1. gitlab: fix archive urls for gitlab service 

    Accessing an url like https://gitlab.example.org/group/project/repository/archive.tar.gz?ref=master
requires tar/gzip to be in the path of the gitlab-workhorse service otherwise it fails.
    @LnL7
    LnL7 committed Jul 19, 2017
    Copy the full SHA
    a03d611 View commit details

  2. Merge pull request #27507 from LnL7/fix-gitlab-archive-url 

    gitlab: fix archive urls for gitlab service
    @fpletz
    fpletz authored Jul 19, 2017
    Copy the full SHA
    13b0b7d View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 nixos/modules/services/misc/gitlab.nix
2 changes: 2 additions & 0 deletions nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -439,6 +439,8 @@ in {
environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
path = with pkgs; [
gitAndTools.git
gnutar
gzip
openssh
gitlab-workhorse
];