Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d166c694188
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43e3285cf523
Choose a head ref
  • 13 commits
  • 15 files changed
  • 3 contributors

Commits on Nov 26, 2018

  1. gitlab-shell: move to pkgs/applications/version-management/gitlab 

    (cherry picked from commit 8e8f692)
    @flokli
    flokli committed Nov 26, 2018
    Copy the full SHA
    df9c1df View commit details

  2. gitaly: move to pkgs/applications/version-management/gitlab 

    (cherry picked from commit cb79c1e)
    @flokli
    flokli committed Nov 26, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c430d13 View commit details

  3. gitlab-workhorse: move to pkgs/applications/version-management/gitlab 

    (cherry picked from commit d768e39)
    @flokli
    flokli committed Nov 26, 2018
    Copy the full SHA
    bfc48c7 View commit details

  4. gitlab-workhorse: drop deterministic-build.patch 

    we already set VERSION in makeFlags below.

(cherry picked from commit 8b51e83)
    @flokli
    flokli committed Nov 26, 2018
    Copy the full SHA
    c3b6aab View commit details

  5. gitlab-workhorse: rename srcs attribute to src 

    (cherry picked from commit 3233efb)
    @flokli
    flokli committed Nov 26, 2018
    Copy the full SHA
    3905118 View commit details

  6. gitlab: 11.4.4 -> 11.5.0, add data.json, make default.nix use it 

    (cherry picked from commit 625e66d)
    @flokli
    flokli committed Nov 26, 2018
    Copy the full SHA
    3d05f49 View commit details

  7. gitlab-shell: 8.3.3 -> 8.4.1 

    (cherry picked from commit 293a631)
    @flokli
    flokli committed Nov 26, 2018
    Copy the full SHA
    808219b View commit details

  8. gitlab-workhorse: 7.0.0 -> 7.1.0 

    (cherry picked from commit a33622e)
    @flokli
    flokli committed Nov 26, 2018
    Copy the full SHA
    a8b34b1 View commit details

  9. gitaly: 0.125.1 -> 0.129.0 

    (cherry picked from commit 63f2547)
    @flokli
    flokli committed Nov 26, 2018
    Copy the full SHA
    3e65e8d View commit details

  10. gitlab tests: enable recommendedProxySettings, test redirection works… 

    … as it should

The nixos test is a bit misleading, as the given nginx configuration
would always cause gitlab to redirect to localhost, which is clearly not
what you want in a production setup.

Instead we now enable services.nginx.recommendedProxySettings,
curl against http://gitlab, and assure we get redirected to that same
hostname, too.

(cherry picked from commit 6870eaf)
    @flokli
    flokli committed Nov 26, 2018
    Copy the full SHA
    86e84c6 View commit details

Commits on Nov 27, 2018

  1. gitlab-runner: 11.2.0 -> 11.5.0 

    (cherry picked from commit c3c57c7)
    @bachp @flokli
    bachp authored and flokli committed Nov 27, 2018
    Copy the full SHA
    aa4599b View commit details

Commits on Nov 28, 2018

  1. gitlab-shell: don't hardcode gitlab-shell paths in authorized_keys 

    (cherry picked from commit a3ec5dc)
    @flokli
    Kristoffer Thømt Ravneberg authored and flokli committed Nov 28, 2018
    Copy the full SHA
    bb287f8 View commit details

Commits on Nov 30, 2018

  1. Merge pull request #51072 from flokli/gitlab-11.5.0-18.09 

    [18.09] Gitlab 11.5.0
    @flokli
    flokli authored Nov 30, 2018
    Copy the full SHA
    43e3285 View commit details
Loading