Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7d31bbceaa12
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3f97de182f39
Choose a head ref
  • 7 commits
  • 14 files changed
  • 2 contributors

Commits on Mar 5, 2020

  1. gitlab: 12.7.6 -> 12.8.1 

    https://about.gitlab.com/releases/2020/02/22/gitlab-12-8-released/
https://about.gitlab.com/releases/2020/02/24/gitlab-12-8-1-released/

(cherry-picked from commit 7d8a200)
    @talyz
    talyz authored and Milan Pässler committed Mar 5, 2020
    Copy the full SHA
    cf3cc7a View commit details

  2. gitaly: 1.83.0 -> 12.8.1 

    (cherry-picked from commit facef28)
    @talyz
    talyz authored and Milan Pässler committed Mar 5, 2020
    Copy the full SHA
    e72a27e View commit details

  3. gitlab-workhorse: 8.20.0 -> 8.21.0 

    (cherry-picked from commit f2bb523)
    @talyz
    talyz authored and Milan Pässler committed Mar 5, 2020
    Copy the full SHA
    802ff69 View commit details

  4. gitlab-shell: Change name from gitlab-shell-go to gitlab-shell 

    This is left over from when gitlab-shell had a ruby part and a go
part. The ruby part is now gone, so let's call the go part
gitlab-shell.

(cherry-picked from commit a3b2828)
    @talyz
    talyz authored and Milan Pässler committed Mar 5, 2020
    Copy the full SHA
    7537484 View commit details

  5. bundlerEnv: Add option to copy gem files instead of symlinking 

    The way ruby loads gems and keeps track of their paths seems to not
always work very well when the gems are accessed through
symlinks. Ruby will then complain that the same files are loaded
multiple times; it relies on the file's full path to determine whether
the file is loaded or not.

This adds an option to simply copy all gem files into the environment
instead, which gets rid of this issue, but may instead result in major
file duplication.

(cherry-picked from commit affcf9b)
    @talyz
    talyz authored and Milan Pässler committed Mar 5, 2020
    Copy the full SHA
    00a06a7 View commit details

  6. gitaly: Copy gem files into bundler env instead of symlinking 

    This fixes issue #79374, where gitaly prints warning messages on the
client side when running push or fetch.

(cherry-picked from commit 74769b6)
    @talyz
    talyz authored and Milan Pässler committed Mar 5, 2020
    Copy the full SHA
    1b2ab5d View commit details

  7. gitlab: 12.8.1 -> 12.8.2 (#81803) 

    Includes multiple security fixes mentioned in
https://about.gitlab.com/releases/2020/03/04/gitlab-12-dot-8-dot-2-released/
(unfortunately, no CVE numbers as of yet)

 - Directory Traversal to Arbitrary File Read
 - Account Takeover Through Expired Link
 - Server Side Request Forgery Through Deprecated Service
 - Group Two-Factor Authentication Requirement Bypass
 - Stored XSS in Merge Request Pages
 - Stored XSS in Merge Request Submission Form
 - Stored XSS in File View
 - Stored XSS in Grafana Integration
 - Contribution Analytics Exposed to Non-members
 - Incorrect Access Control in Docker Registry via Deploy Tokens
 - Denial of Service via Permission Checks
 - Denial of Service in Design For Public Issue
 - GitHub Tokens Displayed in Plaintext on Integrations Page
 - Incorrect Access Control via LFS Import
 - Unescaped HTML in Header
 - Private Merge Request Titles Leaked via Widget
 - Project Namespace Exposed via Vulnerability Feedback Endpoint
 - Denial of Service Through Recursive Requests
 - Project Authorization Not Being Updated
 - Incorrect Permission Level For Group Invites
 - Disclosure of Private Group Epic Information
 - User IP Address Exposed via Badge images
 - Update postgresql (GitLab Omnibus)

(cherry-picked from commit c25756f)
    Milan committed Mar 5, 2020
    Copy the full SHA
    3f97de1 View commit details
12 changes: 6 additions & 6 deletions pkgs/applications/version-management/gitlab/data.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"version": "12.7.6",
"repo_hash": "092c6n2jg8himmcc23gh3gvmx0y272kwk00cj1s2k4b92dlzvm18",
"version": "12.8.2",
"repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.7.6-ee",
"rev": "v12.8.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "1.83.0",
"GITLAB_PAGES_VERSION": "1.12.0",
"GITALY_SERVER_VERSION": "12.8.2",
"GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.20.0"
"GITLAB_WORKHORSE_VERSION": "8.21.0"
}
}
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/Gemfile
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3'
gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 7.5', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.0'
gem 'activesupport', '~> 5.2.3'
gem 'activesupport', '6.0.2'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
@@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false

# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.5.0'
gem 'gitlab-labkit', '~> 0.9.1'

# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
46 changes: 24 additions & 22 deletions pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -2,32 +2,33 @@ GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
actionpack (6.0.2)
actionview (= 6.0.2)
activesupport (= 6.0.2)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.0.2)
activesupport (= 6.0.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activesupport (5.2.3)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.0.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
ast (2.4.0)
binding_ninja (0.2.3)
builder (3.2.3)
builder (3.2.4)
charlock_holmes (0.7.6)
coderay (1.1.2)
concord (0.1.5)
@@ -36,11 +37,11 @@ GEM
concurrent-ruby (1.1.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.5)
crass (1.0.6)
diff-lcs (1.3)
docile (1.3.2)
equalizer (0.0.11)
erubi (1.8.0)
erubi (1.9.0)
escape_utils (1.2.1)
factory_bot (5.0.2)
activesupport (>= 4.2.0)
@@ -71,9 +72,9 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gitlab-labkit (0.5.2)
actionpack (~> 5)
activesupport (~> 5)
gitlab-labkit (0.9.1)
actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0)
grpc (~> 1.19)
jaeger-client (~> 0.10)
opentracing (~> 0.4)
@@ -88,7 +89,7 @@ GEM
google-protobuf (~> 3.8)
googleapis-common-protos-types (~> 1.0)
hashdiff (0.3.9)
i18n (1.6.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaeger-client (0.10.0)
@@ -110,7 +111,7 @@ GEM
mime-types-data (3.2019.0331)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest (5.14.0)
msgpack (1.3.1)
multipart-post (2.0.0)
nokogiri (1.10.7)
@@ -132,7 +133,7 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.3)
rack (2.0.7)
rack (2.1.2)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
@@ -146,8 +147,8 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (6.2.0)
redis (4.1.2)
rouge (3.11.0)
redis (4.1.3)
rouge (3.15.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@@ -192,7 +193,7 @@ GEM
thread_safe (0.3.6)
thrift (0.11.0.0)
timecop (0.9.1)
tzinfo (1.2.5)
tzinfo (1.2.6)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
unparser (0.4.5)
@@ -208,19 +209,20 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
zeitwerk (2.2.2)

PLATFORMS
ruby

DEPENDENCIES
activesupport (~> 5.2.3)
activesupport (= 6.0.2)
bundler (>= 1.17.3)
factory_bot
faraday (~> 0.12)
github-linguist (~> 7.5)
gitlab-gollum-lib (~> 4.2.7.7)
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-labkit (~> 0.5.0)
gitlab-labkit (~> 0.9.1)
gitlab-markup (~> 1.7.0)
google-protobuf (~> 3.8.0)
grpc (~> 1.24.0)
8 changes: 5 additions & 3 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{ stdenv, fetchFromGitLab, buildGoPackage, ruby, bundlerEnv, pkgconfig, libgit2 }:
{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby,
bundlerEnv, pkgconfig, libgit2 }:

let
rubyEnv = bundlerEnv rec {
name = "gitaly-env";
inherit ruby;
copyGemFiles = true;
gemdir = ./.;
gemset =
let x = import (gemdir + "/gemset.nix");
@@ -17,14 +19,14 @@ let
};
};
in buildGoPackage rec {
version = "1.83.0";
version = "12.8.2";
pname = "gitaly";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "1vwa38mhnxyncrrvp45d8s6fg94xaq8c71d7qh9ip77db0ak45kh";
sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic";
};

# Fix a check which assumes that hook files are writeable by their
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/deps.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading