Unverified Commit 1f244f16 authored by Jeff Slight's avatar Jeff Slight Committed by GitHub
Browse files

gitlab: 15.6.0 -> 15.6.1 (#203868) 

* gitlab: 15.6.0 -> 15.6.1

* remove attr_encrypted gem
parent 5195ca23

pkgs/applications/version-management/gitlab/data.json

+5 −5
Original line number Diff line number Diff line 
{

  "version": "15.6.0",

  "repo_hash": "sha256-7Pjksu1l2QfhpYieEGB9coypSt/0iMfptCa69Iaoe3s=",

  "version": "15.6.1",

  "repo_hash": "sha256-cdwfljmJvApU2q0pmWSmcMnHkQH4hfN7+cld5oP880g=",

  "yarn_hash": "0lgl8rs9mlrwpzq75rywdbjbiib17wxvzlv1jibnx66iw1ym2rvh",

  "owner": "gitlab-org",

  "repo": "gitlab",

  "rev": "v15.6.0-ee",

  "rev": "v15.6.1-ee",

  "passthru": {

    "GITALY_SERVER_VERSION": "15.6.0",

    "GITALY_SERVER_VERSION": "15.6.1",

    "GITLAB_PAGES_VERSION": "1.63.0",

    "GITLAB_SHELL_VERSION": "14.13.0",

    "GITLAB_WORKHORSE_VERSION": "15.6.0"

    "GITLAB_WORKHORSE_VERSION": "15.6.1"

  },

  "vendored_gems": [

    "bundler-checksum",

pkgs/applications/version-management/gitlab/gitaly/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ let 
    gemdir = ./.;

  };



  version = "15.6.0";

  version = "15.6.1";

  package_version = "v${lib.versions.major version}";

  gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -22,7 +22,7 @@ let 
      owner = "gitlab-org";

      repo = "gitaly";

      rev = "v${version}";

      sha256 = "sha256-MQFvDSQhmlCz+ox9TFFEd+q2beDUXYVhIyEWWnxn7r0=";

      sha256 = "sha256-mzX+6kMXqdrxqMaUwN2tG5kJgKSRv0/tNN8ibHqBbzU=";

    };



    vendorSha256 = "sha256-SEPfso27PHHpvnQwdeMQYECw/CZIa/NdpMBSTRJEwIo=";

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ in 
buildGoModule rec {

  pname = "gitlab-workhorse";



  version = "15.6.0";

  version = "15.6.1";



  src = fetchFromGitLab {

    owner = data.owner;

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ gem 'ssh_data', '~> 1.3' 
gem 'spamcheck', '~> 1.0.0'



# Gitaly GRPC protocol definitions

gem 'gitaly', '~> 15.5.0'

gem 'gitaly', '~> 15.5.2'



# KAS GRPC protocol definitions

gem 'kas-grpc', '~> 0.0.2'

pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ GEM 
      rails (>= 3.2.0)

    git (1.11.0)

      rchardet (~> 1.8)

    gitaly (15.5.0)

    gitaly (15.5.2)

      grpc (~> 1.0)

    gitlab (4.16.1)

      httparty (~> 0.14, >= 0.14.0)
@@ -1663,7 +1663,7 @@ DEPENDENCIES 
  gettext (~> 3.3)

  gettext_i18n_rails (~> 1.8.0)

  gettext_i18n_rails_js (~> 1.3)

  gitaly (~> 15.5.0)

  gitaly (~> 15.5.2)

  gitlab-chronic (~> 0.10.5)

  gitlab-dangerfiles (~> 3.6.2)

  gitlab-experiment (~> 0.7.1)