gitlab: 11.8.2 -> 11.9.0

wip/yesman
Ben Gamari 5 years ago
parent 0ba98bb64c
commit d8c16f11a6
  1. 28
      pkgs/applications/version-management/gitlab/data.json
  2. 5
      pkgs/applications/version-management/gitlab/gitaly/Gemfile
  3. 15
      pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
  4. 4
      pkgs/applications/version-management/gitlab/gitaly/default.nix
  5. 29
      pkgs/applications/version-management/gitlab/gitaly/gemset.nix
  6. 4
      pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
  7. 42
      pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
  8. 34
      pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile
  9. 91
      pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock
  10. 87
      pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix
  11. 34
      pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
  12. 91
      pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock
  13. 87
      pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix

@ -1,31 +1,31 @@
{
"ce": {
"version": "11.8.2",
"repo_hash": "0v55anvnwb81h5vf2wfk5qkyqh7ng2a29j368zwpn2bh57dkwxry",
"deb_hash": "0kx3k5vs8w1jdj7d7xr269ypb3qwbk3xc5hrhah5fk5i7557gsn1",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.8.2-ce.0_amd64.deb/download.deb",
"version": "11.9.0",
"repo_hash": "1dm7syarifhfzy63mnwipmk01h9yxrbzqxlkjzqff4nrx04301lr",
"deb_hash": "0p97ykl8vz47d9y0rgn738p79i4sx64dgj5f2x8r2ylz7ihzzp0k",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.0-ce.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ce",
"rev": "v11.8.2",
"rev": "v11.9.0",
"passthru": {
"GITALY_SERVER_VERSION": "1.20.0",
"GITALY_SERVER_VERSION": "1.27.0",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.4.4",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.1"
}
},
"ee": {
"version": "11.8.2",
"repo_hash": "1gf7yb10iik1a8l8n51xmzwsqdi3g1hyk934jj9y1mc30dpgdhm2",
"deb_hash": "1yv0p7sp55ik30z05dwhq57ylw5v0d3jxxfp3q03gr76sy0i4axn",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.8.2-ee.0_amd64.deb/download.deb",
"version": "11.9.0",
"repo_hash": "0p4b65b6yqw5xhhz11ww9pn03dm4qws7qhk840r3cgsv23n1jcqv",
"deb_hash": "08k1l0k2n7jrm75l8x4fnb7jwwzzxp31ywriyj7y3pwin9xsmkmc",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.0-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ee",
"rev": "v11.8.2-ee",
"rev": "v11.9.0-ee",
"passthru": {
"GITALY_SERVER_VERSION": "1.20.0",
"GITALY_SERVER_VERSION": "1.27.0",
"GITLAB_PAGES_VERSION": "1.5.0",
"GITLAB_SHELL_VERSION": "8.4.4",
"GITLAB_SHELL_VERSION": "8.7.1",
"GITLAB_WORKHORSE_VERSION": "8.3.1"
}
}

@ -3,10 +3,10 @@ source 'https://rubygems.org'
# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
gem 'bundler', '>= 1.16.5'
gem 'rugged', '~> 0.27'
gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 6.1', require: 'linguist'
gem 'gitlab-markup', '~> 1.6.5'
gem 'gitaly-proto', '~> 1.10.0'
gem 'gitaly-proto', '~> 1.13.0'
gem 'activesupport', '~> 5.0.2'
gem 'rdoc', '~> 4.2'
gem 'gitlab-gollum-lib', '~> 4.2', require: false
@ -28,6 +28,7 @@ group :development, :test do
gem 'rspec-parameterized', require: false
gem 'timecop', require: false
gem 'factory_bot', require: false
gem 'pry', '~> 0.12.2', require: false
# gitlab-shell spec gems
gem 'listen', '~> 0.5.0'

@ -36,7 +36,7 @@ GEM
ffi (1.10.0)
gemojione (3.3.0)
json
gitaly-proto (1.10.0)
gitaly-proto (1.13.0)
grpc (~> 1.0)
github-linguist (6.2.0)
charlock_holmes (~> 0.7.6)
@ -64,7 +64,7 @@ GEM
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
google-protobuf (3.6.1)
googleapis-common-protos-types (1.0.2)
googleapis-common-protos-types (1.0.3)
google-protobuf (~> 3.0)
grpc (1.15.0)
google-protobuf (~> 3.1)
@ -79,6 +79,7 @@ GEM
listen (0.5.3)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.2)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2018.0812)
@ -102,6 +103,9 @@ GEM
parser
unparser
procto (0.0.3)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.3)
rainbow (3.0.0)
rbtrace (0.4.11)
@ -137,7 +141,7 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
rugged (0.27.5)
rugged (0.28.0)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@ -178,7 +182,7 @@ DEPENDENCIES
bundler (>= 1.16.5)
factory_bot
faraday (~> 0.12)
gitaly-proto (~> 1.10.0)
gitaly-proto (~> 1.13.0)
github-linguist (~> 6.1)
gitlab-gollum-lib (~> 4.2)
gitlab-gollum-rugged_adapter (~> 0.4.4)
@ -187,12 +191,13 @@ DEPENDENCIES
grpc (~> 1.15.0)
licensee (~> 8.9.0)
listen (~> 0.5.0)
pry (~> 0.12.2)
rbtrace
rdoc (~> 4.2)
rspec
rspec-parameterized
rubocop (~> 0.50)
rugged (~> 0.27)
rugged (~> 0.28)
sentry-raven (~> 2.7.2)
simplecov (~> 0.9.0)
timecop

