public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab: 8.5.12 -> 8.10.3, update module

Browse Source 
Fixes #14795.
This commit is contained in:
Franz Pletz
2016-08-03 18:49:18 +02:00
parent 6e1f80eb9d
commit c39b6025d8
10 changed files with 1098 additions and 1237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
pkgs/applications/version-management/gitlab/nulladapter.patch
View File

@@ -1,29 +1,70 @@
index acd1874..f493451 100644
diff --git a/Gemfile b/Gemfile
index 92e666c..f97c991 100644
--- a/Gemfile
+++ b/Gemfile
@@ -318,3 +318,5 @@ gem 'oauth2', '~> 1.0.0'
@@ -117,7 +117,7 @@ gem 'rouge', '~> 2.0'
# Soft deletion
gem "paranoia", "~> 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
-gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
+gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2', '< 1.6.8'
# Diffs
gem 'diffy', '~> 3.0.3'
@@ -349,3 +349,5 @@ gem 'health_check', '~> 2.1.0'
# System information
gem 'vmstat', '~> 2.1.1'
gem 'sys-filesystem', '~> 1.1.6'
+
+gem "activerecord-nulldb-adapter"
index 14d2c76..7a010f0 100644
diff --git a/Gemfile.lock b/Gemfile.lock
index e2b3d55..23a5454 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,6 +34,8 @@ GEM
activesupport (= 4.2.5.1)
@@ -32,6 +32,8 @@ GEM
activemodel (= 4.2.7)
activesupport (= 4.2.7)
arel (~> 6.0)
activerecord-deprecated_finders (1.0.4)
+ activerecord-nulldb-adapter (0.3.2)
+ activerecord-nulldb-adapter (0.3.3)
+ activerecord (>= 2.0.0)
activerecord-session_store (0.1.2)
actionpack (>= 4.0.0, < 5)
activerecord (>= 4.0.0, < 5)
@@ -880,6 +882,7 @@ DEPENDENCIES
RedCloth (~> 4.2.9)
ace-rails-ap (~> 2.0.1)
activerecord-deprecated_finders (~> 1.0.3)
activerecord-session_store (1.0.0)
actionpack (>= 4.0, < 5.1)
activerecord (>= 4.0, < 5.1)
@@ -390,7 +392,7 @@ GEM
method_source (0.8.2)
mime-types (2.99.2)
mimemagic (0.3.0)
- mini_portile2 (2.1.0)
+ mini_portile2 (2.0.0)
minitest (5.7.0)
mousetrap-rails (1.4.6)
multi_json (1.12.1)
@@ -401,9 +403,8 @@ GEM
net-ldap (0.12.1)
net-ssh (3.0.1)
newrelic_rpm (3.14.1.311)
- 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)
numerizer (0.1.1)
oauth (0.4.7)
oauth2 (1.2.0)
@@ -803,6 +803,7 @@ PLATFORMS
DEPENDENCIES
RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.0.2)
+ activerecord-nulldb-adapter
activerecord-session_store (~> 0.1.0)
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)