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
base: 2437cd6094ff
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e97d89fde2e4
Choose a head ref
  • 4 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 28, 2020

  1. 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 191c2c6)
    @flokli
    flokli committed Apr 28, 2020
    Copy the full SHA
    c69934e View commit details
    Browse the repository at this point in the history

  2. gitlab-workhorse: 8.21.1 -> 8.21.2 

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

  3. gitaly: 12.8.8 -> 12.8.9 

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

  4. 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 c7d47ce)
    @manveru @flokli
    manveru authored and flokli committed Apr 28, 2020
    Copy the full SHA
    e97d89f View commit details
    Browse the repository at this point in the history