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: c40d1486cc93
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: eadeca9ea759
Choose a head ref
  • 7 commits
  • 25 files changed
  • 2 contributors

Commits on Oct 4, 2019

  1. gitlab: 12.1.6 -> 12.3.4

    - Update GitLab to 12.3.4
    
    - Update update.py to cope with the new upstream repository structure
    
    - Refactor gitlab-shell to use buildGoPackage and bundlerEnv for
      dependencies
    
    - Refactor gitlab-workhorse to use buildGoPackage for dependencies
    
    - Make update.py able to update gitlab-shell and gitlab-workhorse
      dependencies
    
    - Various fixes necessary for update to work
    talyz committed Oct 4, 2019
    Copy the full SHA
    f3eb063 View commit details
    Browse the repository at this point in the history
  2. gitlab-shell: Split patch into ruby and go parts

    Split the remove-hardcoded-locations patch into two separate patches,
    one for the ruby package and one for the go package. This is clearer
    and results in fewer rebuilds.
    talyz committed Oct 4, 2019
    Copy the full SHA
    09e657e View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. gitlab: Build frontend assets from source

    Instead of extracting prebuilt assets from the debian build, build
    them from the source. This should give faster package updates and
    reduces the amount of data needed to be downloaded by more than 500MB.
    talyz committed Oct 8, 2019
    Copy the full SHA
    59324d1 View commit details
    Browse the repository at this point in the history
  2. gitlab: Refactor for new repo structure

    GitLab recently restructured their repos; whereas previously they had
    one gitlab-ce and one gitlab-ee repo, they're now one and the
    same. All proprietary components are put into the ee subdirectory -
    removing it gives us the foss / community version of GitLab. For more
    info, see
    https://about.gitlab.com/2019/02/21/merging-ce-and-ee-codebases/
    
    This gives us the opportunity to simplify things quite a bit, since we
    don't have to keep track of two separate versions of either the base
    data or rubyEnv.
    talyz committed Oct 8, 2019
    Copy the full SHA
    afa3abf View commit details
    Browse the repository at this point in the history
  3. gitlab: 12.3.4 -> 12.3.5

    talyz committed Oct 8, 2019
    Copy the full SHA
    9be76d0 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    c115d4d View commit details
    Browse the repository at this point in the history
  5. Merge pull request #70216 from talyz/gitlab_12_3_2

    gitlab: 12.1.6 -> 12.3.5, bundler: 1.17.2 -> 1.17.3
    globin committed Oct 8, 2019
    Copy the full SHA
    eadeca9 View commit details
    Browse the repository at this point in the history