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

gitlab: 11.10.4 -> 11.10.5 #63045

Closed
wants to merge 1 commit into from

Conversation

Projects
None yet
4 participants
@mmahut
Copy link
Contributor

commented Jun 12, 2019

Motivation for this change

Security update to 11.10.5

https://about.gitlab.com/2019/06/03/security-release-gitlab-11-dot-11-dot-1-released/

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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mmahut

This comment has been minimized.

Copy link
Contributor Author

commented Jun 12, 2019

ping @flokli for potencial review

@samueldr samueldr requested a review from flokli Jun 12, 2019

@samueldr

This comment has been minimized.

Copy link
Member

commented Jun 12, 2019

@GrahamcOfBorg build gitlab

@flokli

This comment has been minimized.

Copy link
Contributor

commented Jun 13, 2019

@mmahut thanks! Please target master, the fix for 19.03 can be easily backported afterwards.

@flokli flokli changed the base branch from release-19.03 to master Jun 13, 2019

@flokli flokli force-pushed the mmahut:gitlab_11.0.5 branch from f568b6e to c674f39 Jun 13, 2019

@flokli

This comment has been minimized.

Copy link
Contributor

commented Jun 13, 2019

@GrahamcOfBorg build gitlab

@Ekleog

This comment has been minimized.

Copy link
Member

commented Jun 13, 2019

In the fix list there's a bug that appears to be an unauthed RCE, so merging this until @flokli reviews Merges are bf01a3b (technically done with a cherry-pick) and backport 5713232

@mmahut Actually, this PR should have been opened against master, and a backport generated with git cherry-pick -x sent to release-19.03. Sorry for having misunderstood your question on IRC!

Also, I think the test is broken (and already was before this PR), as I'm unable to run it on my computer, but let's try to run it on ofborg anyway -- cc @fpletz @globin @krav as maintainers, and @flokli who apparently was expected for review.

@GrahamcOfBorg build nixosTests.gitlab

@flokli

This comment has been minimized.

Copy link
Contributor

commented Jun 13, 2019

This was merged to master and 19.03 manually, as described above, so closing here. Thanks for the PR!

@flokli flokli closed this Jun 13, 2019

@mmahut

This comment has been minimized.

Copy link
Contributor Author

commented Jun 13, 2019

Just for the record, I opened just againts release-19.03 as my plan to open an udate to 11.11.3 againts master. Is this okay process wide? Or should we always have commits in both master and release-19.03?

@mmahut mmahut deleted the mmahut:gitlab_11.0.5 branch Jun 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.