Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 4ddaf40a7dc0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 27a5ddcf747f
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on Oct 23, 2019

  1. gitlab: Get rid of most 'already initialized constant'-warnings 

    On start, unicorn, sidekiq and other parts running ruby code emits
quite a few warnings similar to

/var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here
/var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL
/nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here

This seems to be caused by the same ruby files being evaluated
multiple times due to the paths being different - sometimes they're
loaded using the direct path and sometimes through a symlink, due to
our split between config and package data. To fix this, we make sure
that the offending files in the state directory always reference the
store path, regardless of that being the real file or a symlink.

(cherry picked from commit ed4a09c)
    @talyz
    talyz committed Oct 23, 2019
    Copy the full SHA
    3e29737 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #71816 from talyz/gitlab-already-initialized-const… 

    …ant-release-19.09

gitlab: Get rid of most 'already initialized constant'-warnings
    @flokli
    flokli committed Oct 23, 2019
    Copy the full SHA
    12abbe5 View commit details
    Browse the repository at this point in the history

  3. nixos/smokeping: replace smokeping.fcgi with a symlink 

    This fixes a regression from bb649d9.
There were permission problems, when the preStart script tried to copy
the smokeping.fcgi file over the old file.

(cherry picked from commit 9eb067b)
    @erictapen @wizeman
    erictapen authored and wizeman committed Oct 23, 2019
    Copy the full SHA
    990f5f4 View commit details
    Browse the repository at this point in the history

  4. smokeping: add erictapen as maintainer 

    (cherry picked from commit b8cd11f)
    @erictapen @wizeman
    erictapen authored and wizeman committed Oct 23, 2019
    Copy the full SHA
    27a5ddc View commit details
    Browse the repository at this point in the history