diff options
| -rw-r--r-- | Gemfile | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css | 2 | ||||
| -rw-r--r-- | doc/INSTALL | 14 | ||||
| -rw-r--r-- | doc/UPGRADING | 4 | ||||
| -rw-r--r-- | lib/redmine.rb | 5 | ||||
| -rw-r--r-- | lib/redmine/preparation.rb | 4 |
6 files changed, 12 insertions, 23 deletions
@@ -18,6 +18,7 @@ gem 'propshaft', '~> 1.1.0' gem 'rack', '>= 3.1.3' gem "stimulus-rails", "~> 1.3" gem "importmap-rails", "~> 2.0" +gem 'commonmarker', '~> 2.3.0' # Ruby Standard Gems gem 'csv', '~> 3.3.2' @@ -46,11 +47,6 @@ group :minimagick do gem 'mini_magick', '~> 5.2.0' end -# Optional CommonMark support, not for JRuby -group :common_mark do - gem "commonmarker", '~> 2.3.0' -end - # Include database gems for the adapters found in the database # configuration file database_file = File.join(File.dirname(__FILE__), "config/database.yml") diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5c6ca8172..6f61b548a 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -317,7 +317,7 @@ div + .drdn-items {border-top:1px solid #ccc;} width:100%; height:24px; display:inline-block; - padding:3px 18px 3px 6px; + padding:1.5px 18px 3px 6px; border-radius:3px; border:1px solid #ccc; margin:0 !important; diff --git a/doc/INSTALL b/doc/INSTALL index 54d51740b..f229fa509 100644 --- a/doc/INSTALL +++ b/doc/INSTALL @@ -136,10 +136,10 @@ Please do not enter your SMTP settings in environment.rb. == References -* https://www.redmine.org/wiki/redmine/RedmineInstall -* https://www.redmine.org/wiki/redmine/EmailConfiguration -* https://www.redmine.org/wiki/redmine/RedmineSettings -* https://www.redmine.org/wiki/redmine/RedmineRepositories -* https://www.redmine.org/wiki/redmine/RedmineReceivingEmails -* https://www.redmine.org/wiki/redmine/RedmineReminderEmails -* https://www.redmine.org/wiki/redmine/RedmineLDAP +* https://www.redmine.org/projects/redmine/wiki/RedmineInstall +* https://www.redmine.org/projects/redmine/wiki/EmailConfiguration +* https://www.redmine.org/projects/redmine/wiki/RedmineSettings +* https://www.redmine.org/projects/redmine/wiki/RedmineRepositories +* https://www.redmine.org/projects/redmine/wiki/RedmineReceivingEmails +* https://www.redmine.org/projects/redmine/wiki/RedmineReminderEmails +* https://www.redmine.org/projects/redmine/wiki/RedmineLDAP diff --git a/doc/UPGRADING b/doc/UPGRADING index 091b86283..b990ddba2 100644 --- a/doc/UPGRADING +++ b/doc/UPGRADING @@ -62,7 +62,7 @@ https://www.redmine.org/ directory for web server delivery. By default, Redmine automatically recompiles assets in production mode when the application starts. - This behavior can be controlled using the "config.assets.redmine_detect_update flag" from configuration file. + This behavior can be controlled using the "config.assets.redmine_detect_update" flag from configuration file. To manually compile assets or if automatic compilation is disabled: @@ -101,4 +101,4 @@ https://www.redmine.org/ == References -* https://www.redmine.org/wiki/redmine/RedmineUpgrade +* https://www.redmine.org/projects/redmine/wiki/RedmineUpgrade diff --git a/lib/redmine.rb b/lib/redmine.rb index 95b3b7f3f..78a1a6d8c 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -24,11 +24,6 @@ begin rescue LoadError # MiniMagick is not available end -begin - require 'commonmarker' unless Object.const_defined?(:Commonmarker) -rescue LoadError - # CommonMarker is not available -end module Redmine end diff --git a/lib/redmine/preparation.rb b/lib/redmine/preparation.rb index 822662e11..a31204904 100644 --- a/lib/redmine/preparation.rb +++ b/lib/redmine/preparation.rb @@ -408,9 +408,7 @@ module Redmine WikiFormatting.map do |format| format.register :textile - if Object.const_defined?(:Commonmarker) - format.register :common_mark, label: 'CommonMark Markdown (GitHub Flavored)' - end + format.register :common_mark, label: 'CommonMark Markdown (GitHub Flavored)' end ActionView::Template.register_template_handler :rsb, Views::ApiTemplateHandler |