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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0e1950c5a719
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 25757b66e183
Choose a head ref
  • 10 commits
  • 26 files changed
  • 1 contributor

Commits on Oct 9, 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

(cherry picked from commit f3eb063)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: 063CCCAD04182D32
    Expired
    Learn about vigilant mode
    Copy the full SHA
    7e65ab1 View commit details

  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.

(cherry picked from commit 09e657e)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cc2ddcd View commit details

  3. 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.

(cherry picked from commit 59324d1)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019
    Copy the full SHA
    d7a3aaa View commit details

  4. 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.

(cherry picked from commit afa3abf)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019
    Copy the full SHA
    fdba7dd View commit details

  5. gitlab: 12.3.4 -> 12.3.5 

    (cherry picked from commit 9be76d0)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019
    Copy the full SHA
    1babda4 View commit details

  6. gitlab: Add myself to list of maintainers 

    (cherry picked from commit c115d4d)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019
    Copy the full SHA
    e6fa97f View commit details

  7. nixos/gitlab: Fix state directory permissions 

    Since the preStart script is no longer running in privileged mode, we
reassign the files in the state directory and its config subdirectory
to the user we're running as. This is done by splitting the preStart
script into a privileged and an unprivileged part where the privileged
part does the reassignment.

Also, delete the database.yml symlink if it exists, since we want to
create a real file in its place.

Fixes #68696.

(cherry picked from commit 0f8133d)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019
    Copy the full SHA
    2af3ede View commit details

  8. nixos/gitlab: Clean up the initializers on start 

    The initializers directory is populated with files from the gitlab
distribution on start, but old files will be left in the state folder
even if they're removed from the distribution, which can lead to
startup failures. Fix this by always purging the directory on start
before populating it.

(cherry picked from commit c6efa9f)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019
    Copy the full SHA
    bdd898b View commit details

  9. nixos/gitlab: Fix evaluation failure when postgresql is disabled 

    config.services.postgresql.package is only defined when the postgresql
service is activated, which means we fail to evaluate when
databaseCreateLocally == false. Fix this by using the default
postgresql package when the postgresql service is disabled.

(cherry picked from commit ec958d4)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019
    Copy the full SHA
    8194004 View commit details

  10. nixos/gitlab: Only create the database when databaseHost is unset 

    Make sure that we don't create a database if we're not going to
connect to it. Also, fix the assertion that usernames be equal to only
trig when peer authentication is used (databaseHost == "").

(cherry picked from commit 58a7502)
    @talyz @globin
    talyz authored and globin committed Oct 9, 2019
    Copy the full SHA
    25757b6 View commit details
Loading