@ -7,14 +7,14 @@ let
gemdir = ./.;
};
in buildGoPackage rec {
version = "1.20.0";
version = "1.27.0";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "11a3h5l535zij71l2b9zsrigly5m2grqqiki25n07dhksqh8w784";
sha256 = "0m96048nxbgdkly5rz9d21yz8dmgv1kqis98is5kdz5b1wmhz18r";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";

@ -180,10 +180,10 @@
dependencies = ["grpc"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qj46fii2q1gpdxi03gs2c5gr8hcj4xfs39rd0r6zx9n47zxiqcb";
sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
type = "gem";
};
version = "1.10.0";
version = "1.13.0";
};
github-linguist = {
dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@ -258,10 +258,10 @@
dependencies = ["google-protobuf"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
type = "gem";
};
version = "1.0.2";
version = "1.0.3";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@ -331,6 +331,14 @@
};
version = "0.4.2";
};
method_source = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
type = "gem";
};
version = "0.9.2";
};
mime-types = {
dependencies = ["mime-types-data"];
source = {
@ -464,6 +472,15 @@
};
version = "0.0.3";
};
pry = {
dependencies = ["coderay" "method_source"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
type = "gem";
};
version = "0.12.2";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
@ -578,10 +595,10 @@
rugged = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
type = "gem";
};
version = "0.27.5";
version = "0.28.0";
};
safe_yaml = {
source = {

@ -1,14 +1,14 @@
{ stdenv, ruby, bundler, fetchFromGitLab, go }:
stdenv.mkDerivation rec {
version = "8.4.4";
version = "8.7.1";
name = "gitlab-shell-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq";
sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia";
};
buildInputs = [ ruby bundler go ];

@ -1,16 +1,16 @@
diff --git a/go/internal/config/config.go b/go/internal/config/config.go
index 435cb29..078c1df 100644
index f951fe6..b422fe3 100644
--- a/go/internal/config/config.go
+++ b/go/internal/config/config.go
@@ -2,7 +2,6 @@ package config
@@ -3,7 +3,6 @@ package config
import (
"io/ioutil"
"net/url"
- "os"
"path"
"strings"
yaml "gopkg.in/yaml.v2"
@@ -26,16 +25,13 @@ type Config struct {
@@ -30,16 +29,13 @@ type Config struct {
}
func New() (*Config, error) {
@ -28,12 +28,25 @@ index 435cb29..078c1df 100644
+ return newFromFile("/run/gitlab/shell-config.yml")
}
func newFromFile(filename string) (*Config, error) {
func (c *Config) FeatureEnabled(featureName string) bool {
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
index 0600a18..c46f2d7 100644
--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
attr_accessor :auth_file, :key
def self.command(whatever)
- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
+ "/run/current-system/sw/bin/gitlab-shell #{whatever}"
end
def self.command_key(key_id)
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 57c70f5..700569b 100644
index 2cb76a8..f59ad5e 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -187,7 +187,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
@@ -190,7 +190,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength
args = [executable, gitaly_address, json_args]
# We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
@ -43,16 +56,3 @@ index 57c70f5..700569b 100644
end
def api
diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb
index 0600a18..6814f0a 100644
--- a/lib/gitlab_keys.rb
+++ b/lib/gitlab_keys.rb
@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength
attr_accessor :auth_file, :key
def self.command(whatever)
- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}"
+ "/run/current-system/sw/bin/gitlab-shell #{whatever}"
end
def self.command_key(key_id)

@ -18,7 +18,7 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
gem 'mysql2', '~> 0.4.10', group: :mysql
gem 'pg', '~> 1.1', group: :postgres
gem 'rugged', '~> 0.27'
gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.0'
gem 'faraday', '~> 0.12'
@ -68,7 +68,7 @@ gem 'gpgme', '~> 2.0.18'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap'
# API
@ -94,13 +94,15 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups
gem 'fog-aws', '~> 2.0.1'
gem 'fog-core', '~> 1.44'
gem 'fog-google', '~> 1.7.1'
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-aws', '~> 3.3'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0'
gem 'fog-google', '~> 1.8'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.2.0'
gem 'fog-aliyun', '~> 0.3'
# for Google storage
gem 'google-api-client', '~> 0.23'
@ -143,7 +145,7 @@ gem 'diffy', '~> 3.1.0'
gem 'rack', '2.0.6'
group :unicorn do
gem 'unicorn', '~> 5.1.0'
gem 'unicorn', '~> 5.4.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@ -184,7 +186,7 @@ gem 're2', '~> 1.1.1'
# Misc
gem 'version_sorter', '~> 2.1.0'
gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1'
@ -202,9 +204,6 @@ gem 'connection_pool', '~> 2.0'
# Discord integration
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
gem 'hipchat', '~> 1.5.0'
# JIRA integration
gem 'jira-ruby', '~> 1.4'
@ -326,7 +325,7 @@ group :development do
end
group :development, :test do
gem 'bootsnap', '~> 1.3'
gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@ -383,7 +382,7 @@ group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
gem 'webmock', '~> 2.3.2'
gem 'webmock', '~> 3.5.1'
gem 'rails-controller-testing'
gem 'sham_rack', '~> 1.3.6'
gem 'concurrent-ruby', '~> 1.1'
@ -413,7 +412,7 @@ gem 'sys-filesystem', '~> 1.1.6'
# SSH host key support
gem 'net-ssh', '~> 5.0'
gem 'sshkey', '~> 1.9.0'
gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support
group :ed25519 do
@ -422,7 +421,8 @@ group :ed25519 do
end
# Gitaly GRPC client
gem 'gitaly-proto', '~> 1.10.0', require: 'gitaly'
gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
gem 'grpc', '~> 1.15.0'
gem 'google-protobuf', '~> 3.6'

@ -85,7 +85,7 @@ GEM
binding_ninja (0.2.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
bootsnap (1.4.1)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
brakeman (4.2.1)
@ -218,32 +218,33 @@ GEM
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
fog-aliyun (0.2.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-aliyun (0.3.3)
fog-core
fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
fog-aws (2.0.1)
fog-core (~> 1.38)
fog-json (~> 1.0)
fog-aws (3.3.0)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-core (1.45.0)
fog-core (2.1.0)
builder
excon (~> 0.58)
formatador (~> 0.2)
fog-google (1.7.1)
fog-core
fog-json
fog-xml
mime-types
fog-google (1.8.2)
fog-core (<= 2.1.0)
fog-json (~> 1.2)
fog-xml (~> 0.1.0)
google-api-client (~> 0.23.0)
fog-json (1.0.2)
fog-core (~> 1.0)
fog-json (1.2.0)
fog-core
multi_json (~> 1.10)
fog-local (0.3.1)
fog-core (~> 1.27)
fog-openstack (0.1.21)
fog-core (>= 1.40)
fog-local (0.6.0)
fog-core (>= 1.27, < 3.0)
fog-openstack (1.0.8)
fog-core (~> 2.1)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-rackspace (0.1.1)
@ -278,7 +279,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gitaly-proto (1.10.0)
gitaly-proto (1.13.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
@ -290,7 +291,7 @@ GEM
rubocop (~> 0.54.0)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.19)
gitlab_omniauth-ldap (2.0.4)
gitlab_omniauth-ldap (2.1.1)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
@ -309,7 +310,7 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google-protobuf (3.6.1)
googleapis-common-protos-types (1.0.2)
googleapis-common-protos-types (1.0.3)
google-protobuf (~> 3.0)
googleauth (0.6.6)
faraday (~> 0.12)
@ -357,15 +358,12 @@ GEM
thor
tilt
hangouts-chat (0.0.5)
hashdiff (0.3.4)
hashdiff (0.3.8)
hashie (3.5.7)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
health_check (2.6.0)
rails (>= 4.0)
hipchat (1.5.2)
httparty
mimemagic
html-pipeline (2.8.4)
activesupport (>= 2)
nokogiri (>= 1.4)
@ -425,7 +423,7 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.10.0)
kgio (2.11.2)
knapsack (1.17.0)
rake
kubeclient (4.2.2)
@ -669,7 +667,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
raindrops (0.18.0)
raindrops (0.19.0)
rake (12.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
@ -787,7 +785,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
rugged (0.27.5)
rugged (0.28.0)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@ -858,7 +856,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
sshkey (1.9.0)
sshkey (2.0.0)
stackprof (0.2.10)
state_machines (0.5.0)
state_machines-activemodel (0.5.1)
@ -901,7 +899,7 @@ GEM
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.2)
unicorn (5.1.0)
unicorn (5.4.1)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
@ -919,7 +917,7 @@ GEM
validates_hostname (1.0.6)
activerecord (>= 3.0)
activesupport (>= 3.0)
version_sorter (2.1.0)
version_sorter (2.2.4)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
@ -928,7 +926,7 @@ GEM
vmstat (2.3.0)
warden (1.2.7)
rack (>= 1.0)
webmock (2.3.2)
webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
@ -968,7 +966,7 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0)
bootsnap (~> 1.3)
bootsnap (~> 1.4)
bootstrap_form (~> 2.7.0)
brakeman (~> 4.2)
browser (~> 2.5)
@ -1005,12 +1003,12 @@ DEPENDENCIES
flipper-active_record (~> 0.13.0)
flipper-active_support_cache_store (~> 0.13.0)
flowdock (~> 0.7)
fog-aliyun (~> 0.2.0)
fog-aws (~> 2.0.1)
fog-core (~> 1.44)
fog-google (~> 1.7.1)
fog-local (~> 0.3)
fog-openstack (~> 0.1)
fog-aliyun (~> 0.3)
fog-aws (~> 3.3)
fog-core (= 2.1.0)
fog-google (~> 1.8)
fog-local (~> 0.6)
fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
foreman (~> 0.84.0)
@ -1020,13 +1018,13 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 1.10.0)
gitaly-proto (~> 1.13.0)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-markup (~> 1.6.5)
gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.0.4)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
google-protobuf (~> 3.6)
@ -1043,7 +1041,6 @@ DEPENDENCIES
hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes
health_check (~> 2.6.0)
hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html2text
httparty (~> 0.13.3)
@ -1141,7 +1138,7 @@ DEPENDENCIES
ruby-progressbar
ruby_parser (~> 3.8)
rubyzip (~> 1.2.2)
rugged (~> 0.27)
rugged (~> 0.28)
sanitize (~> 4.6)
sass (~> 3.5)
sass-rails (~> 5.0.6)
@ -1161,7 +1158,7 @@ DEPENDENCIES
spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0)
sshkey (~> 1.9.0)
sshkey (~> 2.0)
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6)
@ -1173,13 +1170,13 @@ DEPENDENCIES
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
unf (~> 0.1.4)
unicorn (~> 5.1.0)
unicorn (~> 5.4.1)
unicorn-worker-killer (~> 0.4.4)
validates_hostname (~> 1.0.6)
version_sorter (~> 2.1.0)
version_sorter (~> 2.2.4)
virtus (~> 1.0.1)
vmstat (~> 2.3.0)
webmock (~> 2.3.2)
webmock (~> 3.5.1)
webpack-rails (~> 0.9.10)
wikicloth (= 0.8.1)

@ -309,10 +309,10 @@
dependencies = ["msgpack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
type = "gem";
};
version = "1.3.2";
version = "1.4.1";
};
bootstrap_form = {
source = {
@ -933,64 +933,64 @@
dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
type = "gem";
};
version = "0.2.0";
version = "0.3.3";
};
fog-aws = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs";
type = "gem";
};
version = "2.0.1";
version = "3.3.0";
};
fog-core = {
dependencies = ["builder" "excon" "formatador"];
dependencies = ["builder" "excon" "formatador" "mime-types"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
type = "gem";
};
version = "1.45.0";
version = "2.1.0";
};
fog-google = {
dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
type = "gem";
};
version = "1.7.1";
version = "1.8.2";
};
fog-json = {
dependencies = ["fog-core" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
type = "gem";
};
version = "1.0.2";
version = "1.2.0";
};
fog-local = {
dependencies = ["fog-core"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn";
sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
type = "gem";
};
version = "0.3.1";
version = "0.6.0";
};
fog-openstack = {
dependencies = ["fog-core" "fog-json" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys";
sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
type = "gem";
};
version = "0.1.21";
version = "1.0.8";
};
fog-rackspace = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@ -1102,10 +1102,10 @@
dependencies = ["grpc"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qj46fii2q1gpdxi03gs2c5gr8hcj4xfs39rd0r6zx9n47zxiqcb";
sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
type = "gem";
};
version = "1.10.0";
version = "1.13.0";
};
github-markup = {
source = {
@ -1156,10 +1156,10 @@
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
type = "gem";
};
version = "2.0.4";
version = "2.1.1";
};
globalid = {
dependencies = ["activesupport"];
@ -1200,10 +1200,10 @@
dependencies = ["google-protobuf"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
type = "gem";
};
version = "1.0.2";
version = "1.0.3";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@ -1323,10 +1323,10 @@
hashdiff = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
type = "gem";
};
version = "0.3.4";
version = "0.3.8";
};
hashie = {
source = {
@ -1354,15 +1354,6 @@
};
version = "2.6.0";
};
hipchat = {
dependencies = ["httparty" "mimemagic"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
type = "gem";
};
version = "1.5.2";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
source = {
@ -1589,10 +1580,10 @@
kgio = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
type = "gem";
};
version = "2.10.0";
version = "2.11.2";
};
knapsack = {
dependencies = ["rake"];
@ -2493,10 +2484,10 @@
raindrops = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz";
sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
type = "gem";
};
version = "0.18.0";
version = "0.19.0";
};
rake = {
source = {
@ -2948,10 +2939,10 @@
rugged = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
type = "gem";
};
version = "0.27.5";
version = "0.28.0";
};
safe_yaml = {
source = {
@ -3192,10 +3183,10 @@
sshkey = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
type = "gem";
};
version = "1.9.0";
version = "2.0.0";
};
stackprof = {
source = {
@ -3419,10 +3410,10 @@
dependencies = ["kgio" "raindrops"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
type = "gem";
};
version = "5.1.0";
version = "5.4.1";
};
unicorn-worker-killer = {
dependencies = ["get_process_mem" "unicorn"];
@ -3462,10 +3453,10 @@
version_sorter = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";
sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
type = "gem";
};
version = "2.1.0";
version = "2.2.4";
};
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
@ -3497,10 +3488,10 @@
dependencies = ["addressable" "crack" "hashdiff"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
type = "gem";
};
version = "2.3.2";
version = "3.5.1";
};
webpack-rails = {
dependencies = ["railties"];

@ -18,7 +18,7 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
gem 'mysql2', '~> 0.4.10', group: :mysql
gem 'pg', '~> 1.1', group: :postgres
gem 'rugged', '~> 0.27'
gem 'rugged', '~> 0.28'
gem 'grape-path-helpers', '~> 1.0'
gem 'faraday', '~> 0.12'
@ -71,7 +71,7 @@ gem 'gpgme', '~> 2.0.18'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap'
# API
@ -97,13 +97,15 @@ gem 'carrierwave', '~> 1.3'
gem 'mini_magick'
# for backups
gem 'fog-aws', '~> 2.0.1'
gem 'fog-core', '~> 1.44'
gem 'fog-google', '~> 1.7.1'
gem 'fog-local', '~> 0.3'
gem 'fog-openstack', '~> 0.1'
gem 'fog-aws', '~> 3.3'
# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
# Also see config/initializers/fog_core_patch.rb.
gem 'fog-core', '= 2.1.0'
gem 'fog-google', '~> 1.8'
gem 'fog-local', '~> 0.6'
gem 'fog-openstack', '~> 1.0'
gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.2.0'
gem 'fog-aliyun', '~> 0.3'
# for Google storage
gem 'google-api-client', '~> 0.23'
@ -153,7 +155,7 @@ gem 'diffy', '~> 3.1.0'
gem 'rack', '2.0.6'
group :unicorn do
gem 'unicorn', '~> 5.1.0'
gem 'unicorn', '~> 5.4.1'
gem 'unicorn-worker-killer', '~> 0.4.4'
end
@ -194,7 +196,7 @@ gem 're2', '~> 1.1.1'
# Misc
gem 'version_sorter', '~> 2.1.0'
gem 'version_sorter', '~> 2.2.4'
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.1'
@ -212,9 +214,6 @@ gem 'connection_pool', '~> 2.0'
# Discord integration
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
gem 'hipchat', '~> 1.5.0'
# JIRA integration
gem 'jira-ruby', '~> 1.4'
@ -338,7 +337,7 @@ group :development do
end
group :development, :test do
gem 'bootsnap', '~> 1.3'
gem 'bootsnap', '~> 1.4'
gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
gem 'pry-byebug', '~> 3.5.1', platform: :mri
gem 'pry-rails', '~> 0.3.4'
@ -395,7 +394,7 @@ group :test do
gem 'shoulda-matchers', '~> 3.1.2', require: false
gem 'email_spec', '~> 2.2.0'
gem 'json-schema', '~> 2.8.0'
gem 'webmock', '~> 2.3.2'
gem 'webmock', '~> 3.5.1'
gem 'rails-controller-testing'
gem 'sham_rack', '~> 1.3.6'
gem 'concurrent-ruby', '~> 1.1'
@ -428,7 +427,7 @@ gem 'net-ntp'
# SSH host key support
gem 'net-ssh', '~> 5.0'
gem 'sshkey', '~> 1.9.0'
gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support
group :ed25519 do
@ -437,7 +436,8 @@ group :ed25519 do
end
# Gitaly GRPC client
gem 'gitaly-proto', '~> 1.10.0', require: 'gitaly'
gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly'
gem 'grpc', '~> 1.15.0'
gem 'google-protobuf', '~> 3.6'

@ -93,7 +93,7 @@ GEM
binding_ninja (0.2.2)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
bootsnap (1.4.1)
msgpack (~> 1.0)
bootstrap_form (2.7.0)
brakeman (4.2.1)
@ -242,32 +242,33 @@ GEM
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
fog-aliyun (0.2.0)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-aliyun (0.3.3)
fog-core
fog-json
ipaddress (~> 0.8)
xml-simple (~> 1.1)
fog-aws (2.0.1)
fog-core (~> 1.38)
fog-json (~> 1.0)
fog-aws (3.3.0)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-core (1.45.0)
fog-core (2.1.0)
builder
excon (~> 0.58)
formatador (~> 0.2)
fog-google (1.7.1)
fog-core
fog-json
fog-xml
mime-types
fog-google (1.8.2)
fog-core (<= 2.1.0)
fog-json (~> 1.2)
fog-xml (~> 0.1.0)
google-api-client (~> 0.23.0)
fog-json (1.0.2)
fog-core (~> 1.0)
fog-json (1.2.0)
fog-core
multi_json (~> 1.10)
fog-local (0.3.1)
fog-core (~> 1.27)
fog-openstack (0.1.21)
fog-core (>= 1.40)
fog-local (0.6.0)
fog-core (>= 1.27, < 3.0)
fog-openstack (1.0.8)
fog-core (~> 2.1)
fog-json (>= 1.0)
ipaddress (>= 0.8)
fog-rackspace (0.1.1)
@ -302,7 +303,7 @@ GEM
gettext_i18n_rails (>= 0.7.1)
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gitaly-proto (1.10.0)
gitaly-proto (1.13.0)
grpc (~> 1.0)
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
@ -315,7 +316,7 @@ GEM
rubocop (~> 0.54.0)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.19)
gitlab_omniauth-ldap (2.0.4)
gitlab_omniauth-ldap (2.1.1)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
@ -334,7 +335,7 @@ GEM
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
google-protobuf (3.6.1)
googleapis-common-protos-types (1.0.2)
googleapis-common-protos-types (1.0.3)
google-protobuf (~> 3.0)
googleauth (0.6.6)
faraday (~> 0.12)
@ -384,15 +385,12 @@ GEM
thor
tilt
hangouts-chat (0.0.5)
hashdiff (0.3.4)
hashdiff (0.3.8)
hashie (3.5.7)
hashie-forbidden_attributes (0.1.1)
hashie (>= 3.0)
health_check (2.6.0)
rails (>= 4.0)
hipchat (1.5.2)
httparty
mimemagic
html-pipeline (2.8.4)
activesupport (>= 2)
nokogiri (>= 1.4)
@ -453,7 +451,7 @@ GEM
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.10.0)
kgio (2.11.2)
knapsack (1.17.0)
rake
kubeclient (4.2.2)
@ -699,7 +697,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
raindrops (0.18.0)
raindrops (0.19.0)
rake (12.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
@ -817,7 +815,7 @@ GEM
rubyntlm (0.6.2)
rubypants (0.2.0)
rubyzip (1.2.2)
rugged (0.27.5)
rugged (0.28.0)
safe_yaml (1.0.4)
sanitize (4.6.6)
crass (~> 1.0.2)
@ -888,7 +886,7 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
sshkey (1.9.0)
sshkey (2.0.0)
stackprof (0.2.10)
state_machines (0.5.0)
state_machines-activemodel (0.5.1)
@ -931,7 +929,7 @@ GEM
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.3.2)
unicorn (5.1.0)
unicorn (5.4.1)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
@ -949,7 +947,7 @@ GEM
validates_hostname (1.0.6)
activerecord (>= 3.0)
activesupport (>= 3.0)
version_sorter (2.1.0)
version_sorter (2.2.4)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
@ -958,7 +956,7 @@ GEM
vmstat (2.3.0)
warden (1.2.7)
rack (>= 1.0)
webmock (2.3.2)
webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
@ -999,7 +997,7 @@ DEPENDENCIES
benchmark-ips (~> 2.3.0)
better_errors (~> 2.5.0)
binding_of_caller (~> 0.8.0)
bootsnap (~> 1.3)
bootsnap (~> 1.4)
bootstrap_form (~> 2.7.0)
brakeman (~> 4.2)
browser (~> 2.5)
@ -1040,12 +1038,12 @@ DEPENDENCIES
flipper-active_record (~> 0.13.0)
flipper-active_support_cache_store (~> 0.13.0)
flowdock (~> 0.7)
fog-aliyun (~> 0.2.0)
fog-aws (~> 2.0.1)
fog-core (~> 1.44)
fog-google (~> 1.7.1)
fog-local (~> 0.3)
fog-openstack (~> 0.1)
fog-aliyun (~> 0.3)
fog-aws (~> 3.3)
fog-core (= 2.1.0)
fog-google (~> 1.8)
fog-local (~> 0.6)
fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
foreman (~> 0.84.0)
@ -1055,14 +1053,14 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 1.10.0)
gitaly-proto (~> 1.13.0)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-license (~> 1.0)
gitlab-markup (~> 1.6.5)
gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4)
gitlab_omniauth-ldap (~> 2.0.4)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
google-protobuf (~> 3.6)
@ -1080,7 +1078,6 @@ DEPENDENCIES
hangouts-chat (~> 0.0.5)
hashie-forbidden_attributes
health_check (~> 2.6.0)
hipchat (~> 1.5.0)
html-pipeline (~> 2.8)
html2text
httparty (~> 0.13.3)
@ -1180,7 +1177,7 @@ DEPENDENCIES
ruby-progressbar
ruby_parser (~> 3.8)
rubyzip (~> 1.2.2)
rugged (~> 0.27)
rugged (~> 0.28)
sanitize (~> 4.6)
sass (~> 3.5)
sass-rails (~> 5.0.6)
@ -1200,7 +1197,7 @@ DEPENDENCIES
spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0)
sshkey (~> 1.9.0)
sshkey (~> 2.0)
stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6)
@ -1212,13 +1209,13 @@ DEPENDENCIES
u2f (~> 0.2.1)
uglifier (~> 2.7.2)
unf (~> 0.1.4)
unicorn (~> 5.1.0)
unicorn (~> 5.4.1)
unicorn-worker-killer (~> 0.4.4)
validates_hostname (~> 1.0.6)
version_sorter (~> 2.1.0)
version_sorter (~> 2.2.4)
virtus (~> 1.0.1)
vmstat (~> 2.3.0)
webmock (~> 2.3.2)
webmock (~> 3.5.1)
webpack-rails (~> 0.9.10)
wikicloth (= 0.8.1)

@ -344,10 +344,10 @@
dependencies = ["msgpack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy";
sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh";
type = "gem";
};
version = "1.3.2";
version = "1.4.1";
};
bootstrap_form = {
source = {
@ -1021,64 +1021,64 @@
dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m";
sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh";
type = "gem";
};
version = "0.2.0";
version = "0.3.3";
};
fog-aws = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs";
type = "gem";
};
version = "2.0.1";
version = "3.3.0";
};
fog-core = {
dependencies = ["builder" "excon" "formatador"];
dependencies = ["builder" "excon" "formatador" "mime-types"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak";
type = "gem";
};
version = "1.45.0";
version = "2.1.0";
};
fog-google = {
dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2";
sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m";
type = "gem";
};
version = "1.7.1";
version = "1.8.2";
};
fog-json = {
dependencies = ["fog-core" "multi_json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx";
type = "gem";
};
version = "1.0.2";
version = "1.2.0";
};
fog-local = {
dependencies = ["fog-core"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn";
sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21";
type = "gem";
};
version = "0.3.1";
version = "0.6.0";
};
fog-openstack = {
dependencies = ["fog-core" "fog-json" "ipaddress"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys";
sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg";
type = "gem";
};
version = "0.1.21";
version = "1.0.8";
};
fog-rackspace = {
dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
@ -1190,10 +1190,10 @@
dependencies = ["grpc"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qj46fii2q1gpdxi03gs2c5gr8hcj4xfs39rd0r6zx9n47zxiqcb";
sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn";
type = "gem";
};
version = "1.10.0";
version = "1.13.0";
};
github-markup = {
source = {
@ -1252,10 +1252,10 @@
dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv";
sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90";
type = "gem";
};
version = "2.0.4";
version = "2.1.1";
};
globalid = {
dependencies = ["activesupport"];
@ -1296,10 +1296,10 @@
dependencies = ["google-protobuf"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq";
sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj";
type = "gem";
};
version = "1.0.2";
version = "1.0.3";
};
googleauth = {
dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
@ -1428,10 +1428,10 @@
hashdiff = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a";
sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask";
type = "gem";
};
version = "0.3.4";
version = "0.3.8";
};
hashie = {
source = {
@ -1459,15 +1459,6 @@
};
version = "2.6.0";
};
hipchat = {
dependencies = ["httparty" "mimemagic"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
type = "gem";
};
version = "1.5.2";
};
html-pipeline = {
dependencies = ["activesupport" "nokogiri"];
source = {
@ -1702,10 +1693,10 @@
kgio = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50";
type = "gem";
};
version = "2.10.0";
version = "2.11.2";
};
knapsack = {
dependencies = ["rake"];
@ -2622,10 +2613,10 @@
raindrops = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz";
sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp";
type = "gem";
};
version = "0.18.0";
version = "0.19.0";
};
rake = {
source = {
@ -3077,10 +3068,10 @@
rugged = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6";
sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi";
type = "gem";
};
version = "0.27.5";
version = "0.28.0";
};
safe_yaml = {
source = {
@ -3321,10 +3312,10 @@
sshkey = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp";
type = "gem";
};
version = "1.9.0";
version = "2.0.0";
};
stackprof = {
source = {
@ -3548,10 +3539,10 @@
dependencies = ["kgio" "raindrops"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v";
sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak";
type = "gem";
};
version = "5.1.0";
version = "5.4.1";
};
unicorn-worker-killer = {
dependencies = ["get_process_mem" "unicorn"];
@ -3591,10 +3582,10 @@
version_sorter = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr";
sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s";
type = "gem";
};
version = "2.1.0";
version = "2.2.4";
};
virtus = {
dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
@ -3626,10 +3617,10 @@
dependencies = ["addressable" "crack" "hashdiff"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp";
type = "gem";
};
version = "2.3.2";
version = "3.5.1";
};
webpack-rails = {
dependencies = ["railties"];

Loading…
Cancel
Save