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: 6939378871a1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 58f884cd3d89
Choose a head ref
  • 8 commits
  • 16 files changed
  • 3 contributors

Commits on Jun 3, 2020

  1. gitlab: 12.8.10 -> 12.10.6 

    (cherry picked from commit f613702)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    3a0a5e5 View commit details
    Browse the repository at this point in the history

  2. gitlab: increase webpack memory limit 

    (cherry picked from commit 7555548)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    2968e6f View commit details
    Browse the repository at this point in the history

  3. nixos/gitlab: use new structure.sql 

    According to https://gitlab.com/gitlab-org/gitlab/-/issues/211487

(cherry picked from commit 47c8e52)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    3069def View commit details
    Browse the repository at this point in the history

  4. gitaly: revert a commit that broke config loading 

    (cherry picked from commit e32bf64)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    d181fdf View commit details
    Browse the repository at this point in the history

  5. gitaly: fix gitlab-shell-config path patching 

    (cherry picked from commit 7060927)
    @globin @flokli
    globin authored and flokli committed Jun 3, 2020
    Copy the full SHA
    6bd20ee View commit details
    Browse the repository at this point in the history

  6. gitlab: 12.10.6 -> 12.10.8 

    (cherry picked from commit af05325)
    @globin @flokli
    globin authored and flokli committed Jun 3, 2020
    Copy the full SHA
    0610639 View commit details
    Browse the repository at this point in the history

  7. gitlab: 12.10.8 -> 12.10.9 

    (cherry picked from commit d7b09d3)
    @flokli
    flokli committed Jun 3, 2020
    Copy the full SHA
    2947a53 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Merge pull request #89435 from flokli/20.03/gitlab-12.10.9 

    [20.03] gitlab: 12.8.10 -> 12.10.9
    @flokli
    flokli committed Jun 4, 2020
    Copy the full SHA
    58f884c View commit details
    Browse the repository at this point in the history