diff options
Diffstat (limited to 'pkgs/applications/version-management/gitlab/nulladapter.patch')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/nulladapter.patch | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch index e972e1568e3a..2ee416dbb8e5 100644 --- a/pkgs/applications/version-management/gitlab/nulladapter.patch +++ b/pkgs/applications/version-management/gitlab/nulladapter.patch @@ -1,8 +1,8 @@ diff --git a/Gemfile b/Gemfile -index 92e666c..f97c991 100644 +index 68547b6..60aaf99 100644 --- a/Gemfile +++ b/Gemfile -@@ -117,7 +117,7 @@ gem 'rouge', '~> 2.0' +@@ -118,7 +118,7 @@ gem 'rouge', '~> 2.0' # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM @@ -11,14 +11,14 @@ index 92e666c..f97c991 100644 # Diffs gem 'diffy', '~> 3.0.3' -@@ -349,3 +349,5 @@ gem 'health_check', '~> 2.1.0' +@@ -351,3 +351,5 @@ gem 'health_check', '~> 2.1.0' # System information gem 'vmstat', '~> 2.1.1' gem 'sys-filesystem', '~> 1.1.6' + +gem "activerecord-nulldb-adapter" diff --git a/Gemfile.lock b/Gemfile.lock -index e2b3d55..23a5454 100644 +index 5511d71..38d357e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,6 +32,8 @@ GEM @@ -30,7 +30,7 @@ index e2b3d55..23a5454 100644 activerecord-session_store (1.0.0) actionpack (>= 4.0, < 5.1) activerecord (>= 4.0, < 5.1) -@@ -390,7 +392,7 @@ GEM +@@ -396,7 +398,7 @@ GEM method_source (0.8.2) mime-types (2.99.2) mimemagic (0.3.0) @@ -39,32 +39,22 @@ index e2b3d55..23a5454 100644 minitest (5.7.0) mousetrap-rails (1.4.6) multi_json (1.12.1) -@@ -401,9 +403,8 @@ GEM +@@ -407,8 +409,8 @@ GEM net-ldap (0.12.1) net-ssh (3.0.1) - newrelic_rpm (3.14.1.311) + newrelic_rpm (3.16.0.318) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) -- pkg-config (~> 1.1.7) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + pkg-config (~> 1.1.7) numerizer (0.1.1) oauth (0.4.7) - oauth2 (1.2.0) -@@ -803,6 +803,7 @@ PLATFORMS +@@ -800,6 +802,7 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.0.2) + ace-rails-ap (~> 4.1.0) + activerecord-nulldb-adapter activerecord-session_store (~> 1.0.0) acts-as-taggable-on (~> 3.4) addressable (~> 2.3.8) -@@ -894,7 +895,7 @@ DEPENDENCIES - nested_form (~> 0.3.2) - net-ssh (~> 3.0.1) - newrelic_rpm (~> 3.14) -- nokogiri (~> 1.6.7, >= 1.6.7.2) -+ nokogiri (~> 1.6.7, >= 1.6.7.2, < 1.6.8) - oauth2 (~> 1.2.0) - octokit (~> 4.3.0) - omniauth (~> 1.3.1) |