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: bd210da58246
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4094ac5a33da
Choose a head ref
  • 13 commits
  • 15 files changed
  • 3 contributors

Commits on Jan 17, 2018

  1. gitlab: 10.0.2 -> 10.1.1 

    (cherry picked from commit f2ac5e0)
    @afrepues @globin
    afrepues authored and globin committed Jan 17, 2018
    Copy the full SHA
    80288f7 View commit details
    Browse the repository at this point in the history

  2. gitlab-shell: 5.9.0 -> 5.9.3 

    (cherry picked from commit c9bb6ac)
    @afrepues @globin
    afrepues authored and globin committed Jan 17, 2018
    Copy the full SHA
    a294cfb View commit details
    Browse the repository at this point in the history

  3. gitlab-workhorse: 3.0.0 -> 3.2.0 

    (cherry picked from commit fa0148a)
    @afrepues @globin
    afrepues authored and globin committed Jan 17, 2018
    Copy the full SHA
    1feccc9 View commit details
    Browse the repository at this point in the history

  4. gitlab: 10.1.1 -> 10.3.3 

    (cherry picked from commit 1c5fd46)
    @globin
    globin committed Jan 17, 2018
    Copy the full SHA
    4a3dc0e View commit details
    Browse the repository at this point in the history

  5. gitlab-shell: 5.9.3 -> 5.10.2 

    (cherry picked from commit 0ad54e4)
    @globin
    globin committed Jan 17, 2018
    Copy the full SHA
    ae7a9e1 View commit details
    Browse the repository at this point in the history

  6. gitlab-workhorse: 3.2.0 -> 3.3.1 

    (cherry picked from commit 042c12e)
    @globin
    globin committed Jan 17, 2018
    Copy the full SHA
    1b39953 View commit details
    Browse the repository at this point in the history

  7. gitaly: 0.38.0 -> 0.43.1 

    (cherry picked from commit 2aa4517)
    @afrepues @globin
    afrepues authored and globin committed Jan 17, 2018
    Copy the full SHA
    703ea75 View commit details
    Browse the repository at this point in the history

  8. gitaly: 0.43.1 -> 0.59.2 

    (cherry picked from commit e7e12e5)
    @globin
    globin committed Jan 17, 2018
    Copy the full SHA
    34faf46 View commit details
    Browse the repository at this point in the history

  9. gitlab: remove unnecessary assertion 

    It also gives less information than the error from the module system.

(cherry picked from commit c403676)
    @globin
    globin committed Jan 17, 2018
    Copy the full SHA
    e784b4a View commit details
    Browse the repository at this point in the history

  10. gitlab: Rename jws_private_key to openid_connect_signing_key 

    See
gitlabhq/omnibus-gitlab@24d56df

(cherry picked from commit b95cdd4)
    @bgamari @globin
    bgamari authored and globin committed Jan 17, 2018
    Copy the full SHA
    3e5160f View commit details
    Browse the repository at this point in the history

  11. gitlab module: gitaly fixes 

    (cherry picked from commit 69c396f)
    @globin
    globin committed Jan 17, 2018
    Copy the full SHA
    9685f4e View commit details
    Browse the repository at this point in the history

  12. gitlab module: config changes for gitlab 10.3 

    (cherry picked from commit e606bb2)
    @globin
    globin committed Jan 17, 2018
    Copy the full SHA
    be1e131 View commit details
    Browse the repository at this point in the history

  13. gitlab: 10.3.3 -> 10.3.4 

    Fixes:
 - CVE-2017-0915
 - CVE-2018-3710
 - CVE-2017-0918
 - CVE-2017-0923
 - CVE-2017-0925
 - CVE-2017-0926
 - CVE-2017-0924
 - CVE-2017-0914
 - CVE-2017-0916
 - CVE-2017-0917
 - CVE-2017-0927
 - CVE-2017-0922

See https://about.gitlab.com/2018/01/16/gitlab-10-dot-3-dot-4-released/
for details.

(cherry picked from commit 231f434)
    @globin
    globin committed Jan 17, 2018
    Copy the full SHA
    4094ac5 View commit details
    Browse the repository at this point in the history