Skip to content
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
base: 5955b96940c9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1125fb02ccfc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 19, 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.
    talyz committed Oct 19, 2019
    Copy the full SHA
    ed4a09c View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2019

  1. Merge pull request #71428 from talyz/gitlab-already-initialized-constant

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