Skip to content
This repository has been 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
base: 4a0df0ce2636
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: a7ceb2536ab1
Choose a head ref
  • 7 commits
  • 8 files changed
  • 3 contributors

Commits on Apr 28, 2020

  1. nixos/gitlab: Fix services.gitlab.enableStartTLSAuto 

    'toString false' results in an empty string, which, in this context,
is a syntax error. Use boolToString instead.

Fixes #86160

(cherry picked from commit c0a838d)
    @talyz
    talyz committed Apr 28, 2020
    Copy the full SHA
    f907dc9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #86191 from talyz/release-19.09 

    nixos/gitlab: Fix services.gitlab.enableStartTLSAuto
    @talyz
    talyz committed Apr 28, 2020
    Copy the full SHA
    9ffae2a View commit details
    Browse the repository at this point in the history

  3. gitlab: 12.8.8 -> 12.8.9 

    See
https://about.gitlab.com/releases/2020/04/14/critical-security-release-gitlab-12-dot-9-dot-3-released/
for details.

(cherry picked from commit d190292)
    @flokli
    flokli committed Apr 28, 2020
    Copy the full SHA
    7b9f3c8 View commit details
    Browse the repository at this point in the history

  4. gitlab: support passing --rev to the update-all script 

    While it's already possible to invoke `update-data` with the `--rev`
argument, one still needs to run all later phases manually.

Fix this, by having `update-all` also accept a `--rev` argument, and
pass it down to `update-data`.

Also, make the help text a bit more usable, by suggesting the usual
versioning scheme used these times.

(cherry picked from commit 191c2c67a409ae8cf3d3bee7811a7b10397efe81)
    @flokli
    flokli committed Apr 28, 2020
    Copy the full SHA
    57df0aa View commit details
    Browse the repository at this point in the history

  5. gitlab-workhorse: 8.21.1 -> 8.21.2 

    (cherry picked from commit f7ddd30bef15238d6d9a12f48408d38571944d85)
    @flokli
    flokli committed Apr 28, 2020
    Copy the full SHA
    767ca36 View commit details
    Browse the repository at this point in the history

  6. gitaly: 12.8.8 -> 12.8.9 

    (cherry picked from commit c86c77be0cf45023586e7252bfb05238ae6d38db)
    @flokli
    flokli committed Apr 28, 2020
    Copy the full SHA
    68169a7 View commit details
    Browse the repository at this point in the history

  7. gitlab: update.py: invoke bundle lock manually 

    `bundix -l` doesn't work, as it treats bundler's warning about upgrading
the lockfile version as an error, so invoke `bundle lock` manually.

(cherry picked from commit 4c26ab4)
    @manveru @flokli
    manveru authored and flokli committed Apr 28, 2020
    Copy the full SHA
    a7ceb25 View commit details
    Browse the repository at this point in the history