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

gitlab: 11.5.0 -> 11.5.1 #51526

Merged
merged 2 commits into from Dec 4, 2018
Merged

gitlab: 11.5.0 -> 11.5.1 #51526

merged 2 commits into from Dec 4, 2018

Conversation

globin
Copy link
Member

@globin globin commented Dec 4, 2018

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

cc @flokli

flokli
flokli reviewed Dec 4, 2018
View reviewed changes
pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@@ -25,7 +25,7 @@ index 435cb29..078c1df 100644

func NewFromDir(dir string) (*Config, error) {
- return newFromFile(path.Join(dir, configFile))
+ return newFromFile(path.Join(dir, "shell-config.yml"))
+ return newFromFile("/run/gitlab/shell-config.yml")
Copy link
Contributor

@flokli flokli Dec 4, 2018 •
edited

Choose a reason for hiding this comment

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

why was that necessary? To increase readability?
We do set dir to /run/gitlab inside above function and pass it as dir into here.

Copy link
Contributor

Choose a reason for hiding this comment

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

reply from @globin via another channel: there were multiple callers of NewFromDir, und by patching it here we catch all.

@flokli
Copy link
Contributor

flokli commented Dec 4, 2018

Tested via my playground gitlab instance, and was also tested by @globin on a more production instance. Merging.

@flokli flokli merged commit 478654d into NixOS:master Dec 4, 2018
@flokli flokli mentioned this pull request Dec 4, 2018
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flokli flokli flokli left review comments

Assignees
No one assigned
Labels
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
3 participants
@globin @flokli @GrahamcOfBorg