summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm/adapters
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-12-23 17:07:51 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-12-23 17:07:51 +0000
commita657a12450621e5ed9d0627b9a33a42d9799db3b (patch)
treeda2566c514702273488e4a85cac5fbc9b0f707dc /lib/redmine/scm/adapters
parent471e01ca5059f892888f78e2278dd41d742a4b75 (diff)
downloadredmine-a657a12450621e5ed9d0627b9a33a42d9799db3b.tar.gz
redmine-a657a12450621e5ed9d0627b9a33a42d9799db3b.zip
Don't load redcarpet with JRuby.
git-svn-id: http://svn.redmine.org/redmine/trunk@12453 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm/adapters')
-rw-r--r--lib/redmine/scm/adapters/abstract_adapter.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index b6b4e08c3..258b625fb 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -16,6 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require 'cgi'
+require 'redmine/scm/adapters'
if RUBY_VERSION < '1.9'
require 'iconv'