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.

Sign up for GitHub

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

gitlab: 11.2.3 -> 11.3.4, fix gitlab-ee #48096

Merged
merged 4 commits into from Oct 10, 2018
Merged

gitlab: 11.2.3 -> 11.3.4, fix gitlab-ee #48096

merged 4 commits into from Oct 10, 2018

Conversation

krav
Copy link
Contributor

@krav krav commented Oct 9, 2018

Motivation for this change

There's been a security release of Gitlab.

Additionally the Gemfile diverged between the community and enterprise edition with 11.3.0, so this adds a separate ruby env fixing gitlab-ee. I've also removed a timestamp from gitlab-workhorse to make it deterministic.

The test seems to work, but times out on my computer while the pre-execution script is running. I see it's commented out in nixos/release.nix.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@c0bw3b
Copy link
Contributor

c0bw3b commented Oct 9, 2018

The 11.3.x bump is ok for unstable, but the security issues means that release-18.09 should jump from 11.2.3 to 11.2.5

cc maintainers @fpletz @globin

@globin
Copy link
Member

globin commented Oct 10, 2018

We have been backporting all versions to release branches so far as it is too much work currently to let them diverge, if someone wants to step up to maintain security patch releases, I'll be happy to merge them, otherwise we'll continue with the current practice.

@globin globin self-assigned this Oct 10, 2018
@globin globin merged commit e51d749 into NixOS:master Oct 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@globin globin

Labels
1.severity: security 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@krav @c0bw3b @globin @GrahamcOfBorg