From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 9 Dec 2013 06:13:12 +0000 (+0000)
Subject: Merged r12273 from trunk to 2.3-stable.
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=765ee4c62d224a4d3d25aff63d500397af3a33c1;p=redmine.git

Merged r12273 from trunk to 2.3-stable.

Fixed uninitialized constant Redmine::Scm::Adapters::CommandFailed error when reloading in development mode.

git-svn-id: http://svn.redmine.org/redmine/branches/2.3-stable@12390 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index a757df154..28411004f 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -18,7 +18,7 @@
 require 'SVG/Graph/Bar'
 require 'SVG/Graph/BarHorizontal'
 require 'digest/sha1'
-require 'redmine/scm/adapters/abstract_adapter'
+require 'redmine/scm/adapters'
 
 class ChangesetNotFound < Exception; end
 class InvalidRevisionParam < Exception; end
diff --git a/lib/redmine/scm/adapters.rb b/lib/redmine/scm/adapters.rb
new file mode 100644
index 000000000..511ca29c2
--- /dev/null
+++ b/lib/redmine/scm/adapters.rb
@@ -0,0 +1,25 @@
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+module Redmine
+  module Scm
+    module Adapters
+      class CommandFailed < StandardError #:nodoc:
+      end
+    end
+  end
+end
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 3e51f2d4d..b6b4e08c3 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -24,9 +24,6 @@ end
 module Redmine
   module Scm
     module Adapters
-      class CommandFailed < StandardError #:nodoc:
-      end
-
       class AbstractAdapter #:nodoc:
 
         # raised if scm command exited with error, e.g. unknown revision.