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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4b34c18e310b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b26075b1377
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 13, 2020

  1. gitlab: fix asset building for CE 

    We have to specify if we're building CE or EE otherwise at least some JS
building was broken, resulting in e.g. broken "boards" pages.
    @globin
    globin committed Jan 13, 2020
    Copy the full SHA
    6bf0ed8 View commit details

Commits on Jan 16, 2020

  1. Merge pull request #77624 from mayflower/gitlab-ce-assets-building 

    gitlab: fix asset building for CE
    @globin
    globin authored Jan 16, 2020
    Copy the full SHA
    7b26075 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 pkgs/applications/version-management/gitlab/default.nix
1 change: 1 addition & 0 deletions pkgs/applications/version-management/gitlab/default.nix
View file
Original file line number Diff line number Diff line change
@@ -51,6 +51,7 @@ let
# One of the patches uses this variable - if it's unset, execution
# of rake tasks fails.
GITLAB_LOG_PATH = "log";
FOSS_ONLY = !gitlabEnterprise;

configurePhase = ''
runHook preConfigure