Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.03] gitlab: 12.7.6 -> 12.8.1 #81654

Merged
6 commits merged into from Mar 4, 2020
Merged

[20.03] gitlab: 12.7.6 -> 12.8.1 #81654

6 commits merged into from Mar 4, 2020

Conversation

ghost
Copy link

@ghost ghost commented Mar 3, 2020 •
edited by ghost

Motivation for this change

Backport of #81556

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@talyz
gitlab: 12.7.6 -> 12.8.1
fd4429d 
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
gitaly: 1.83.0 -> 12.8.1
7546b5c
@talyz
gitlab-workhorse: 8.20.0 -> 8.21.0
878a867
@talyz
gitlab-shell: Change name from gitlab-shell-go to gitlab-shell
fb670a8 
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
bundlerEnv: Add option to copy gem files instead of symlinking
9474fad 
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
gitaly: Copy gem files into bundler env instead of symlinking
d9ea349 
This fixes issue #79374, where gitaly prints warning messages on the
client side when running push or fetch.
@ghost ghost requested review from alyssais and zimbatm as code owners March 3, 2020 21:38
@ofborg ofborg bot added the 6.topic: ruby label Mar 3, 2020
@ofborg ofborg bot requested review from talyz, fpletz, ehmry and globin March 3, 2020 21:48
@talyz
Copy link
Contributor

talyz commented Mar 4, 2020

@GrahamcOfBorg test gitlab

talyz
talyz approved these changes Mar 4, 2020
View reviewed changes
Copy link
Contributor

@talyz talyz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works as expected, both the NixOS tests and playing around in a VM. :)

@ghost ghost merged commit 53e5e70 into NixOS:release-20.03 Mar 4, 2020
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alyssais alyssais Awaiting requested review from alyssais alyssais is a code owner

@zimbatm zimbatm Awaiting requested review from zimbatm zimbatm is a code owner

@fpletz fpletz Awaiting requested review from fpletz

@ehmry ehmry Awaiting requested review from ehmry

@globin globin Awaiting requested review from globin

Assignees
No one assigned
Labels
6.topic: ruby 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@talyz