Navigation Menu

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: 87cc49a3fe64
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 53e5e70edab2
Choose a head ref
  • 8 commits
  • 16 files changed
  • 3 contributors

Commits on Mar 4, 2020

  1. nixos/zfs: continue trimming also if one pool fails 

    fixes NixOS/nixpkgs#81602

(cherry picked from commit 557989c460e386d0abca068245806a2fbc89edf0)
    @Mic92
    Mic92 committed Mar 4, 2020
    Copy the full SHA
    876085e View commit details
    Browse the repository at this point in the history

  2. knot-resolver: apply upstream patch 

    Encrypted ZFS users were affected, in particular some NixOS users
who reported the issue upstream.  /cc #81188.

(cherry picked from commit b7f5450)
    @vcunat
    vcunat committed Mar 4, 2020
    Copy the full SHA
    feaa634 View commit details
    Browse the repository at this point in the history

  3. gitlab: 12.7.6 -> 12.8.1 

    https://about.gitlab.com/releases/2020/02/22/gitlab-12-8-released/
https://about.gitlab.com/releases/2020/02/24/gitlab-12-8-1-released/
    @talyz
    talyz authored and Milan committed Mar 4, 2020
    Copy the full SHA
    894ff16 View commit details
    Browse the repository at this point in the history

  4. gitaly: 1.83.0 -> 12.8.1

    @talyz
    talyz authored and Milan committed Mar 4, 2020
    Copy the full SHA
    750cf9e View commit details
    Browse the repository at this point in the history

  5. gitlab-workhorse: 8.20.0 -> 8.21.0

    @talyz
    talyz authored and Milan committed Mar 4, 2020
    Copy the full SHA
    08582eb View commit details
    Browse the repository at this point in the history

  6. gitlab-shell: Change name from gitlab-shell-go to gitlab-shell 

    This is left over from when gitlab-shell had a ruby part and a go
part. The ruby part is now gone, so let's call the go part
gitlab-shell.
    @talyz
    talyz authored and Milan committed Mar 4, 2020
    Copy the full SHA
    06bd94c View commit details
    Browse the repository at this point in the history

  7. bundlerEnv: Add option to copy gem files instead of symlinking 

    The way ruby loads gems and keeps track of their paths seems to not
always work very well when the gems are accessed through
symlinks. Ruby will then complain that the same files are loaded
multiple times; it relies on the file's full path to determine whether
the file is loaded or not.

This adds an option to simply copy all gem files into the environment
instead, which gets rid of this issue, but may instead result in major
file duplication.
    @talyz
    talyz authored and Milan committed Mar 4, 2020
    Copy the full SHA
    4d50664 View commit details
    Browse the repository at this point in the history

  8. gitaly: Copy gem files into bundler env instead of symlinking 

    This fixes issue #79374, where gitaly prints warning messages on the
client side when running push or fetch.
    @talyz
    talyz authored and Milan committed Mar 4, 2020
    Copy the full SHA
    53e5e70 View commit details
    Browse the repository at this point in the history