70 lines
2 KiB
Diff
70 lines
2 KiB
Diff
diff --git a/Gemfile b/Gemfile
|
|
index 92e666c..f97c991 100644
|
|
--- a/Gemfile
|
|
+++ b/Gemfile
|
|
@@ -117,7 +117,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
|
|
-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"
|
|
diff --git a/Gemfile.lock b/Gemfile.lock
|
|
index e2b3d55..23a5454 100644
|
|
--- a/Gemfile.lock
|
|
+++ b/Gemfile.lock
|
|
@@ -32,6 +32,8 @@ GEM
|
|
activemodel (= 4.2.7)
|
|
activesupport (= 4.2.7)
|
|
arel (~> 6.0)
|
|
+ activerecord-nulldb-adapter (0.3.3)
|
|
+ activerecord (>= 2.0.0)
|
|
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 (~> 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)
|