From 3aa1992080e46df3a0d95c8750438ca416128fb4 Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Mon, 19 Jan 2015 10:48:34 +0200
Subject: [PATCH] Bump epp-xml

---
 Gemfile                  | 6 +++---
 Gemfile.lock             | 8 ++++----
 app/models/api_log/db.rb | 4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 843e7fb6e..b992cc501 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'paper_trail',               '~> 3.0.6' # archiving
 gem 'rails-settings-cached',     '~> 0.4.1' # for settings
 gem 'delayed_job_active_record', '~> 4.0.3' # delayed job
 
-# html-xml 
+# html-xml
 gem 'haml-rails', '~> 0.6.0' # haml for views
 gem 'nokogiri',   '~> 1.6.2.1' # For XML parsing
 
@@ -85,9 +85,9 @@ group :development, :test do
   gem 'database_cleaner',    '~> 1.3.0' # For cleaning db in feature and epp tests
   gem 'faker',               '~> 1.3.0' # Library to generate fake data
 
-  # EPP 
+  # EPP
   gem 'epp',       '~> 1.4.0'   # EPP client
-  gem 'epp-xml',   '~> 0.10.3'  # EPP XMLs
+  gem 'epp-xml',   '~> 0.10.4'  # EPP XMLs
   gem 'uuidtools', '~> 2.1.4' # For unique IDs (used by the epp gem)
 
   # debug
diff --git a/Gemfile.lock b/Gemfile.lock
index d6864d21f..6bfc0b07b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -128,7 +128,7 @@ GEM
     epp (1.4.0)
       hpricot
       libxml-ruby
-    epp-xml (0.10.3)
+    epp-xml (0.10.4)
       activesupport (~> 4.1)
       builder (~> 3.2)
     equalizer (0.0.9)
@@ -197,7 +197,7 @@ GEM
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -221,7 +221,7 @@ GEM
       open4 (~> 1.3.4)
       rake
     mini_portile (0.6.0)
-    minitest (5.5.0)
+    minitest (5.5.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     newrelic_rpm (3.9.9.275)
@@ -444,7 +444,7 @@ DEPENDENCIES
   delayed_job_active_record (~> 4.0.3)
   devise (~> 3.4.1)
   epp (~> 1.4.0)
-  epp-xml (~> 0.10.3)
+  epp-xml (~> 0.10.4)
   fabrication (~> 2.11.3)
   faker (~> 1.3.0)
   grape (~> 0.10.1)
diff --git a/app/models/api_log/db.rb b/app/models/api_log/db.rb
index 0e908818d..255caffda 100644
--- a/app/models/api_log/db.rb
+++ b/app/models/api_log/db.rb
@@ -1,6 +1,8 @@
 module ApiLog
   class Db < ActiveRecord::Base
     self.abstract_class = true
-    establish_connection "api_log_#{Rails.env}"
+    # to_sym is needed because passing a string to ActiveRecord::Base.establish_connection
+    # for a configuration lookup is deprecated
+    establish_connection "api_log_#{Rails.env}".to_sym
   end
 end