Merge remote-tracking branch 'upstream/pull/2134'

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 0954071a56f0405517b205818468e834041b4fb9..225fc0677a39b3fcd7951c7e7d8b5be56fabb62f 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -1,5 +1,3 @@
-require "oauth/controllers/provider_controller"
-
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
 

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 2c414004d4516b1fec2ed9887e8801eb056f22f3..63f48a876ee14653f8d2205674b34d639c073f5a 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,5 +1,3 @@
-require "cgi"
-
 module BrowseHelper
   def printable_name(object, version = false)
     id = if object.id.is_a?(Array)

diff --git a/app/helpers/browse_tags_helper.rb b/app/helpers/browse_tags_helper.rb
index 038c5ae5bb7ce08b495a8670b8234a671ff7fa1f..7c43511c45bcfe7579d91602fa2b25852f83d351 100644 (file)
--- a/app/helpers/browse_tags_helper.rb
+++ b/app/helpers/browse_tags_helper.rb
@@ -1,5 +1,3 @@
-require "cgi"
-
 module BrowseTagsHelper
   def format_key(key)
     if url = wiki_link("key", key)

diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb
index 88a5a2a74ae3a42a6970fdd94239d11d9efcf9c9..16470343656a1880a25eae74e6be6ba4c6417f38 100644 (file)
--- a/app/helpers/title_helper.rb
+++ b/app/helpers/title_helper.rb
@@ -1,5 +1,3 @@
-require "htmlentities"
-
 module TitleHelper
   def self.coder
     @coder ||= HTMLEntities.new

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index d11942beb6434e7c393db40ad3cfd5f3c3c4849b..5dafaaa5c7afefd4097e30f0d3f7283245dacf92 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -30,8 +30,6 @@
 #  client_applications_user_id_fkey  (user_id => users.id)
 #
 
-require "oauth"
-
 class ClientApplication < ActiveRecord::Base
   belongs_to :user
   has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all

diff --git a/app/models/concerns/geo_record.rb b/app/models/concerns/geo_record.rb
index dbda2960f65ce6ad72d7eaf996b9bbee76fc57e0..91533ece438f89fd9cf8440bfd5400d84ad9addf 100644 (file)
--- a/app/models/concerns/geo_record.rb
+++ b/app/models/concerns/geo_record.rb
@@ -1,5 +1,3 @@
-require "delegate"
-
 module GeoRecord
   extend ActiveSupport::Concern
 

diff --git a/app/models/message.rb b/app/models/message.rb
index 4e89cb2e1648dd709f3e99cd715ee8df22b99c44..e3a3ec921b62f25cdfa13713aabb2b2c2490f371 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -24,8 +24,6 @@
 #  messages_to_user_id_fkey    (to_user_id => users.id)
 #
 
-require "validators"
-
 class Message < ActiveRecord::Base
   belongs_to :sender, :class_name => "User", :foreign_key => :from_user_id
   belongs_to :recipient, :class_name => "User", :foreign_key => :to_user_id

diff --git a/lib/validators.rb b/app/validators/utf8_validator.rb
similarity index 100%
rename from lib/validators.rb
rename to app/validators/utf8_validator.rb

diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb
index 135b27edfcd3dce4846feb85a9fc6efcc883bf9a..0fb20fab1f01e9a9b09522bd6dbc6400fb660f22 100644 (file)
--- a/test/controllers/amf_controller_test.rb
+++ b/test/controllers/amf_controller_test.rb
@@ -1,5 +1,4 @@
 require "test_helper"
-require "stringio"
 
 class AmfControllerTest < ActionController::TestCase
   include Potlatch

diff --git a/test/controllers/traces_controller_test.rb b/test/controllers/traces_controller_test.rb
index cd30746fe4a15b7d5315b3168b08a696a3618b26..179070e005d4463154bd5374852bdf8b792610f4 100644 (file)
--- a/test/controllers/traces_controller_test.rb
+++ b/test/controllers/traces_controller_test.rb
@@ -1,5 +1,4 @@
 require "test_helper"
-require "digest"
 require "minitest/mock"
 
 class TracesControllerTest < ActionController::TestCase

diff --git a/test/models/trace_test.rb b/test/models/trace_test.rb
index 8bae041fcae9152d08981c21a813eef5ee863c9e..2ab1a3d5a4da50c3e770b1183c30d0b5de2f6c07 100644 (file)
--- a/test/models/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -1,5 +1,4 @@
 require "test_helper"
-require "digest"
 require "minitest/mock"
 
 class TraceTest < ActiveSupport::TestCase