diff lib/redmine.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/lib/redmine.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/lib/redmine.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -22,6 +22,11 @@
 rescue LoadError
   # RMagick is not available
 end
+begin
+  require 'redcarpet' unless Object.const_defined?(:Redcarpet)
+rescue LoadError
+  # Redcarpet is not available
+end
 
 require 'redmine/scm/base'
 require 'redmine/access_control'
@@ -30,7 +35,7 @@
 require 'redmine/activity/fetcher'
 require 'redmine/ciphering'
 require 'redmine/codeset_util'
-require 'redmine/custom_field_format'
+require 'redmine/field_format'
 require 'redmine/i18n'
 require 'redmine/menu_manager'
 require 'redmine/notifiable'
@@ -73,18 +78,6 @@
 Redmine::Scm::Base.add "Git"
 Redmine::Scm::Base.add "Filesystem"
 
-Redmine::CustomFieldFormat.map do |fields|
-  fields.register 'string'
-  fields.register 'text'
-  fields.register 'int', :label => :label_integer
-  fields.register 'float'
-  fields.register 'list'
-  fields.register 'date'
-  fields.register 'bool', :label => :label_boolean
-  fields.register 'user', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list'
-  fields.register 'version', :only => %w(Issue TimeEntry Version Project), :edit_as => 'list'
-end
-
 # Permissions
 Redmine::AccessControl.map do |map|
   map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true, :read => true
@@ -93,6 +86,7 @@
   map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
   map.permission :close_project, {:projects => [:close, :reopen]}, :require => :member, :read => true
   map.permission :select_project_modules, {:projects => :modules}, :require => :member
+  map.permission :view_members, {:members => [:index, :show]}, :public => true, :read => true
   map.permission :manage_members, {:projects => :settings, :members => [:index, :show, :create, :update, :destroy, :autocomplete]}, :require => :member
   map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
   map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
@@ -279,6 +273,10 @@
 
 Redmine::WikiFormatting.map do |format|
   format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
+  if Object.const_defined?(:Redcarpet)
+    format.register :markdown, Redmine::WikiFormatting::Markdown::Formatter, Redmine::WikiFormatting::Markdown::Helper,
+      :label => 'Markdown (experimental)'
+  end
 end
 
 ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler