diff --git a/.codeclimate.yml b/.codeclimate.yml
index 2fa53227b2..8b28d9b81d 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -62,4 +62,3 @@ exclude_paths:
   - "**/node_modules/"
   - spec/**
   - spec_legacy/**/*
-  - lib/redcloth3.rb
diff --git a/.rubocop.yml b/.rubocop.yml
index c375c81b96..60185ec6ed 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.5
   Exclude:
     - db/schema.rb
 
diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index 1f9b171325..ac7d99ac4f 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -34,7 +34,6 @@
 //= require action_menu
 //= require breadcrumb
 //= require findDomElement
-//= require jstoolbar
 //= require settings
 //= require modal
 //= require tab_handling
diff --git a/app/assets/javascripts/forums.js b/app/assets/javascripts/forums.js
index ef5e3503c8..96ee527d2e 100644
--- a/app/assets/javascripts/forums.js
+++ b/app/assets/javascripts/forums.js
@@ -35,7 +35,12 @@
         content = $("#reply_content");
 
       subject.val(result.subject);
-      content.val(result.content);
+
+      $('op-ckeditor-form')
+        .data('editor')
+        .then(function(editor) {
+          editor.setData(result.content);
+        });
 
       reply.slideDown();
       content.focus();
diff --git a/app/assets/javascripts/jstoolbar.js b/app/assets/javascripts/jstoolbar.js
deleted file mode 100644
index 559575dd03..0000000000
--- a/app/assets/javascripts/jstoolbar.js
+++ /dev/null
@@ -1,30 +0,0 @@
-//-- copyright
-// OpenProject is a project management system.
-// Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2017 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// 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.
-//
-// See docs/COPYRIGHT.rdoc for more details.
-//++
-
-//= require jstoolbar/jstoolbar
-//= require jstoolbar/translations
diff --git a/app/assets/javascripts/jstoolbar/jstoolbar.js b/app/assets/javascripts/jstoolbar/jstoolbar.js
deleted file mode 100644
index f4c0d2d660..0000000000
--- a/app/assets/javascripts/jstoolbar/jstoolbar.js
+++ /dev/null
@@ -1,378 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * This file is part of DotClear.
- * Copyright (c) 2005 Nicolas Martin & Olivier Meunier and contributors. All
- * rights reserved.
- *
- * DotClear 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.
- *
- * DotClear 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 DotClear; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * ***** END LICENSE BLOCK *****
-*/
-
-/* Modified by JP LANG for textile formatting */
-
-function jsToolBar(textarea) {
-  if (!document.createElement) { return; }
-
-  if (!textarea) { return; }
-
-  if ((typeof(document["selection"]) == "undefined")
-  && (typeof(textarea["setSelectionRange"]) == "undefined")) {
-    return;
-  }
-
-  this.textarea = textarea;
-
-  this.editor = document.createElement('div');
-  this.editor.className = 'jstEditor';
-
-  this.textarea.parentNode.insertBefore(this.editor,this.textarea);
-  this.editor.appendChild(this.textarea);
-
-  this.toolbar = document.createElement("div");
-  this.toolbar.className = 'jstElements';
-  this.editor.parentNode.insertBefore(this.toolbar,this.editor);
-
-  // Dragable resizing (only for gecko)
-  if (this.editor.addEventListener)
-  {
-    this.handle = document.createElement('div');
-    this.handle.className = 'jstHandle';
-    var dragStart = this.resizeDragStart;
-    var This = this;
-    this.handle.addEventListener('mousedown',function(event) { dragStart.call(This,event); },false);
-    // fix memory leak in Firefox (bug #241518)
-    window.addEventListener('unload',function() {
-        var del = This.handle.parentNode.removeChild(This.handle);
-        delete(This.handle);
-    },false);
-
-    this.editor.parentNode.insertBefore(this.handle,this.editor.nextSibling);
-  }
-
-  this.context = null;
-  this.toolNodes = {}; // lorsque la toolbar est dessinée , cet objet est garni
-          // de raccourcis vers les éléments DOM correspondants aux outils.
-}
-
-function jsButton(title, fn, scope, className) {
-    if(typeof jsToolBar.strings == 'undefined') {
-      this.title = title || null;
-    } else {
-      this.title = jsToolBar.strings[title] || title || null;
-    }
-  this.fn = fn || function(){};
-  this.scope = scope || null;
-  this.className = className || null;
-}
-jsButton.prototype.draw = function() {
-  if (!this.scope) return null;
-
-  var button = document.createElement('button');
-  button.setAttribute('type','button');
-  button.setAttribute('aria-label', this.title);
-  if (this.className) button.className = this.className;
-  button.title = this.title;
-
-  if (this.icon != undefined) {
-    button.style.backgroundImage = 'url('+this.icon+')';
-  }
-  if (typeof(this.fn) == 'function') {
-    var This = this;
-    button.onclick = function() { try { This.fn.apply(This.scope, arguments) } catch (e) {} return false; };
-  }
-  return button;
-};
-
-function jsSpace(id) {
-  this.id = id || null;
-  this.width = null;
-}
-jsSpace.prototype.draw = function() {
-  var span = document.createElement('span');
-  if (this.id) span.id = this.id;
-  span.appendChild(document.createTextNode(String.fromCharCode(160)));
-  span.className = 'jstSpacer';
-  if (this.width) span.style.marginRight = this.width+'px';
-
-  return span;
-};
-
-function jsCombo(title, options, scope, fn, className) {
-  this.title = title || null;
-  this.options = options || null;
-  this.scope = scope || null;
-  this.fn = fn || function(){};
-  this.className = className || null;
-}
-jsCombo.prototype.draw = function() {
-  if (!this.scope || !this.options) return null;
-
-  var select = document.createElement('select');
-  if (this.className) select.className = className;
-  select.title = this.title;
-
-  for (var o in this.options) {
-    //var opt = this.options[o];
-    var option = document.createElement('option');
-    option.value = o;
-    option.appendChild(document.createTextNode(this.options[o]));
-    select.appendChild(option);
-  }
-
-  var This = this;
-  select.onchange = function() {
-    try {
-      This.fn.call(This.scope, this.value);
-    } catch (e) { alert(e); }
-
-    return false;
-  };
-
-  return select;
-};
-
-
-jsToolBar.prototype = {
-  base_url: '',
-  mode: 'wiki',
-  elements: {},
-  help_link: '',
-
-  getMode: function() {
-    return this.mode;
-  },
-
-  setMode: function(mode) {
-    this.mode = mode || 'wiki';
-  },
-
-  switchMode: function(mode) {
-    mode = mode || 'wiki';
-    this.draw(mode);
-  },
-
-  setHelpLink: function(link) {
-    this.help_link = link;
-  },
-
-  button: function(toolName) {
-    var tool = this.elements[toolName];
-    if (typeof tool.fn[this.mode] != 'function') return null;
-    var b = new jsButton(tool.title, tool.fn[this.mode], this, 'icon-small jstb_'+toolName);
-    if (tool.icon != undefined) b.icon = tool.icon;
-    return b;
-  },
-  space: function(toolName) {
-    var tool = new jsSpace(toolName);
-    if (this.elements[toolName].width !== undefined)
-      tool.width = this.elements[toolName].width;
-    return tool;
-  },
-  combo: function(toolName) {
-    var tool = this.elements[toolName];
-    var length = tool[this.mode].list.length;
-
-    if (typeof tool[this.mode].fn != 'function' || length == 0) {
-      return null;
-    } else {
-      var options = {};
-      for (var i=0; i < length; i++) {
-        var opt = tool[this.mode].list[i];
-        options[opt] = tool.options[opt];
-      }
-      return new jsCombo(tool.title, options, this, tool[this.mode].fn);
-    }
-  },
-  draw: function(mode) {
-    this.setMode(mode);
-
-    // Empty toolbar
-    while (this.toolbar.hasChildNodes()) {
-      this.toolbar.removeChild(this.toolbar.firstChild)
-    }
-    this.toolNodes = {}; // vide les raccourcis DOM/**/
-
-    // Draw toolbar elements
-    var b, tool, newTool;
-
-    for (var i in this.elements) {
-      b = this.elements[i];
-
-      var disabled =
-      b.type == undefined || b.type == ''
-      || (b.disabled != undefined && b.disabled)
-      || (b.context != undefined && b.context != null && b.context != this.context);
-
-      if (!disabled && typeof this[b.type] == 'function') {
-        tool = this[b.type](i);
-        if (tool) newTool = tool.draw();
-        if (newTool) {
-          this.toolNodes[i] = newTool; //mémorise l'accès DOM pour usage éventuel ultérieur
-          this.toolbar.appendChild(newTool);
-        }
-      }
-    }
-
-    if (this.help_link !== '') {
-      this.toolbar.appendChild(this.help_link);
-    }
-  },
-
-  singleTag: function(stag,etag) {
-    stag = stag || null;
-    etag = etag || stag;
-
-    if (!stag || !etag) { return; }
-
-    this.encloseSelection(stag,etag);
-  },
-
-  encloseLineSelection: function (prefix, suffix, fn) {
-      this.textarea.focus();
-      prefix = prefix || '';
-      suffix = suffix || '';
-      var start, end, sel, scrollPos, subst, res;
-      if (typeof(document["selection"]) != "undefined") {
-        // just makes it work in IE8 somehow
-        var helperRange = document.selection.createRange();
-        var bookmark = helperRange.getBookmark();
-        var origParent = helperRange.parentElement();
-        var moveStart = 0;
-        // we move the starting point of the selection to the last newline
-        // and track the number of movements
-        try {
-          while (helperRange.text[0] != "\n" && helperRange.text[0] != "\r") {
-            helperRange.moveStart("character", -1);
-            if (origParent != helperRange.parentElement()) {
-              throw "Outside of Textarea";
-            }
-            moveStart -= 1;
-          }
-          moveStart += 1;
-        } catch(err) {
-          if (err != "Outside of Textarea")
-            throw err;
-        }
-        var range = document.selection.createRange();
-        range.moveStart("character", moveStart);
-        if (range.text.match(/ $/))
-          range.moveEnd("character", -1);
-        sel = range.text;
-      } else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
-          start = this.textarea.selectionStart;
-          end = this.textarea.selectionEnd;
-          scrollPos = this.textarea.scrollTop;
-          // go to the start of the line
-          start = this.textarea.value.substring(0, start).replace(/[^\r\n]*$/g,'').length;
-          // go to the end of the line
-          end = this.textarea.value.length - this.textarea.value.substring(end, this.textarea.value.length).replace(/^[^\r\n]*/, '').length;
-          sel = this.textarea.value.substring(start, end);
-      }
-      if (sel.match(/ $/)) {
-          sel = sel.substring(0, sel.length - 1);
-          suffix = suffix + " ";
-      }
-      if (typeof(fn) == 'function') {
-          res = (sel) ? fn.call(this, sel) : fn('');
-      } else {
-          res = (sel) ? sel : '';
-      }
-      subst = prefix + res + suffix;
-      if (typeof(document["selection"]) != "undefined") {
-          range.text = subst;
-          this.textarea.caretPos -= suffix.length;
-      } else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
-          var cursorPosition = start;
-          this.textarea.value = this.textarea.value.substring(0, start) + subst + this.textarea.value.substring(end);
-          if (sel) {
-              cursorPosition += subst.length;
-          } else {
-              cursorPosition += prefix.length + res.length;
-          }
-          this.textarea.setSelectionRange(cursorPosition, cursorPosition);
-          this.textarea.scrollTop = scrollPos;
-      }
-  },
-
-  encloseSelection: function (prefix, suffix, fn) {
-      this.textarea.focus();
-      prefix = prefix || '';
-      suffix = suffix || '';
-      var start, end, sel, scrollPos, subst, res;
-      if (typeof(document["selection"]) != "undefined") {
-          sel = document.selection.createRange().text;
-      } else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
-          start = this.textarea.selectionStart;
-          end = this.textarea.selectionEnd;
-          scrollPos = this.textarea.scrollTop;
-          sel = this.textarea.value.substring(start, end);
-      }
-      if (sel.match(/ $/)) {
-          sel = sel.substring(0, sel.length - 1);
-          suffix = suffix + " ";
-      }
-      if (typeof(fn) == 'function') {
-          res = (sel) ? fn.call(this, sel) : fn('');
-      } else {
-          res = (sel) ? sel : '';
-      }
-      subst = prefix + res + suffix;
-      if (typeof(document["selection"]) != "undefined") {
-          var range = document.selection.createRange().text = subst;
-          this.textarea.caretPos -= suffix.length;
-      } else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
-          this.textarea.value = this.textarea.value.substring(0, start) + subst + this.textarea.value.substring(end);
-          if (sel) {
-              this.textarea.setSelectionRange(start + subst.length, start + subst.length);
-          } else {
-              this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
-          }
-          this.textarea.scrollTop = scrollPos;
-      }
-  },
-
-  stripBaseURL: function(url) {
-    if (this.base_url != '') {
-      var pos = url.indexOf(this.base_url);
-      if (pos == 0) {
-        url = url.substr(this.base_url.length);
-      }
-    }
-
-    return url;
-  }
-};
-
-/** Resizer
--------------------------------------------------------- */
-jsToolBar.prototype.resizeSetStartH = function() {
-  this.dragStartH = this.textarea.offsetHeight + 0;
-};
-jsToolBar.prototype.resizeDragStart = function(event) {
-  var This = this;
-  this.dragStartY = event.clientY;
-  this.resizeSetStartH();
-  document.addEventListener('mousemove', this.dragMoveHdlr=function(event){This.resizeDragMove(event);}, false);
-  document.addEventListener('mouseup', this.dragStopHdlr=function(event){This.resizeDragStop(event);}, false);
-};
-
-jsToolBar.prototype.resizeDragMove = function(event) {
-  this.textarea.style.height = (this.dragStartH+event.clientY-this.dragStartY)+'px';
-};
-
-jsToolBar.prototype.resizeDragStop = function(event) {
-  document.removeEventListener('mousemove', this.dragMoveHdlr, false);
-  document.removeEventListener('mouseup', this.dragStopHdlr, false);
-};
diff --git a/app/assets/javascripts/jstoolbar/markdown.js b/app/assets/javascripts/jstoolbar/markdown.js
deleted file mode 100644
index b15d201831..0000000000
--- a/app/assets/javascripts/jstoolbar/markdown.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * This file is part of DotClear.
- * Copyright (c) 2005 Nicolas Martin & Olivier Meunier and contributors. All
- * rights reserved.
- *
- * DotClear 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.
- *
- * DotClear 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 DotClear; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * ***** END LICENSE BLOCK *****
-*/
-
-/* Modified by JP LANG for textile formatting */
-
-// strong
-jsToolBar.prototype.elements.strong = {
-	type: 'button',
-	title: 'Strong',
-	fn: {
-		wiki: function() { this.singleTag('**') }
-	}
-};
-
-// em
-jsToolBar.prototype.elements.em = {
-	type: 'button',
-	title: 'Italic',
-	fn: {
-		wiki: function() { this.singleTag("_") }
-	}
-};
-
-// del
-jsToolBar.prototype.elements.del = {
-	type: 'button',
-	title: 'Deleted',
-	fn: {
-		wiki: function() { this.singleTag('~~') }
-	}
-};
-
-// code
-jsToolBar.prototype.elements.code = {
-	type: 'button',
-	title: 'Code',
-	fn: {
-		wiki: function() { this.singleTag('`') }
-	}
-};
-
-// spacer
-jsToolBar.prototype.elements.space1 = {type: 'space'};
-
-// headings
-jsToolBar.prototype.elements.h1 = {
-	type: 'button',
-	title: 'Heading 1',
-	fn: {
-		wiki: function() {
-		  this.encloseLineSelection('# ', '',function(str) {
-		    str = str.replace(/^#+/, '');
-		    return str;
-		  });
-		}
-	}
-};
-jsToolBar.prototype.elements.h2 = {
-	type: 'button',
-	title: 'Heading 2',
-	fn: {
-		wiki: function() {
-		  this.encloseLineSelection('## ', '',function(str) {
-        str = str.replace(/^#+/, '');
-		    return str;
-		  });
-		}
-	}
-};
-jsToolBar.prototype.elements.h3 = {
-	type: 'button',
-	title: 'Heading 3',
-	fn: {
-		wiki: function() {
-		  this.encloseLineSelection('### ', '',function(str) {
-        str = str.replace(/^#+/, '');
-		    return str;
-		  });
-		}
-	}
-};
-
-// spacer
-jsToolBar.prototype.elements.space2 = {type: 'space'};
-
-// ul
-jsToolBar.prototype.elements.ul = {
-	type: 'button',
-	title: 'Unordered list',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^)[#-]?\s*/g,"$1- ");
-			});
-		}
-	}
-};
-
-// ol
-jsToolBar.prototype.elements.ol = {
-	type: 'button',
-	title: 'Ordered list',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^)[*-]?\s*/g,"$11. ");
-			});
-		}
-	}
-};
-
-// spacer
-jsToolBar.prototype.elements.space3 = {type: 'space'};
-
-// bq
-jsToolBar.prototype.elements.bq = {
-	type: 'button',
-	title: 'Quote',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
-			});
-		}
-	}
-};
-
-// unbq
-jsToolBar.prototype.elements.unbq = {
-	type: 'button',
-	title: 'Unquote',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
-			});
-		}
-	}
-};
-
-// pre
-jsToolBar.prototype.elements.code = {
-	type: 'button',
-	title: 'Code fence',
-	fn: {
-		wiki: function() { this.encloseLineSelection('```\n', '\n```') }
-	}
-};
-
-// spacer
-jsToolBar.prototype.elements.space4 = {type: 'space'};
-
-// wiki page
-jsToolBar.prototype.elements.link = {
-	type: 'button',
-	title: 'Link',
-	fn: {
-		wiki: function() { this.encloseSelection("[", "]()") }
-	}
-};
-// image
-jsToolBar.prototype.elements.img = {
-	type: 'button',
-	title: 'Image',
-	fn: {
-		wiki: function() { this.encloseSelection("![](", ")") }
-	}
-};
-
-
diff --git a/app/assets/javascripts/jstoolbar/textile.js b/app/assets/javascripts/jstoolbar/textile.js
deleted file mode 100644
index fef9112dd6..0000000000
--- a/app/assets/javascripts/jstoolbar/textile.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * This file is part of DotClear.
- * Copyright (c) 2005 Nicolas Martin & Olivier Meunier and contributors. All
- * rights reserved.
- *
- * DotClear 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.
- *
- * DotClear 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 DotClear; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * ***** END LICENSE BLOCK *****
-*/
-
-/* Modified by JP LANG for textile formatting */
-
-// strong
-jsToolBar.prototype.elements.strong = {
-	type: 'button',
-	title: 'Strong',
-	fn: {
-		wiki: function() { this.singleTag('*') }
-	}
-};
-
-// em
-jsToolBar.prototype.elements.em = {
-	type: 'button',
-	title: 'Italic',
-	fn: {
-		wiki: function() { this.singleTag("_") }
-	}
-};
-
-// ins
-jsToolBar.prototype.elements.ins = {
-	type: 'button',
-	title: 'Underline',
-	fn: {
-		wiki: function() { this.singleTag('+') }
-	}
-};
-
-// del
-jsToolBar.prototype.elements.del = {
-	type: 'button',
-	title: 'Deleted',
-	fn: {
-		wiki: function() { this.singleTag('-') }
-	}
-};
-
-// code
-jsToolBar.prototype.elements.pre = {
-	type: 'button',
-	title: 'Code',
-	fn: {
-		wiki: function() { this.singleTag('@') }
-	}
-};
-
-// spacer
-jsToolBar.prototype.elements.space1 = {type: 'space'};
-
-// headings
-jsToolBar.prototype.elements.h1 = {
-	type: 'button',
-	title: 'Heading 1',
-	fn: {
-		wiki: function() {
-		  this.encloseLineSelection('h1. ', '',function(str) {
-		    str = str.replace(/^h\d+\.\s+/, '');
-		    return str;
-		  });
-		}
-	}
-};
-jsToolBar.prototype.elements.h2 = {
-	type: 'button',
-	title: 'Heading 2',
-	fn: {
-		wiki: function() {
-		  this.encloseLineSelection('h2. ', '',function(str) {
-		    str = str.replace(/^h\d+\.\s+/, '');
-		    return str;
-		  });
-		}
-	}
-};
-jsToolBar.prototype.elements.h3 = {
-	type: 'button',
-	title: 'Heading 3',
-	fn: {
-		wiki: function() {
-		  this.encloseLineSelection('h3. ', '',function(str) {
-		    str = str.replace(/^h\d+\.\s+/, '');
-		    return str;
-		  });
-		}
-	}
-};
-
-// spacer
-jsToolBar.prototype.elements.space2 = {type: 'space'};
-
-// ul
-jsToolBar.prototype.elements.ul = {
-	type: 'button',
-	title: 'Unordered list',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^)[#-]?\s*/g,"$1* ");
-			});
-		}
-	}
-};
-
-// ol
-jsToolBar.prototype.elements.ol = {
-	type: 'button',
-	title: 'Ordered list',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^)[*-]?\s*/g,"$1# ");
-			});
-		}
-	}
-};
-
-// spacer
-jsToolBar.prototype.elements.space3 = {type: 'space'};
-
-// bq
-jsToolBar.prototype.elements.bq = {
-	type: 'button',
-	title: 'Quote',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
-			});
-		}
-	}
-};
-
-// unbq
-jsToolBar.prototype.elements.unbq = {
-	type: 'button',
-	title: 'Unquote',
-	fn: {
-		wiki: function() {
-			this.encloseLineSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
-			});
-		}
-	}
-};
-
-// pre
-jsToolBar.prototype.elements.pre = {
-	type: 'button',
-	title: 'Preformatted text',
-	fn: {
-		wiki: function() { this.encloseLineSelection('<pre>\n', '\n</pre>') }
-	}
-};
-
-// spacer
-jsToolBar.prototype.elements.space4 = {type: 'space'};
-
-// wiki page
-jsToolBar.prototype.elements.link = {
-	type: 'button',
-	title: 'Wiki link',
-	fn: {
-		wiki: function() { this.encloseSelection("[[", "]]") }
-	}
-};
-// image
-jsToolBar.prototype.elements.img = {
-	type: 'button',
-	title: 'Image',
-	fn: {
-		wiki: function() { this.encloseSelection("!", "!") }
-	}
-};
-
-
diff --git a/app/assets/javascripts/jstoolbar/translations.js b/app/assets/javascripts/jstoolbar/translations.js
deleted file mode 100644
index 1874dc71ef..0000000000
--- a/app/assets/javascripts/jstoolbar/translations.js
+++ /dev/null
@@ -1,20 +0,0 @@
-jQuery(function() {
-  jsToolBar.strings = {
-    'Strong':            I18n.t('js.wiki_formatting.strong'),
-    'Italic':            I18n.t('js.wiki_formatting.italic'),
-    'Underline':         I18n.t('js.wiki_formatting.underline'),
-    'Deleted':           I18n.t('js.wiki_formatting.deleted'),
-    'Code':              I18n.t('js.wiki_formatting.code'),
-    'Heading 1':         I18n.t('js.wiki_formatting.heading1'),
-    'Heading 2':         I18n.t('js.wiki_formatting.heading2'),
-    'Heading 3':         I18n.t('js.wiki_formatting.heading3'),
-    'Unordered list':    I18n.t('js.wiki_formatting.unordered_list'),
-    'Ordered list':      I18n.t('js.wiki_formatting.ordered_list'),
-    'Quote':             I18n.t('js.wiki_formatting.quote'),
-    'Unquote':           I18n.t('js.wiki_formatting.unquote'),
-    'Preformatted text': I18n.t('js.wiki_formatting.preformatted_text'),
-    'Wiki link':         I18n.t('js.wiki_formatting.wiki_link'),
-    'Image':             I18n.t('js.wiki_formatting.image')
-  }
-});
-
diff --git a/app/assets/stylesheets/openproject/_index.sass b/app/assets/stylesheets/openproject/_index.sass
index bd45845923..a10e93138d 100644
--- a/app/assets/stylesheets/openproject/_index.sass
+++ b/app/assets/stylesheets/openproject/_index.sass
@@ -2,7 +2,6 @@
 @import openproject/announcements
 @import openproject/functions
 @import openproject/homescreen
-@import openproject/jstoolbar
 
 // Legacy styles, remove if possible
 @import openproject/legacy
diff --git a/app/assets/stylesheets/openproject/_jstoolbar.sass b/app/assets/stylesheets/openproject/_jstoolbar.sass
deleted file mode 100644
index fe73bfb8fc..0000000000
--- a/app/assets/stylesheets/openproject/_jstoolbar.sass
+++ /dev/null
@@ -1,154 +0,0 @@
-//-- copyright
-// OpenProject is a project management system.
-// Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2017 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// 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.
-//
-// See docs/COPYRIGHT.rdoc for more details.
-//++
-
-$jstoolbar--icon-background: #fff
-$jstoolbar--icon-hover-border: #ccc
-$jstoolbar--icon-border: #fff
-$jstoolbar--icon-active-border: #bbb
-$jstoolbar--icon-active-background: #eee
-
-.jstEditor
-  padding-left: 0
-  clear: both
-
-  textarea, iframe
-    margin: 0
-
-  textarea
-    min-height: 200px
-
-  textarea.-small
-    min-height: 50px
-
-.jstHandle
-  height: 10px
-  font-size: 0.1em
-  cursor: s-resize
-
-.jstElements
-  background: #fff
-  float: right
-  line-height: 1.6rem
-  margin-bottom: 0.25rem
-  text-align: right
-
-  button
-    @include icon-common
-    padding: 0.25rem
-    margin-left: 0.125rem
-    height: 1.625rem
-    width: 1.625rem
-    max-width: 1.625rem
-    border: 1px solid $jstoolbar--icon-border
-    background-color: $jstoolbar--icon-background
-    color: $body-font-color
-    border-radius: 2px
-    overflow: hidden
-    display: inline-block
-
-    &:hover
-      border-color: $jstoolbar--icon-hover-border
-      cursor: pointer
-
-    &:focus
-      border-color: $jstoolbar--icon-hover-border
-
-    &.-active
-      border-color: $jstoolbar--icon-hover-border
-      box-shadow: inset 0px 0px 3px $jstoolbar--icon-active-border
-      background: $jstoolbar--icon-active-background
-
-    &:before
-      display: block
-
-    span
-      display: none
-
-  .jstb_help
-    font-size: 0.8125rem
-    padding: 0.35rem
-    line-height: 1rem
-    @extend .icon-help1
-
-    &:before
-      color: $body-font-color
-      padding: 0
-
-  span
-    display: inline
-
-
-.jstSpacer
-  width: 0
-  font-size: 1px
-  margin-right: 4px
-
-.jstb_strong
-  @extend .icon-bold
-
-.jstb_em
-  @extend .icon-italic
-
-.jstb_ins
-  @extend .icon-underline
-
-.jstb_del
-  @extend .icon-strike-through
-
-.jstb_code
-  @extend .icon-code-tag
-
-.jstb_h1
-  @extend .icon-headline1
-
-.jstb_h2
-  @extend .icon-headline2
-
-.jstb_h3
-  @extend .icon-headline3
-
-.jstb_ul
-  @extend .icon-unordered-list
-
-.jstb_ol
-  @extend .icon-ordered-list
-
-.jstb_bq
-  @extend .icon-paragraph-right
-
-.jstb_unbq
-  @extend .icon-paragraph-left
-
-.jstb_pre
-  @extend .icon-pre
-
-.jstb_link
-  @extend .icon-link
-
-.jstb_img
-  @extend .icon-image1
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 67bdf7b0e5..c16528ad43 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -80,7 +80,9 @@ class BoardsController < ApplicationController
         render template: 'messages/index'
       end
       format.atom do
-        @messages = @board.messages.order(["#{Message.table_name}.sticked_on ASC", sort_clause].compact.join(', '))
+        @messages = @board
+                    .messages
+                    .order(["#{Message.table_name}.sticked_on ASC", sort_clause].compact.join(', '))
                     .includes(:author, :board)
                     .limit(Setting.feeds_limit.to_i)
 
@@ -90,14 +92,15 @@ class BoardsController < ApplicationController
   end
 
   def set_topics
-    @topics =  @board.topics.order(["#{Message.table_name}.sticked_on ASC", sort_clause].compact.join(', '))
-               .includes(:author,  last_reply: :author)
+    @topics =  @board
+               .topics
+               .order(["#{Message.table_name}.sticked_on ASC", sort_clause].compact.join(', '))
+               .includes(:author, last_reply: :author)
                .page(params[:page])
                .per_page(per_page_param)
   end
 
-  def new
-  end
+  def new; end
 
   def create
     if @board.save
@@ -108,8 +111,7 @@ class BoardsController < ApplicationController
     end
   end
 
-  def edit
-  end
+  def edit; end
 
   def update
     if @board.update_attributes(permitted_params.board)
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index bde22329e8..b7ca2efdd7 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -30,10 +30,6 @@
 class HelpController < ApplicationController
   layout 'help'
 
-  def wiki_syntax; end
-
-  def wiki_syntax_detailed; end
-
   def keyboard_shortcuts; end
 
   def text_formatting
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6e31a28471..43f0b0898e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -633,12 +633,6 @@ module ApplicationHelper
     end
   end
 
-  def wiki_helper
-    helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
-    extend helper
-    self
-  end
-
   def link_to_content_update(text, url_params = {}, html_options = {})
     link_to(text, url_params, html_options)
   end
diff --git a/app/helpers/text_formatting_helper.rb b/app/helpers/text_formatting_helper.rb
index 22feffe840..954e9ec8ea 100644
--- a/app/helpers/text_formatting_helper.rb
+++ b/app/helpers/text_formatting_helper.rb
@@ -52,10 +52,9 @@ module TextFormattingHelper
     end
   end
 
-  private
-
+  #TODO remove
   def current_formatting_helper
-    helper_class = OpenProject::TextFormatting::Formatters.helper_for(Setting.text_formatting)
+    helper_class = OpenProject::TextFormatting::Formats.rich_helper
     helper_class.new(self)
   end
 end
diff --git a/app/views/attribute_help_texts/_form.html.erb b/app/views/attribute_help_texts/_form.html.erb
index 192a5a7fd0..50653c1a09 100644
--- a/app/views/attribute_help_texts/_form.html.erb
+++ b/app/views/attribute_help_texts/_form.html.erb
@@ -41,7 +41,6 @@ See docs/COPYRIGHT.rdoc for more details.
     <% end %>
   </div>
   <div class="form--field -required">
-    <%= f.text_area :help_text, :cols => 100, :rows => 20, :class => 'wiki-edit' %>
-    <%= wikitoolbar_for("#{f.object_name}_help_text") %>
+    <%= f.text_area :help_text, cols: 100, rows: 20, class: 'wiki-edit', with_text_formatting: true %>
   </div>
 </section>
diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb
index aee679f795..937cad297c 100644
--- a/app/views/boards/index.html.erb
+++ b/app/views/boards/index.html.erb
@@ -88,8 +88,9 @@ See docs/COPYRIGHT.rdoc for more details.
             <td><%= board.messages_count %></td>
             <td>
               <% if board.last_message %>
+                <% board.last_message %>
                 <%= authoring board.last_message.created_on, board.last_message.author %><br />
-                <%= link_to_message board.last_message %>
+                <%= link_to_message board.last_message, no_root: true %>
               <% end %>
             </td>
           </tr>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index f77cf3b0cd..76d01d410e 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -130,7 +130,7 @@ See docs/COPYRIGHT.rdoc for more details.
               <% if message.last_reply %>
                 <%= authoring message.last_reply.created_on, message.last_reply.author %><br/>
                 <br/>
-                <%= link_to message.subject, topic_path(message.last_reply) %>
+                <%= link_to_message message.last_reply, no_root: true %>
               <% end %>
             </td>
           </tr>
diff --git a/app/views/help/wiki_syntax.html.erb b/app/views/help/wiki_syntax.html.erb
deleted file mode 100644
index 7cfa9d4404..0000000000
--- a/app/views/help/wiki_syntax.html.erb
+++ /dev/null
@@ -1,235 +0,0 @@
-<%#-- copyright
-OpenProject is a project management system.
-Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2017 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-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.
-
-See docs/COPYRIGHT.rdoc for more details.
-
-++#%>
-<% content_for :styles do %>
-  h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
-    body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
-    table th { padding-top: 1em; }
-    table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
-    table td code { font-size: 1.2em; }
-    table td h1 { font-size: 1.8em; text-align: left; }
-    table td h2 { font-size: 1.4em; text-align: left; }
-    table td h3 { font-size: 1.2em; text-align: left; }
-<% end %>
-
-<% html_title "Wiki Syntax Quick Reference" %>
-<h1>Wiki Syntax Quick Reference</h1>
-
-<table width="100%">
-  <tr>
-    <th colspan="3">Font Styles</th>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_strong.png', style: 'border: 1px solid #bbb', alt: 'Strong' %></th>
-    <td width="50%">*Strong*</td>
-    <td width="50%"><strong>Strong</strong></td>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_em.png', style: 'border: 1px solid #bbb', alt: 'Italic' %></th>
-    <td>_Italic_</td>
-    <td><em>Italic</em></td>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_ins.png', style: 'border: 1px solid #bbb', alt: 'Underline' %></th>
-    <td>+Underline+</td>
-    <td><ins>Underline</ins></td>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_del.png', style: 'border: 1px solid #bbb', alt: 'Deleted' %></th>
-    <td>-Deleted-</td>
-    <td><del>Deleted</del></td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>??Quote??</td>
-    <td><cite>Quote</cite></td>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_code.png', style: 'border: 1px solid #bbb', alt: 'Inline Code' %></th>
-    <td>@Inline Code@</td>
-    <td><code>Inline Code</code></td>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_pre.png', style: 'border: 1px solid #bbb', alt: 'Preformatted text' %></th>
-    <td>&lt;pre><br />
-      &nbsp;lines<br />
-      &nbsp;of code<br />
-      &lt;/pre></td>
-    <td>
-      <pre>
- lines
- of code
-</pre>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan="3">Lists</th>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_ul.png', style: 'border: 1px solid #bbb', alt: 'Unordered list' %></th>
-    <td>* Item 1<br />
-      * Item 2</td>
-    <td>
-      <ul>
-        <li>Item 1</li>
-        <li>Item 2</li>
-      </ul>
-    </td>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_ol.png', style: 'border: 1px solid #bbb', alt: 'Ordered list' %></th>
-    <td># Item 1<br />
-      # Item 2</td>
-    <td>
-      <ol>
-        <li>Item 1</li>
-        <li>Item 2</li>
-      </ol>
-    </td>
-  </tr>
-
-  <tr>
-    <th colspan="3">Headings</th>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_h1.png', style: 'border: 1px solid #bbb', alt: 'Heading 1' %></th>
-    <td>h1. Title 1</td>
-    <td>
-      <h1>Title 1</h1>
-    </td>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_h2.png', style: 'border: 1px solid #bbb', alt: 'Heading 2' %></th>
-    <td>h2. Title 2</td>
-    <td>
-      <h2>Title 2</h2>
-    </td>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_h3.png', style: 'border: 1px solid #bbb', alt: 'Heading 3' %></th>
-    <td>h3. Title 3</td>
-    <td>
-      <h3>Title 3</h3>
-    </td>
-  </tr>
-  <tr>
-    <th colspan="3">Links</th>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>http://foo.bar</td>
-    <td><a href="#">http://foo.bar</a></td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>"Foo":http://foo.bar</td>
-    <td><a href="#">Foo</a></td>
-  </tr>
-
-  <tr>
-    <th colspan="3">OpenProject links</th>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_link.png', style: 'border: 1px solid #bbb', alt: 'Link to a Wiki page' %></th>
-    <td>[[Wiki page]]</td>
-    <td><a href="#">Wiki page</a></td>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_link.png', style: 'border: 1px solid #bbb', alt: 'Link to a Wiki page' %></th>
-    <td>[[Sandbox:Wiki page]]</td>
-    <td><a href="#">Wiki page</a> (On the Sandbox project)</td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>WorkPackage #12</td>
-    <td>WorkPackage <a href="#">#12</a></td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>WorkPackage ##12</td>
-    <td>WorkPackage <a href="#">Bug #12: WorkPackage Subject</a> 2012-06-06 – 2013-06-06</td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>WorkPackage ###12</td>
-    <td>WorkPackage <a href="#">Bug #12: WorkPackage Subject</a> 2012-06-06 – 2013-06-06
-
-      <div style="padding-left: 10px; padding-top: 0.5em; padding-bottom: 0.5em; line-height: 1.5em;">
-        <strong>Responsible:</strong> John Doe<br>
-        <strong>Assigned to:</strong> John Doe
-      </div>
-      <div style="padding-left: 10px;">
-        I am the description of this work package.
-      </div>
-    </td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>Link user#4 via ID<br><i>(Using links in work package descriptions or comments will trigger a "you were mentioned" email notification. Type '@' to let an autocompleter suggest you project members to link to.)</i></td>
-    <td>Link <a href="#" class="user-mention">John Doe</a> via ID</td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>Link user:"johndoe" via login name <br><i>(Using links in work package descriptions or comments will trigger a "you were mentioned" email notification.)</i></td>
-    <td>Link <a href="#" class="user-mention">John Doe</a> via login name</td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>Revision r43</td>
-    <td>Revision <a href="#">r43</a></td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>commit:f30e13e43</td>
-    <td><a href="#">f30e13e4</a></td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>source:some/file</td>
-    <td><a href="#">source:some/file</a></td>
-  </tr>
-
-  <tr>
-    <th colspan="3">Inline images</th>
-  </tr>
-  <tr>
-    <th><%= image_tag 'jstoolbar/bt_img.png', style: 'border: 1px solid #bbb', alt: 'Image' %></th>
-    <td>!<em>image_url</em>!</td>
-    <td></td>
-  </tr>
-  <tr>
-    <th><div class="generic-table--empty-header"></div></th>
-    <td>!<em>attached_image</em>!</td>
-    <td></td>
-  </tr>
-</table>
-
-<p>
-  <%= link_to_function 'More Information', "window.open('wiki_syntax_detailed', '', '')" %>
-</p>
diff --git a/app/views/help/wiki_syntax_detailed.html.erb b/app/views/help/wiki_syntax_detailed.html.erb
deleted file mode 100644
index a8c7fa316d..0000000000
--- a/app/views/help/wiki_syntax_detailed.html.erb
+++ /dev/null
@@ -1,297 +0,0 @@
-<%#-- copyright
-OpenProject is a project management system.
-Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License version 3.
-
-OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-Copyright (C) 2006-2017 Jean-Philippe Lang
-Copyright (C) 2010-2013 the ChiliProject Team
-
-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.
-
-See docs/COPYRIGHT.rdoc for more details.
-
-++#%>
-<% content_for :styles do %>
-  body { font:80% Verdana,Tahoma,Arial,sans-serif; }
-    h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
-    pre, code { font-size:120%; }
-    pre code { font-size:100%; }
-    pre {
-        margin: 1em 1em 1em 1.6em;
-        padding: 2px;
-        background-color: #fafafa;
-        border: 1px solid #dadada;
-        width:95%;
-        overflow-x: auto;
-    }
-    a.new { color: #b73535; }
-
-    .CodeRay .c  { color:#666; }
-
-    .CodeRay .cl { color:#B06; font-weight:bold }
-    .CodeRay .dl { color:black }
-    .CodeRay .fu { color:#06B; font-weight:bold }
-
-    .CodeRay .il { background: #eee }
-    .CodeRay .il .idl { font-weight: bold; color: #888 }
-
-    .CodeRay .iv { color:#33B }
-    .CodeRay .r  { color:#080; font-weight:bold }
-
-    .CodeRay .s  { background-color:#fff0f0 }
-    .CodeRay .s  .dl { color:#710 }
-<% end %>
-<% html_title "Wiki Formatting" %>
-<h1><a name="1" class="wiki-page"></a>Wiki Formatting</h1>
-<h2><a name="2" class="wiki-page"></a>Links</h2>
-<h3><a name="3" class="wiki-page"></a>OpenProject links</h3>
-<p>OpenProject allows hyperlinking between work packages, changesets and wiki pages from anywhere wiki formatting is used.</p>
-<ul>
-  <li><strong>#124</strong> displays a link to a work package: <del><a href="#" class="work package" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del> (link is striked-through if the work package is closed)</li>
-  <li><strong>##124</strong> displays a link to a work package with context information: <a href="#" class="work package status-1 priority-2 overdue created-by-me" title="Work package subject (New)">Bug #12: Work package subject</a> 2012-05-14 - 2012-05-23</li>
-  <li><strong>###124</strong> displays a link to a work package with context information and an excerpt (first 3 lines) of the description</li>
-  <li><strong>r758</strong> displays a link to a changeset: <a href="#" class="changeset" title="Search engine now only searches objects the user is allowed to view.">r758</a></li>
-  <li><strong>commit:c6f4d0fd</strong> displays a link to a changeset with a non-numeric hash: <a href="#" class="changeset">c6f4d0fd</a></li>
-  <li><strong>sandbox:r758</strong> displays a link to a changeset of another project: <a href="#" class="changeset" title="Search engine now only searches objects the user is allowed to view.">sandbox:r758</a></li>
-  <li><strong>sandbox:c6f4d0fd</strong> displays a link to a changeset with a non-numeric hash: <a href="#" class="changeset">sandbox:c6f4d0fd</a></li>
-</ul>
-<p>Wiki links:</p>
-<ul>
-  <li><strong>[[Guide]]</strong> displays a link to the page named 'Guide': <a href="#" class="wiki-page">Guide</a></li>
-  <li><strong>[[Guide#further-reading]]</strong> takes you to the anchor "further-reading". Headings get automatically assigned anchors so that you can refer to them: <a href="#" class="wiki-page">Guide</a></li>
-  <li><strong>[[Guide|User manual]]</strong> displays a link to the same page but with a different text: <a href="#" class="wiki-page">User manual</a></li>
-</ul>
-<p>You can also link to pages of an other project wiki:</p>
-<ul>
-  <li><strong>[[sandbox:some page]]</strong> displays a link to the page named 'Some page' of the Sandbox wiki</li>
-  <li><strong>[[sandbox:]]</strong> displays a link to the Sandbox wiki main page</li>
-</ul>
-<p>Wiki links are displayed in red if the page doesn't exist yet, eg: <a href="#" class="wiki-page new">Nonexistent page</a>.</p>
-<p>Links to other resources:</p>
-<ul>
-  <li>Versions:
-
-    <ul>
-      <li><strong>version#3</strong> (link to version with id 3)</li>
-      <li><strong>version:1.0.0</strong> (link to version named "1.0.0")</li>
-      <li><strong>version:"1.0 beta 2"</strong></li>
-      <li><strong>sandbox:version:1.0.0</strong> (link to version "1.0.0" in the project "sandbox")</li>
-    </ul>
-  </li>
-</ul>
-<ul>
-  <li>Attachments:
-
-    <ul>
-      <li><strong>attachment:file.zip</strong> (link to the attachment of the current object named file.zip)</li>
-      <li>For now, attachments of the current object can be referenced only (if you're on a work package, it's possible to reference attachments of this work package only)</li>
-    </ul>
-  </li>
-</ul>
-<ul>
-  <li>Repository files:
-
-    <ul>
-      <li><strong>source:some/file</strong>           (link to the file located at /some/file in the project's repository)</li>
-      <li><strong>source:some/file@52</strong>        (link to the file's revision 52)</li>
-      <li><strong>source:some/file#L120</strong>      (link to line 120 of the file)</li>
-      <li><strong>source:some/file@52#L120</strong>   (link to line 120 of the file's revision 52)</li>
-      <li><strong>source:"some file@52#L120"</strong> (use double quotes when the URL contains spaces</li>
-      <li><strong>export:some/file</strong>           (force the download of the file)</li>
-      <li><strong>sandbox:source:some/file</strong>   (link to the file located at /some/file in the repository of the project "sandbox")</li>
-      <li><strong>sandbox:export:some/file</strong>   (force the download of the file)</li>
-    </ul>
-  </li>
-</ul>
-<ul>
-  <li>Forum messages:
-
-    <ul>
-      <li><strong>message#1218</strong> (link to message with id 1218)</li>
-    </ul>
-  </li>
-</ul>
-<ul>
-  <li>Projects:
-
-    <ul>
-      <li><strong>project#3</strong> (link to project with id 3)</li>
-      <li><strong>project:someproject</strong> (link to project named "someproject")</li>
-    </ul>
-  </li>
-</ul>
-<p>Escaping:</p>
-<ul>
-  <li>You can prevent OpenProject links from being parsed by preceding them with an exclamation mark: !</li>
-</ul>
-<h3><a name="4" class="wiki-page"></a>External links</h3>
-<p>HTTP URLs and email addresses are automatically turned into clickable links:</p>
-<pre>
-https://www.openproject.org, someone@foo.bar
-</pre>
-<p>displays: <a class="external" href="https://www.openproject.org">https://www.openproject.org</a>, <a href="mailto:someone@foo.bar" class="email">someone@foo.bar</a></p>
-<p>If you want to display a specific text instead of the URL, you can use the standard textile syntax:</p>
-<pre>
-"OpenProject web site":https://www.openproject.org
-</pre>
-<p>displays: <a href="https://www.openproject.org" class="external">OpenProject web site</a></p>
-<h2><a name="5" class="wiki-page"></a>Text formatting</h2>
-<p>For things such as headlines, bold, tables, lists, OpenProject supports Textile syntax.  See <a class="external" href="http://txstyle.org/">http://txstyle.org/</a> for information on using any of these features.  A few samples are included below, but the engine is capable of much more of that.</p>
-<h3><a name="6" class="wiki-page"></a>Font style</h3>
-<pre>
-* *bold*
-* _italic_
-* _*bold italic*_
-* +underline+
-* -strike-through-
-</pre>
-<p>Display:</p>
-<ul>
-  <li><strong>bold</strong></li>
-  <li><em>italic</em></li>
-  <li><em>*bold italic*</em></li>
-  <li><ins>underline</ins></li>
-  <li><del>strike-through</del></li>
-</ul>
-<h3><a name="7" class="wiki-page"></a>Inline images</h3>
-<ul>
-  <li><strong>!image_url!</strong> displays an image located at image_url (textile syntax)</li>
-  <li><strong>!>image_url!</strong> right floating image</li>
-  <li>If you have an image attached to your wiki page, it can be displayed inline using its filename: <strong>!attached_image.png!</strong></li>
-</ul>
-<h3><a name="8" class="wiki-page"></a>Headings</h3>
-<p>Prefixing a line with <code>h1.</code>, <code>h2.</code> etc. will create a heading:</p>
-<pre>
-h1. Heading
-h2. Subheading
-h3. Subsubheading
-</pre>
-<p>OpenProject assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.</p>
-<h3>Numbered Headings</h3>
-<p>
-  You may also define numbered headings by prefixing lines with <code>h1#.</code>, <code>h2#.</code> etc. The heading numbers are then automatically managed by OpenProject for you.
-      </p>
-<table>
-  <thead>
-    <tr>
-      <th>
-        Wiki format
-            </th>
-      <th style='padding-left: 3em'>
-        Resulting Text
-            </th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>
-        <pre>
-h1#. Topic Foo
-h2#. Sub-Topic Foo Bar
-h1#. Topic Baz
-</pre>
-      </td>
-      <td style='padding-left: 3em'>
-        <strong>1. Topic A</strong><br/>
-        1.2. Sub-Topic 1<br/>
-        <strong>2. Topic B</strong>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<h3><a name="9" class="wiki-page"></a>Paragraphs</h3>
-<pre>
-p>. right aligned
-p=. centered
-</pre>
-<p style="text-align:center;">This is a centered paragraph.</p>
-<h3><a name="10" class="wiki-page"></a>Blockquotes</h3>
-<p>Start the paragraph with <strong>bq.</strong></p>
-<pre>
-bq. Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.
-To go live, all you need to add is a database and a web server.
-</pre>
-<p>Display:</p>
-<blockquote>
-  <p>Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.<br />
-    To go live, all you need to add is a database and a web server.</p>
-</blockquote>
-<h3><a name="11" class="wiki-page"></a>Table of content</h3>
-<pre>
-{{toc}} => left aligned toc
-{{>toc}} => right aligned toc
-</pre>
-<h3><a name="11" class="wiki-page"></a>Acronyms</h3>
-<p>Display tooltip for acronym by entering tooltip in parantheses after upper case
-acronym.</p>
-<pre>
-WHO(World Health Organisation) => Displays "World Health Organisation" as
-tooltip of "WHO"
-</pre>
-<p>
-  <acronym title="World Health Organisation">WHO</acronym>
-</p>
-<h2><a name="12" class="wiki-page"></a>Macros</h2>
-<p>OpenProject has the following builtin macros:</p>
-<p>
-  <dl>
-    <dt><code>hello_world</code></dt>
-    <dd>
-      <p>Sample macro.</p>
-    </dd>
-    <dt><code>include</code></dt>
-    <dd>
-      <p>Include a wiki page. Example:</p>
-      <pre><code>{{include(Foo)}}</code></pre>
-    </dd>
-    <dt><code>child_pages</code></dt>
-    <dd>
-      <p>Displays a list of child pages. With no argument, it displays the child pages of the current wiki page. Examples:</p>
-      <pre><code>
-        {{child_pages}} -- can be used from a wiki page only
-        {{child_pages(Foo)}} -- lists all children of page Foo
-        {{child_pages(Foo, parent=1)}} -- same as above with a link to page Foo
-      </code></pre>
-    </dd>
-    <dt><code>macro_list</code></dt>
-    <dd>
-      <p>Displays a list of all available macros, including description if available.</p>
-    </dd>
-  </dl>
-</p>
-<h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
-<p>Code highlighting relies on <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, a fast syntax highlighting library written completely in Ruby. It currently supports c, cpp, css, delphi, groovy, html, java, javascript, json, php, python, rhtml, ruby, scheme, sql, xml and yaml languages.</p>
-<p>You can highlight code in your wiki page using this syntax:</p>
-<pre>
-&lt;pre&gt;&lt;code class="ruby"&gt;
-  Place you code here.
-&lt;/code&gt;&lt;/pre&gt;
-</pre>
-<p>Example:</p>
-<pre><code class="ruby CodeRay"><span class="no"> 1</span> <span class="c"># The Greeter class</span>
-<span class="no"> 2</span> <span class="r">class</span> <span class="cl">Greeter</span>
-<span class="no"> 3</span>   <span class="r">def</span> <span class="fu">initialize</span>(name)
-<span class="no"> 4</span>     <span class="iv">@name</span> = name.capitalize
-<span class="no"> 5</span>   <span class="r">end</span>
-<span class="no"> 6</span>
-<span class="no"> 7</span>   <span class="r">def</span> <span class="fu">salute</span>
-<span class="no"> 8</span>     puts <span class="s"><span class="dl">"</span><span class="k">Hello </span><span class="il"><span class="idl">#{</span><span class="iv">@name</span><span class="idl">}</span></span><span class="k">!</span><span class="dl">"</span></span>
-<span class="no"> 9</span>   <span class="r">end</span>
-<span class="no"><strong>10</strong></span> <span class="r">end</span>
-</code>
-</pre>
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index 8e1eb40d67..59c8b7c644 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -49,13 +49,6 @@ See docs/COPYRIGHT.rdoc for more details.
       </span>
     </div>
     <div class="form--field"><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']], container_class: '-xslim' %></div>
-    <div class="form--field"><%= setting_select :text_formatting, OpenProject::TextFormatting::Formatters.format_names.collect{|name| [t("text_formatting.#{name}"), name]}, container_class: '-xslim' %></div>
-    <div class="form--field">
-      <%= setting_check_box :use_wysiwyg %>
-      <span class="form--field-instructions">
-        <%= t(:setting_use_wysiwyg_description) %>
-      </span>
-    </div>
     <div class="form--field"><%= setting_check_box :cache_formatted_text %></div>
     <div class="form--field"><%= setting_select :wiki_compression, [['Gzip', 'gzip']], blank: :label_none, container_class: '-xslim' %></div>
     <div class="form--field"><%= setting_check_box :feeds_enabled, size: 6 %></div>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index d963767139..9b1b98c63b 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -13,8 +13,6 @@ OpenProject::Application.configure do
     copy_issue_actions.js
     date-de-DE.js
     date-en-US.js
-    jstoolbar/textile.js
-    jstoolbar/markdown.js
     locales/*.js
     members_form.js
     members_select_boxes.js
diff --git a/config/initializers/redcloth_numbered_headings.rb b/config/initializers/redcloth_numbered_headings.rb
deleted file mode 100644
index 2720832e64..0000000000
--- a/config/initializers/redcloth_numbered_headings.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-#-- encoding: UTF-8
-
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-require 'redcloth3'
-
-module RedCloth3Patch
-  private
-
-  def block_textile_prefix(text)
-    text.replace(prepend_number_to_heading(text))
-
-    super(text)
-  end
-
-  HEADING = /^h(\d)\.(.*)$/ unless defined? HEADING
-  NUMBERED_HEADING = /^h(\d)#\.(.*)$/ unless defined? NUMBERED_HEADING
-
-  def prepend_number_to_heading(text)
-    if text =~ NUMBERED_HEADING
-      level = $1.to_i
-
-      number = get_next_number_or_start_new_numbering level
-
-      new_text = "h#{level}. #{number}#{$2}"
-    elsif text =~ HEADING
-      reset_numbering
-    end
-
-    new_text.nil? ? text : new_text
-  end
-
-  def get_next_number_or_start_new_numbering(level)
-    begin
-      number = get_number_for_level level
-    rescue ArgumentError
-      reset_numbering
-      number = get_number_for_level level
-    end
-
-    number
-  end
-
-  def get_number_for_level(level)
-    @numbering_provider ||= Redcloth3::NumberingStack.new level
-
-    @numbering_provider.get_next_numbering_for_level level
-  end
-
-  def reset_numbering
-    @numbering_provider = nil
-  end
-end
-
-RedCloth3.send(:prepend, RedCloth3Patch)
-
-module Redcloth3
-  class NumberingStack
-    def initialize(level)
-      @stack = []
-      @init_level = level ? level.to_i : 1
-    end
-
-    def get_next_numbering_for_level(level)
-      internal_level = map_external_to_internal_level level
-
-      increase_numbering_for_level internal_level
-
-      current_numbering
-    end
-
-    private
-
-    def increase_numbering_for_level(level)
-      if @stack[level].nil?
-        @stack[level] = 1
-        fill_nil_levels_with_zero
-      else
-        @stack[level] += 1
-        reset_higher_levels_than level
-      end
-
-      @stack[level]
-    end
-
-    def reset_higher_levels_than(level)
-      @stack = @stack.slice! 0, level + 1
-    end
-
-    def current_numbering
-      @stack.join('.') + '.'
-    end
-
-    def map_external_to_internal_level(level)
-      if level.to_i < @init_level
-        raise ArgumentError, 'Current level lower than initial level'
-      end
-      level.to_i - @init_level
-    end
-
-    def fill_nil_levels_with_zero
-      @stack.map! { |e| e.nil? ? 0 : e }
-    end
-  end
-end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 77032372ba..613e8dec91 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1999,7 +1999,6 @@ en:
   setting_brute_force_block_after_failed_logins: "Block user after this number of failed login attempts"
   setting_brute_force_block_minutes: "Time the user is blocked for"
   setting_cache_formatted_text: "Cache formatted text"
-  setting_use_wysiwyg: "WYSIWYG editor"
   setting_use_wysiwyg_description: "Select to enable CKEditor5 WYSIWYG editor for all users by default. CKEditor has limited functionality for GFM Markdown."
   setting_column_options: "Customize the appearance of the work package lists"
   setting_commit_fix_keywords: "Fixing keywords"
@@ -2074,7 +2073,6 @@ en:
   setting_start_of_week: "Week starts on"
   setting_sys_api_enabled: "Enable repository management web service"
   setting_sys_api_description: "The repository management web service provides integration and user authorization for accessing repositories."
-  setting_text_formatting: "Text formatting"
   setting_time_format: "Time format"
   setting_accessibility_mode_for_anonymous: "Enable accessibility mode for anonymous users"
   setting_user_format: "Users display format"
@@ -2099,7 +2097,6 @@ en:
       deletion: "Deletion"
 
   text_formatting:
-    textile: 'Textile'
     markdown: 'Markdown'
     plain: 'Plain text'
 
diff --git a/config/routes.rb b/config/routes.rb
index a3d9338dee..5d8966bacf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,7 +88,6 @@ OpenProject::Application.routes.draw do
   mount API::Root => '/'
 
   get '/roles/workflow/:id/:role_id/:type_id' => 'roles#workflow'
-  get '/help/:ctrl/:page' => 'help#index'
 
   get   '/types/:id/edit/:tab' => "types#edit",
         as: "edit_type_tab"
@@ -493,8 +492,6 @@ OpenProject::Application.routes.draw do
 
   resource :help, controller: :help, only: [] do
     member do
-      get :wiki_syntax
-      get :wiki_syntax_detailed
       get :keyboard_shortcuts
       get :text_formatting
     end
diff --git a/config/settings.yml b/config/settings.yml
index fbeb171a07..deea499151 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -77,7 +77,7 @@ consent_time:
 consent_info:
   serialized: true
   default:
-    en: "h2. Consent\n\nYou need to agree to the privacy and security policy of this OpenProject instance."
+    en: "## Consent\n\nYou need to agree to the privacy and security policy of this OpenProject instance."
 # Indicates wether or not users need to consent to something such as privacy policy.
 consent_required:
   default: 0
@@ -144,10 +144,6 @@ bcc_recipients:
   default: 1
 plain_text_mail:
   default: 0
-text_formatting:
-  default: textile
-use_wysiwyg:
-  default: 1
 cache_formatted_text:
   default: 0
 wiki_compression:
diff --git a/spec_legacy/functional/help_controller_spec.rb b/db/migrate/20180706150714_convert_to_markdown.rb
similarity index 76%
rename from spec_legacy/functional/help_controller_spec.rb
rename to db/migrate/20180706150714_convert_to_markdown.rb
index 9dbfdff55b..16de2880a3 100644
--- a/spec_legacy/functional/help_controller_spec.rb
+++ b/db/migrate/20180706150714_convert_to_markdown.rb
@@ -1,5 +1,3 @@
-#-- encoding: UTF-8
-
 #-- copyright
 # OpenProject is a project management system.
 # Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
@@ -28,20 +26,15 @@
 # See docs/COPYRIGHT.rdoc for more details.
 #++
 
-require_relative '../legacy_spec_helper'
-
-describe HelpController, type: :controller do
-  render_views
-
-  specify 'renders wiki_syntax properly' do
-    get 'wiki_syntax'
-
-    assert_select 'h1', 'Wiki Syntax Quick Reference'
-  end
+class ConvertToMarkdown < ActiveRecord::Migration[5.1]
+  def up
+    setting = Setting.where(name: 'text_formatting').pluck(:value)
 
-  specify 'renders wiki_syntax_detailed properly' do
-    get 'wiki_syntax_detailed'
+    if setting && setting[0] == 'textile'
+      converter = OpenProject::TextFormatting::Formatters::Markdown::TextileConverter.new
+      converter.run!
+    end
 
-    assert_select 'h1', 'Wiki Formatting'
+    Setting.where(name: %w(text_formatting use_wysiwyg)).delete_all
   end
 end
diff --git a/docs/api/apiv3/basic-objects.apib b/docs/api/apiv3/basic-objects.apib
index a2912d3dcd..1f71654412 100644
--- a/docs/api/apiv3/basic-objects.apib
+++ b/docs/api/apiv3/basic-objects.apib
@@ -143,24 +143,21 @@ embedded errors or simply state that multiple errors occured.
 
 # Formattable Text
 
-OpenProject supports text formatting in Textile. Other text formats *may* be introduced in the future.
-Properties that contain formattable text have a special representation in this API. In this specification their
+OpenProject supports text formatting in Markdown. Properties that contain formattable text have a special representation in this API. In this specification their
 type is indicated as `Formattable`. Their representation contains the following properties:
 
 | Property | Description                                        | Type   | Example                            | Supported operations |
 |:--------:| -------------------------------------------------- | ------ | ---------------------------------- | -------------------- |
-| format   | Indicates the formatting language of the raw text  | String | textile                            | READ                 |
-| raw      | The raw text, as entered by the user               | String | `I *am* formatted!`                | READ / WRITE         |
+| format   | Indicates the formatting language of the raw text  | String | markdown                           | READ                 |
+| raw      | The raw text, as entered by the user               | String | `I **am** formatted!`              | READ / WRITE         |
 | html     | The text converted to HTML according to the format | String | `I <strong>am</strong> formatted!` | READ                 |
 
 `format` can as of today have one of the following values:
 
 * `plain` - only basic formatting, e.g. inserting paragraphs and line breaks into HTML
-* `textile` - formatting using Textile
+* `markdown` - formatting using Markdown
 * `custom` - There is no apparent formatting rule that transforms the raw version to HTML (only used for read only properties)
 
-More formats might be added in the future.
-
 Note that `raw` is the only property supporting the **write** operation. A property of type *Formattable* that
 is marked as **read and write**, will only accept changes to the `raw` property. Changes to `format` and `html` will be **silently ignored**.
 It is thus sufficient to solely provide the `raw` property for changes.
@@ -170,8 +167,8 @@ If the *Formattable* is marked as **read only**, the `raw` attribute also become
 #### Example
 
     {
-        "format": "textile",
-        "raw": "I *am* formatted!",
+        "format": "markdown",
+        "raw": "I **am** formatted!",
         "html": "I <strong>am</strong> formatted!"
     }
 
diff --git a/docs/api/apiv3/endpoints/activities.apib b/docs/api/apiv3/endpoints/activities.apib
index 482a3780e2..e76eb6e710 100644
--- a/docs/api/apiv3/endpoints/activities.apib
+++ b/docs/api/apiv3/endpoints/activities.apib
@@ -35,13 +35,13 @@ Activity can be either _type Activity or _type Activity::Comment.
                 "id": 1,
                 "details": [
                     {
-                        "format": "textile",
+                        "format": "markdown",
                         "raw": "Lorem ipsum dolor sit amet.",
                         "html": "<p>Lorem ipsum dolor sit amet.</p>"
                     }
                 ],
                 "comment": {
-                    "format": "textile",
+                    "format": "markdown",
                     "raw": "Lorem ipsum dolor sit amet.",
                     "html": "<p>Lorem ipsum dolor sit amet.</p>"
                 },
diff --git a/docs/api/apiv3/endpoints/forms.apib b/docs/api/apiv3/endpoints/forms.apib
index dbc042a71b..6a4df00906 100644
--- a/docs/api/apiv3/endpoints/forms.apib
+++ b/docs/api/apiv3/endpoints/forms.apib
@@ -21,7 +21,7 @@ Subsequent calls to the form should contain a single JSON object as described by
 |:-------------------:| --------------------------------------------------------------------- | -------------------------------- |
 | validate            | Validate changes, show errors and allowed values for changed resource |                                  |
 | commit              | Actually perform changes to the resource                              | form content is valid            |
-| previewMarkup       | Post markup (e.g. textile) here to receive an HTML-rendered response  |                                  |
+| previewMarkup       | Post markup (e.g. markdown) here to receive an HTML-rendered response |                                  |
 
 ## Linked Properties
 
@@ -88,7 +88,7 @@ That is because the main purpose of a form is helping the client to sort out val
                         "method": "POST"
                     },
                     "previewMarkup": {
-                        "href": "/api/v3/render/textile",
+                        "href": "/api/v3/render/markdown",
                         "method": "POST"
                     },
                     "commit": {
diff --git a/docs/api/apiv3/endpoints/help_texts.apib b/docs/api/apiv3/endpoints/help_texts.apib
index 0076d0d231..5a2ccbbf67 100644
--- a/docs/api/apiv3/endpoints/help_texts.apib
+++ b/docs/api/apiv3/endpoints/help_texts.apib
@@ -45,7 +45,7 @@
                             "attributeCaption": 'ID',
                             "scope": 'WorkPackage',
                             "helpText": {
-                                "format": "textile",
+                                "format": "markdown",
                                 "raw": "Help text for id attribute.",
                                 "html": "<p>Help text for id attribute.</p>"
                             }
@@ -62,7 +62,7 @@
                             "attributeCaption": 'Status',
                             "scope": 'WorkPackage',
                             "helpText": {
-                                "format": "textile",
+                                "format": "markdown",
                                 "raw": "Help text for status attribute.",
                                 "html": "<p>Help text for status attribute.</p>"
                             }
@@ -99,7 +99,7 @@
                 "attributeCaption": 'ID',
                 "scope": 'WorkPackage',
                 "helpText": {
-                    "format": "textile",
+                    "format": "markdown",
                     "raw": "Help text for id attribute.",
                     "html": "<p>Help text for id attribute.</p>"
                 }
diff --git a/docs/api/apiv3/endpoints/render.apib b/docs/api/apiv3/endpoints/render.apib
index 94805fc547..60e53be678 100644
--- a/docs/api/apiv3/endpoints/render.apib
+++ b/docs/api/apiv3/endpoints/render.apib
@@ -1,27 +1,28 @@
 # Group Previewing
 
-Throughout OpenProject user input for many properties can be formatted (e.g. using *Textile*).
+Throughout OpenProject user input for many properties can be formatted using *Markdown*.
 Using the appropriate rendering endpoint it is possible to render custom formatted inputs into HTML and thus
 receive a preview of the rendered text.
 
 The request to a rendering endpoint must always have a MIME-Type of `text/plain`.
 The request body is the actual string that shall be rendered as HTML string.
 
-## Textile [/api/v3/render/textile{?context}]
+## Markdown [/api/v3/render/markdown{?context}]
 
 + Model
     + Body
 
-            <p>Hello world! <a href="http://example.com">This</a> <strong>is</strong> textile!</p>
+            <p>Hello world! <a href="http://example.com">This</a> <strong>is</strong> markdown!</p>
 
-## Preview Textile document [POST]
+## Preview Markdown document [POST]
 
 + Parameters
     + context (optional, string, `/api/v3/work_packages/42`)
         API-Link to the context in which the rendering occurs, for example a specific work package.
 
         If left out only context-agnostic rendering takes place.
-        Please note that OpenProject features textile-extensions that can only work given a context (e.g. display attached images).
+        Please note that OpenProject features markdown-extensions on top of the extensions GitHub Flavored Markdown (gfm) already
+        provides that can only work given a context (e.g. display attached images).
 
         **Supported contexts:**
 
@@ -29,11 +30,11 @@ The request body is the actual string that shall be rendered as HTML string.
 
 + Request (text/plain)
 
-            Hello world! "This":http://example.com *is* textile!
+            Hello world! "This":http://example.com **is** markdown!
 
 + Response 200 (text/html)
 
-    [Textile][]
+    [Markdown][]
 
 + Response 400 (application/json)
 
@@ -47,7 +48,7 @@ The request body is the actual string that shall be rendered as HTML string.
             {
                 "_type": "Error",
                 "errorIdentifier": "urn:openproject-org:api:v3:errors:InvalidRenderContext",
-                "message": "Could not render textile string in the given context."
+                "message": "Could not render markdown string in the given context."
             }
 
 + Response 415 (application/json)
diff --git a/docs/api/apiv3/endpoints/work-packages.apib b/docs/api/apiv3/endpoints/work-packages.apib
index 0ddc15ab80..05b0572124 100644
--- a/docs/api/apiv3/endpoints/work-packages.apib
+++ b/docs/api/apiv3/endpoints/work-packages.apib
@@ -9,7 +9,7 @@
 | addRelation         | Adds a relation to this work package.                                    | **Permission**: manage wp relations    |
 | addWatcher          | Add any user to WP watchers                                              | **Permission**: add watcher            |
 | customActions       | Collection of predefined changes that can be applied to the work package |                                        |
-| previewMarkup       | Post markup (e.g. textile) here to receive an HTML-rendered response     |                                        |
+| previewMarkup       | Post markup (in markdown) here to receive an HTML-rendered response      |                                        |
 | removeWatcher       | Remove any user from WP watchers                                         | **Permission**: delete watcher         |
 | unwatch             | Remove current user from WP watchers                                     | logged in; watching                    |
 | update              | Form endpoint that aids in preparing and performing edits on a WP        | **Permission**: edit work package      |
@@ -253,7 +253,7 @@ and [update](#work-packages-work-package-patch). The attachments the work packag
                 "id": 1528,
                 "subject": "Develop API",
                 "description": {
-                    "format": "textile",
+                    "format": "markdown",
                     "raw": "Develop super cool OpenProject API.",
                     "html": "<p>Develop super cool OpenProject API.</p>"
                 },
@@ -1962,7 +1962,7 @@ Only linked revisions from repositories are shown if the user has the view chang
                         "id": 1,
                         "details": [ ],
                         "comment": {
-                            "format": "textile",
+                            "format": "markdown",
                             "raw": "Lorem ipsum dolor sit amet.",
                             "html": "<p>Lorem ipsum dolor sit amet.</p>"
                         },
@@ -1985,7 +1985,7 @@ Only linked revisions from repositories are shown if the user has the view chang
                         "id": 2,
                         "details": [ ],
                         "comment": {
-                            "format": "textile",
+                            "format": "markdown",
                             "raw": "Lorem ipsum dolor sit amet.",
                             "html": "<p>Lorem ipsum dolor sit amet.</p>"
                         },
diff --git a/features/messages/message.feature b/features/messages/message.feature
deleted file mode 100644
index c34c613c6e..0000000000
--- a/features/messages/message.feature
+++ /dev/null
@@ -1,104 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-Feature: Issue textile quickinfo links
-
-  Background:
-    Given there is 1 project with the following:
-      | name       | parent |
-      | identifier | parent |
-    And I am working in project "parent"
-    And there is a board "development discussion" for project "parent"
-    And there is a role "member"
-    And the role "member" may have the following rights:
-      | manage_boards       |
-      | add_messages        |
-      | edit_messages       |
-      | edit_own_messages   |
-      | delete_messages     |
-      | delete_messages     |
-      | delete_own_messages |
-    And there is 1 user with the following:
-      | login | bob |
-    And the user "bob" is a "member" in the project "parent"
-    And I am already logged in as "bob"
-
-  Scenario: Adding a message to a forum
-    When I go to the boards page of the project called "parent"
-    And I follow "New message"
-    And I fill in "New relase" for "message_subject"
-    And I fill in "We have release a new version of our software." for "message_content"
-    When I click on the first button matching "Create"
-    Then I should see "New relase" within "#content"
-    Then I should see "We have release a new version of our software." within "#content"
-
-  Scenario: Message's reply count is zero
-    Given the board "development discussion" has the following messages:
-      | message #1 |
-    When I go to the message page of message "message #1"
-    Then I should not see "Replies"
-
-  Scenario: Message's reply count is two
-    Given the board "development discussion" has the following messages:
-      | message #1 |
-    And "message #1" has the following replies:
-      | reply #1 |
-      | reply #2 |
-    When I go to the message page of message "message #1"
-    Then I should see "Replies (2)"
-
-  Scenario: Check field value after error message raise when title is empty
-    When I go to the boards page of the project called "parent"
-    And I follow "New message"
-    And I fill in "New relase FAQ" for "message_subject"
-    When I click on the first button matching "Create"
-    Then there should be an error message
-    Then the "message_subject" field should contain "New relase FAQ"
-
-  Scenario: Check field value after error message raise when description is empty
-    When I go to the boards page of the project called "parent"
-    And I follow "New message"
-    And I fill in "Here you find the most frequently asked questions" for "message_content"
-    When I click on the first button matching "Create"
-    Then there should be an error message
-    Then the "message_content" field should contain "Here you find the most frequently asked questions"
-
-  @javascript
-  Scenario: Sticky message on top of messages list
-    Given the board "development discussion" has the following messages:
-      | message #1 |
-      | message #2 |
-      | message #3 |
-    When I go to the boards page of the project called "parent"
-    And I follow "New message"
-    And I fill in "How to?" for "message_subject"
-    And I fill in "How to st-up project on local mashine." for "message_content"
-    And I check "Sticky"
-    When I click on the first button matching "Create"
-    And I go to the boards page of the project called "parent"
-    Then "How to?" should be the first row in table
diff --git a/features/wiki/wiki_add_edit.feature b/features/wiki/wiki_add_edit.feature
deleted file mode 100644
index 24b6ff132c..0000000000
--- a/features/wiki/wiki_add_edit.feature
+++ /dev/null
@@ -1,73 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-Feature: Adding and Editing Wiki Tabs
-
-  Background:
-    Given there is 1 project with the following:
-            | Name | Wookies |
-      And the project "Wookies" uses the following modules:
-            | wiki |
-      And the project "Wookies" has 1 wiki page with the following:
-            | Title | wookietest |
-
-  @javascript
-  Scenario: Adding simple wiki tab as admin
-    Given I am admin
-      And I am working in project "Wookies"
-      And I go to the wiki index page of the project called "Wookies"
-
-  @javascript
-  Scenario: Editing of wiki pages as a member with proper rights
-    Given there is 1 user with the following:
-            | login | chewbacca|
-      And I am logged in as "chewbacca"
-      And there is a role "humanoid"
-      And the role "humanoid" may have the following rights:
-            | view_wiki_pages |
-            | edit_wiki_pages |
-      And the user "chewbacca" is a "humanoid" in the project "Wookies"
-     When I go to the wiki page "wookietest" for the project called "Wookies"
-      And I click "Edit"
-      And I fill in "content_text" with "testing wookie"
-      And I click "Save"
-     Then I should see "testing wookie" within "#content"
-      And I click "Edit"
-
-
-  @javascript
-  Scenario: Overview and see the history of a wiki page
-    Given I am already admin
-    Given the wiki page "wookietest" of the project "Wookies" has 3 versions
-      And I go to the wiki page "wookietest" for the project called "Wookies"
-      And I follow "More" within "#content"
-     When I click "History"
-     Then I should see "History" within "#content"
-     When I press "View differences"
-     Then I should see "Version 1/4"
-     Then I should see "Version 2/4"
diff --git a/features/wiki/wiki_create_child.feature b/features/wiki/wiki_create_child.feature
deleted file mode 100644
index 69741acaa4..0000000000
--- a/features/wiki/wiki_create_child.feature
+++ /dev/null
@@ -1,71 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-Feature: Creating a wiki child page
-
-  Background:
-    Given there are no wiki menu items
-    And there is 1 user with the following:
-      | login | bob |
-    And there is a role "member"
-    And the role "member" may have the following rights:
-      | view_wiki_pages   |
-      | edit_wiki_pages   |
-    And there is 1 project with the following:
-      | name       | project1 |
-      | identifier | project1 |
-      | name       | project1 |
-    And the user "bob" is a "member" in the project "project1"
-    And I am already logged in as "bob"
-
-  @javascript
-  Scenario: A user with proper rights can add a child wiki page
-    Given the project "project1" has 1 wiki page with the following:
-      | title | Wikiparentpage |
-    Given I go to the wiki index page of the project called "project1"
-      And I click "Wikiparentpage"
-      And I click "Wiki page"
-      And I fill in "content_page_title" with "Todd's wiki"
-      And I fill in "content_text" with "Great content"
-      And I press "Save"
-    When I go to the wiki index page of the project called "project1"
-    Then I should see "Todd's wiki" within "#content"
-
-  @javascript
-  Scenario: Creating a wiki child page the title of which contains special characters
-    Given the project "project1" has 1 wiki page with the following:
-      | title | ParentWikiPage |
-    And the project "project1" has 1 wiki menu item with the following:
-      | title         | ParentWikiPage |
-      | new_wiki_page | true           |
-    When I go to the wiki page "ParentWikiPage" of the project called "project1"
-    And I click "Wiki page"
-    And I fill in "content_page_title" with "Child Page !@#{$%^&*()_},./<>?;':"
-    And I fill in "content_text" with "Great content"
-    And I click "Save"
-    Then I should see "Successful creation."
diff --git a/features/wiki/wiki_initial.feature b/features/wiki/wiki_initial.feature
deleted file mode 100644
index f39fe552a7..0000000000
--- a/features/wiki/wiki_initial.feature
+++ /dev/null
@@ -1,52 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-Feature: Activating and deactivating wiki menu as admin
-
-Background:
-
-Given I am admin
-And there is 1 project with the following:
- 
-     | Name | Wookie |
-
-@javascript
-Scenario:  Activation of wiki module via aproject settings as admin
-When I go to the settings page of the project called "Wookie"
-And I click on "tab-modules"
-And I check "Wiki"
-And I press "Save"
-Then I should see "Wiki" within "#menu-sidebar"
-
-@javascript
-Scenario: Deactivation of wiki module via project settings
-When I go to the settings page of the project called "Wookie"
-And I click on "tab-modules"
-And I uncheck "Wiki"
-And I press "Save"
-And I should not see "Wiki" within "#menu-sidebar"
\ No newline at end of file
diff --git a/features/wiki/wiki_new_child.feature b/features/wiki/wiki_new_child.feature
deleted file mode 100644
index 87c433b4c3..0000000000
--- a/features/wiki/wiki_new_child.feature
+++ /dev/null
@@ -1,66 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-Feature: Viewing the wiki new child page
-
-  Background:
-    Given there are no wiki menu items
-    And there is 1 user with the following:
-      | login | bob |
-    And there is a role "member"
-    And the role "member" may have the following rights:
-      | view_wiki_pages   |
-      | edit_wiki_pages   |
-    And there is 1 project with the following:
-      | name       | project1 |
-      | identifier | project1 |
-    And the user "bob" is a "member" in the project "project1"
-    And I am already logged in as "bob"
-
-  Scenario: Visiting the wiki new child page with a parent page that has the new child page option enabled on it's menu item should show the page and select the toc menu entry within the wiki menu item
-    Given the project "project1" has 1 wiki page with the following:
-      | title | ParentWikiPage |
-    And the project "project1" has 1 wiki menu item with the following:
-      | title         | ParentWikiPage |
-      | new_wiki_page | true           |
-    When I go to the wiki page "ParentWikiPage" of the project called "project1"
-    Then I should see "Wiki page" within "#content"
-
-  Scenario: Visiting the wiki new child page with a related page that has the new child page option disabled on it's menu item should show the page and select no menu item
-    Given the project "project1" has 1 wiki page with the following:
-      | title | ParentWikiPage |
-    And the project "project1" has 1 wiki menu item with the following:
-      | title      | ParentWikiPage |
-    When I go to the wiki new child page below the "ParentWikiPage" page of the project called "project1"
-    Then I should see "Wiki page" within "#content"
-    And there should be no child menu item selected
-
-  Scenario: Visiting the wiki new child page with an invalid parent page
-    When I go to the wiki new child page below the "InvalidPage" page of the project called "project1"
-    Then I should see "404" within "#content"
-    Then I should see "The page you were trying to access doesn't exist or has been removed."
diff --git a/frontend/legacy/app/components/help-texts/attribute-help-text.directive.ts b/frontend/legacy/app/components/help-texts/attribute-help-text.directive.ts
index 143374f4da..dca3010808 100644
--- a/frontend/legacy/app/components/help-texts/attribute-help-text.directive.ts
+++ b/frontend/legacy/app/components/help-texts/attribute-help-text.directive.ts
@@ -71,7 +71,7 @@ export class AttributeHelpTextController {
         });
       }
 
-      // HACK: without this, the tempalte is not displayed
+      // HACK: without this, the template is not displayed
       setTimeout(() => this.$scope.$apply());
     });
   }
diff --git a/frontend/src/app/angular4-modules.ts b/frontend/src/app/angular4-modules.ts
index 62493b63e9..9f69a028be 100644
--- a/frontend/src/app/angular4-modules.ts
+++ b/frontend/src/app/angular4-modules.ts
@@ -188,7 +188,6 @@ import {WorkPackageCommentComponent} from "core-components/work-packages/work-pa
 import {OpCkeditorFormComponent} from "core-components/ckeditor/op-ckeditor-form.component";
 import {WorkPackageUploadComponent} from "core-components/wp-attachments/wp-attachments-upload/wp-attachments-upload.component";
 import {OpDragScrollDirective} from "core-app/modules/common/ui/op-drag-scroll.directive";
-import {TextileService} from "core-app/modules/common/textile/textile-service";
 import {UIRouterModule} from "@uirouter/angular";
 import {initializeUiRouterConfiguration} from "core-components/routing/ui-router.config";
 import {WorkPackagesBaseComponent} from "core-components/routing/main/work-packages-base.component";
@@ -250,7 +249,6 @@ import {WikiIncludePageMacroModal} from "core-components/modals/editor/macro-wik
       deps: [Injector],
       multi: true
     },
-    TextileService,
     OpTitleService,
     TimezoneService,
     WorkPackageRelationsService,
diff --git a/frontend/src/app/components/ckeditor/op-ckeditor-form.component.ts b/frontend/src/app/components/ckeditor/op-ckeditor-form.component.ts
index 2c1fb8391b..4c05450dbe 100644
--- a/frontend/src/app/components/ckeditor/op-ckeditor-form.component.ts
+++ b/frontend/src/app/components/ckeditor/op-ckeditor-form.component.ts
@@ -88,7 +88,7 @@ export class OpCkeditorFormComponent implements OnInit {
     this.wrappedTextArea = this.formElement.find(this.textareaSelector);
     this.wrappedTextArea.hide();
     const wrapper = this.$element.find(`.${ckEditorReplacementClass}`);
-    window.OPClassicEditor
+    let editorPromise = window.OPClassicEditor
       .create(wrapper[0], {
         openProject: {
           context: null,
@@ -100,6 +100,8 @@ export class OpCkeditorFormComponent implements OnInit {
       .catch((error:any) => {
         console.error(error);
       });
+
+    this.$element.data('editor', editorPromise);
   }
 
   public $onDestroy() {
@@ -123,6 +125,23 @@ export class OpCkeditorFormComponent implements OnInit {
       // Continue with submission
       return true;
     });
+
+    this.setLabel();
+
+    return editor;
   }
-}
 
+  private setLabel() {
+    let textareaId = this.textareaSelector.substring(1);
+    let label = jQuery(`label[for=${textareaId}`);
+
+    let ckContent = this.$element.find('.ck-content');
+
+    ckContent.attr('aria-label', null);
+    ckContent.attr('aria-labelledby', textareaId);
+
+    label.click(() => {
+      ckContent.focus();
+    });
+  }
+}
diff --git a/frontend/src/app/components/wp-activity/user/user-activity.component.ts b/frontend/src/app/components/wp-activity/user/user-activity.component.ts
index 52bac345eb..a8b212ce29 100644
--- a/frontend/src/app/components/wp-activity/user/user-activity.component.ts
+++ b/frontend/src/app/components/wp-activity/user/user-activity.component.ts
@@ -33,7 +33,6 @@ import {ConfigurationService} from 'core-app/modules/common/config/configuration
 import {WorkPackageCommentField} from 'core-components/work-packages/work-package-comment/wp-comment-field.module';
 import {WorkPackageResource} from 'core-app/modules/hal/resources/work-package-resource';
 import {WorkPackagesActivityService} from 'core-components/wp-single-view-tabs/activity-panel/wp-activity.service';
-import {TextileService} from "core-app/modules/common/textile/textile-service";
 import {AfterViewInit, Component, ElementRef, Inject, Input, OnInit} from "@angular/core";
 import {UserCacheService} from "core-components/user/user-cache.service";
 import {IEditFieldHandler} from "core-app/modules/fields/edit/editing-portal/edit-field-handler.interface";
@@ -76,7 +75,7 @@ export class UserActivityComponent implements IEditFieldHandler, OnInit, AfterVi
     label_updated_on: this.I18n.t('js.label_updated_on'),
     quote_comment: this.I18n.t('js.label_quote_comment'),
     edit_comment: this.I18n.t('js.label_edit_comment'),
-  }
+  };
 
   public accessibilityModeEnabled = this.ConfigurationService.accessibilityModeEnabled();
   private $element:JQuery;
@@ -88,8 +87,7 @@ export class UserActivityComponent implements IEditFieldHandler, OnInit, AfterVi
               readonly wpCacheService:WorkPackageCacheService,
               readonly ConfigurationService:ConfigurationService,
               readonly userCacheService:UserCacheService,
-              readonly I18n:I18nService,
-              readonly textileService:TextileService) {
+              readonly I18n:I18nService) {
   }
 
   public ngOnInit() {
diff --git a/frontend/src/app/globals/augmenting/wiki-toolbar.augment.ts b/frontend/src/app/globals/augmenting/wiki-toolbar.augment.ts
deleted file mode 100644
index e34dde6c9a..0000000000
--- a/frontend/src/app/globals/augmenting/wiki-toolbar.augment.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-//-- copyright
-// OpenProject is a project management system.
-// Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2017 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// 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.
-//
-// See docs/COPYRIGHT.rdoc for more details.
-//++
-
-import {WikiToolbar} from "core-app/globals/augmenting/wiki-toolbar";
-
-(function($:JQueryStatic) {
-
-  // Identify all uses
-  $(function () {
-
-    // Wrap all static wiki-toolbars (rendered from backend)
-    $('.wiki-toolbar')
-      .each((i:number, el:HTMLElement) => {
-        new WikiToolbar(I18n, el);
-      });
-  });
-}(jQuery));
diff --git a/frontend/src/app/globals/augmenting/wiki-toolbar.ts b/frontend/src/app/globals/augmenting/wiki-toolbar.ts
deleted file mode 100644
index 25dd7f33eb..0000000000
--- a/frontend/src/app/globals/augmenting/wiki-toolbar.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-//-- copyright
-// OpenProject is a project management system.
-// Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2017 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// 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.
-//
-// See docs/COPYRIGHT.rdoc for more details.
-//++
-
-import {GlobalI18n} from "core-app/modules/common/i18n/i18n.service";
-
-export class WikiToolbar {
-  public isPreview = false;
-
-  constructor(protected I18n:GlobalI18n,
-              protected element:HTMLElement,
-              public previewCallback?:(preview:boolean) => void) {
-
-    this.onInit();
-  }
-
-  onInit() {
-    const element = jQuery(this.element);
-    const help_link_title = this.I18n.t('js.inplace.link_formatting_help');
-
-    const button = document.createElement('button');
-    button.classList.add('jstb_help', 'formatting-help-link-button');
-    button.setAttribute('type', 'button');
-    button.setAttribute('aria-label', help_link_title);
-    button.setAttribute('title', help_link_title);
-
-    const PREVIEW_ENABLE_TEXT = this.I18n.t('js.inplace.btn_preview_enable');
-    const PREVIEW_DISABLE_TEXT = this.I18n.t('js.inplace.btn_preview_disable');
-    const PREVIEW_BUTTON_CLASS = 'jstb_preview';
-    let previewButtonAttributes:any = {
-      'class': PREVIEW_BUTTON_CLASS + ' icon-preview icon-small',
-      'type': 'button',
-      'title': PREVIEW_ENABLE_TEXT,
-      'aria-label': PREVIEW_ENABLE_TEXT,
-      'text': ''
-    };
-
-    let textarea = this.element;
-    if (!element.is('textarea')) {
-      textarea = this.element.querySelector('textarea') as any;
-    }
-
-    const wikiToolbar = new (window as any).jsToolBar(textarea);
-    wikiToolbar.setHelpLink(button);
-    wikiToolbar.draw();
-
-    previewButtonAttributes.click = () => {
-      this.isPreview = !this.isPreview;
-      !!this.previewCallback && this.previewCallback(this.isPreview);
-
-      const title = this.isPreview ? PREVIEW_DISABLE_TEXT : PREVIEW_ENABLE_TEXT;
-      const toggledClasses = 'icon-preview icon-ticket-edit -active';
-
-      element.closest('.textarea-wrapper')
-        .find('.' + PREVIEW_BUTTON_CLASS).attr('title', title)
-        .attr('aria-label', title)
-        .toggleClass(toggledClasses);
-    };
-
-    if (!!this.previewCallback) {
-      element
-        .closest('.textarea-wrapper')
-        .find('.jstb_help')
-        .after(jQuery('<button>', previewButtonAttributes));
-    }
-  }
-}
diff --git a/frontend/src/app/modules/common/config/configuration.service.ts b/frontend/src/app/modules/common/config/configuration.service.ts
index 69076ce568..9149e772e9 100644
--- a/frontend/src/app/modules/common/config/configuration.service.ts
+++ b/frontend/src/app/modules/common/config/configuration.service.ts
@@ -123,14 +123,6 @@ export class ConfigurationService {
       this.settings.display.date_format !== '';
   }
 
-  public textFormat() {
-    return this.settings.display.text_format;
-  }
-
-  public useWysiwyg() {
-    return this.settings.display.use_wysiwyg;
-  }
-
   public dateFormat()  {
     return this.settings.display.date_format;
   }
diff --git a/frontend/src/app/modules/common/openproject-common.module.ts b/frontend/src/app/modules/common/openproject-common.module.ts
index 9aaf92bb68..4e4fd344fe 100644
--- a/frontend/src/app/modules/common/openproject-common.module.ts
+++ b/frontend/src/app/modules/common/openproject-common.module.ts
@@ -55,7 +55,6 @@ import {FocusDirective} from "core-app/modules/common/focus/focus.directive";
 import {I18nService} from "core-app/modules/common/i18n/i18n.service";
 import {HighlightColDirective} from "core-app/modules/common/highlight-col/highlight-col.directive";
 import {CopyToClipboardDirective} from "core-app/modules/common/copy-to-clipboard/copy-to-clipboard.directive";
-import {WikiToolbarDirective} from "core-app/modules/common/wiki-toolbar/wiki-toolbar.directive";
 import {highlightColBootstrap} from "./highlight-col/highlight-col.directive";
 import {HookService} from "../plugins/hook-service";
 import {HTMLSanitizeService} from "./html-sanitize/html-sanitize.service";
@@ -98,9 +97,6 @@ export function bootstrapModule(injector:Injector) {
     // Entries for ng1 downgraded components
     AttributeHelpTextComponent,
 
-    // Add functionality to rails rendered templates
-    WikiToolbarDirective,
-
     // Table highlight
     HighlightColDirective,
   ],
@@ -129,8 +125,7 @@ export function bootstrapModule(injector:Injector) {
     HighlightColDirective,
 
     // Add functionality to rails rendered templates
-    CopyToClipboardDirective,
-    WikiToolbarDirective
+    CopyToClipboardDirective
   ],
   entryComponents: [
     OpDateTimeComponent,
diff --git a/frontend/src/app/modules/common/textile/textile-service.ts b/frontend/src/app/modules/common/textile/textile-service.ts
deleted file mode 100644
index c71a4c77ef..0000000000
--- a/frontend/src/app/modules/common/textile/textile-service.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-//-- copyright
-// OpenProject is a project management system.
-// Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2017 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// 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.
-//
-// See doc/COPYRIGHT.rdoc for more details.
-//++
-
-import {PathHelperService} from './../path-helper/path-helper.service';
-import {WorkPackageResource} from 'core-app/modules/hal/resources/work-package-resource';
-import {HalLink} from 'core-app/modules/hal/hal-link/hal-link';
-import {WorkPackageNotificationService} from "core-components/wp-edit/wp-notification.service";
-import {Inject, Injectable} from "@angular/core";
-import {HttpClient} from "@angular/common/http";
-
-@Injectable()
-export class TextileService {
-  constructor(private readonly http:HttpClient,
-              private readonly wpNotificationsService:WorkPackageNotificationService,
-              private readonly PathHelper:PathHelperService) {
-  }
-
-  public renderWithWorkPackageContext(workPackage:WorkPackageResource, text:string) {
-    return this.render(workPackage.previewMarkup, text);
-  }
-
-  public render(link:HalLink, text:string) {
-    return this.http
-      .request(
-          link.method,
-          link.href!, {
-            body: text,
-            responseType: 'text',
-            headers: {'Content-Type': 'text/plain; charset=UTF-8'}
-          })
-      .toPromise()
-      .catch((error:any) => this.wpNotificationsService.handleRawError(error));
-  }
-}
diff --git a/frontend/src/app/modules/common/wiki-toolbar/wiki-toolbar.directive.ts b/frontend/src/app/modules/common/wiki-toolbar/wiki-toolbar.directive.ts
deleted file mode 100644
index 972e769cee..0000000000
--- a/frontend/src/app/modules/common/wiki-toolbar/wiki-toolbar.directive.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-//-- copyright
-// OpenProject is a project management system.
-// Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2017 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// 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.
-//
-// See docs/COPYRIGHT.rdoc for more details.
-//++
-
-import {AfterViewInit, Directive, ElementRef, EventEmitter, OnDestroy, Output} from "@angular/core";
-import {I18nService} from "core-app/modules/common/i18n/i18n.service";
-import {WikiToolbar} from "core-app/globals/augmenting/wiki-toolbar";
-
-@Directive({
-  selector: '[op-wiki-toolbar]'
-})
-export class WikiToolbarDirective implements AfterViewInit, OnDestroy {
-  @Output() onPreviewToggle = new EventEmitter<undefined>();
-  public instance:WikiToolbar;
-
-  constructor(readonly I18n:I18nService,
-              readonly elementRef:ElementRef) {
-
-  }
-
-  ngAfterViewInit() {
-    this.instance = new WikiToolbar(
-      this.I18n,
-      this.elementRef.nativeElement,
-      () => {
-        this.onPreviewToggle.emit();
-      });
-  }
-
-
-
-  ngOnDestroy() {
-    // nothing to do
-  }
-}
diff --git a/frontend/src/app/modules/fields/edit/field-types/formattable-wysiwyg-edit-field.component.ts b/frontend/src/app/modules/fields/edit/field-types/formattable-edit-field.component.ts
similarity index 96%
rename from frontend/src/app/modules/fields/edit/field-types/formattable-wysiwyg-edit-field.component.ts
rename to frontend/src/app/modules/fields/edit/field-types/formattable-edit-field.component.ts
index fefee20d25..f4ee1b4bd3 100644
--- a/frontend/src/app/modules/fields/edit/field-types/formattable-wysiwyg-edit-field.component.ts
+++ b/frontend/src/app/modules/fields/edit/field-types/formattable-edit-field.component.ts
@@ -44,6 +44,6 @@ import {FormattableEditField} from "core-app/modules/fields/edit/field-types/for
     </div>
   `
 })
-export class FormattableWysiwygEditFieldComponent extends EditFieldComponent {
+export class FormattableEditFieldComponent extends EditFieldComponent {
   public field:FormattableEditField;
 }
diff --git a/frontend/src/app/modules/fields/edit/field-types/formattable-edit-field.ts b/frontend/src/app/modules/fields/edit/field-types/formattable-edit-field.ts
index 0c3fcea8ce..34515b84e8 100644
--- a/frontend/src/app/modules/fields/edit/field-types/formattable-edit-field.ts
+++ b/frontend/src/app/modules/fields/edit/field-types/formattable-edit-field.ts
@@ -26,13 +26,10 @@
 // See doc/COPYRIGHT.rdoc for more details.
 // ++
 
-import {ConfigurationService} from 'core-app/modules/common/config/configuration.service';
-import {TextileService} from "core-app/modules/common/textile/textile-service";
 import {ICkeditorStatic} from "core-components/ckeditor/op-ckeditor-form.component";
 import {EditField} from "core-app/modules/fields/edit/edit.field.module";
-import {FormattableTextareaEditFieldComponent} from "core-app/modules/fields/edit/field-types/formattable-textarea-edit-field.component";
-import {FormattableWysiwygEditFieldComponent} from "core-app/modules/fields/edit/field-types/formattable-wysiwyg-edit-field.component";
 import {PathHelperService} from "core-app/modules/common/path-helper/path-helper.service";
+import {FormattableEditFieldComponent} from "core-app/modules/fields/edit/field-types/formattable-edit-field.component";
 
 declare global {
   interface Window {
@@ -42,10 +39,7 @@ declare global {
 }
 
 export class FormattableEditField extends EditField {
-  // Dependencies
-  readonly textileService:TextileService = this.$injector.get(TextileService);
   readonly pathHelper:PathHelperService = this.$injector.get(PathHelperService);
-  readonly ConfigurationService:ConfigurationService = this.$injector.get(ConfigurationService);
 
   // Values used in template
   public isBusy:boolean = false;
@@ -57,34 +51,15 @@ export class FormattableEditField extends EditField {
     cancel: this.I18n.t('js.inplace.button_cancel', { attribute: this.schema.name })
   };
 
-  public wysiwig:boolean;
-
   // CKEditor instance
   public ckeditor:any;
 
-  protected initialize() {
-    const configurationService:ConfigurationService = this.$injector.get(ConfigurationService);
-    this.wysiwig = configurationService.textFormat() === 'markdown' && configurationService.useWysiwyg();
-  }
-
   public get component() {
-    if (this.wysiwig) {
-      return FormattableWysiwygEditFieldComponent;
-    } else {
-      return FormattableTextareaEditFieldComponent;
-    }
-  }
-
-  public onSubmit() {
-    if (this.wysiwig && this.ckeditor) {
-      this.rawValue = this.ckeditor.getData();
-    }
+    return FormattableEditFieldComponent;
   }
 
   public $onInit(container:HTMLElement) {
-    if (this.wysiwig) {
-      this.setupMarkdownEditor(container);
-    }
+    this.setupMarkdownEditor(container);
   }
 
   public setupMarkdownEditor(container:HTMLElement) {
@@ -105,16 +80,22 @@ export class FormattableEditField extends EditField {
         }
 
         setTimeout(() => editor.editing.view.focus());
+
+        this.updateValueOnEditorChange(editor);
       })
       .catch((error:any) => {
         console.error(error);
       });
   }
 
+  private updateValueOnEditorChange(editor:any) {
+    editor.model.document.on('change', () => {
+      this.rawValue = this.ckeditor.getData();
+    } );
+  }
+
   public reset() {
-    if (this.wysiwig) {
-      this.ckeditor.setData(this.rawValue);
-    }
+    this.ckeditor.setData(this.rawValue);
   }
 
   public get rawValue() {
@@ -134,7 +115,7 @@ export class FormattableEditField extends EditField {
   }
 
   public isEmpty():boolean {
-    if (this.wysiwig && this.ckeditor) {
+    if (this.ckeditor) {
       return this.ckeditor.getData() === '';
     } else {
       return !(this.value && this.value.raw);
@@ -148,29 +129,4 @@ export class FormattableEditField extends EditField {
       }
     });
   }
-
-  public togglePreview() {
-    this.isPreview = !this.isPreview;
-    this.previewHtml = '';
-
-    if (!this.rawValue) {
-      return;
-    }
-
-    if (this.isPreview) {
-      this.isBusy = true;
-      this.changeset.getForm().then((form:any) => {
-        const link = form.previewMarkup.$link;
-
-        this.textileService.render(link, this.rawValue)
-          .then((result:string) => {
-            this.isBusy = false;
-            this.previewHtml = result;
-          })
-          .catch(() => {
-            this.isBusy = false;
-          });
-      });
-    }
-  }
 }
diff --git a/frontend/src/app/modules/fields/edit/field-types/formattable-textarea-edit-field.component.ts b/frontend/src/app/modules/fields/edit/field-types/formattable-textarea-edit-field.component.ts
deleted file mode 100644
index 582b966a03..0000000000
--- a/frontend/src/app/modules/fields/edit/field-types/formattable-textarea-edit-field.component.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// OpenProject is a project management system.
-// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License version 3.
-//
-// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-// Copyright (C) 2006-2013 Jean-Philippe Lang
-// Copyright (C) 2010-2013 the ChiliProject Team
-//
-// 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.
-//
-// See doc/COPYRIGHT.rdoc for more details.
-// ++
-
-import {AfterViewInit, Component, ElementRef, OnInit, ViewChild} from "@angular/core";
-import {EditFieldComponent} from "core-app/modules/fields/edit/edit-field.component";
-import {FormattableEditField} from "core-app/modules/fields/edit/field-types/formattable-edit-field";
-import {ExpressionService} from "../../../../../../common/expression.service";
-
-@Component({
-  template: `
-    <div class="textarea-wrapper"
-         op-wiki-toolbar
-         (onPreviewToggle)="field.togglePreview()"
-         [ngClass]="{'-preview': field.isPreview}">
-      <textarea
-        style="min-height: 114px"
-        #textAreaField
-        class="focus-input wp-inline-edit--field inplace-edit--textarea -animated"
-        name="value"
-        [hidden]="field.isPreview"
-        [disabled]="field.isBusy || field.inFlight"
-        [required]="field.required"
-        [(ngModel)]="field.rawValue"
-        [id]="handler.htmlId">
-      </textarea>
-      <div class="inplace-edit--preview"
-           *ngIf="field.isPreview && !field.isBusy">
-        <span [innerHTML]="unEscapedPreviewHtml"></span>
-      </div>
-      <div *ngIf="field.isFormattable && !field.isPreview"
-           class="wp-edit-field-attachment-label">
-        <span [textContent]="field.text.attachmentLabel"></span>
-      </div>
-      <edit-field-controls *ngIf="!handler.inEditMode"
-                           [fieldController]="handler"
-                           (onSave)="handler.handleUserSubmit()"
-                           (onCancel)="handler.handleUserCancel()"
-                           [saveTitle]="field.text.save"
-                           [cancelTitle]="field.text.cancel">
-      </edit-field-controls>
-    </div>
-
-  `
-})
-export class FormattableTextareaEditFieldComponent extends EditFieldComponent implements AfterViewInit {
-  public field:FormattableEditField;
-  @ViewChild('textAreaField') public textAreaField:ElementRef;
-
-  ngAfterViewInit() {
-    this.textAreaField.nativeElement.focus();
-  }
-
-  public get unEscapedPreviewHtml() {
-    return ExpressionService.unescape(this.field.previewHtml || '');
-  }
-}
diff --git a/frontend/src/app/modules/fields/openproject-fields.module.ts b/frontend/src/app/modules/fields/openproject-fields.module.ts
index 7e13bf29c4..9c79e0731f 100644
--- a/frontend/src/app/modules/fields/openproject-fields.module.ts
+++ b/frontend/src/app/modules/fields/openproject-fields.module.ts
@@ -39,10 +39,9 @@ import {FormsModule} from "@angular/forms";
 import {DurationEditFieldComponent} from "core-app/modules/fields/edit/field-types/duration-edit-field";
 import {FloatEditFieldComponent} from "core-app/modules/fields/edit/field-types/float-edit-field";
 import {IntegerEditFieldComponent} from "core-app/modules/fields/edit/field-types/integer-edit-field";
-import {FormattableTextareaEditFieldComponent} from "core-app/modules/fields/edit/field-types/formattable-textarea-edit-field.component";
 import {MultiSelectEditFieldComponent} from "core-app/modules/fields/edit/field-types/multi-select-edit-field";
 import {SelectEditFieldComponent} from "core-app/modules/fields/edit/field-types/select-edit-field";
-import {FormattableWysiwygEditFieldComponent} from "core-app/modules/fields/edit/field-types/formattable-wysiwyg-edit-field.component";
+import {FormattableEditFieldComponent} from "core-app/modules/fields/edit/field-types/formattable-edit-field.component";
 import {TextEditFieldComponent} from "core-app/modules/fields/edit/field-types/text-edit-field";
 import {OpenprojectCommonModule} from "core-app/modules/common/openproject-common.module";
 import {WorkPackageEditingPortalService} from "core-app/modules/fields/edit/editing-portal/wp-editing-portal-service";
@@ -76,8 +75,7 @@ import {OpenprojectAccessibilityModule} from "core-app/modules/a11y/openproject-
     DurationEditFieldComponent,
     FloatEditFieldComponent,
     IntegerEditFieldComponent,
-    FormattableWysiwygEditFieldComponent,
-    FormattableTextareaEditFieldComponent,
+    FormattableEditFieldComponent,
     MultiSelectEditFieldComponent,
     SelectEditFieldComponent,
     TextEditFieldComponent,
@@ -91,8 +89,7 @@ import {OpenprojectAccessibilityModule} from "core-app/modules/a11y/openproject-
     DurationEditFieldComponent,
     FloatEditFieldComponent,
     IntegerEditFieldComponent,
-    FormattableWysiwygEditFieldComponent,
-    FormattableTextareaEditFieldComponent,
+    FormattableEditFieldComponent,
     MultiSelectEditFieldComponent,
     SelectEditFieldComponent,
     TextEditFieldComponent,
diff --git a/lib/api/decorators/formattable.rb b/lib/api/decorators/formattable.rb
index e1608118fc..59492460bf 100644
--- a/lib/api/decorators/formattable.rb
+++ b/lib/api/decorators/formattable.rb
@@ -32,12 +32,14 @@ module API
     class Formattable < Single
       include OpenProject::TextFormatting
 
-      def initialize(model, format: nil, object: nil)
-        @format = format || Setting.text_formatting
+      def initialize(model, plain: false, object: nil)
+        @format = if plain
+                    OpenProject::TextFormatting::Formats.plain_format
+                  else
+                    OpenProject::TextFormatting::Formats.rich_format
+                  end
         @object = object
 
-        @format = 'plain' if @format.blank?
-
         # Note: TextFormatting actually makes use of User.current, if it was possible to pass a
         # current_user explicitly, it would make sense to pass one here too.
         super(model, current_user: nil)
@@ -45,16 +47,16 @@ module API
 
       property :format,
                exec_context: :decorator,
-               getter: -> (*) { @format },
+               getter: ->(*) { @format },
                writable: false,
                render_nil: true
       property :raw,
                exec_context: :decorator,
-               getter: -> (*) { represented },
+               getter: ->(*) { represented },
                render_nil: true
       property :html,
                exec_context: :decorator,
-               getter: -> (*) { to_html },
+               getter: ->(*) { to_html },
                writable: false,
                render_nil: true
 
diff --git a/lib/api/v3/attachments/attachment_metadata_representer.rb b/lib/api/v3/attachments/attachment_metadata_representer.rb
index 304bf4ce7c..3620a616e8 100644
--- a/lib/api/v3/attachments/attachment_metadata_representer.rb
+++ b/lib/api/v3/attachments/attachment_metadata_representer.rb
@@ -42,7 +42,7 @@ module API
         property :file_name
         property :description,
                  getter: ->(*) {
-                   ::API::Decorators::Formattable.new(description, format: 'plain')
+                   ::API::Decorators::Formattable.new(description, plain: true)
                  },
                  setter: ->(fragment:, **) { self.description = fragment['raw'] },
                  render_nil: true
diff --git a/lib/api/v3/attachments/attachment_representer.rb b/lib/api/v3/attachments/attachment_representer.rb
index 3af4d6b1c5..9f401ab249 100644
--- a/lib/api/v3/attachments/attachment_representer.rb
+++ b/lib/api/v3/attachments/attachment_representer.rb
@@ -96,7 +96,7 @@ module API
                  getter: ->(*) { filesize }
         property :description,
                  getter: ->(*) {
-                   ::API::Decorators::Formattable.new(description, format: 'plain')
+                   ::API::Decorators::Formattable.new(description, plain: true)
                  },
                  render_nil: true
         property :content_type
diff --git a/lib/api/v3/queries/queries_api.rb b/lib/api/v3/queries/queries_api.rb
index 4a46df47e6..748355adb3 100644
--- a/lib/api/v3/queries/queries_api.rb
+++ b/lib/api/v3/queries/queries_api.rb
@@ -48,7 +48,7 @@ module API
 
           helpers do
             def authorize_by_policy(action, &block)
-              authorize_by_with_raise(-> () { allowed_to?(action) }, &block)
+              authorize_by_with_raise(-> { allowed_to?(action) }, &block)
             end
 
             def allowed_to?(action)
diff --git a/lib/api/v3/render/render_api.rb b/lib/api/v3/render/render_api.rb
index 672e8adf2b..f938b3de94 100644
--- a/lib/api/v3/render/render_api.rb
+++ b/lib/api/v3/render/render_api.rb
@@ -57,8 +57,7 @@ module API
             end
 
             def check_format(format)
-              supported_formats = ::OpenProject::TextFormatting::Formatters.format_names.map(&:to_s)
-              unless supported_formats.include?(format)
+              unless ::OpenProject::TextFormatting::Formats.supported?(format)
                 fail ::API::Errors::NotFound, I18n.t('api_v3.errors.code_404')
               end
             end
diff --git a/lib/api/v3/repositories/revision_representer.rb b/lib/api/v3/repositories/revision_representer.rb
index 38d216eb1d..63e12c57bb 100644
--- a/lib/api/v3/repositories/revision_representer.rb
+++ b/lib/api/v3/repositories/revision_representer.rb
@@ -34,7 +34,7 @@ module API
         include API::V3::Utilities
 
         self_link path: :revision,
-                  title_getter: -> (*) { nil }
+                  title_getter: ->(*) { nil }
 
         link :project do
           {
@@ -44,10 +44,12 @@ module API
         end
 
         link :author do
+          next if represented.user.nil?
+
           {
             href: api_v3_paths.user(represented.user.id),
             title: represented.user.name
-          } unless represented.user.nil?
+          }
         end
 
         link :showRevision do
@@ -63,16 +65,16 @@ module API
         property :author, as: :authorName
         property :message,
                  exec_context: :decorator,
-                 getter: -> (*) {
+                 getter: ->(*) {
                    ::API::Decorators::Formattable.new(represented.comments,
                                                       object: represented,
-                                                      format: 'plain')
+                                                      plain: true)
                  },
                  render_nil: true
 
         property :created_at,
                  exec_context: :decorator,
-                 getter: -> (*) {
+                 getter: ->(*) {
                    datetime_formatter.format_datetime(represented.committed_on)
                  }
 
diff --git a/lib/api/v3/utilities/path_helper.rb b/lib/api/v3/utilities/path_helper.rb
index e9c1205235..d09c566334 100644
--- a/lib/api/v3/utilities/path_helper.rb
+++ b/lib/api/v3/utilities/path_helper.rb
@@ -264,9 +264,12 @@ module API
             "#{root}/revisions/#{id}"
           end
 
-          def self.render_markup(format: nil, link: nil)
-            format = format || Setting.text_formatting
-            format = 'plain' if format == '' # Setting will return '' for plain
+          def self.render_markup(link: nil, plain: false)
+            format = if plain
+                       OpenProject::TextFormatting::Formats.plain_format
+                     else
+                       OpenProject::TextFormatting::Formats.rich_format
+                     end
 
             path = "#{root}/render/#{format}"
             path += "?context=#{link}" if link
diff --git a/lib/api/v3/versions/version_representer.rb b/lib/api/v3/versions/version_representer.rb
index 48223fa9f7..c90a7edaa3 100644
--- a/lib/api/v3/versions/version_representer.rb
+++ b/lib/api/v3/versions/version_representer.rb
@@ -60,7 +60,7 @@ module API
                  getter: ->(*) {
                    ::API::Decorators::Formattable.new(represented.description,
                                                       object: represented,
-                                                      format: 'plain')
+                                                      plain: true)
                  },
                  render_nil: true
 
diff --git a/lib/open_project/client_preference_extractor.rb b/lib/open_project/client_preference_extractor.rb
index 029a38065b..d23a04620f 100644
--- a/lib/open_project/client_preference_extractor.rb
+++ b/lib/open_project/client_preference_extractor.rb
@@ -33,8 +33,6 @@ module OpenProject
       gon.settings = {
         user_preferences: user_preferences,
         display: {
-          use_wysiwyg: Setting.use_wysiwyg?,
-          text_format: Setting.text_formatting,
           date_format: momentjstify_date_format(Setting.date_format),
           time_format: momentjstify_time_format(Setting.time_format),
           start_of_week: Setting.start_of_week
diff --git a/lib/open_project/form_tag_helper.rb b/lib/open_project/form_tag_helper.rb
index 316ccd6d9f..817c2b82f8 100644
--- a/lib/open_project/form_tag_helper.rb
+++ b/lib/open_project/form_tag_helper.rb
@@ -31,9 +31,7 @@ module OpenProject
   module FormTagHelper
     include ActionView::Helpers::FormTagHelper
 
-    TEXT_LIKE_FIELDS = [
-      'number_field', 'password_field', 'url_field', 'telephone_field', 'email_field'
-    ].freeze
+    TEXT_LIKE_FIELDS = %w(number_field password_field url_field telephone_field email_field).freeze
 
     def styled_form_tag(url_for_options = {}, options = {}, &block)
       apply_css_class_to_options(options, 'form')
@@ -88,8 +86,7 @@ module OpenProject
     def text_formatting_wrapper(target_id)
       return ''.html_safe unless target_id.present?
 
-      format = Setting.text_formatting
-      helper = ::OpenProject::TextFormatting::Formatters.helper_for(format).new(self)
+      helper = ::OpenProject::TextFormatting::Formats.rich_helper.new(self)
       helper.wikitoolbar_for target_id
     end
 
diff --git a/lib/open_project/object_linking.rb b/lib/open_project/object_linking.rb
index 8cdbb63bd6..78c5a400ac 100644
--- a/lib/open_project/object_linking.rb
+++ b/lib/open_project/object_linking.rb
@@ -95,7 +95,7 @@ module OpenProject
     def link_to_message(message, options = {}, html_options = nil)
       link_to(
         h(truncate(message.subject, length: 60)),
-        topic_path_or_url(message.root,
+        topic_path_or_url(options.delete(:no_root) ? message : message.root,
                           { r: (message.parent_id && message.id),
                             anchor: (message.parent_id ? "message-#{message.id}" : nil)
                           }.merge(options)),
diff --git a/lib/open_project/text_formatting.rb b/lib/open_project/text_formatting.rb
index 059f459382..f6b06d2ed0 100644
--- a/lib/open_project/text_formatting.rb
+++ b/lib/open_project/text_formatting.rb
@@ -36,7 +36,6 @@ module OpenProject
     # * with a String: format_text(text, options)
     # * with an object and one of its attribute: format_text(issue, :description, options)
     def format_text(*args)
-
       options = args.last.is_a?(Hash) ? args.pop : {}
       case args.size
       when 1
@@ -56,8 +55,11 @@ module OpenProject
       only_path = options.delete(:only_path) != false
       current_user = options.delete(:current_user) { User.current }
 
+      plain = ::OpenProject::TextFormatting::Formats.plain?(options.delete(:format))
+
       Renderer.format_text text,
                            options.merge(
+                             plain: plain,
                              object: object,
                              request: try(:request),
                              current_user: current_user,
diff --git a/lib/open_project/text_formatting/filters/macro_filter.rb b/lib/open_project/text_formatting/filters/macro_filter.rb
index 1730c22fda..3ec807dc46 100644
--- a/lib/open_project/text_formatting/filters/macro_filter.rb
+++ b/lib/open_project/text_formatting/filters/macro_filter.rb
@@ -42,7 +42,7 @@ module OpenProject::TextFormatting
       def call
         doc.search('macro').each do |macro|
           registered.each do |macro_class|
-            next unless macro['class'].include? macro_class.identifier
+            next unless Array(macro['class']).include? macro_class.identifier
 
             begin
               macro_class.apply(macro, result: result, context: context)
diff --git a/lib/open_project/text_formatting/formats.rb b/lib/open_project/text_formatting/formats.rb
new file mode 100644
index 0000000000..8dc7adbf08
--- /dev/null
+++ b/lib/open_project/text_formatting/formats.rb
@@ -0,0 +1,66 @@
+#-- encoding: UTF-8
+
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See docs/COPYRIGHT.rdoc for more details.
+#++
+
+module OpenProject::TextFormatting
+  module Formats
+    class << self
+      attr_reader :plain, :rich
+
+      %i(plain rich).each do |flavor|
+        define_method("#{flavor}_format") do
+          send(flavor).format
+        end
+
+        define_method("#{flavor}_formatter") do
+          send(flavor).formatter
+        end
+
+        define_method("#{flavor}_helper") do
+          send(flavor).helper
+        end
+
+        define_method("register_#{flavor}!") do |klass|
+          instance_variable_set("@#{flavor}", klass)
+        end
+      end
+
+      def supported?(name)
+        [plain, rich].map(&:format).include?(name.to_sym)
+      end
+
+      def plain?(name)
+        name && plain.format == name.to_sym
+      end
+    end
+  end
+end
+
+OpenProject::TextFormatting::Formats.register_plain! ::OpenProject::TextFormatting::Formats::Plain::Format
+OpenProject::TextFormatting::Formats.register_rich! ::OpenProject::TextFormatting::Formats::Markdown::Format
diff --git a/lib/open_project/text_formatting/formatters/markdown/formatter.rb b/lib/open_project/text_formatting/formats/base_format.rb
similarity index 64%
rename from lib/open_project/text_formatting/formatters/markdown/formatter.rb
rename to lib/open_project/text_formatting/formats/base_format.rb
index d628bfb6c6..2d4305d3a5 100644
--- a/lib/open_project/text_formatting/formatters/markdown/formatter.rb
+++ b/lib/open_project/text_formatting/formats/base_format.rb
@@ -1,4 +1,5 @@
 #-- encoding: UTF-8
+
 #-- copyright
 # OpenProject is a project management system.
 # Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
@@ -27,37 +28,31 @@
 # See doc/COPYRIGHT.rdoc for more details.
 #++
 
-module OpenProject::TextFormatting::Formatters
-  module Markdown
-    class Formatter < OpenProject::TextFormatting::Formatters::Base
-      attr_reader :context,
-                  :pipeline
-
-      def initialize(context)
-        @context = context
-        @pipeline = ::HTML::Pipeline.new(located_filters, context)
+module OpenProject::TextFormatting::Formats
+  class BaseFormat
+    class << self
+      def format
+        raise NotImplementedError
       end
 
-      def to_html(text)
-        result = pipeline.call(text, context)
-        output = result[:output].to_s
+      def priority
+        raise NotImplementedError
+      end
 
-        output.html_safe
+      def helper
+        @helper = "OpenProject::TextFormatting::Formats::#{format.to_s.camelcase}::Helper".constantize
       end
 
-      def to_document(text)
-        pipeline.to_document text, context
+      def formatter
+        @formatter ||= "OpenProject::TextFormatting::Formats::#{format.to_s.camelcase}::Formatter".constantize
       end
 
-      def filters
-        [
-          :markdown,
-          :sanitization,
-          HTML::Pipeline::TableOfContentsFilter,
-          :macro,
-          :pattern_matcher,
-          :autolink
-        ]
+      def setup
+        # Force lookup to avoid const errors later on.
+        helper and formatter
+      rescue NameError => e
+        Rails.logger.error "Failed to register wiki formatting #{format}: #{e}"
+        Rails.logger.debug { e.backtrace }
       end
     end
   end
diff --git a/lib/open_project/text_formatting/formatters/base.rb b/lib/open_project/text_formatting/formats/base_formatter.rb
similarity index 95%
rename from lib/open_project/text_formatting/formatters/base.rb
rename to lib/open_project/text_formatting/formats/base_formatter.rb
index 33a5aa86a3..1b1ad9dccb 100644
--- a/lib/open_project/text_formatting/formatters/base.rb
+++ b/lib/open_project/text_formatting/formats/base_formatter.rb
@@ -27,8 +27,8 @@
 # See doc/COPYRIGHT.rdoc for more details.
 #++
 
-module OpenProject::TextFormatting::Formatters
-  class Base
+module OpenProject::TextFormatting::Formats
+  class BaseFormatter
     attr_reader :options, :project
 
     def initialize(options)
@@ -46,8 +46,6 @@ module OpenProject::TextFormatting::Formatters
       []
     end
 
-    protected
-
     def located_filters
       filters.map do |f|
         if [Symbol, String].include? f.class
diff --git a/lib/open_project/text_formatting/formats/markdown/format.rb b/lib/open_project/text_formatting/formats/markdown/format.rb
new file mode 100644
index 0000000000..7f4acddf7e
--- /dev/null
+++ b/lib/open_project/text_formatting/formats/markdown/format.rb
@@ -0,0 +1,43 @@
+#-- encoding: UTF-8
+
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+module OpenProject::TextFormatting::Formats::Markdown
+  class Format < OpenProject::TextFormatting::Formats::BaseFormat
+    class << self
+      def format
+        :markdown
+      end
+
+      def priority
+        5
+      end
+    end
+  end
+end
diff --git a/lib/open_project/text_formatting/formats/markdown/formatter.rb b/lib/open_project/text_formatting/formats/markdown/formatter.rb
new file mode 100644
index 0000000000..4565fb406f
--- /dev/null
+++ b/lib/open_project/text_formatting/formats/markdown/formatter.rb
@@ -0,0 +1,67 @@
+#-- encoding: UTF-8
+
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+module OpenProject::TextFormatting::Formats::Markdown
+  class Formatter < OpenProject::TextFormatting::Formats::BaseFormatter
+    attr_reader :context,
+                :pipeline
+
+    def initialize(context)
+      @context = context
+      @pipeline = ::HTML::Pipeline.new(located_filters, context)
+    end
+
+    def to_html(text)
+      result = pipeline.call(text, context)
+      output = result[:output].to_s
+
+      output.html_safe
+    end
+
+    def to_document(text)
+      pipeline.to_document text, context
+    end
+
+    def filters
+      [
+        :markdown,
+        :sanitization,
+        HTML::Pipeline::TableOfContentsFilter,
+        :macro,
+        :pattern_matcher,
+        :autolink
+      ]
+    end
+
+    def self.format
+      :markdown
+    end
+  end
+end
diff --git a/lib/open_project/text_formatting/formatters/markdown/helper.rb b/lib/open_project/text_formatting/formats/markdown/helper.rb
similarity index 74%
rename from lib/open_project/text_formatting/formatters/markdown/helper.rb
rename to lib/open_project/text_formatting/formats/markdown/helper.rb
index 6c605271cb..b9e9f222c4 100644
--- a/lib/open_project/text_formatting/formatters/markdown/helper.rb
+++ b/lib/open_project/text_formatting/formats/markdown/helper.rb
@@ -27,7 +27,7 @@
 # See doc/COPYRIGHT.rdoc for more details.
 #++
 
-module OpenProject::TextFormatting::Formatters
+module OpenProject::TextFormatting::Formats
   module Markdown
     class Helper
       attr_reader :view_context
@@ -36,13 +36,8 @@ module OpenProject::TextFormatting::Formatters
         @view_context = view_context
       end
 
-
       def text_formatting_js_includes
-        if Setting.use_wysiwyg?
-          view_context.javascript_include_tag 'vendor/ckeditor/ckeditor.js'
-        else
-          view_context.javascript_include_tag 'jstoolbar/markdown.js'
-        end
+        view_context.javascript_include_tag 'vendor/ckeditor/ckeditor.js'
       end
 
       def text_formatting_has_preview?
@@ -50,11 +45,7 @@ module OpenProject::TextFormatting::Formatters
       end
 
       def wikitoolbar_for(field_id)
-        if Setting.use_wysiwyg?
-          wysiwyg_for field_id
-        else
-          jstoolbar_for field_id
-        end
+        wysiwyg_for field_id
       end
 
       private
@@ -69,17 +60,6 @@ module OpenProject::TextFormatting::Formatters
                                  '',
                                  'textarea-selector': "##{field_id}"
       end
-
-      def jstoolbar_for(field_id)
-        view_context.content_for(:additional_js_dom_ready) do
-          %(
-              var wikiToolbar = new jsToolBar(document.getElementById('#{field_id}'));
-              wikiToolbar.draw();
-            ).html_safe
-        end
-
-        ''.html_safe
-      end
     end
   end
 end
diff --git a/lib/open_project/text_formatting/formatters/markdown/textile_converter.rb b/lib/open_project/text_formatting/formats/markdown/textile_converter.rb
similarity index 99%
rename from lib/open_project/text_formatting/formatters/markdown/textile_converter.rb
rename to lib/open_project/text_formatting/formats/markdown/textile_converter.rb
index 87ac6c5866..9556b9599e 100644
--- a/lib/open_project/text_formatting/formatters/markdown/textile_converter.rb
+++ b/lib/open_project/text_formatting/formats/markdown/textile_converter.rb
@@ -54,7 +54,7 @@
 
 require 'open3'
 
-module OpenProject::TextFormatting::Formatters
+module OpenProject::TextFormatting::Formats
   module Markdown
     class TextileConverter
       include ActionView::Helpers::TagHelper
diff --git a/lib/open_project/text_formatting/formats/plain/format.rb b/lib/open_project/text_formatting/formats/plain/format.rb
new file mode 100644
index 0000000000..aed0e68e6e
--- /dev/null
+++ b/lib/open_project/text_formatting/formats/plain/format.rb
@@ -0,0 +1,43 @@
+#-- encoding: UTF-8
+
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+module OpenProject::TextFormatting::Formats::Plain
+  class Format < OpenProject::TextFormatting::Formats::BaseFormat
+    class << self
+      def format
+        :plain
+      end
+
+      def priority
+        100
+      end
+    end
+  end
+end
diff --git a/lib/open_project/text_formatting/formatters/plain/formatter.rb b/lib/open_project/text_formatting/formats/plain/formatter.rb
similarity index 90%
rename from lib/open_project/text_formatting/formatters/plain/formatter.rb
rename to lib/open_project/text_formatting/formats/plain/formatter.rb
index dd56916468..cbab6486f4 100644
--- a/lib/open_project/text_formatting/formatters/plain/formatter.rb
+++ b/lib/open_project/text_formatting/formats/plain/formatter.rb
@@ -1,4 +1,5 @@
 #-- encoding: UTF-8
+
 #-- copyright
 # OpenProject is a project management system.
 # Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
@@ -27,9 +28,9 @@
 # See docs/COPYRIGHT.rdoc for more details.
 #++
 
-module OpenProject::TextFormatting::Formatters
+module OpenProject::TextFormatting::Formats
   module Plain
-    class Formatter < OpenProject::TextFormatting::Formatters::Base
+    class Formatter < OpenProject::TextFormatting::Formats::BaseFormatter
       attr_reader :context,
                   :pipeline
 
@@ -49,6 +50,10 @@ module OpenProject::TextFormatting::Formatters
       def filters
         %i(plain pattern_matcher)
       end
+
+      def self.format
+        :plain
+      end
     end
   end
 end
diff --git a/lib/open_project/text_formatting/formatters/plain/helper.rb b/lib/open_project/text_formatting/formats/plain/helper.rb
similarity index 93%
rename from lib/open_project/text_formatting/formatters/plain/helper.rb
rename to lib/open_project/text_formatting/formats/plain/helper.rb
index 33bcaa9da6..822f777c8e 100644
--- a/lib/open_project/text_formatting/formatters/plain/helper.rb
+++ b/lib/open_project/text_formatting/formats/plain/helper.rb
@@ -27,7 +27,7 @@
 # See docs/COPYRIGHT.rdoc for more details.
 #++
 
-module OpenProject::TextFormatting::Formatters
+module OpenProject::TextFormatting::Formats
   module Plain
     class Helper
       def wikitoolbar_for(_field_id)
@@ -38,8 +38,7 @@ module OpenProject::TextFormatting::Formatters
         false
       end
 
-      def text_formatting_js_includes
-      end
+      def text_formatting_js_includes; end
     end
   end
 end
diff --git a/lib/open_project/text_formatting/formatters.rb b/lib/open_project/text_formatting/formatters.rb
deleted file mode 100644
index db9c131d3a..0000000000
--- a/lib/open_project/text_formatting/formatters.rb
+++ /dev/null
@@ -1,88 +0,0 @@
-#-- encoding: UTF-8
-
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-module OpenProject::TextFormatting
-  module Formatters
-    class << self
-
-      def registered
-        unless defined? @formatters
-          register_default!
-        end
-
-        @formatters
-      end
-
-      def registered?(key)
-        registered.key? key.to_sym
-      end
-
-      def register(namespace:)
-        # Force lookup to avoid const errors later on.
-        key = namespace.to_sym
-        modulename = namespace.to_s.classify
-
-        raise ArgumentError, "format name '#{name}' is already taken" if registered?(key)
-
-        begin
-          formatter = "OpenProject::TextFormatting::Formatters::#{modulename}::Formatter".constantize
-          helper = "OpenProject::TextFormatting::Formatters::#{modulename}::Helper".constantize
-          registered[key] = { formatter: formatter, helper: helper }
-        rescue NameError => e
-          Rails.logger.error "Failed to register wiki formatting #{namespace}: #{e}"
-          Rails.logger.debug { e.backtrace }
-        end
-      end
-
-      def formatter_for(name)
-        entry = registered.fetch(name.to_sym) { registered[:plain] }
-        entry[:formatter]
-      end
-
-      def helper_for(name)
-        entry = registered.fetch(name.to_sym) { registered[:plain] }
-        entry[:helper]
-      end
-
-      def format_names
-        registered.keys.map
-      end
-
-      private
-
-      def register_default!
-        @formatters = {}
-        register namespace: :plain
-        register namespace: :markdown
-        register namespace: :textile
-      end
-    end
-  end
-end
diff --git a/lib/open_project/text_formatting/formatters/textile/formatter.rb b/lib/open_project/text_formatting/formatters/textile/formatter.rb
deleted file mode 100644
index 6a3152e411..0000000000
--- a/lib/open_project/text_formatting/formatters/textile/formatter.rb
+++ /dev/null
@@ -1,515 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See doc/COPYRIGHT.rdoc for more details.
-#++
-
-module OpenProject::TextFormatting::Formatters
-  module Textile
-    class Formatter < OpenProject::TextFormatting::Formatters::Base
-
-      include Redmine::WikiFormatting::Macros::Definitions
-      include ActionView::Helpers::SanitizeHelper
-      include Redmine::I18n
-      # used for the work package quick links
-      include WorkPackagesHelper
-      include ApplicationHelper
-      # Used for escaping helper 'h()'
-      include ERB::Util
-      # Rails helper
-      include ActionView::Context
-      include ActionView::Helpers::TagHelper
-      include ActionView::Helpers::UrlHelper
-      include ActionView::Helpers::TextHelper
-      # For route path helpers
-      include OpenProject::ObjectLinking
-      include OpenProject::StaticRouting::UrlHelpers
-      # Truncation
-      include OpenProject::TextFormatting::Truncation
-
-      def controller; end
-
-      def to_html(text)
-        edit = !!options[:edit]
-        # don't return html in edit mode when textile or text formatting is enabled
-        return text if edit
-
-        object = options[:object]
-        project = options[:project]
-        only_path = options.delete(:only_path) != false
-
-        # offer 'plain' as readable version for 'no formatting' to callers
-        format = options.delete(:format) { :textile }
-        text = RedclothWrapper.new(text).to_html
-
-        # TODO: transform modifications into WikiFormatting Helper, or at least ask the helper if he wants his stuff to be modified
-        @parsed_headings = []
-        text = parse_non_pre_blocks(text) { |text|
-          [:execute_macros, :parse_inline_attachments, :parse_wiki_links, :parse_redmine_links, :parse_headings, :parse_relative_urls].each do |method_name|
-            send method_name, text, project, object, options[:attribute], only_path, options
-          end
-        }
-
-        if @parsed_headings.any?
-          replace_toc(text, @parsed_headings, options)
-        end
-
-        escape_non_macros(text)
-        text.html_safe
-      end
-
-      ##
-      # Escape double curly braces after macro expansion.
-      # This will avoid arbitrary angular expressions to be evaluated in
-      # formatted text marked html_safe.
-      def escape_non_macros(text)
-        text.gsub!(/\{\{(?! \$root\.DOUBLE_LEFT_CURLY_BRACE)/, '{{ $root.DOUBLE_LEFT_CURLY_BRACE }}')
-      end
-
-      def parse_non_pre_blocks(text)
-        s = StringScanner.new(text)
-        tags = []
-        parsed = ''
-        while !s.eos?
-          s.scan(/(.*?)(<(\/)?(pre|code)(.*?)>|\z)/im)
-          text = s[1]
-          full_tag = s[2]
-          closing = s[3]
-          tag = s[4]
-          if tags.empty?
-            yield text
-          end
-          parsed << text
-          if tag
-            if closing
-              if tags.last == tag.downcase
-                tags.pop
-              end
-            else
-              tags << tag.downcase
-            end
-            parsed << full_tag
-          end
-        end
-        # Close any non closing tags
-        while tag = tags.pop
-          parsed << "</#{tag}>"
-        end
-        parsed
-      end
-
-
-      MACROS_RE = /
-                    (!)?                        # escaping
-                    (
-                    \{\{                        # opening tag
-                    ([\w]+)                     # macro name
-                    (\(([^\}]*)\))?             # optional arguments
-                    \}\}                        # closing tag
-                    )
-                  /x unless const_defined?(:MACROS_RE)
-
-      # Macros substitution
-      def execute_macros(text, project, obj, _attr, _only_path, options)
-        return if !!options[:edit]
-        text.gsub!(MACROS_RE) do
-          esc = $1
-          all = $2
-          macro = $3
-          args = ($5 || '').split(',').each(&:strip!)
-          if esc.nil?
-            begin
-              exec_macro(macro, obj, args, view: self, project: project)
-            rescue => e
-              "<span class=\"flash error macro-unavailable permanent\">\
-              #{::I18n.t(:macro_execution_error, macro_name: macro)} (#{e})\
-              </span>".squish
-            rescue NotImplementedError
-              "<span class=\"flash error macro-unavailable permanent\">\
-              #{::I18n.t(:macro_unavailable, macro_name: macro)}\
-              </span>".squish
-            end || all
-          else
-            all
-          end
-        end
-      end
-
-      RELATIVE_LINK_RE = %r{
-        <a
-        (?:
-          (\shref=
-            (?:                         # the href and link
-              (?:'(\/[^>]+?)')|
-              (?:"(\/[^>]+?)")
-            )
-          )|
-          [^>]
-        )*
-        >
-        [^<]*?<\/a>                     # content and closing link tag.
-      }x unless const_defined?(:RELATIVE_LINK_RE)
-
-      def parse_relative_urls(text, _project, _obj, _attr, only_path, _options)
-        return if only_path
-        text.gsub!(RELATIVE_LINK_RE) do |m|
-          href = $1
-          relative_url = $2 || $3
-          next m unless href.present?
-          request = options[:request]
-          if request.present?
-            # we have a request!
-            protocol = request.protocol
-            host_with_port = request.host_with_port
-          elsif @controller
-            # use the same methods as url_for in the Mailer
-            url_opts = @controller.class.default_url_options
-            next m unless url_opts && url_opts[:protocol] && url_opts[:host]
-            protocol = "#{url_opts[:protocol]}://"
-            host_with_port = url_opts[:host]
-          else
-            next m
-          end
-          m.sub href, " href=\"#{protocol}#{host_with_port}#{relative_url}\""
-        end
-      end
-
-      def parse_inline_attachments(text, _project, obj, _attr, only_path, options)
-        # when using an image link, try to use an attachment, if possible
-        if options[:attachments] || (obj && obj.respond_to?(:attachments))
-          attachments = nil
-          text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
-            filename = $1.downcase
-            ext = $2
-            alt = $3
-            alttext = $4
-            attachments ||= (options[:attachments] || obj.attachments).sort_by(&:created_at).reverse
-            # search for the picture in attachments
-            if found = attachments.detect { |att| att.filename.downcase == filename }
-              image_url = url_for only_path: only_path, controller: '/attachments', action: 'download', id: found
-              desc = found.description.to_s.gsub('"', '')
-              if !desc.blank? && alttext.blank?
-                alt = " title=\"#{desc}\" alt=\"#{desc}\""
-              end
-              "src=\"#{image_url}\"#{alt}"
-            else
-              m
-            end
-          end
-        end
-      end
-
-      # Wiki links
-      #
-      # Examples:
-      #   [[mypage]]
-      #   [[mypage|mytext]]
-      # wiki links can refer other project wikis, using project name or identifier:
-      #   [[project:]] -> wiki starting page
-      #   [[project:|mytext]]
-      #   [[project:mypage]]
-      #   [[project:mypage|mytext]]
-      def parse_wiki_links(text, project, _obj, _attr, only_path, options)
-        text.gsub!(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |_m|
-          link_project = project
-          esc = $1
-          all = $2
-          page = $3
-          title = $5
-          if esc.nil?
-            if page =~ /\A([^\:]+)\:(.*)\z/
-              link_project = Project.find_by(identifier: $1) || Project.find_by(name: $1)
-              page = $2
-              title ||= $1 if page.blank?
-            end
-
-            if link_project && link_project.wiki
-              # extract anchor
-              anchor = nil
-              if page =~ /\A(.+?)\#(.+)\z/
-                page = $1
-                anchor = $2
-              end
-              # Unescape the escaped entities from textile
-              page = CGI.unescapeHTML(page)
-              # check if page exists
-              wiki_page = link_project.wiki.find_page(page)
-              default_wiki_title = wiki_page.nil? ? page : wiki_page.title
-              wiki_title = title || default_wiki_title
-              url = case options[:wiki_links]
-                    when :local; "#{title}.html"
-                    when :anchor; "##{title}"   # used for single-file wiki export
-                    else
-                      wiki_page_id = wiki_page.nil? ? page.to_url : wiki_page.slug
-                      url_for(only_path: only_path,
-                              controller: '/wiki',
-                              action: 'show',
-                              project_id: link_project,
-                              id: wiki_page_id,
-                              title: wiki_page.nil? ? wiki_title.strip : nil,
-                              anchor: anchor)
-              end
-              link_to(h(wiki_title), url, class: ('wiki-page' + (wiki_page ? '' : ' new')))
-            else
-              # project or wiki doesn't exist
-              all
-            end
-          else
-            all
-          end
-        end
-      end
-
-      # Redmine links
-      #
-      # Examples:
-      #   Issues:
-      #     #52 -> Link to issue #52
-      #   Changesets:
-      #     r52 -> Link to revision 52
-      #     commit:a85130f -> Link to scmid starting with a85130f
-      #   Documents:
-      #     document#17 -> Link to document with id 17
-      #     document:Greetings -> Link to the document with title "Greetings"
-      #     document:"Some document" -> Link to the document with title "Some document"
-      #   Versions:
-      #     version#3 -> Link to version with id 3
-      #     version:1.0.0 -> Link to version named "1.0.0"
-      #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
-      #   Attachments:
-      #     attachment:file.zip -> Link to the attachment of the current object named file.zip
-      #   Source files:
-      #     source:some/file -> Link to the file located at /some/file in the project's repository
-      #     source:some/file@52 -> Link to the file's revision 52
-      #     source:some/file#L120 -> Link to line 120 of the file
-      #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
-      #     export:some/file -> Force the download of the file
-      #   Forum messages:
-      #     message#1218 -> Link to message with id 1218
-      #
-      #   Links can refer other objects from other projects, using project identifier:
-      #     identifier:r52
-      #     identifier:document:"Some document"
-      #     identifier:version:1.0.0
-      #     identifier:source:some/file
-      def parse_redmine_links(text, project, obj, attr, only_path, options)
-        text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-_]+):)?(attachment|version|commit|source|export|message|project|user|group)?((#+|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|\]|<|$)}) do |_m|
-          leading = $1
-          esc = $2
-          project_prefix = $3
-          project_identifier = $4
-          prefix = $5
-          sep = $7 || $9
-          identifier = $8 || $10
-          link = nil
-          if project_identifier
-            project = Project.visible.find_by(identifier: project_identifier)
-          end
-          if esc.nil?
-            if prefix.nil? && sep == 'r'
-              # project.changesets.visible raises an SQL error because of a double join on repositories
-              if project && project.repository && (changeset = Changeset.visible.find_by(repository_id: project.repository.id, revision: identifier))
-                link = link_to(h("#{project_prefix}r#{identifier}"), { only_path: only_path, controller: '/repositories', action: 'revision', project_id: project, rev: changeset.revision },
-                               class: 'changeset',
-                               title: truncate_single_line(changeset.comments, length: 100))
-              end
-            elsif sep == '#'
-              oid = identifier.to_i
-              case prefix
-              when nil
-                if work_package = WorkPackage.visible
-                  .includes(:status)
-                  .references(:statuses)
-                  .find_by(id: oid)
-                  link = link_to("##{oid}",
-                                 work_package_path_or_url(id: oid, only_path: only_path),
-                                 class: work_package_css_classes(work_package),
-                                 title: "#{truncate(work_package.subject, length: 100)} (#{work_package.status.try(:name)})")
-                end
-              when 'version'
-                if version = Version.visible.find_by(id: oid)
-                  link = link_to h(version.name), { only_path: only_path, controller: '/versions', action: 'show', id: version },
-                                 class: 'version'
-                end
-              when 'message'
-                if message = Message.visible.includes(:parent).find_by(id: oid)
-                  link = link_to_message(message, { only_path: only_path }, class: 'message')
-                end
-              when 'project'
-                if p = Project.visible.find_by(id: oid)
-                  link = link_to_project(p, { only_path: only_path }, class: 'project')
-                end
-              when 'user'
-                if user = User.in_visible_project.find_by(id: oid)
-                  link = link_to_user(user, class: 'user-mention')
-                end
-              when 'group'
-                if group = Group.find_by(id: oid)
-                  link = content_tag(:span, group.name, class: 'user-mention')
-                end
-              end
-            elsif sep == '##'
-              oid = identifier.to_i
-              if work_package = WorkPackage.visible
-                .includes(:status)
-                .references(:statuses)
-                .find_by(id: oid)
-                link = work_package_quick_info(work_package, only_path: only_path)
-              end
-            elsif sep == '###'
-              oid = identifier.to_i
-              work_package = WorkPackage.visible
-                .includes(:status)
-                .references(:statuses)
-                .find_by(id: oid)
-              if work_package && obj && !options[:no_nesting] && !(attr == :description && obj.id == work_package.id)
-                link = work_package_quick_info_with_description(work_package, only_path: only_path)
-              end
-            elsif sep == ':'
-              # removes the double quotes if any
-              name = identifier.gsub(%r{\A"(.*)"\z}, '\\1')
-              case prefix
-              when 'version'
-                if project && version = project.versions.visible.find_by(name: name)
-                  link = link_to h(version.name), { only_path: only_path, controller: '/versions', action: 'show', id: version },
-                                 class: 'version'
-                end
-              when 'commit'
-                if project && project.repository && (changeset = Changeset.visible.where(['repository_id = ? AND scmid LIKE ?', project.repository.id, "#{name}%"]).first)
-                  link = link_to h("#{project_prefix}#{name}"), { only_path: only_path, controller: '/repositories', action: 'revision', project_id: project, rev: changeset.identifier },
-                                 class: 'changeset',
-                                 title: truncate_single_line(changeset.comments, length: 100)
-                end
-              when 'source', 'export'
-                if project && project.repository && User.current.allowed_to?(:browse_repository, project)
-                  name =~ %r{\A[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?\z}
-                  path = $1
-                  rev = $3
-                  anchor = $5
-                  link = link_to h("#{project_prefix}#{prefix}:#{name}"), { controller: '/repositories', action: 'entry', project_id: project,
-                                                                            repo_path: path.to_s,
-                                                                            rev: rev,
-                                                                            anchor: anchor,
-                                                                            format: (prefix == 'export' ? 'raw' : nil) },
-                                 class: (prefix == 'export' ? 'source download' : 'source')
-                end
-              when 'attachment'
-                attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
-                if attachments && attachment = attachments.detect { |a| a.filename == name }
-                  link = link_to h(attachment.filename), { only_path: only_path, controller: '/attachments', action: 'download', id: attachment },
-                                 class: 'attachment'
-                end
-              when 'project'
-                p = Project
-                  .visible
-                  .where(['projects.identifier = :s OR LOWER(projects.name) = :s',
-                          { s: name.downcase }])
-                  .first
-                if p
-                  link = link_to_project(p, { only_path: only_path }, class: 'project')
-                end
-              when 'user'
-                if user = User.in_visible_project.find_by(login: name)
-                  link = link_to_user(user, class: 'user-mention')
-                end
-              end
-            end
-          end
-          leading + (link || "#{project_prefix}#{prefix}#{sep}#{identifier}")
-        end
-      end
-
-      HEADING_RE = /<h(1|2|3|4)( [^>]+)?>(.+?)<\/h(1|2|3|4)>/i unless const_defined?(:HEADING_RE)
-
-      # Headings and TOC
-      # Adds ids and links to headings unless options[:headings] is set to false
-      def parse_headings(text, _project, _obj, _attr, _only_path, options)
-        return if options[:headings] == false
-
-        text.gsub!(HEADING_RE) do
-          level = $1.to_i
-          attrs = $2
-          content = $3
-          item = strip_tags(content).strip
-          tocitem = strip_tags(content.gsub(/<br \/>/, ' '))
-          anchor = item.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
-          @parsed_headings << [level, anchor, tocitem]
-          url = full_url(anchor, options[:request])
-          "<a name=\"#{anchor}\"></a>\n<h#{level} #{attrs}>#{content}<a href=\"#{url}\" class=\"wiki-anchor\">&para;</a></h#{level}>"
-        end
-      end
-
-      TOC_RE = /<p>\{\{([<>]?)toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
-
-      # Renders the TOC with given headings
-      def replace_toc(text, headings, options)
-        text.gsub!(TOC_RE) do
-          if headings.empty?
-            ''
-          else
-            div_class = 'toc'
-            div_class << ' right' if $1 == '>'
-            div_class << ' left' if $1 == '<'
-            out = "<fieldset class='form--fieldset -collapsible'>"
-            out << "<legend class='form--fieldset-legend' title='#{l(:description_toc_toggle)}'>"
-            out << "<a href='#'>#{l(:label_table_of_contents)}</a></legend><div>"
-            out << "<ul class=\"#{div_class}\"><li>"
-            root = headings.map(&:first).min
-            current = root
-            started = false
-            headings.each do |level, anchor, item|
-              if level > current
-                out << '<ul><li>' * (level - current)
-              elsif level < current
-                out << "</li></ul>\n" * (current - level) + '</li><li>'
-              elsif started
-                out << '</li><li>'
-              end
-              url = full_url(anchor, options[:request])
-              out << "<a href=\"#{url}\">#{item}</a>"
-              current = level
-              started = true
-            end
-            out << '</li></ul>' * (current - root)
-            out << '</li></ul>'
-            out << '</div></fieldset>'
-          end
-        end
-      end
-
-      #
-      # displays the current url plus an optional anchor
-      #
-      def full_url(anchor_name = '', request)
-        return "##{anchor_name}" if request.nil?
-        url_for pagination_params_whitelist(request).merge(anchor: anchor_name, only_path: true)
-      rescue ActionController::UrlGenerationError
-        # In a context outside params, we don't know what the relative anchor url is
-        "##{anchor_name}"
-      end
-    end
-  end
-end
diff --git a/lib/open_project/text_formatting/formatters/textile/helper.rb b/lib/open_project/text_formatting/formatters/textile/helper.rb
deleted file mode 100644
index cca59797fc..0000000000
--- a/lib/open_project/text_formatting/formatters/textile/helper.rb
+++ /dev/null
@@ -1,72 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See doc/COPYRIGHT.rdoc for more details.
-#++
-
-module OpenProject::TextFormatting::Formatters
-  module Textile
-    class Helper
-
-      attr_reader :view_context
-
-      def initialize(view_context)
-        @view_context = view_context
-      end
-
-      def text_formatting_js_includes
-        view_context.javascript_include_tag 'jstoolbar/textile.js'
-      end
-
-      def text_formatting_has_preview?
-        true
-      end
-
-      def wikitoolbar_for(field_id)
-        help_button = view_context.content_tag(
-          :button,
-          '',
-          type: 'button',
-          class: 'jstb_help formatting-help-link-button',
-          :'aria-label' => ::I18n.t('js.inplace.link_formatting_help'),
-          title: ::I18n.t('js.inplace.link_formatting_help')
-        )
-
-
-        view_context.content_for(:additional_js_dom_ready) do
-          %(
-              var wikiToolbar = new jsToolBar(document.getElementById('#{field_id}'));
-
-              wikiToolbar.setHelpLink(jQuery('#{view_context.escape_javascript help_button}')[0]);
-              wikiToolbar.draw();
-            ).html_safe
-        end
-
-        ''.html_safe
-      end
-    end
-  end
-end
diff --git a/lib/open_project/text_formatting/formatters/textile/redcloth_wrapper.rb b/lib/open_project/text_formatting/formatters/textile/redcloth_wrapper.rb
deleted file mode 100644
index 7501751732..0000000000
--- a/lib/open_project/text_formatting/formatters/textile/redcloth_wrapper.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2017 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See doc/COPYRIGHT.rdoc for more details.
-#++
-
-require 'redcloth3'
-
-module OpenProject::TextFormatting::Formatters
-  module Textile
-    class RedclothWrapper < RedCloth3
-      include ERB::Util
-      include ActionView::Helpers::TagHelper
-
-      # auto_link rule after textile rules so that it doesn't break !image_url! tags
-      RULES = [:textile, :block_markdown_rule, :inline_auto_link, :inline_auto_mailto]
-
-      def initialize(*args)
-        super
-
-        self.hard_breaks = true
-        self.no_span_caps = true
-        self.filter_styles = true
-      end
-
-      def to_html(*_rules)
-        @toc = []
-        super(*RULES).to_s
-      end
-
-      private
-
-      # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
-      # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a>
-      def hard_break(text)
-        text.gsub!(/(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, '\\1<br />') if hard_breaks
-      end
-
-      # Patch to add code highlighting support to RedCloth
-      def smooth_offtags(text)
-        unless @pre_list.empty?
-          ## replace <pre> content
-          text.gsub!(/<redpre#(\d+)>/) do
-            content = @pre_list[$1.to_i]
-            if content.match(/<code\s+class="(\w+)">\s?(.+)/m)
-              content = "<code class=\"#{$1} CodeRay\">" +
-                Redmine::SyntaxHighlighting.highlight_by_language($2, $1)
-            end
-            content
-          end
-        end
-      end
-
-
-      def auto_link_regexp
-        @auto_link_regexp ||= begin
-          %r{
-              (                          # leading text
-                <\w+.*?>|                # leading HTML tag, or
-                [^=<>!:'"/]|             # leading punctuation, or
-                \{\{\w+\(|               # inside a macro?
-                ^                        # beginning of line
-              )
-              (
-                (?:https?://)|           # protocol spec, or
-                (?:s?ftps?://)|
-                (?:www\.)                # www.*
-              )
-              (
-                (\S+?)                   # url
-                (\/)?                    # slash
-              )
-              ((?:&gt;)?|[^\w\=\/;\(\)]*?)               # post
-              (?=<|\s|$)
-             }x
-        end
-      end
-
-      # Turns all urls into clickable links (code from Rails).
-      def inline_auto_link(text)
-        text.gsub!(auto_link_regexp) do
-          all = $&
-          leading = $1
-          proto = $2
-          url = $3
-          post = $6
-          if url.nil? || leading =~ /<a\s/i || leading =~ /![<>=]?/ || leading =~ /\{\{\w+\(/
-            # don't replace URLs that are already linked
-            # and URLs prefixed with ! !> !< != (textile images)
-            all
-          else
-            # Idea below : an URL with unbalanced parethesis and
-            # ending by ')' is put into external parenthesis
-            if url[-1] == ?) and ((url.count('(') - url.count(')')) < 0)
-              url = url[0..-2] # discard closing parenth from url
-              post = ')' + post # add closing parenth to post
-            end
-            tag = content_tag('a',
-                              proto + url,
-                              href: "#{proto == 'www.' ? 'http://www.' : proto}#{url}",
-                              class: 'external icon-context icon-copy')
-            %(#{leading}#{tag}#{post})
-          end
-        end
-      end
-
-      # Turns all email addresses into clickable links (code from Rails).
-      def inline_auto_mailto(text)
-        text.gsub!(/((?<!user:")\b[\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
-          mail = $1
-          if text.match(/<a\b[^>]*>(.*)(#{Regexp.escape(mail)})(.*)<\/a>/)
-            mail
-          else
-            content_tag('a', mail, href: "mailto:#{mail}", class: 'email')
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/open_project/text_formatting/matchers/link_handlers/colon_separator.rb b/lib/open_project/text_formatting/matchers/link_handlers/colon_separator.rb
index e403419dee..295df6d011 100644
--- a/lib/open_project/text_formatting/matchers/link_handlers/colon_separator.rb
+++ b/lib/open_project/text_formatting/matchers/link_handlers/colon_separator.rb
@@ -31,7 +31,6 @@
 module OpenProject::TextFormatting::Matchers
   module LinkHandlers
     class ColonSeparator < Base
-
       def self.allowed_prefixes
         %w(commit source export version project user attachment)
       end
@@ -77,15 +76,13 @@ module OpenProject::TextFormatting::Matchers
       end
 
       def oid
-        if matcher.identifier
-          matcher.identifier.gsub(%r{\A"(.*)"\z}, '\\1')
-        end
+        matcher.identifier&.gsub(%r{\A"(.*)"\z}, '\\1')
       end
 
       private
 
       def render_version
-        if project && version = project.versions.visible.find_by(name: oid)
+        if project && (version = project.versions.visible.find_by(name: oid))
           link_to h(version.name),
                   { only_path: context[:only_path], controller: '/versions', action: 'show', id: version },
                   class: 'version'
@@ -93,7 +90,7 @@ module OpenProject::TextFormatting::Matchers
       end
 
       def render_commit
-        if project && project.repository && (changeset = Changeset.visible.where(['repository_id = ? AND scmid LIKE ?', project.repository.id, "#{oid}%"]).first)
+        if project&.repository && (changeset = Changeset.visible.where(['repository_id = ? AND scmid LIKE ?', project.repository.id, "#{oid}%"]).first)
           link_to h("#{project_prefix}#{name}"),
                   { only_path: context[:only_path], controller: '/repositories', action: 'revision', project_id: project, rev: changeset.identifier },
                   class: 'changeset',
@@ -102,7 +99,7 @@ module OpenProject::TextFormatting::Matchers
       end
 
       def render_source
-        if project && project.repository && User.current.allowed_to?(:browse_repository, project)
+        if project&.repository && User.current.allowed_to?(:browse_repository, project)
           matcher.identifier =~ %r{\A[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?\z}
           path = $1
           rev = $3
@@ -131,16 +128,16 @@ module OpenProject::TextFormatting::Matchers
 
       def render_project
         p = Project
-          .visible
-          .where(['projects.identifier = :s OR LOWER(projects.name) = :s', { s: oid.downcase }])
-          .first
+            .visible
+            .where(['projects.identifier = :s OR LOWER(projects.name) = :s', { s: oid.downcase }])
+            .first
         if p
           link_to_project(p, { only_path: context[:only_path] }, class: 'project')
         end
       end
 
       def render_user
-        if user = User.in_visible_project.find_by(login: oid)
+        if (user = User.in_visible_project.find_by(login: oid))
           link_to_user(user, class: 'user-mention')
         end
       end
diff --git a/lib/open_project/text_formatting/matchers/link_handlers/revisions.rb b/lib/open_project/text_formatting/matchers/link_handlers/revisions.rb
index a9fa142c8a..1f32e9c9d8 100644
--- a/lib/open_project/text_formatting/matchers/link_handlers/revisions.rb
+++ b/lib/open_project/text_formatting/matchers/link_handlers/revisions.rb
@@ -31,7 +31,6 @@
 module OpenProject::TextFormatting::Matchers
   module LinkHandlers
     class Revisions < Base
-
       ##
       # Match work package links.
       # Condition: Separator is #|##|###
@@ -45,7 +44,6 @@ module OpenProject::TextFormatting::Matchers
       #
       # #1234, ##1234, ###1234
       def call
-
         # don't handle link unless repository exists
         return nil unless project && project.repository
         changeset = Changeset.visible.find_by(repository_id: project.repository.id, revision: matcher.identifier)
diff --git a/lib/open_project/text_formatting/matchers/link_handlers/work_packages.rb b/lib/open_project/text_formatting/matchers/link_handlers/work_packages.rb
index 12e7ce01e9..059d8548a0 100644
--- a/lib/open_project/text_formatting/matchers/link_handlers/work_packages.rb
+++ b/lib/open_project/text_formatting/matchers/link_handlers/work_packages.rb
@@ -31,7 +31,6 @@
 module OpenProject::TextFormatting::Matchers
   module LinkHandlers
     class WorkPackages < Base
-
       ##
       # Match work package links.
       # Condition: Separator is #|##|###
@@ -66,7 +65,6 @@ module OpenProject::TextFormatting::Matchers
       end
 
       def render_work_package_link(work_package)
-
         if matcher.sep == '##'
           return work_package_quick_info(work_package, only_path: context[:only_path])
         elsif matcher.sep == '###' && !context[:no_nesting]
diff --git a/lib/open_project/text_formatting/matchers/resource_links_matcher.rb b/lib/open_project/text_formatting/matchers/resource_links_matcher.rb
index 458dc9c09c..53014901e4 100644
--- a/lib/open_project/text_formatting/matchers/resource_links_matcher.rb
+++ b/lib/open_project/text_formatting/matchers/resource_links_matcher.rb
@@ -30,7 +30,6 @@
 
 module OpenProject::TextFormatting
   module Matchers
-
     # OpenProject links matching
     #
     # Examples:
@@ -99,7 +98,7 @@ module OpenProject::TextFormatting
             )
             |\.\z # Allow matching when string ends with .
             |, # or with ,
-            |\s
+            |[[:space:]]
             |\]
             |<
             |$
@@ -111,7 +110,7 @@ module OpenProject::TextFormatting
       # Allowed prefix matchers
       def self.allowed_prefixes
         link_handlers
-          .map { |handler| handler.allowed_prefixes }
+          .map(&:allowed_prefixes)
           .flatten
           .uniq
       end
diff --git a/lib/open_project/text_formatting/matchers/wiki_links_matcher.rb b/lib/open_project/text_formatting/matchers/wiki_links_matcher.rb
index 3530a90540..877fac2505 100644
--- a/lib/open_project/text_formatting/matchers/wiki_links_matcher.rb
+++ b/lib/open_project/text_formatting/matchers/wiki_links_matcher.rb
@@ -30,7 +30,6 @@
 
 module OpenProject::TextFormatting
   module Matchers
-
     # OpenProject wiki link syntax
     # Examples:
     #   [[mypage]]
@@ -134,20 +133,20 @@ module OpenProject::TextFormatting
         wiki_title = title || default_wiki_title
 
         url = case context[:wiki_links]
-        when :local;
-          "#{title}.html"
-        when :anchor;
-          "##{title}" # used for single-file wiki export
-        else
-          wiki_page_id = wiki_page.nil? ? page.to_url : wiki_page.slug
-          url_for only_path: context[:only_path],
-                  controller: '/wiki',
-                  action: 'show',
-                  project_id: project.identifier,
-                  title: wiki_page.nil? ? wiki_title.strip : nil,
-                  id: wiki_page_id,
-                anchor: anchor
-        end
+              when :local
+                "#{title}.html"
+              when :anchor
+                "##{title}" # used for single-file wiki export
+              else
+                wiki_page_id = wiki_page.nil? ? page.to_url : wiki_page.slug
+                url_for only_path: context[:only_path],
+                        controller: '/wiki',
+                        action: 'show',
+                        project_id: project.identifier,
+                        title: wiki_page.nil? ? wiki_title.strip : nil,
+                        id: wiki_page_id,
+                        anchor: anchor
+              end
 
         link_to h(wiki_title),
                 url,
diff --git a/lib/open_project/text_formatting/renderer.rb b/lib/open_project/text_formatting/renderer.rb
index 7c5dc87737..c43e33c12b 100644
--- a/lib/open_project/text_formatting/renderer.rb
+++ b/lib/open_project/text_formatting/renderer.rb
@@ -34,13 +34,16 @@ module OpenProject::TextFormatting
       def format_text(text, options = {})
         return '' if text.blank?
 
-        # offer 'plain' as readable version for 'no formatting' to callers
-        format = options.fetch(:format, Setting.text_formatting)
+        formatter = if options.delete(:plain)
+                      OpenProject::TextFormatting::Formats.plain_formatter
+                    else
+                      OpenProject::TextFormatting::Formats.rich_formatter
+                    end
 
-        formatter = OpenProject::TextFormatting::Formatters.formatter_for(format).new(options)
-        formatter.to_html(text)
+        formatter
+          .new(options)
+          .to_html(text)
       end
     end
   end
 end
-
diff --git a/lib/open_project/wiki_formatting/macros/default.rb b/lib/open_project/wiki_formatting/macros/default.rb
deleted file mode 100644
index 44d7c4effc..0000000000
--- a/lib/open_project/wiki_formatting/macros/default.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-module OpenProject
-  module WikiFormatting
-    module Macros
-      module Default
-        Redmine::WikiFormatting::Macros.register do
-          # Builtin macros
-
-          desc 'Sample macro.'
-
-          macro :hello_world do |obj, args|
-            "Hello world! Object: #{obj.class.name}, " + (args.empty? ? 'Called with no argument.' : "Arguments: #{args.join(', ')}")
-          end
-        end
-
-        Redmine::WikiFormatting::Macros.register do
-          desc 'Displays a list of all available macros, including description if available.'
-          macro :macro_list do |_obj, _args|
-            out = ''
-            available_macros = Redmine::WikiFormatting::Macros.available_macros
-
-            available_macros.keys.map(&:to_s).sort.each do |macro|
-              out << content_tag('dt', content_tag('code', macro))
-              out << content_tag('dd', format_text(available_macros[macro.to_sym]))
-            end
-            content_tag('dl', out.html_safe)
-          end
-        end
-
-        Redmine::WikiFormatting::Macros.register do
-          desc "Displays a list of child pages. With no argument, it displays the child pages of the current wiki page. Examples:\n\n" +
-            "  !{{child_pages}} -- can be used from a wiki page only\n" +
-            "  !{{child_pages(Foo)}} -- lists all children of page Foo\n" +
-            '  !{{child_pages(Foo, parent=1)}} -- same as above with a link to page Foo'
-
-          macro :child_pages do |obj, args|
-            args, options = extract_macro_options(args, :parent)
-            page = nil
-            if args.size > 0
-              page = Wiki.find_page(args.first.to_s, project: @project)
-            elsif obj.is_a?(WikiContent)
-              page = obj.page
-            else
-              raise 'With no argument, this macro can be called from wiki pages only.'
-            end
-            raise 'Page not found' if page.nil? || !User.current.allowed_to?(:view_wiki_pages, page.wiki.project)
-            pages = ([page] + page.descendants).group_by(&:parent_id)
-            render_page_hierarchy(pages, options[:parent] ? page.parent_id : page.id)
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/open_project/wiki_formatting/macros/work_package_button.rb b/lib/open_project/wiki_formatting/macros/work_package_button.rb
deleted file mode 100644
index d2e39a9477..0000000000
--- a/lib/open_project/wiki_formatting/macros/work_package_button.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-module OpenProject
-  module WikiFormatting
-    module Macros
-      module WorkPackageButton
-        Redmine::WikiFormatting::Macros.register do
-          desc 'Inserts a link or button to the create form of a work package'
-          macro :create_work_package_link do |_obj, args, options|
-            project = @project || options[:project]
-            if project.nil?
-              raise I18n.t('macros.create_work_package_link.errors.no_project_context')
-            end
-
-            type_name = args.shift
-            class_name = args.shift == 'button' ? 'button' : nil
-            if type_name.present?
-              type = project.types.find_by(name: type_name)
-              if type.nil?
-                raise I18n.t(
-                  'macros.create_work_package_link.errors.invalid_type',
-                  type: type_name,
-                  project: project.name
-                )
-              end
-
-              link_to I18n.t('macros.create_work_package_link.link_name_type', type_name: type_name),
-                      new_project_work_packages_path(project_id: project.identifier, type: type.id),
-                      class: class_name
-            else
-              link_to I18n.t('macros.create_work_package_link.link_name'),
-                      new_project_work_packages_path(project_id: project.identifier),
-                      class: class_name
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
deleted file mode 100644
index 595f613419..0000000000
--- a/lib/redcloth3.rb
+++ /dev/null
@@ -1,1199 +0,0 @@
-#-- encoding: UTF-8
-#                                vim:ts=4:sw=4:
-# = RedCloth - Textile and Markdown Hybrid for Ruby
-#
-# Homepage::  http://whytheluckystiff.net/ruby/redcloth/
-# Author::    why the lucky stiff (http://whytheluckystiff.net/)
-# Copyright:: (cc) 2004 why the lucky stiff (and his puppet organizations.)
-# License::   BSD
-#
-# (see http://hobix.com/textile/ for a Textile Reference.)
-#
-# Based on (and also inspired by) both:
-#
-# PyTextile: http://diveintomark.org/projects/textile/textile.py.txt
-# Textism for PHP: http://www.textism.com/tools/textile/
-#
-#
-
-# = RedCloth
-#
-# RedCloth is a Ruby library for converting Textile and/or Markdown
-# into HTML.  You can use either format, intermingled or separately.
-# You can also extend RedCloth to honor your own custom text stylings.
-#
-# RedCloth users are encouraged to use Textile if they are generating
-# HTML and to use Markdown if others will be viewing the plain text.
-#
-# == What is Textile?
-#
-# Textile is a simple formatting style for text
-# documents, loosely based on some HTML conventions.
-#
-# == Sample Textile Text
-#
-#  h2. This is a title
-#
-#  h3. This is a subhead
-#
-#  This is a bit of paragraph.
-#
-#  bq. This is a blockquote.
-#
-# = Writing Textile
-#
-# A Textile document consists of paragraphs.  Paragraphs
-# can be specially formatted by adding a small instruction
-# to the beginning of the paragraph.
-#
-#  h[n].   Header of size [n].
-#  bq.     Blockquote.
-#  #       Numeric list.
-#  *       Bulleted list.
-#
-# == Quick Phrase Modifiers
-#
-# Quick phrase modifiers are also included, to allow formatting
-# of small portions of text within a paragraph.
-#
-#  \_emphasis\_
-#  \_\_italicized\_\_
-#  \*strong\*
-#  \*\*bold\*\*
-#  ??citation??
-#  -deleted text-
-#  +inserted text+
-#  ^superscript^
-#  ~subscript~
-#  @code@
-#  %(classname)span%
-#
-#  ==notextile== (leave text alone)
-#
-# == Links
-#
-# To make a hypertext link, put the link text in "quotation
-# marks" followed immediately by a colon and the URL of the link.
-#
-# Optional: text in (parentheses) following the link text,
-# but before the closing quotation mark, will become a Title
-# attribute for the link, visible as a tool tip when a cursor is above it.
-#
-# Example:
-#
-#  "This is a link (This is a title) ":http://www.textism.com
-#
-# Will become:
-#
-#  <a href="http://www.textism.com" title="This is a title">This is a link</a>
-#
-# == Images
-#
-# To insert an image, put the URL for the image inside exclamation marks.
-#
-# Optional: text that immediately follows the URL in (parentheses) will
-# be used as the Alt text for the image. Images on the web should always
-# have descriptive Alt text for the benefit of readers using non-graphical
-# browsers.
-#
-# Optional: place a colon followed by a URL immediately after the
-# closing ! to make the image into a link.
-#
-# Example:
-#
-#  !http://www.textism.com/common/textist.gif(Textist)!
-#
-# Will become:
-#
-#  <img src="http://www.textism.com/common/textist.gif" alt="Textist" />
-#
-# With a link:
-#
-#  !/common/textist.gif(Textist)!:http://textism.com
-#
-# Will become:
-#
-#  <a href="http://textism.com"><img src="/common/textist.gif" alt="Textist" /></a>
-#
-# == Defining Acronyms
-#
-# HTML allows authors to define acronyms via the tag. The definition appears as a
-# tool tip when a cursor hovers over the acronym. A crucial aid to clear writing,
-# this should be used at least once for each acronym in documents where they appear.
-#
-# To quickly define an acronym in Textile, place the full text in (parentheses)
-# immediately following the acronym.
-#
-# Example:
-#
-#  ACLU(American Civil Liberties Union)
-#
-# Will become:
-#
-#  <acronym title="American Civil Liberties Union">ACLU</acronym>
-#
-# == Adding Tables
-#
-# In Textile, simple tables can be added by separating each column by
-# a pipe.
-#
-#     |a|simple|table|row|
-#     |And|Another|table|row|
-#
-# Attributes are defined by style definitions in parentheses.
-#
-#     table(border:1px solid black).
-#     (background:#ddd;color:red). |{}| | | |
-#
-# == Using RedCloth
-#
-# RedCloth is simply an extension of the String class, which can handle
-# Textile formatting.  Use it like a String and output HTML with its
-# RedCloth#to_html method.
-#
-#  doc = RedCloth.new "
-#
-#  h2. Test document
-#
-#  Just a simple test."
-#
-#  puts doc.to_html
-#
-# By default, RedCloth uses both Textile and Markdown formatting, with
-# Textile formatting taking precedence.  If you want to turn off Markdown
-# formatting, to boost speed and limit the processor:
-#
-#  class RedCloth::Textile.new( str )
-
-class RedCloth3 < String
-
-    VERSION = '3.0.4'
-    DEFAULT_RULES = [:textile, :markdown]
-
-    #
-    # Two accessor for setting security restrictions.
-    #
-    # This is a nice thing if you're using RedCloth for
-    # formatting in public places (e.g. Wikis) where you
-    # don't want users to abuse HTML for bad things.
-    #
-    # If +:filter_html+ is set, HTML which wasn't
-    # created by the Textile processor will be escaped.
-    #
-    # If +:filter_styles+ is set, it will also disable
-    # the style markup specifier. ('{color: red}')
-    #
-    attr_accessor :filter_html, :filter_styles
-
-    #
-    # Accessor for toggling hard breaks.
-    #
-    # If +:hard_breaks+ is set, single newlines will
-    # be converted to HTML break tags.  This is the
-    # default behavior for traditional RedCloth.
-    #
-    attr_accessor :hard_breaks
-
-    # Accessor for toggling lite mode.
-    #
-    # In lite mode, block-level rules are ignored.  This means
-    # that tables, paragraphs, lists, and such aren't available.
-    # Only the inline markup for bold, italics, entities and so on.
-    #
-    #   r = RedCloth.new( "And then? She *fell*!", [:lite_mode] )
-    #   r.to_html
-    #   #=> "And then? She <strong>fell</strong>!"
-    #
-    attr_accessor :lite_mode
-
-    #
-    # Accessor for toggling span caps.
-    #
-    # Textile places `span' tags around capitalized
-    # words by default, but this wreaks havoc on Wikis.
-    # If +:no_span_caps+ is set, this will be
-    # suppressed.
-    #
-    attr_accessor :no_span_caps
-
-    #
-    # Establishes the markup predence.  Available rules include:
-    #
-    # == Textile Rules
-    #
-    # The following textile rules can be set individually.  Or add the complete
-    # set of rules with the single :textile rule, which supplies the rule set in
-    # the following precedence:
-    #
-    # refs_textile::          Textile references (i.e. [hobix]http://hobix.com/)
-    # block_textile_table::   Textile table block structures
-    # block_textile_lists::   Textile list structures
-    # block_textile_prefix::  Textile blocks with prefixes (i.e. bq., h2., etc.)
-    # inline_textile_image::  Textile inline images
-    # inline_textile_link::   Textile inline links
-    # inline_textile_span::   Textile inline spans
-    # glyphs_textile:: Textile entities (such as em-dashes and smart quotes)
-    #
-    # == Markdown
-    #
-    # refs_markdown::         Markdown references (for example: [hobix]: http://hobix.com/)
-    # block_markdown_setext:: Markdown setext headers
-    # block_markdown_atx::    Markdown atx headers
-    # block_markdown_rule::   Markdown horizontal rules
-    # block_markdown_bq::     Markdown blockquotes
-    # block_markdown_lists::  Markdown lists
-    # inline_markdown_link::  Markdown links
-    attr_accessor :rules
-
-    # Returns a new RedCloth object, based on _string_ and
-    # enforcing all the included _restrictions_.
-    #
-    #   r = RedCloth.new( "h1. A <b>bold</b> man", [:filter_html] )
-    #   r.to_html
-    #     #=>"<h1>A &lt;b&gt;bold&lt;/b&gt; man</h1>"
-    #
-    def initialize( string, restrictions = [] )
-        restrictions.each { |r| method( "#{ r }=" ).call( true ) }
-        super( string )
-    end
-
-    #
-    # Generates HTML from the Textile contents.
-    #
-    #   r = RedCloth.new( "And then? She *fell*!" )
-    #   r.to_html( true )
-    #     #=>"And then? She <strong>fell</strong>!"
-    #
-    def to_html( *rules )
-        rules = DEFAULT_RULES if rules.empty?
-        # make our working copy
-        text = self.dup
-
-        @urlrefs = {}
-        @shelf = []
-        textile_rules = [:block_textile_table, :block_textile_lists,
-                         :block_textile_prefix, :inline_textile_image, :inline_textile_link,
-                         :inline_textile_code, :inline_textile_span, :glyphs_textile]
-        markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
-                          :block_markdown_bq, :block_markdown_lists,
-                          :inline_markdown_reflink, :inline_markdown_link]
-        @rules = rules.map do |rule|
-            case rule
-            when :markdown
-                markdown_rules
-            when :textile
-                textile_rules
-            else
-                rule
-            end
-        end.flatten
-
-        # standard clean up
-        incoming_entities text
-        clean_white_space text
-
-        # start processor
-        @pre_list = []
-        rip_offtags text
-        no_textile text
-        escape_html_tags text
-        # need to do this before #hard_break and #blocks
-        block_textile_quotes text unless @lite_mode
-        hard_break text
-        unless @lite_mode
-            refs text
-            blocks text
-        end
-        inline text
-        smooth_offtags text
-
-        retrieve text
-
-        text.gsub!( /<\/?notextile>/, '' )
-        text.gsub!( /x%x%/, '&#38;' )
-        clean_html text if filter_html
-        text.strip!
-        text
-
-    end
-
-  #######
-  private
-    #######
-    #
-    # Mapping of 8-bit ASCII codes to HTML numerical entity equivalents.
-    # (from PyTextile)
-    #
-    TEXTILE_TAGS =
-
-        [[128, 8364], [129, 0], [130, 8218], [131, 402], [132, 8222], [133, 8230],
-         [134, 8224], [135, 8225], [136, 710], [137, 8240], [138, 352], [139, 8249],
-         [140, 338], [141, 0], [142, 0], [143, 0], [144, 0], [145, 8216], [146, 8217],
-         [147, 8220], [148, 8221], [149, 8226], [150, 8211], [151, 8212], [152, 732],
-         [153, 8482], [154, 353], [155, 8250], [156, 339], [157, 0], [158, 0], [159, 376]].map! do |a, b|
-            [a.chr, ( b.zero? and "" or "&#{ b };" )]
-        end
-
-    #
-    # Regular expressions to convert to HTML.
-    #
-    A_HLGN = /(?:(?:<>|<|>|\=|[()]+)+)/
-    A_VLGN = /[\-^~]/
-    C_CLAS = '(?:\([^)]+\))'
-    C_LNGE = '(?:\[[^\[\]]+\])'
-    C_STYL = '(?:\{[^}]+\})'
-    S_CSPN = '(?:\\\\\d+)'
-    S_RSPN = '(?:/\d+)'
-    A = "(?:#{A_HLGN}?#{A_VLGN}?|#{A_VLGN}?#{A_HLGN}?)"
-    S = "(?:#{S_CSPN}?#{S_RSPN}|#{S_RSPN}?#{S_CSPN}?)"
-    C = "(?:#{C_CLAS}?#{C_STYL}?#{C_LNGE}?|#{C_STYL}?#{C_LNGE}?#{C_CLAS}?|#{C_LNGE}?#{C_STYL}?#{C_CLAS}?)"
-    # PUNCT = Regexp::quote( '!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~' )
-    PUNCT = Regexp::quote( '!"#$%&\'*+,-./:;=?@\\^_`|~' )
-    PUNCT_NOQ = Regexp::quote( '!"#$&\',./:;=?@\\`|' )
-    PUNCT_Q = Regexp::quote( '*-_+^~%' )
-    HYPERLINK = '(\S+?)([^\w\s/;=\?]*?)(?=\s|<|$)'
-
-    # Text markup tags, don't conflict with block tags
-    SIMPLE_HTML_TAGS = [
-        'tt', 'b', 'i', 'big', 'small', 'em', 'strong', 'dfn', 'code',
-        'samp', 'kbd', 'var', 'cite', 'abbr', 'acronym', 'a', 'img', 'br',
-        'br', 'map', 'q', 'sub', 'sup', 'span', 'bdo'
-    ]
-
-    QTAGS = [
-        ['**', 'b', :limit],
-        ['*', 'strong', :limit],
-        ['??', 'cite', :limit],
-        ['-', 'del', :limit],
-        ['__', 'i', :limit],
-        ['_', 'em', :limit],
-        ['%', 'span', :limit],
-        ['+', 'ins', :limit],
-        ['^', 'sup', :limit],
-        ['~', 'sub', :limit]
-    ]
-    QTAGS_JOIN = QTAGS.map {|rc, _ht, _rtype| Regexp::quote rc}.join('|')
-
-    QTAGS.map! do |rc, ht, rtype|
-        rcq = Regexp::quote rc
-        re =
-            case rtype
-            when :limit
-                /(^|[>\s\(])          # sta
-                (?!\-\-)
-                (#{QTAGS_JOIN}|)      # oqs
-                (#{rcq})              # qtag
-                (\w|[^\s].*?[^\s])    # content
-                (?!\-\-)
-                #{rcq}
-                (#{QTAGS_JOIN}|)      # oqa
-                (?=[[:punct:]]|<|\s|\)|$)/x
-            else
-                /(#{rcq})
-                (#{C})
-                (?::(\S+))?
-                (\w|[^\s\-].*?[^\s\-])
-                #{rcq}/xm
-            end
-        [rc, ht, re, rtype]
-    end
-
-    # Elements to handle
-    GLYPHS = [
-      #   [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1&#8217;\2' ], # single closing
-      #   [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1&#8217;' ], # single closing
-      #   [ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '&#8217;' ], # single closing
-      #   [ /\'/, '&#8216;' ], # single opening
-      #   [ /</, '&lt;' ], # less-than
-      #   [ />/, '&gt;' ], # greater-than
-      #   [ /([^\s\[{(])?"(\s|:|$)/, '\1&#8221;\2' ], # double closing
-      #   [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1&#8221;' ], # double closing
-      #   [ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '&#8221;' ], # double closing
-      #   [ /"/, '&#8220;' ], # double opening
-      #   [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
-      #   [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
-      #   [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^<A-Za-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
-      #   [ /(\.\s)?\s?--\s?/, '\1&#8212;' ], # em dash
-      #   [ /\s->\s/, ' &rarr; ' ], # right arrow
-      #   [ /\s-\s/, ' &#8211; ' ], # en dash
-      #   [ /(\d+) ?x ?(\d+)/, '\1&#215;\2' ], # dimension sign
-      #   [ /\b ?[(\[]TM[\])]/i, '&#8482;' ], # trademark
-      #   [ /\b ?[(\[]R[\])]/i, '&#174;' ], # registered
-      #   [ /\b ?[(\[]C[\])]/i, '&#169;' ] # copyright
-    ]
-
-    H_ALGN_VALS = {
-        '<' => 'left',
-        '=' => 'center',
-        '>' => 'right',
-        '<>' => 'justify'
-    }
-
-    V_ALGN_VALS = {
-        '^' => 'top',
-        '-' => 'middle',
-        '~' => 'bottom'
-    }
-
-    #
-    # Flexible HTML escaping
-    #
-    def htmlesc( str, mode=:Quotes )
-      if str
-        str.gsub!( '&', '&amp;' )
-        str.gsub!( '"', '&quot;' ) if mode != :NoQuotes
-        str.gsub!( "'", '&#039;' ) if mode == :Quotes
-        str.gsub!( '<', '&lt;')
-        str.gsub!( '>', '&gt;')
-      end
-      str
-    end
-
-    # Search and replace for Textile glyphs (quotes, dashes, other symbols)
-    def pgl( text )
-        #GLYPHS.each do |re, resub, tog|
-        #    next if tog and method( tog ).call
-        #    text.gsub! re, resub
-        #end
-        text.gsub!(/\b([A-Z][A-Z0-9]{1,})\b(?:[(]([^)]*)[)])/) do |_m|
-          "<acronym title=\"#{htmlesc $2}\">#{$1}</acronym>"
-        end
-    end
-
-    # Parses Textile attribute lists and builds an HTML attribute string
-    def pba( text_in, element = "" )
-
-        return '' unless text_in
-
-        style = []
-        text = text_in.dup
-        if element == 'td'
-            colspan = $1 if text =~ /\\(\d+)/
-            rowspan = $1 if text =~ /\/(\d+)/
-            style << "vertical-align:#{ v_align( $& ) };" if text =~ A_VLGN
-        end
-
-        style << "#{ htmlesc $1 };" if text.sub!( /\{([^}]*)\}/, '' ) && !filter_styles
-
-        lang = $1 if
-            text.sub!( /\[([^)]+?)\]/, '' )
-
-        cls = $1 if
-            text.sub!( /\(([^()]+?)\)/, '' )
-
-        style << "padding-left:#{ $1.length }em;" if
-            text.sub!( /([(]+)/, '' )
-
-        style << "padding-right:#{ $1.length }em;" if text.sub!( /([)]+)/, '' )
-
-        style << "text-align:#{ h_align( $& ) };" if text =~ A_HLGN
-
-        cls, id = $1, $2 if cls =~ /^(.*?)#(.*)$/
-
-        atts = ''
-        atts << " style=\"#{ style.join }\"" unless style.empty?
-        atts << " class=\"#{ cls }\"" unless cls.to_s.empty?
-        atts << " lang=\"#{ lang }\"" if lang
-        atts << " id=\"#{ id }\"" if id
-        atts << " colspan=\"#{ colspan }\"" if colspan
-        atts << " rowspan=\"#{ rowspan }\"" if rowspan
-
-        atts
-    end
-
-    TABLE_RE = /^(?:table(_?#{S}#{A}#{C})\. ?\n)?^(#{A}#{C}\.? ?\|.*?\|)(\n\n|\Z)/m
-
-    # Parses a Textile table block, building HTML from the result.
-    def block_textile_table( text )
-        text.gsub!( TABLE_RE ) do |_matches|
-
-            tatts, fullrow = $~[1..2]
-            tatts = pba( tatts, 'table' )
-            tatts = shelve( tatts ) if tatts
-            rows = []
-
-            fullrow.each_line do |row|
-                ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
-                cells = []
-                row.split( /(\|)(?![^\[\|]*\]\])/ )[1..-2].each do |cell|
-                    next if cell == '|'
-                    ctyp = 'd'
-                    ctyp = 'h' if cell =~ /^_/
-
-                    catts = ''
-                    catts, cell = pba( $1, 'td' ), $2 if cell =~ /^(_?#{S}#{A}#{C}\. ?)(.*)/
-
-                    catts = shelve( catts ) if catts
-                    cells << "\t\t\t<t#{ ctyp }#{ catts }>#{ cell }</t#{ ctyp }>"
-                end
-                ratts = shelve( ratts ) if ratts
-                rows << "\t\t<tr#{ ratts }>\n#{ cells.join( "\n" ) }\n\t\t</tr>"
-            end
-            "\t<table#{ tatts }>\n#{ rows.join( "\n" ) }\n\t</table>\n\n"
-        end
-    end
-
-    LISTS_RE = /^([#*]+?#{C} .*?)$(?![^#*])/m
-    LISTS_CONTENT_RE = /^([#*]+)(#{A}#{C}) (.*)$/m
-
-    # Parses Textile lists and generates HTML
-    def block_textile_lists( text )
-        text.gsub!( LISTS_RE ) do |match|
-            lines = match.split( /\n/ )
-            last_line = -1
-            depth = []
-            lines.each_with_index do |line, line_id|
-                if line =~ LISTS_CONTENT_RE
-                    tl,atts,content = $~[1..3]
-                    if depth.last
-                        if depth.last.length > tl.length
-                            (depth.length - 1).downto(0) do |i|
-                                break if depth[i].length == tl.length
-                                lines[line_id - 1] << "</li>\n\t</#{LT(depth[i])}l>\n\t"
-                                depth.pop
-                            end
-                        end
-                        if depth.last and depth.last.length == tl.length
-                            lines[line_id - 1] << '</li>'
-                        end
-                    end
-                    unless depth.last == tl
-                        depth << tl
-                        atts = pba( atts )
-                        atts = shelve( atts ) if atts
-                        lines[line_id] = "\t<#{LT(tl)}l#{ atts }>\n\t<li>#{content}"
-                    else
-                        lines[line_id] = "\t\t<li>#{ content }"
-                    end
-                    last_line = line_id
-
-                else
-                    last_line = line_id
-                end
-                if line_id - last_line > 1 or line_id == lines.length - 1
-                    depth.delete_if do |v|
-                        lines[last_line] << "</li>\n\t</#{LT(v)}l>"
-                    end
-                end
-            end
-            lines.join("\n")
-        end
-    end
-
-    QUOTES_RE = /(^>+([^\n]*?)(\n|$))+/m
-    QUOTES_CONTENT_RE = /^([> ]+)(.*)$/m
-
-    def block_textile_quotes(text)
-      text.gsub!( QUOTES_RE ) do |match|
-        lines = match.split(/\n/)
-        quotes = ''
-        indent = 0
-        lines.each do |line|
-          line =~ QUOTES_CONTENT_RE
-          bq,content = $1, $2
-          l = bq.count('>')
-          if l != indent
-            quotes << ("\n\n" +
-              (if l > indent
-                 '<blockquote class="icon icon-quote2">' * (l - indent)
-               else
-                 '</blockquote>' * (indent - l)
-               end) +
-              "\n\n")
-            indent = l
-          end
-          quotes << (content + "\n")
-        end
-        quotes << ("\n" + '</blockquote>' * indent + "\n\n")
-        quotes
-      end
-    end
-
-    CODE_RE = /(\W)
-        @
-        (?:\|(\w+?)\|)?
-        (.+?)
-        @
-        (?=\W)/x
-
-    def inline_textile_code(text)
-      text.gsub!(CODE_RE) do |_m|
-        before, lang,code, after = $~[1..4]
-        lang = " lang=\"#{ lang }\"" if lang
-        rip_offtags("#{before}<code#{lang}>#{code}</code>#{after}", false)
-      end
-    end
-
-    def LT(text)
-        text =~ /\#$/ ? 'o' : 'u'
-    end
-
-    def hard_break(text)
-        text.gsub!( /(.)\n(?!\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks
-    end
-
-    BLOCKS_GROUP_RE = /\n{2,}(?! )/m
-
-    def blocks(text, deep_code = false)
-        text.replace( text.split( BLOCKS_GROUP_RE ).map do |blk|
-            plain = blk !~ /\A[#*> ]/
-
-            # skip blocks that are complex HTML
-            if blk =~ /^<\/?(\w+).*>/ and not SIMPLE_HTML_TAGS.include? $1
-                blk
-            else
-                # search for indentation levels
-                blk.strip!
-                if blk.empty?
-                    blk
-                else
-                    code_blk = nil
-                    blk.gsub!( /((?:\n(?:\n^ +[^\n]*)+)+)/m ) do |iblk|
-                        flush_left iblk
-                        blocks iblk, plain
-                        iblk.gsub( /^(\S)/, "\t\\1" )
-                        if plain
-                            code_blk = iblk; ""
-                        else
-                            iblk
-                        end
-                    end
-
-                    block_applied = 0
-                    @rules.each do |rule_name|
-                        block_applied += 1 if ( rule_name.to_s.match /^block_/ and method( rule_name ).call( blk ) )
-                    end
-                    if block_applied.zero?
-                        if deep_code
-                            blk = "\t<pre><code>#{ blk }</code></pre>"
-                        else
-                            blk = "\t<p>#{ blk }</p>"
-                        end
-                    end
-                    # hard_break blk
-                    blk + "\n#{ code_blk }"
-                end
-            end
-
-        end.join( "\n\n" ) )
-    end
-
-    def textile_bq( _tag, atts, cite, content )
-        cite, cite_title = check_refs( cite )
-        cite = " cite=\"#{ cite }\"" if cite
-        atts = shelve( atts ) if atts
-        "\t<blockquote#{ cite }>\n\t\t<p#{ atts }>#{ content }</p>\n\t</blockquote>"
-    end
-
-    def textile_p( tag, atts, _cite, content )
-        atts = shelve( atts ) if atts
-        "\t<#{ tag }#{ atts }>#{ content }</#{ tag }>"
-    end
-
-    alias textile_h1 textile_p
-    alias textile_h2 textile_p
-    alias textile_h3 textile_p
-    alias textile_h4 textile_p
-    alias textile_h5 textile_p
-    alias textile_h6 textile_p
-
-    def textile_fn_( _tag, num, atts, _cite, content )
-        atts << " id=\"fn#{ num }\" class=\"footnote\""
-        content = "<sup>#{ num }</sup> #{ content }"
-        atts = shelve( atts ) if atts
-        "\t<p#{ atts }>#{ content }</p>"
-    end
-
-    BLOCK_RE = /^(([a-z]+)(\d*))(#{A}#{C})\.(?::(\S+))? (.*)$/m
-
-    def block_textile_prefix( text )
-        if text =~ BLOCK_RE
-            tag,tagpre,num,atts,cite,content = $~[1..6]
-            atts = pba( atts )
-
-            # pass to prefix handler
-            replacement = nil
-            if respond_to? "textile_#{ tag }", true
-              replacement = method( "textile_#{ tag }" ).call( tag, atts, cite, content )
-            elsif respond_to? "textile_#{ tagpre }_", true
-              replacement = method( "textile_#{ tagpre }_" ).call( tagpre, num, atts, cite, content )
-            end
-            text.gsub!( $& ) { replacement } if replacement
-        end
-    end
-
-    SETEXT_RE = /\A(.+?)\n([=-])[=-]* *$/m
-    def block_markdown_setext( text )
-        if text =~ SETEXT_RE
-            tag = if $2 == "="; "h1"; else; "h2"; end
-            blk, cont = "<#{ tag }>#{ $1 }</#{ tag }>", $'
-            blocks cont
-            text.replace( blk + cont )
-        end
-    end
-
-    ATX_RE = /\A(\#{1,6})  # $1 = string of #'s
-              [ ]*
-              (.+?)       # $2 = Header text
-              [ ]*
-              \#*         # optional closing #'s (not counted)
-              $/x
-    def block_markdown_atx( text )
-        if text =~ ATX_RE
-            tag = "h#{ $1.length }"
-            blk, cont = "<#{ tag }>#{ $2 }</#{ tag }>\n\n", $'
-            blocks cont
-            text.replace( blk + cont )
-        end
-    end
-
-    MARKDOWN_BQ_RE = /\A(^ *> ?.+$(.+\n)*\n*)+/m
-
-    def block_markdown_bq( text )
-        text.gsub!( MARKDOWN_BQ_RE ) do |blk|
-            blk.gsub!( /^ *> ?/, '' )
-            flush_left blk
-            blocks blk
-            blk.gsub!( /^(\S)/, "\t\\1" )
-            "<blockquote>\n#{ blk }\n</blockquote>\n\n"
-        end
-    end
-
-    MARKDOWN_RULE_RE = /^(#{
-        ['*', '-', '_'].map { |ch| ' ?(' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
-    })$/
-
-    def block_markdown_rule( text )
-        text.gsub!( MARKDOWN_RULE_RE ) do |_blk|
-            "<hr />"
-        end
-    end
-
-    # XXX TODO XXX
-    def block_markdown_lists( _text )
-    end
-
-    def inline_textile_span( text )
-        QTAGS.each do |_qtag_rc, ht, qtag_re, rtype|
-            text.gsub!( qtag_re ) do |_m|
-
-                case rtype
-                when :limit
-                    sta,oqs,qtag,content,oqa = $~[1..6]
-                    atts = nil
-                    if content =~ /^(#{C})(.+)$/
-                      atts, content = $~[1..2]
-                    end
-                else
-                    qtag,atts,cite,content = $~[1..4]
-                    sta = ''
-                end
-                atts = pba( atts )
-                atts = shelve( atts ) if atts
-
-                "#{ sta }#{ oqs }<#{ ht }#{ atts }>#{ content }</#{ ht }>#{ oqa }"
-
-            end
-        end
-    end
-
-    LINK_RE = /
-            (
-            ([\s\[{(]|[#{PUNCT}])?     # $pre
-            "                          # start
-            (#{C})                     # $atts
-            ([^"\n]+?)                 # $text
-            \s?
-            (?:\(([^)]+?)\)(?="))?     # $title
-            ":
-            (                          # $url
-            (\/|[a-zA-Z]+:\/\/|www\.|mailto:)  # $proto
-            [\w\/]\S+?
-            )
-            (\/)?                      # $slash
-            ([^\w\=\/;\(\)]*?)         # $post
-            )
-            (?=<|\s|$)
-        /x
-    #"
-    def inline_textile_link( text )
-        text.gsub!( LINK_RE ) do |_m|
-          all,pre,atts,text,title,url,proto,slash,post = $~[1..9]
-          if text.include?('<br />')
-            all
-          else
-            url, url_title = check_refs( url )
-            title ||= url_title
-
-            # Idea below : an URL with unbalanced parethesis and
-            # ending by ')' is put into external parenthesis
-            if ( url[-1]==?) and ((url.count("(") - url.count(")")) < 0 ) )
-              url=url[0..-2] # discard closing parenth from url
-              post = ")"+post # add closing parenth to post
-            end
-            atts = pba( atts )
-            atts = " href=\"#{ htmlesc url }#{ slash }\"#{ atts }"
-            atts << " title=\"#{ htmlesc title }\"" if title
-            atts = shelve( atts ) if atts
-
-            external = (url =~ /^https?:\/\//) ? ' class="external"' : ''
-
-            "#{ pre }<a#{ atts }#{ external }>#{ text }</a>#{ post }"
-          end
-        end
-    end
-
-    MARKDOWN_REFLINK_RE = /
-            \[([^\[\]]+)\]      # $text
-            [ ]?                # opt. space
-            (?:\n[ ]*)?         # one optional newline followed by spaces
-            \[(.*?)\]           # $id
-        /x
-
-    def inline_markdown_reflink( text )
-        text.gsub!( MARKDOWN_REFLINK_RE ) do |_m|
-            text, id = $~[1..2]
-
-            if id.empty?
-                url, title = check_refs( text )
-            else
-                url, title = check_refs( id )
-            end
-
-            atts = " href=\"#{ url }\""
-            atts << " title=\"#{ title }\"" if title
-            atts = shelve( atts )
-
-            "<a#{ atts }>#{ text }</a>"
-        end
-    end
-
-    MARKDOWN_LINK_RE = /
-            \[([^\[\]]+)\]      # $text
-            \(                  # open paren
-            [ \t]*              # opt space
-            <?(.+?)>?           # $href
-            [ \t]*              # opt space
-            (?:                 # whole title
-            (['"])              # $quote
-            (.*?)               # $title
-            \3                  # matching quote
-            )?                  # title is optional
-            \)
-        /x
-
-    def inline_markdown_link( text )
-        text.gsub!( MARKDOWN_LINK_RE ) do |_m|
-            text, url, quote, title = $~[1..4]
-
-            atts = " href=\"#{ url }\""
-            atts << " title=\"#{ title }\"" if title
-            atts = shelve( atts )
-
-            "<a#{ atts }>#{ text }</a>"
-        end
-    end
-
-    TEXTILE_REFS_RE =  /(^ *)\[([^\[\n]+?)\](#{HYPERLINK})(?=\s|$)/
-    MARKDOWN_REFS_RE = /(^ *)\[([^\n]+?)\]:\s+<?(#{HYPERLINK})>?(?:\s+"((?:[^"]|\\")+)")?(?=\s|$)/m
-
-    def refs( text )
-        @rules.each do |rule_name|
-            method( rule_name ).call( text ) if rule_name.to_s.match /^refs_/
-        end
-    end
-
-    def refs_textile( text )
-        text.gsub!( TEXTILE_REFS_RE ) do |_m|
-            flag, url = $~[2..3]
-            @urlrefs[flag.downcase] = [url, nil]
-            nil
-        end
-    end
-
-    def refs_markdown( text )
-        text.gsub!( MARKDOWN_REFS_RE ) do |_m|
-            flag, url = $~[2..3]
-            title = $~[6]
-            @urlrefs[flag.downcase] = [url, title]
-            nil
-        end
-    end
-
-    def check_refs( text )
-        ret = @urlrefs[text.downcase] if text
-        ret || [text, nil]
-    end
-
-    IMAGE_RE = /
-            (>|\s|^)           # start of line?
-            \!                   # opening
-            (\<|\=|\>)?          # optional alignment atts
-            (#{C})               # optional style,class atts
-            (?:\. )?             # optional dot-space
-            ([^\s(!]+?)          # presume this is the src
-            \s?                  # optional space
-            (?:\(((?:[^\(\)]|\([^\)]+\))+?)\))?   # optional title
-            \!                   # closing
-            (?::#{ HYPERLINK })? # optional href
-        /x
-
-    def inline_textile_image( text )
-        text.gsub!( IMAGE_RE )  do |_m|
-            stln,algn,atts,url,title,href,href_a1,href_a2 = $~[1..8]
-            htmlesc title
-            atts = pba( atts )
-            atts = " src=\"#{ htmlesc url.dup }\"#{ atts }"
-            atts << " title=\"#{ title }\"" if title
-            atts << " alt=\"#{ title }\""
-            # size = @getimagesize($url);
-            # if($size) $atts.= " $size[3]";
-
-            href, alt_title = check_refs( href ) if href
-            url, url_title = check_refs( url )
-
-            out = ''
-            out << "<a#{ shelve( " href=\"#{ href }\"" ) }>" if href
-            out << "<img#{ shelve( atts ) } />"
-            out << "</a>#{ href_a1 }#{ href_a2 }" if href
-
-            if algn
-                algn = h_align( algn )
-                if stln == "<p>"
-                    out = "<p style=\"float:#{ algn }\">#{ out }"
-                else
-                    out = "#{ stln }<div style=\"float:#{ algn }\">#{ out }</div>"
-                end
-            else
-                out = stln + out
-            end
-
-            out
-        end
-    end
-
-    def shelve( val )
-        @shelf << val
-        " :redsh##{ @shelf.length }:"
-    end
-
-    def retrieve( text )
-        @shelf.each_with_index do |r, i|
-            text.gsub!( " :redsh##{ i + 1 }:", r )
-        end
-    end
-
-    def incoming_entities( text )
-        ## turn any incoming ampersands into a dummy character for now.
-        ## This uses a negative lookahead for alphanumerics followed by a semicolon,
-        ## implying an incoming html entity, to be skipped
-
-        text.gsub!( /&(?![#a-z0-9]+;)/i, "x%x%" )
-    end
-
-    def no_textile( text )
-        text.gsub!( /(^|\s)==([^=]+.*?)==(\s|$)?/,
-                    '\1<notextile>\2</notextile>\3' )
-        text.gsub!( /^ *==([^=]+.*?)==/m,
-                    '\1<notextile>\2</notextile>\3' )
-    end
-
-    def clean_white_space( text )
-        # normalize line breaks
-        text.gsub!( /\r\n/, "\n" )
-        text.gsub!( /\r/, "\n" )
-        text.gsub!( /\t/, '    ' )
-        text.gsub!( /^ +$/, '' )
-        text.gsub!( /\n{3,}/, "\n\n" )
-        text.gsub!( /"$/, "\" " )
-
-        # if entire document is indented, flush
-        # to the left side
-        flush_left text
-    end
-
-    def flush_left( text )
-        indt = 0
-        if text =~ /^ /
-            while text !~ /^ {#{indt}}\S/
-                indt += 1
-            end unless text.empty?
-            if indt.nonzero?
-                text.gsub!( /^ {#{indt}}/, '' )
-            end
-        end
-    end
-
-    def footnote_ref( text )
-        text.gsub!( /\b\[([0-9]+?)\](\s)?/,
-                    '<sup><a href="#fn\1">\1</a></sup>\2' )
-    end
-
-    OFFTAGS = /(code|pre|kbd|notextile)/
-    OFFTAG_MATCH = /(?:(<\/#{ OFFTAGS }>)|(<#{ OFFTAGS }[^>]*>))(.*?)(?=<\/?#{ OFFTAGS }\W|\Z)/mi
-    OFFTAG_OPEN = /<#{ OFFTAGS }/
-    OFFTAG_CLOSE = /<\/?#{ OFFTAGS }/
-    HASTAG_MATCH = /(<\/?\w[^\n]*?>)/m
-    ALLTAG_MATCH = /(<\/?\w[^\n]*?>)|.*?(?=<\/?\w[^\n]*?>|$)/m
-
-    def glyphs_textile( text, level = 0 )
-        if text !~ HASTAG_MATCH
-            pgl text
-            footnote_ref text
-        else
-            codepre = 0
-            text.gsub!( ALLTAG_MATCH ) do |line|
-                ## matches are off if we're between <code>, <pre> etc.
-                if $1
-                    if line =~ OFFTAG_OPEN
-                        codepre += 1
-                    elsif line =~ OFFTAG_CLOSE
-                        codepre -= 1
-                        codepre = 0 if codepre < 0
-                    end
-                elsif codepre.zero?
-                    glyphs_textile( line, level + 1 )
-                else
-                    htmlesc( line, :NoQuotes )
-                end
-                # p [level, codepre, line]
-
-                line
-            end
-        end
-    end
-
-    def rip_offtags( text, escape_aftertag=true )
-        if text =~ /<.*>/
-            ## strip and encode <pre> content
-            codepre, used_offtags = 0, {}
-            text.gsub!( OFFTAG_MATCH ) do |line|
-                if $3
-                    first, offtag, aftertag = $3, $4, $5
-                    codepre += 1
-                    used_offtags[offtag] = true
-                    if codepre - used_offtags.length > 0
-                        htmlesc( line, :NoQuotes )
-                        @pre_list.last << line
-                        line = ""
-                    else
-                        ### htmlesc is disabled between CODE tags which will be parsed with highlighter
-                        ### Regexp in formatter.rb is : /<code\s+class="(\w+)">\s?(.+)/m
-                        ### NB: some changes were made not to use $N variables, because we use "match"
-                        ###   and it breaks following lines
-                        htmlesc( aftertag, :NoQuotes ) if aftertag && escape_aftertag && !first.match(/<code\s+class="(\w+)">/)
-                        line = "<redpre##{ @pre_list.length }>"
-                        first.match(/<#{ OFFTAGS }([^>]*)>/)
-                        tag = $1
-                        $2.to_s.match(/(class\=("[^"]+"|'[^']+'))/i)
-                        tag << " #{$1}" if $1
-                        @pre_list << "<#{ tag }>#{ aftertag }"
-                    end
-                elsif $1 and codepre > 0
-                    if codepre - used_offtags.length > 0
-                        htmlesc( line, :NoQuotes )
-                        @pre_list.last << line
-                        line = ""
-                    end
-                    codepre -= 1 unless codepre.zero?
-                    used_offtags = {} if codepre.zero?
-                end
-                line
-            end
-        end
-        text
-    end
-
-    def smooth_offtags( text )
-        unless @pre_list.empty?
-            ## replace <pre> content
-            text.gsub!( /<redpre#(\d+)>/ ) { @pre_list[$1.to_i] }
-        end
-    end
-
-    def inline( text )
-        [/^inline_/, /^glyphs_/].each do |meth_re|
-            @rules.each do |rule_name|
-                method( rule_name ).call( text ) if rule_name.to_s.match( meth_re )
-            end
-        end
-    end
-
-    def h_align( text )
-        H_ALGN_VALS[text]
-    end
-
-    def v_align( text )
-        V_ALGN_VALS[text]
-    end
-
-    def textile_popup_help( name, windowW, windowH )
-        ' <a target="_blank" href="http://hobix.com/textile/#' + helpvar + '">' + name + '</a><br />'
-    end
-
-    # HTML cleansing stuff
-    BASIC_TAGS = {
-        'a' => ['href', 'title'],
-        'img' => ['src', 'alt', 'title'],
-        'br' => [],
-        'i' => nil,
-        'u' => nil,
-        'b' => nil,
-        'pre' => nil,
-        'kbd' => nil,
-        'code' => ['lang'],
-        'cite' => nil,
-        'strong' => nil,
-        'em' => nil,
-        'ins' => nil,
-        'sup' => nil,
-        'sub' => nil,
-        'del' => nil,
-        'table' => nil,
-        'tr' => nil,
-        'td' => ['colspan', 'rowspan'],
-        'th' => nil,
-        'ol' => nil,
-        'ul' => nil,
-        'li' => nil,
-        'p' => nil,
-        'h1' => nil,
-        'h2' => nil,
-        'h3' => nil,
-        'h4' => nil,
-        'h5' => nil,
-        'h6' => nil,
-        'blockquote' => ['cite']
-    }
-
-    def clean_html( text, tags = BASIC_TAGS )
-        text.gsub!( /<!\[CDATA\[/, '' )
-        text.gsub!( /<(\/*)(\w+)([^>]*)>/ ) do
-            raw = $~
-            tag = raw[2].downcase
-            if tags.has_key? tag
-                pcs = [tag]
-                tags[tag].each do |prop|
-                    ['"', "'", ''].each do |q|
-                        q2 = ( q != '' ? q : '\s' )
-                        if raw[3] =~ /#{prop}\s*=\s*#{q}([^#{q2}]+)#{q}/i
-                            attrv = $1
-                            next if prop == 'src' and attrv =~ %r{^(?!http)\w+:}
-                            pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\""
-                            break
-                        end
-                    end
-                end if tags[tag]
-                "<#{raw[1]}#{pcs.join " "}>"
-            else
-                " "
-            end
-        end
-    end
-
-    ALLOWED_TAGS = %w(redpre pre code notextile)
-
-    def escape_html_tags(text)
-      text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|_m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
-    end
-end
diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
deleted file mode 100644
index 996d1dec01..0000000000
--- a/lib/redmine/wiki_formatting/macros.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-module Redmine
-  module WikiFormatting
-    module Macros
-      module Definitions
-        def exec_macro(name, obj, args, options = {})
-          method_name = "macro_#{name}"
-          if respond_to?(method_name)
-            if method(method_name).arity == 2
-              send(method_name, obj, args)
-            else
-              send(method_name, obj, args, options)
-            end
-          end
-        end
-
-        def extract_macro_options(args, *keys)
-          options = {}
-          while args.last.to_s.strip =~ %r{^(.+)\=(.+)$} && keys.include?($1.downcase.to_sym)
-            options[$1.downcase.to_sym] = $2
-            args.pop
-          end
-          [args, options]
-        end
-      end
-
-      @@available_macros = {}
-
-      class << self
-        # Called with a block to define additional macros.
-        # Macro blocks accept 2 arguments:
-        # * obj: the object that is rendered
-        # * args: macro arguments
-        #
-        # Plugins can use this method to define new macros:
-        #
-        #   Redmine::WikiFormatting::Macros.register do
-        #     desc "This is my macro"
-        #     macro :my_macro do |obj, args|
-        #       "My macro output"
-        #     end
-        #   end
-        def register(&block)
-          class_eval(&block) if block_given?
-        end
-
-        def available_macros
-          @@available_macros
-        end
-
-        private
-
-        # Defines a new macro with the given name and block.
-        def macro(name, &block)
-          name = name.to_sym if name.is_a?(String)
-          @@available_macros[name] = @@desc || ''
-          @@desc = nil
-          raise 'Can not create a macro without a block!' unless block_given?
-          Definitions.send :define_method, "macro_#{name}".downcase, &block
-        end
-
-        # Sets description for the next macro to be defined
-        def desc(txt)
-          @@desc = txt
-        end
-
-        include OpenProject::WikiFormatting::Macros::Default
-        include OpenProject::WikiFormatting::Macros::WorkPackageButton
-      end
-    end
-  end
-end
diff --git a/lib/tabular_form_builder.rb b/lib/tabular_form_builder.rb
index d0102b9b2c..80e3c0e67e 100644
--- a/lib/tabular_form_builder.rb
+++ b/lib/tabular_form_builder.rb
@@ -35,8 +35,8 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
   include ActionView::Helpers::AssetTagHelper
   include ERB::Util
 
-  (field_helpers - %i(radio_button hidden_field fields_for label) + %i(date_select)).each do |selector|
-    define_method selector do |field, options = {}, *args|
+  def self.tag_with_label_method(selector, &block)
+    ->(field, options, *args) do
       options[:class] = Array(options[:class]) + [field_css_class(selector)]
       merge_required_attributes(options[:required], options)
 
@@ -45,14 +45,29 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
       label = label_for_field(field, label_options)
       input = super(field, input_options, *args)
 
-      if options[:with_text_formatting]
-        input.concat text_formatting_wrapper options[:id]
-      end
+      input = instance_exec(input, options, &block) if block_given?
 
       (label + container_wrap_field(input, selector, options))
     end
   end
 
+  def self.with_text_formatting
+    ->(input, options) {
+      if options[:with_text_formatting]
+        # use either the provided id or fetch the one created by rails
+        input.concat text_formatting_wrapper options[:id] || input.match(/<[^>]* id="(\w+)"[^>]*>/)[1]
+      end
+
+      input
+    }
+  end
+
+  (field_helpers - %i(radio_button hidden_field fields_for label) + %i(date_select)).each do |selector|
+    define_method selector, &tag_with_label_method(selector)
+  end
+
+  define_method(:text_area, &tag_with_label_method(:text_area, &with_text_formatting))
+
   def label(method, text = nil, options = {}, &block)
     options[:class] = Array(options[:class]) + %w(form--label)
     options[:title] = options[:title] || title_from_context(method)
@@ -132,7 +147,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
                               prefix.html_safe,
                               class: 'form--field-affix',
                               id: options[:prefix_id],
-                              :'aria-hidden' => true)
+                              'aria-hidden': true)
     end
 
     if suffix
@@ -140,7 +155,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
                              suffix.html_safe,
                              class: 'form--field-affix',
                              id: options[:suffix_id],
-                             :'aria-hidden' => true)
+                             'aria-hidden': true)
     end
 
     field_container_wrap_field(ret, options)
@@ -148,7 +163,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
 
   def merge_required_attributes(required, options = nil)
     if required
-      options.merge!(required: true, :'aria-required' => 'true')
+      options.merge!(required: true, 'aria-required': 'true')
     end
   end
 
@@ -177,8 +192,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
   def text_formatting_wrapper(target_id)
     return ''.html_safe unless target_id.present?
 
-    format = Setting.text_formatting
-    helper = ::OpenProject::TextFormatting::Formatters.helper_for(format).new(@template)
+    helper = ::OpenProject::TextFormatting::Formats.rich_helper.new(@template)
     helper.wikitoolbar_for target_id
   end
 
@@ -232,7 +246,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
       content << content_tag('span',
                              '*',
                              class: 'form--label-required',
-                             :'aria-hidden' => true)
+                             'aria-hidden': true)
     end
   end
 
diff --git a/lib/tasks/code.rake b/lib/tasks/code.rake
index e57ebd3ff5..38e326dc15 100644
--- a/lib/tasks/code.rake
+++ b/lib/tasks/code.rake
@@ -34,7 +34,6 @@ namespace :code do
       files = Dir['**/**{.rb,.html.erb,.rhtml,.rjs,.plain.erb,.rxml,.yml,.rake,.eml}']
       files.reject! { |f|
         f.include?('lib/plugins') ||
-          f.include?('lib/redcloth') ||
           f.include?('lib/diff')
       }
 
diff --git a/lib/tasks/copyright.rake b/lib/tasks/copyright.rake
index d138747987..8ae2d37b98 100644
--- a/lib/tasks/copyright.rake
+++ b/lib/tasks/copyright.rake
@@ -142,10 +142,7 @@ namespace :copyright do
 
   desc 'Update the copyright on .rb source files'
   task :update_rb, :arg1 do |_task, args|
-    excluded = (['acts_as_tree',
-                 'rfpdf',
-                 'verification'].map { |dir| "lib/plugins/#{dir}" }) +
-               (['redcloth'].map { |dir| "lib/#{dir}" })
+    excluded = (%w(acts_as_tree rfpdf verification).map { |dir| "lib/plugins/#{dir}" })
 
     rewrite_copyright('rb', excluded, :rb, args[:arg1])
   end
diff --git a/lib/tasks/markdown.rake b/lib/tasks/markdown.rake
deleted file mode 100644
index 6b8c9180f7..0000000000
--- a/lib/tasks/markdown.rake
+++ /dev/null
@@ -1,46 +0,0 @@
-
-# Textile to Markdown converter
-# Based on redmine_convert_textile_to_markown
-# https://github.com/Ecodev/redmine_convert_textile_to_markown
-#
-# Original license:
-# Copyright (c) 2016
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-namespace :markdown do
-  task :convert_from_textile  => :environment do
-
-    warning = <<~EOS
-      **WARNING**
-      THIS IS NOT REVERSIBLE.
-      Ensure you have backed up your installation before running this task.
-
-      This rake task will modify EVERY formattable textile field in your database.
-      It uses pandoc to convert each textile field to GFM-Markdown.
-    EOS
-
-    printf "#{warning}\nPress 'y' to continue: "
-    prompt = STDIN.gets.chomp
-    exit(1) unless prompt == 'y'
-
-    converter = OpenProject::TextFormatting::Formatters::Markdown::TextileConverter.new
-    converter.run!
-  end
-end
diff --git a/spec/factories/wiki_page_factory.rb b/spec/factories/wiki_page_factory.rb
index 26d0c53ab1..734048e3bf 100644
--- a/spec/factories/wiki_page_factory.rb
+++ b/spec/factories/wiki_page_factory.rb
@@ -29,7 +29,7 @@
 FactoryBot.define do
   factory :wiki_page do
     wiki
-    sequence(:title) do |n| "Wiki Page No. #{n}" end
+    sequence(:title) { |n| "Wiki Page No. #{n}" }
 
     factory :wiki_page_with_content do
       callback(:after_build) do |wiki_page|
diff --git a/spec/features/admin/attribute_help_texts_spec.rb b/spec/features/admin/attribute_help_texts_spec.rb
index 4a17fcfa00..b1c8d2ed3c 100644
--- a/spec/features/admin/attribute_help_texts_spec.rb
+++ b/spec/features/admin/attribute_help_texts_spec.rb
@@ -36,6 +36,10 @@ describe 'Attribute help texts' do
 
   let(:relation_columns_allowed) { true }
 
+  def set_help_text(text)
+    find('.ck-content').set(text)
+  end
+
   describe 'Work package help texts' do
     before do
       with_enterprise_token(relation_columns_allowed ? :attribute_help_texts : nil)
@@ -55,7 +59,7 @@ describe 'Attribute help texts' do
         # Set attributes
         # -> create
         select 'Status', from: 'attribute_help_text_attribute_name'
-        fill_in 'Help text', with: 'My attribute help text'
+        set_help_text('My attribute help text')
         click_button 'Save'
 
         # Should now show on index for editing
@@ -67,18 +71,18 @@ describe 'Attribute help texts' do
         # -> edit
         page.find('.attribute-help-text--entry td a', text: 'Status').click
         expect(page).to have_selector('#attribute_help_text_attribute_name[disabled]')
-        fill_in 'Help text', with: ''
+        set_help_text(' ')
         click_button 'Save'
 
         # Handle errors
         expect(page).to have_selector('#errorExplanation', text: "Help text can't be blank.")
-        fill_in 'Help text', with: 'New *help* text'
+        set_help_text('New**help**text')
         click_button 'Save'
 
         # On index again
         expect(page).to have_selector('.attribute-help-text--entry td', text: 'Status')
         instance.reload
-        expect(instance.help_text).to eq 'New *help* text'
+        expect(instance.help_text).to eq 'New**help**text'
 
         # Open help text modal
         modal.open!
diff --git a/spec/features/auth/consent_auth_stage_spec.rb b/spec/features/auth/consent_auth_stage_spec.rb
index 1ae424f12a..8a59fbdeb5 100644
--- a/spec/features/auth/consent_auth_stage_spec.rb
+++ b/spec/features/auth/consent_auth_stage_spec.rb
@@ -85,7 +85,7 @@ describe 'Authentication Stages', type: :feature, js: true do
     end
   end
   context 'when enabled, localized consent exists',
-          with_settings: { consent_info: { de: 'h1. Einwilligung', en: 'h1. Consent header!' } } do
+          with_settings: { consent_info: { de: '# Einwilligung', en: '# Consent header!' } } do
     let(:consent_required) { true }
     let(:language) { 'de' }
 
@@ -97,7 +97,7 @@ describe 'Authentication Stages', type: :feature, js: true do
     end
   end
 
-  context 'when enabled, but consent exists', with_settings: { consent_info: { en: 'h1. Consent header!' } } do
+  context 'when enabled, but consent exists', with_settings: { consent_info: { en: '# Consent header!' } } do
     let(:consent_required) { true }
     it 'should show consent' do
       expect(Setting.consent_time).to be_blank
diff --git a/spec/features/boards/message_spec.rb b/spec/features/boards/message_spec.rb
index 99b6192dbb..3aa336f5cd 100644
--- a/spec/features/boards/message_spec.rb
+++ b/spec/features/boards/message_spec.rb
@@ -28,42 +28,89 @@
 
 require 'spec_helper'
 
-describe 'messages', type: :feature do
-  let(:user) { FactoryBot.create :admin, firstname: 'Hugo', lastname: 'Hungrig' }
+describe 'messages', type: :feature, js: true do
+  let(:board) { FactoryBot.create(:board) }
+
+  let(:user) do
+    FactoryBot.create :user,
+                      member_in_project: board.project,
+                      member_through_role: role
+  end
+  let(:other_user) do
+    FactoryBot.create :user,
+                      member_in_project: board.project,
+                      member_through_role: role
+  end
+  let(:role) { FactoryBot.create(:role, permissions: [:add_messages]) }
+
+  let(:index_page) { Pages::Messages::Index.new(board.project) }
 
   before do
-    allow(User).to receive(:current).and_return user
+    login_as user
   end
 
-  describe 'quoting' do
-    let(:topic) { FactoryBot.create :message }
-    let!(:reply) do
-      FactoryBot.create :message,
-                         board: topic.board,
-                         parent: topic,
-                         author: user,
-                         subject: 'Go Ahead!',
-                         content: 'You can quote me on this!'
-    end
-
-    before do
-      visit topic_path(topic)
-    end
-
-    describe 'clicking on quote', js: true do
-      it 'opens the filled-in reply form' do
-        msg = find 'div.reply', text: /Go Ahead!/
-        within(msg) do click_on 'Quote' end
-
-        reply = find '#reply'
-        expect(reply).to be_visible
-
-        subject = find '#reply_subject'
-        expect(subject.value).to eq 'RE: Go Ahead!'
-
-        content = find '#reply_content'
-        expect(content.value).to eq "Hugo Hungrig wrote:\n> You can quote me on this!\n\n"
-      end
-    end
+  scenario 'adding, checking replies, replying' do
+    index_page.visit!
+
+    create_page = index_page.click_create_message
+
+    create_page.set_subject 'The message is'
+    create_page.click_save
+
+    create_page.expect_notification(type: :error, message: 'Content can\'t be blank')
+    create_page.add_text 'There is no message here'
+
+    show_page = create_page.click_save
+
+    show_page.expect_current_path
+
+    show_page.expect_subject('The message is')
+    show_page.expect_content('There is no message here')
+
+    index_page.visit!
+    index_page.expect_listed(subject: 'The message is',
+                             replies: 0)
+
+    # Replying as other user
+
+    login_as other_user
+
+    show_page.visit!
+    show_page.expect_no_replies
+    reply = show_page.reply 'But, but there should be one'
+
+    show_page.expect_current_path(reply)
+    show_page.expect_num_replies(1)
+
+    show_page.expect_reply(subject: 'RE: The message is',
+                           content: 'But, but there should be one')
+
+    index_page.visit!
+
+    index_page.expect_listed(subject: 'The message is',
+                             replies: 1,
+                             last_message: 'RE: The message is')
+
+    # Quoting as first user again
+    login_as user
+
+    show_page.visit!
+    quote = show_page.quote(quoted_message: reply,
+                            subject: 'And now to something completely different',
+                            content: "No, there really isn't\n\n")
+
+    show_page.expect_current_path(quote)
+
+    show_page.expect_num_replies(2)
+    show_page.expect_reply(reply: quote,
+                           subject: 'And now to something completely different',
+                           content: 'No, there really isn\'t')
+
+    expect(page).to have_selector('blockquote', text: 'But, but there should be one')
+
+    index_page.visit!
+    index_page.expect_listed(subject: 'The message is',
+                             replies: 2,
+                             last_message: 'And now to something completely different')
   end
 end
diff --git a/spec/features/boards/sticky_spec.rb b/spec/features/boards/sticky_spec.rb
new file mode 100644
index 0000000000..0be5f57f9a
--- /dev/null
+++ b/spec/features/boards/sticky_spec.rb
@@ -0,0 +1,82 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See docs/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe 'sticky messages', type: :feature do
+  let(:board) { FactoryBot.create(:board) }
+
+  let!(:message1) do
+    FactoryBot.create :message, board: board, created_on: Time.now - 1.minute do |message|
+      Message.where(id: message.id).update_all(updated_on: Time.now - 1.minute)
+    end
+  end
+  let!(:message2) do
+    FactoryBot.create :message, board: board, created_on: Time.now - 2.minute do |message|
+      Message.where(id: message.id).update_all(updated_on: Time.now - 2.minute)
+    end
+  end
+  let!(:message3) do
+    FactoryBot.create :message, board: board, created_on: Time.now - 3.minute do |message|
+      Message.where(id: message.id).update_all(updated_on: Time.now - 3.minute)
+    end
+  end
+
+  let(:user) do
+    FactoryBot.create :user,
+                      member_in_project: board.project,
+                      member_through_role: role
+  end
+  let(:role) { FactoryBot.create(:role, permissions: [:edit_messages]) }
+
+  before do
+    login_as user
+    visit project_boards_path(board.project)
+  end
+
+  def expect_order_of_messages(*order)
+    order.each_with_index do |message, index|
+      expect(page).to have_selector("table tbody tr:nth-of-type(#{index + 1})", text: message.subject)
+    end
+  end
+
+  scenario 'sticky messages are on top' do
+    expect_order_of_messages(message1, message2, message3)
+
+    click_link(message2.subject)
+
+    click_link('Edit')
+
+    check('Sticky')
+    click_button('Save')
+
+    visit project_boards_path(board.project)
+
+    expect_order_of_messages(message2, message1, message3)
+  end
+end
diff --git a/spec/features/wiki/adding_editing_history_spec.rb b/spec/features/wiki/adding_editing_history_spec.rb
new file mode 100644
index 0000000000..0115165b11
--- /dev/null
+++ b/spec/features/wiki/adding_editing_history_spec.rb
@@ -0,0 +1,103 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See docs/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe 'wiki pages', type: :feature, js: true do
+  let(:project) do
+    FactoryBot.create(:project, enabled_module_names: [:news])
+  end
+  let(:user) do
+    FactoryBot.create :user,
+                      member_in_project: project,
+                      member_through_role: role
+  end
+  let(:role) do
+    FactoryBot.create(:role,
+                      permissions: %i[view_wiki_pages
+                                      edit_wiki_pages
+                                      view_wiki_edits
+                                      select_project_modules
+                                      edit_project])
+  end
+  let(:content_first_version) do
+    'The new content, first version'
+  end
+  let(:content_second_version) do
+    'The new content, second version'
+  end
+
+  before do
+    login_as user
+  end
+
+  scenario 'adding, editing and history' do
+    visit settings_project_path(project, tab: 'modules')
+
+    expect(page).to have_no_selector('.menu-sidebar .main-item-wrapper', text: 'Wiki')
+
+    within '#content' do
+      check 'Wiki'
+
+      click_button 'Save'
+    end
+
+    expect(page).to have_selector('#menu-sidebar .main-item-wrapper', text: 'Wiki')
+
+    # creating by accessing the page
+    visit project_wiki_path(project, 'new page')
+
+    find('.ck-content').set(content_first_version)
+
+    click_button 'Save'
+
+    expect(page).to have_selector('.title-container', text: 'New page')
+    expect(page).to have_selector('.wiki-content', text: content_first_version)
+
+    within '.toolbar-items' do
+      click_on "Edit"
+    end
+
+    find('.ck-content').set(content_second_version)
+
+    click_button 'Save'
+    expect(page).to have_selector('.wiki-content', text: content_second_version)
+
+    within '.toolbar-items' do
+      click_on 'More'
+      click_on 'History'
+    end
+
+    click_on 'View differences'
+
+    within '.text-diff' do
+      expect(page).to have_selector('ins.diffmod', text: 'second')
+      expect(page).to have_selector('del.diffmod', text: 'first')
+    end
+  end
+end
diff --git a/spec/features/wiki/child_pages_spec.rb b/spec/features/wiki/child_pages_spec.rb
new file mode 100644
index 0000000000..2b8b939fee
--- /dev/null
+++ b/spec/features/wiki/child_pages_spec.rb
@@ -0,0 +1,78 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See docs/COPYRIGHT.rdoc for more details.
+#++
+
+require 'spec_helper'
+
+describe 'wiki child pages', type: :feature, js: true do
+  let(:project) do
+    FactoryBot.create(:project)
+  end
+  let(:user) do
+    FactoryBot.create :user,
+                      member_in_project: project,
+                      member_through_role: role
+  end
+  let(:role) do
+    FactoryBot.create(:role,
+                      permissions: %i[view_wiki_pages edit_wiki_pages])
+  end
+  let(:parent_page) do
+    FactoryBot.create(:wiki_page_with_content,
+                      wiki: project.wiki)
+  end
+  let(:child_page_name) { 'The child page !@#{$%^&*()_},./<>?;\':' }
+
+  before do
+    login_as user
+  end
+
+  scenario 'adding a childpage' do
+    visit project_wiki_path(project, parent_page.title)
+
+    click_on 'Wiki page'
+
+    fill_in 'content_page_title', with: child_page_name
+
+    find('.ck-content').set('The child page\'s content')
+
+    click_button 'Save'
+
+    # hierarchy displayed in the breadcrumb
+    expect(page).to have_selector('#breadcrumb .breadcrumb',
+                                  text: "#{parent_page.title}\n#{child_page_name}")
+
+    # hierarchy displayed in the sidebar
+    expect(page).to have_selector('.pages-hierarchy',
+                                  text: "#{parent_page.title}\n#{child_page_name}")
+
+    # on toc page
+    visit index_project_wiki_index_path(project)
+
+    expect(page).to have_content(child_page_name)
+  end
+end
diff --git a/spec/features/wiki/wiki_textile_links_spec.rb b/spec/features/wiki/wiki_textile_links_spec.rb
deleted file mode 100644
index 4ceb951fce..0000000000
--- a/spec/features/wiki/wiki_textile_links_spec.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-
-describe 'Wiki unicode title spec', type: :feature, js: true do
-  let(:user) { FactoryBot.create :admin }
-  let(:project) { FactoryBot.create :project }
-  let(:wiki_page_1) {
-    FactoryBot.build :wiki_page_with_content, title: 'Test'
-  }
-  let(:work_package) {
-    FactoryBot.create :work_package,
-                       project: project,
-                       start_date: Date.today,
-                       due_date: Date.today + 1.days,
-                       assigned_to: user
-  }
-  let(:wp_id) { work_package.id }
-
-  let(:wiki_body) {
-    <<-EOS
-
-    **1 quickinfo**
-    ##{wp_id}
-
-    **2 quickinfo**
-    ###{wp_id}
-
-    **3 quickinfo**
-    ####{wp_id}
-
-    EOS
-  }
-
-  before do
-    login_as(user)
-
-    project.wiki.pages << wiki_page_1
-    project.wiki.save!
-
-    visit project_wiki_path(project, :wiki)
-
-    # Set value
-    find('#content_text').set(wiki_body)
-    click_button 'Save'
-
-    expect(page).to have_selector('.title-container h2', text: 'Wiki')
-  end
-
-  it 'renders correct links' do
-
-    expect(page).to have_selector('a.issue', count: 3)
-
-    links = page.all('a.issue')
-
-    expect(links[0].text).to eq("##{wp_id}")
-    expect(links[0][:href]).to include(work_package_path(wp_id))
-    expect(links[1].text).to eq("#{work_package.type.name} ##{wp_id} #{work_package.status.name}")
-    expect(links[1][:href]).to include(work_package_path(wp_id))
-    expect(links[2].text).to eq("#{work_package.type.name} ##{wp_id} #{work_package.status.name}")
-    expect(links[2][:href]).to include(work_package_path(wp_id))
-  end
-end
diff --git a/spec/features/wiki/wiki_unicode_spec.rb b/spec/features/wiki/wiki_unicode_spec.rb
index ec970c8eb0..058e94a10a 100644
--- a/spec/features/wiki/wiki_unicode_spec.rb
+++ b/spec/features/wiki/wiki_unicode_spec.rb
@@ -31,20 +31,20 @@ require 'spec_helper'
 describe 'Wiki unicode title spec', type: :feature, js: true do
   let(:user) { FactoryBot.create :admin }
   let(:project) { FactoryBot.create :project }
-  let(:wiki_page_1) {
+  let(:wiki_page_1) do
     FactoryBot.build :wiki_page_with_content,
-                       title: '<script>alert("FOO")</script>'
-  }
-  let(:wiki_page_2) {
+                     title: '<script>alert("FOO")</script>'
+  end
+  let(:wiki_page_2) do
     FactoryBot.build :wiki_page_with_content,
-                       title: 'Base de données'
-  }
-  let(:wiki_page_3) {
+                     title: 'Base de données'
+  end
+  let(:wiki_page_3) do
     FactoryBot.build :wiki_page_with_content,
-                       title: 'Base_de_données'
-  }
+                     title: 'Base_de_données'
+  end
 
-  let(:wiki_body) {
+  let(:wiki_body) do
     <<-EOS
     [[Base de données]] should link to wiki_page_2
 
@@ -57,19 +57,13 @@ describe 'Wiki unicode title spec', type: :feature, js: true do
     [[<script>alert("FOO")</script>]]
 
     EOS
-  }
+  end
 
-  let(:expected_slugs) {
-    [
-      'base-de-donnees',
-      'base-de-donnees',
-      'base-de-donnees',
-      'base-de-donnees-1',
-      'alert-foo',
-    ]
-  }
+  let(:expected_slugs) do
+    %w(base-de-donnees base-de-donnees base-de-donnees base-de-donnees-1 alert-foo)
+  end
 
-  let(:expected_titles) {
+  let(:expected_titles) do
     [
       'Base de données',
       'Base de données',
@@ -77,7 +71,7 @@ describe 'Wiki unicode title spec', type: :feature, js: true do
       'Base_de_données',
       '<script>alert("FOO")</script>'
     ]
-  }
+  end
 
   before do
     login_as(user)
@@ -91,7 +85,7 @@ describe 'Wiki unicode title spec', type: :feature, js: true do
     visit project_wiki_path(project, :wiki)
 
     # Set value
-    find('#content_text').set(wiki_body)
+    find('.ck-content').base.send_keys(wiki_body)
     click_button 'Save'
 
     expect(page).to have_selector('.title-container h2', text: 'Wiki')
diff --git a/spec/features/work_packages/attachments/attachment_upload_spec.rb b/spec/features/work_packages/attachments/attachment_upload_spec.rb
index 7d7823bddb..58c9bef6a1 100644
--- a/spec/features/work_packages/attachments/attachment_upload_spec.rb
+++ b/spec/features/work_packages/attachments/attachment_upload_spec.rb
@@ -25,7 +25,7 @@ describe 'Upload attachment to work package', js: true do
     wp_page.visit!
   end
 
-  describe 'wysiwyg editor', with_settings: { text_formatting: 'markdown', use_wysiwyg?: 1 } do
+  describe 'wysiwyg editor' do
     it 'can upload an image via drag & drop' do
       # Activate the edit field
       field.activate!
diff --git a/spec/features/work_packages/attribute_help_texts_spec.rb b/spec/features/work_packages/attribute_help_texts_spec.rb
index 59b7d46af1..191ffc35af 100644
--- a/spec/features/work_packages/attribute_help_texts_spec.rb
+++ b/spec/features/work_packages/attribute_help_texts_spec.rb
@@ -34,8 +34,8 @@ describe 'Work package attribute help texts', type: :feature, js: true do
 
   let(:instance) do
     FactoryBot.create :work_package_help_text,
-                       attribute_name: :status,
-                       help_text: 'Some *help text* for status.'
+                      attribute_name: :status,
+                      help_text: 'Some **help text** for status.'
   end
 
   let(:modal) { Components::AttributeHelpTextModal.new(instance) }
@@ -74,8 +74,8 @@ describe 'Work package attribute help texts', type: :feature, js: true do
     end
     let(:user) do
       FactoryBot.create :user,
-                         member_in_project: project,
-                         member_through_role: view_wps_role
+                        member_in_project: project,
+                        member_through_role: view_wps_role
     end
 
     it_behaves_like 'allows to view help texts'
diff --git a/spec/features/work_packages/copy_spec.rb b/spec/features/work_packages/copy_spec.rb
index e669fe5d02..1177c7a306 100644
--- a/spec/features/work_packages/copy_spec.rb
+++ b/spec/features/work_packages/copy_spec.rb
@@ -31,59 +31,59 @@ require 'spec_helper'
 RSpec.feature 'Work package copy', js: true, selenium: true do
   let(:user) do
     FactoryBot.create(:user,
-                       member_in_project: project,
-                       member_through_role: create_role)
+                      member_in_project: project,
+                      member_through_role: create_role)
   end
   let(:work_flow) do
     FactoryBot.create(:workflow,
-                       role: create_role,
-                       type_id: original_work_package.type_id,
-                       old_status: original_work_package.status,
-                       new_status: FactoryBot.create(:status))
+                      role: create_role,
+                      type_id: original_work_package.type_id,
+                      old_status: original_work_package.status,
+                      new_status: FactoryBot.create(:status))
   end
 
   let(:create_role) do
     FactoryBot.create(:role,
-                       permissions: [:view_work_packages,
-                                     :add_work_packages,
-                                     :edit_work_packages])
+                      permissions: [:view_work_packages,
+                                    :add_work_packages,
+                                    :edit_work_packages])
   end
   let(:type) { FactoryBot.create(:type) }
   let(:project) { FactoryBot.create(:project, types: [type]) }
   let(:original_work_package) do
     FactoryBot.build(:work_package,
-                      project: project,
-                      assigned_to: assignee,
-                      responsible: responsible,
-                      fixed_version: version,
-                      type: type,
-                      author: author)
+                     project: project,
+                     assigned_to: assignee,
+                     responsible: responsible,
+                     fixed_version: version,
+                     type: type,
+                     author: author)
   end
   let(:role) { FactoryBot.build(:role, permissions: [:view_work_packages]) }
   let(:assignee) do
     FactoryBot.build(:user,
-                      firstname: 'An',
-                      lastname: 'assignee',
-                      member_in_project: project,
-                      member_through_role: role)
+                     firstname: 'An',
+                     lastname: 'assignee',
+                     member_in_project: project,
+                     member_through_role: role)
   end
   let(:responsible) do
     FactoryBot.build(:user,
-                      firstname: 'The',
-                      lastname: 'responsible',
-                      member_in_project: project,
-                      member_through_role: role)
+                     firstname: 'The',
+                     lastname: 'responsible',
+                     member_in_project: project,
+                     member_through_role: role)
   end
   let(:author) do
     FactoryBot.build(:user,
-                      firstname: 'The',
-                      lastname: 'author',
-                      member_in_project: project,
-                      member_through_role: role)
+                     firstname: 'The',
+                     lastname: 'author',
+                     member_in_project: project,
+                     member_through_role: role)
   end
   let(:version) do
     FactoryBot.build(:version,
-                      project: project)
+                     project: project)
   end
 
   before do
diff --git a/spec/features/work_packages/details/custom_fields/custom_field_spec.rb b/spec/features/work_packages/details/custom_fields/custom_field_spec.rb
index ad0257d4d4..2b30566ce9 100644
--- a/spec/features/work_packages/details/custom_fields/custom_field_spec.rb
+++ b/spec/features/work_packages/details/custom_fields/custom_field_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'features/work_packages/work_packages_page'
 require 'features/work_packages/details/inplace_editor/shared_examples'
 
-describe 'custom field inplace editor', js: true, with_settings: { text_formatting: 'markdown' } do
+describe 'custom field inplace editor', js: true do
   let(:user) { FactoryBot.create :admin }
   let(:type) { FactoryBot.create(:type_standard, custom_fields: custom_fields) }
   let(:project) do
@@ -58,7 +58,6 @@ describe 'custom field inplace editor', js: true, with_settings: { text_formatti
       field.expect_inactive!
     end
 
-    it_behaves_like 'a previewable field'
     it_behaves_like 'a workpackage autocomplete field'
   end
 
diff --git a/spec/features/work_packages/details/inplace_editor/shared_examples.rb b/spec/features/work_packages/details/inplace_editor/shared_examples.rb
index 63c4048504..e8e0c99f76 100644
--- a/spec/features/work_packages/details/inplace_editor/shared_examples.rb
+++ b/spec/features/work_packages/details/inplace_editor/shared_examples.rb
@@ -101,27 +101,6 @@ shared_examples 'a cancellable field' do
   end
 end
 
-shared_examples 'a previewable field' do
-  before do
-    skip('Markdown mode does not provide previewing') if Setting.text_formatting == 'markdown'
-  end
-
-  it 'can preview the field' do
-    field.activate!
-
-    field.input_element.set '*Highlight*'
-    preview = field.field_container.find('.jstb_preview')
-
-    # Enable preview
-    preview.click
-    expect(field.field_container).to have_selector('strong', text: 'Highlight')
-
-    # Disable preview
-    preview.click
-    expect(field.field_container).to have_no_selector('strong')
-  end
-end
-
 shared_examples 'a workpackage autocomplete field' do
   let!(:wp2) { FactoryBot.create(:work_package, project: project, subject: 'AutoFoo') }
 
@@ -136,23 +115,23 @@ shared_examples 'a principal autocomplete field' do
   let(:role) { FactoryBot.create(:role, permissions: %i[view_work_packages edit_work_packages]) }
   let!(:user) do
     FactoryBot.create :user,
-                       member_in_project: project,
-                       member_through_role: role,
-                       firstname: 'John'
+                      member_in_project: project,
+                      member_through_role: role,
+                      firstname: 'John'
   end
   let!(:mentioned_user) do
     FactoryBot.create :user,
-                       member_in_project: project,
-                       member_through_role: role,
-                       firstname: 'Laura',
-                       lastname: 'Foobar'
+                      member_in_project: project,
+                      member_through_role: role,
+                      firstname: 'Laura',
+                      lastname: 'Foobar'
   end
   let!(:mentioned_group) do
     FactoryBot.create(:group, lastname: 'Laudators').tap do |group|
       FactoryBot.create :member,
-                         principal: group,
-                         project: project,
-                         roles: [role]
+                        principal: group,
+                        project: project,
+                        roles: [role]
     end
   end
 
diff --git a/spec/features/work_packages/details/markdown/activity_comments_spec.rb b/spec/features/work_packages/details/markdown/activity_comments_spec.rb
index 093936787e..2385222dba 100644
--- a/spec/features/work_packages/details/markdown/activity_comments_spec.rb
+++ b/spec/features/work_packages/details/markdown/activity_comments_spec.rb
@@ -3,9 +3,7 @@ require 'spec_helper'
 require 'features/work_packages/shared_contexts'
 require 'features/work_packages/details/inplace_editor/shared_examples'
 
-describe 'activity comments',
-         with_settings: { text_formatting: 'markdown' },
-         js: true do
+describe 'activity comments', js: true do
   let(:project) { FactoryBot.create :project, is_public: true }
   let!(:work_package) do
     FactoryBot.create(:work_package,
diff --git a/spec/features/work_packages/details/markdown/description_editor_spec.rb b/spec/features/work_packages/details/markdown/description_editor_spec.rb
index da0dcde5c7..1f5c3c3da2 100644
--- a/spec/features/work_packages/details/markdown/description_editor_spec.rb
+++ b/spec/features/work_packages/details/markdown/description_editor_spec.rb
@@ -32,7 +32,7 @@ require 'features/work_packages/shared_contexts'
 require 'support/work_packages/work_package_field'
 require 'features/work_packages/work_packages_page'
 
-describe 'description inplace editor', js: true, selenium: true, with_settings: { text_formatting: 'markdown' } do
+describe 'description inplace editor', js: true, selenium: true do
   let(:project) { FactoryBot.create :project_with_types, is_public: true }
   let(:property_name) { :description }
   let(:property_title) { 'Description' }
diff --git a/spec/features/work_packages/details/textile/activity_comments_spec.rb b/spec/features/work_packages/details/textile/activity_comments_spec.rb
deleted file mode 100644
index fc6280dfc0..0000000000
--- a/spec/features/work_packages/details/textile/activity_comments_spec.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-require 'spec_helper'
-
-require 'features/work_packages/shared_contexts'
-require 'features/work_packages/details/inplace_editor/shared_examples'
-
-describe 'activity comments (textile)',
-         with_settings: { text_formatting: 'textile' },
-         js: true do
-  let(:project) { FactoryBot.create :project, is_public: true }
-  let!(:work_package) {
-    FactoryBot.create(:work_package,
-                       project: project,
-                       journal_notes: initial_comment)
-  }
-  let(:wp_page) { Pages::SplitWorkPackage.new(work_package, project) }
-  let(:selector) { '.work-packages--activity--add-comment' }
-  let(:comment_field) {
-    WorkPackageEditorField.new wp_page,
-                               'comment',
-                               selector: selector
-  }
-  let(:initial_comment) { 'the first comment in this WP' }
-
-  before do
-    login_as(current_user)
-    allow(current_user.pref).to receive(:warn_on_leaving_unsaved?).and_return(false)
-  end
-
-  context 'with permission' do
-    let(:current_user) { FactoryBot.create :admin }
-
-    before do
-      wp_page.visit!
-      wp_page.ensure_page_loaded
-    end
-
-    describe 'preview' do
-      let(:field) { comment_field }
-      it_behaves_like 'a previewable field'
-    end
-
-    context 'in edit state' do
-      before do
-        comment_field.activate!
-      end
-
-      describe 'editing' do
-        it 'buttons are disabled when empty' do
-          expect(page).to have_selector("#{selector} .inplace-edit--control--save[disabled]")
-          comment_field.cancel_by_click
-        end
-      end
-
-      describe 'submitting comment' do
-        it 'does not submit with enter' do
-          comment_field.input_element.set 'this is a comment'
-          comment_field.submit_by_enter
-
-          expect(page).to_not have_selector('.user-comment .message', text: 'this is a comment')
-        end
-
-        it 'submits with click' do
-          comment_field.input_element.set 'this is a comment!1'
-          comment_field.submit_by_click
-
-          expect(page).to have_selector('.user-comment .message', text: 'this is a comment!1')
-        end
-
-        it 'submits comments repeatedly' do
-          comment_field.input_element.set 'this is my first comment!1'
-          comment_field.submit_by_click
-
-          expect(page).to have_selector('.user-comment > .message', count: 2)
-          expect(page).to have_selector('.user-comment > .message',
-                                        text: 'this is my first comment!1')
-
-          expect(comment_field.editing?).to be false
-          comment_field.activate!
-          expect(comment_field.editing?).to be true
-
-          comment_field.input_element.set 'this is my second comment!1'
-          comment_field.submit_by_click
-
-          expect(page).to have_selector('.user-comment > .message', count: 3)
-          expect(page).to have_selector('.user-comment > .message',
-                                        text: 'this is my second comment!1')
-        end
-      end
-
-      describe 'cancel comment' do
-        it do
-          expect(comment_field.editing?).to be true
-          comment_field.input_element.set 'this is a comment'
-
-          # Escape should NOT cancel the editing
-          comment_field.cancel_by_escape
-          expect(comment_field.editing?).to be true
-
-          expect(page).to_not have_selector('.user-comment .message', text: 'this is a comment')
-
-          # Click should cancel the editing
-          comment_field.cancel_by_click
-          expect(comment_field.editing?).to be false
-
-          expect(page).to_not have_selector('.user-comment .message', text: 'this is a comment')
-        end
-      end
-
-      it 'saves while in preview mode' do
-        comment_field.input_element.set '*Highlight*'
-        preview = comment_field.field_container.find('.jstb_preview')
-
-        # Enable preview
-        preview.click
-        expect(comment_field.field_container).to have_selector('strong', text: 'Highlight')
-
-        comment_field.submit_by_click
-        expect(page).to have_selector('.user-comment .message', text: 'Highlight')
-      end
-
-      describe 'quoting' do
-        it 'can quote a previous comment' do
-          expect(page).to have_selector('.user-comment .message',
-                                        text: initial_comment)
-
-          # Hover comment
-          page.find('.user-comment > .message').hover
-
-          # Quote this comment
-          page.find('.comments-icons .icon-quote').click
-          expect(comment_field.editing?).to be true
-
-          # Add our comment
-          quote = comment_field.input_element[:value]
-          expect(quote).to include("> #{initial_comment}")
-          quote << "\nthis is some remark under a quote"
-          comment_field.input_element.set(quote)
-          comment_field.submit_by_click
-
-          expect(page).to have_selector('.user-comment > .message', count: 2)
-          expect(page).to have_selector('.user-comment > .message blockquote')
-        end
-      end
-
-      describe 'with an existing comment' do
-        it 'allows to edit an existing comment' do
-          comment_field.input_element.set 'Comment with *bold text*'
-          comment_field.submit_by_click
-
-          expect(page).to have_selector('.user-comment .message strong', text: 'bold text')
-          expect(page).to have_selector('.user-comment .message', text: 'Comment with bold text')
-
-          # Hover the new activity
-          activity = page.find('#activity-2')
-          page.driver.browser.action.move_to(activity.native).perform
-
-          # Check the edit textarea
-          activity.find('.icon-edit').click
-          edit = WorkPackageEditorField.new wp_page,
-                                              'comment',
-                                              selector: '.user-comment--form'
-
-          edit.expect_value 'Comment with *bold text*'
-          edit.set_value 'Comment with _italic text_'
-
-          edit.submit_by_click
-          expect(page).to have_selector('.user-comment .message em', text: 'italic text')
-          expect(page).to have_selector('.user-comment .message', text: 'Comment with italic text')
-
-          # Clear the comment
-          activity = page.find('#activity-2')
-          page.driver.browser.action.move_to(activity.native).perform
-
-          # Check the edit textarea
-          activity.find('.icon-edit').click
-          edit = WorkPackageEditorField.new wp_page,
-                                              'comment',
-                                              selector: '.user-comment--form'
-
-          edit.set_value ''
-          edit.submit_by_click
-
-          expect(page).to have_no_selector('#activity-2 .user-comment .message em', text: 'italic text')
-        end
-      end
-    end
-  end
-
-  context 'with no permission' do
-    let(:current_user) { FactoryBot.create(:user, member_in_project: project, member_through_role: role) }
-    let(:role) { FactoryBot.create :role, permissions: %i(view_work_packages) }
-
-    before do
-      wp_page.visit!
-      wp_page.ensure_page_loaded
-    end
-
-    it 'does not show the field' do
-      expect(page).to have_no_selector(selector, visible: true)
-    end
-  end
-end
diff --git a/spec/features/work_packages/details/textile/description_editor_spec.rb b/spec/features/work_packages/details/textile/description_editor_spec.rb
deleted file mode 100644
index d77c9f59d5..0000000000
--- a/spec/features/work_packages/details/textile/description_editor_spec.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-require 'features/work_packages/details/inplace_editor/shared_examples'
-require 'features/work_packages/shared_contexts'
-require 'support/work_packages/work_package_field'
-require 'features/work_packages/work_packages_page'
-
-describe 'description inplace editor', js: true, selenium: true do
-  let(:project) { FactoryBot.create :project_with_types, is_public: true }
-  let(:property_name) { :description }
-  let(:property_title) { 'Description' }
-  let(:description_text) { 'Ima description' }
-  let!(:work_package) {
-    FactoryBot.create(
-      :work_package,
-      project: project,
-      description: description_text
-    )
-  }
-  let(:user) { FactoryBot.create :admin }
-  let(:field) { WorkPackageEditorField.new wp_page, 'description' }
-  let(:wp_page) { Pages::SplitWorkPackage.new(work_package, project) }
-
-  before do
-    login_as(user)
-
-    wp_page.visit!
-    wp_page.ensure_page_loaded
-  end
-
-  context 'with permission' do
-    it 'allows editing description field' do
-      field.expect_state_text(description_text)
-
-      # Regression test #24033
-      # Cancelling an edition several tiems properly resets the value
-      field.activate!
-
-      field.set_value "My intermittent edit 1"
-      field.cancel_by_escape
-
-      field.activate!
-      field.set_value "My intermittent edit 2"
-      field.cancel_by_click
-
-      field.activate!
-      field.expect_value description_text
-      field.cancel_by_click
-
-      # Activate the field
-      field.activate!
-
-      # Pressing escape does nothing here
-      field.cancel_by_escape
-      field.expect_active!
-
-      # Cancelling through the action panel
-      field.cancel_by_click
-      field.expect_inactive!
-    end
-  end
-
-  context 'when is empty' do
-    let(:description_text) { '' }
-
-    it 'renders a placeholder' do
-      field.expect_state_text 'Click to enter description...'
-
-      field.activate!
-      # An empty description is also allowed
-      field.expect_save_button(enabled: true)
-      field.set_value 'A new hope ...'
-      field.expect_save_button(enabled: true)
-      field.submit_by_click
-
-      wp_page.expect_notification message: I18n.t('js.notice_successful_update')
-      field.expect_state_text 'A new hope ...'
-    end
-  end
-
-  context 'with no permission' do
-    let(:user) { FactoryBot.create(:user, member_in_project: project, member_through_role: role) }
-    let(:role) { FactoryBot.create :role, permissions: %i(view_work_packages) }
-
-    it 'does not show the field' do
-      expect(page).to have_no_selector('.wp-edit-field.description.-editable')
-
-      field.display_element.click
-      field.expect_inactive!
-    end
-
-    context 'when is empty' do
-      let(:description_text) { '' }
-
-      it 'renders a placeholder' do
-        field.expect_state_text ''
-      end
-    end
-  end
-end
diff --git a/spec/features/work_packages/edit_work_package_spec.rb b/spec/features/work_packages/edit_work_package_spec.rb
index 111d6c782e..f3cc13a410 100644
--- a/spec/features/work_packages/edit_work_package_spec.rb
+++ b/spec/features/work_packages/edit_work_package_spec.rb
@@ -4,27 +4,27 @@ require 'features/page_objects/notification'
 describe 'edit work package', js: true do
   let(:dev_role) do
     FactoryBot.create :role,
-                       permissions: [:view_work_packages,
-                                     :add_work_packages]
+                      permissions: [:view_work_packages,
+                                    :add_work_packages]
   end
   let(:dev) do
     FactoryBot.create :user,
-                       firstname: 'Dev',
-                       lastname: 'Guy',
-                       member_in_project: project,
-                       member_through_role: dev_role
+                      firstname: 'Dev',
+                      lastname: 'Guy',
+                      member_in_project: project,
+                      member_through_role: dev_role
   end
   let(:manager_role) do
     FactoryBot.create :role,
-                       permissions: [:view_work_packages,
-                                     :edit_work_packages]
+                      permissions: [:view_work_packages,
+                                    :edit_work_packages]
   end
   let(:manager) do
     FactoryBot.create :admin,
-                       firstname: 'Manager',
-                       lastname: 'Guy',
-                       member_in_project: project,
-                       member_through_role: manager_role
+                      firstname: 'Manager',
+                      lastname: 'Guy',
+                      member_in_project: project,
+                      member_through_role: manager_role
   end
 
   let(:cf_all) do
@@ -42,18 +42,18 @@ describe 'edit work package', js: true do
   let(:type) { FactoryBot.create :type, custom_fields: [cf_all, cf_tp1] }
   let(:type2) { FactoryBot.create :type, custom_fields: [cf_all, cf_tp2] }
   let(:project) { FactoryBot.create(:project, types: [type, type2]) }
-  let(:work_package) {
+  let(:work_package) do
     work_package = FactoryBot.create(:work_package,
-                                      author: dev,
-                                      project: project,
-                                      type: type,
-                                      created_at: 5.days.ago.to_date.to_s(:db))
+                                     author: dev,
+                                     project: project,
+                                     type: type,
+                                     created_at: 5.days.ago.to_date.to_s(:db))
 
     note_journal = work_package.journals.last
     note_journal.update_attributes(created_at: 5.days.ago.to_date.to_s)
 
     work_package
-  }
+  end
   let(:status) { work_package.status }
 
   let(:new_subject) { 'Some other subject' }
@@ -62,10 +62,10 @@ describe 'edit work package', js: true do
   let(:status2) { FactoryBot.create :status }
   let(:workflow) do
     FactoryBot.create :workflow,
-                       type_id: type2.id,
-                       old_status: work_package.status,
-                       new_status: status2,
-                       role: manager_role
+                      type_id: type2.id,
+                      old_status: work_package.status,
+                      new_status: status2,
+                      role: manager_role
   end
   let(:version) { FactoryBot.create :version, project: project }
   let(:category) { FactoryBot.create :category, project: project }
@@ -161,7 +161,7 @@ describe 'edit work package', js: true do
   end
 
   context 'switching to custom field with required CF' do
-    let(:custom_field) {
+    let(:custom_field) do
       FactoryBot.create(
         :work_package_custom_field,
         field_format: 'string',
@@ -169,7 +169,7 @@ describe 'edit work package', js: true do
         is_required:  true,
         is_for_all:   true
       )
-    }
+    end
     let!(:type2) { FactoryBot.create(:type, custom_fields: [custom_field]) }
 
     it 'shows the required field when switching' do
@@ -187,14 +187,11 @@ describe 'edit work package', js: true do
     end
   end
 
-  it 'allows the user to add a comment to a work package with previewing the stuff before' do
+  it 'allows the user to add a comment to a work package' do
     wp_page.ensure_page_loaded
 
     wp_page.trigger_edit_comment
     wp_page.update_comment 'hallo welt'
-    wp_page.preview_comment
-
-    expect(page).to have_selector('.inplace-edit--preview', text: 'hallo welt', wait: 10)
 
     wp_page.save_comment
 
diff --git a/spec/features/work_packages/new/new_work_package_spec.rb b/spec/features/work_packages/new/new_work_package_spec.rb
index b349783260..e06360cd01 100644
--- a/spec/features/work_packages/new/new_work_package_spec.rb
+++ b/spec/features/work_packages/new/new_work_package_spec.rb
@@ -124,7 +124,6 @@ describe 'new work package', js: true do
 
     context 'with subject set' do
       it 'creates a basic work package' do
-
         wp_page.description_field.set(description)
 
         save_work_package!
diff --git a/spec/features/work_packages/table/inline_create/parallel_creation_spec.rb b/spec/features/work_packages/table/inline_create/parallel_creation_spec.rb
index f524e05371..07235c368b 100644
--- a/spec/features/work_packages/table/inline_create/parallel_creation_spec.rb
+++ b/spec/features/work_packages/table/inline_create/parallel_creation_spec.rb
@@ -7,16 +7,16 @@ describe 'Parallel work package creation spec', js: true do
   let(:role) { FactoryBot.create :role, permissions: permissions }
   let(:user) do
     FactoryBot.create :user,
-                       member_in_project: project,
-                       member_through_role: role
+                      member_in_project: project,
+                      member_through_role: role
   end
   let(:status) { FactoryBot.create(:default_status) }
   let(:workflow) do
     FactoryBot.create :workflow,
-                       type_id: type.id,
-                       old_status: status,
-                       new_status: FactoryBot.create(:status),
-                       role: role
+                      type_id: type.id,
+                      old_status: status,
+                      new_status: FactoryBot.create(:status),
+                      role: role
   end
 
   let!(:project) { FactoryBot.create(:project, is_public: true) }
diff --git a/spec/features/work_packages/tabs/activity_revisions_spec.rb b/spec/features/work_packages/tabs/activity_revisions_spec.rb
index b3b6c40d9b..950d346935 100644
--- a/spec/features/work_packages/tabs/activity_revisions_spec.rb
+++ b/spec/features/work_packages/tabs/activity_revisions_spec.rb
@@ -183,10 +183,10 @@ describe 'Activity tab', js: true, selenium: true do
         expect(field.editing?).to be true
 
         # Add our comment
-        quote = field.input_element[:value]
-        expect(quote).to include("> #{initial_comment}")
-        quote << "\nthis is some remark under a quote"
-        field.input_element.set(quote)
+        editor = find('.ck-content')
+        expect(editor).to have_selector('blockquote', text: initial_comment)
+
+        editor.base.send_keys "\nthis is some remark under a quote"
         field.submit_by_click
 
         expect(page).to have_selector('.user-comment > .message', count: 3)
diff --git a/spec/features/work_packages/tabs/activity_tab_spec.rb b/spec/features/work_packages/tabs/activity_tab_spec.rb
index 453a736929..52e23c1281 100644
--- a/spec/features/work_packages/tabs/activity_tab_spec.rb
+++ b/spec/features/work_packages/tabs/activity_tab_spec.rb
@@ -5,36 +5,36 @@ require 'support/work_packages/work_package_field'
 
 describe 'Activity tab', js: true, selenium: true do
   def alter_work_package_at(work_package, attributes:, at:, user: User.current)
-    work_package.update_attributes(attributes.merge({ updated_at: at }))
+    work_package.update_attributes(attributes.merge(updated_at: at))
 
     note_journal = work_package.journals.last
     note_journal.update_attributes(created_at: at, user: attributes[:user])
   end
 
   let(:project) { FactoryBot.create :project_with_types, is_public: true }
-  let!(:work_package) {
+  let!(:work_package) do
     work_package = FactoryBot.create(:work_package,
-                                      project: project,
-                                      created_at: 5.days.ago.to_date.to_s(:db),
-                                      subject: initial_subject,
-                                      journal_notes: initial_comment)
+                                     project: project,
+                                     created_at: 5.days.ago.to_date.to_s(:db),
+                                     subject: initial_subject,
+                                     journal_notes: initial_comment)
 
     note_journal = work_package.journals.last
     note_journal.update_attributes(created_at: 5.days.ago.to_date.to_s)
 
     work_package
-  }
+  end
 
   let(:initial_subject) { 'My Subject' }
   let(:initial_comment) { 'First comment on this wp.' }
   let(:comments_in_reverse) { false }
   let(:activity_tab) { ::Components::WorkPackages::Activities.new(work_package) }
 
-  let(:initial_note) {
+  let(:initial_note) do
     work_package.journals[0]
-  }
+  end
 
-  let!(:note_1) {
+  let!(:note_1) do
     attributes = { subject: 'New subject', description: 'Some not so long description.' }
 
     alter_work_package_at(work_package,
@@ -43,9 +43,9 @@ describe 'Activity tab', js: true, selenium: true do
                           user: user)
 
     work_package.journals.last
-  }
+  end
 
-  let!(:note_2) {
+  let!(:note_2) do
     attributes = { journal_notes: 'Another comment by a different user' }
 
     alter_work_package_at(work_package,
@@ -54,7 +54,7 @@ describe 'Activity tab', js: true, selenium: true do
                           user: FactoryBot.create(:admin))
 
     work_package.journals.last
-  }
+  end
 
   before do
     login_as(user)
@@ -64,11 +64,11 @@ describe 'Activity tab', js: true, selenium: true do
   end
 
   shared_examples 'shows activities in order' do
-    let(:journals) {
+    let(:journals) do
       journals = [initial_note, note_1, note_2]
 
       journals
-    }
+    end
 
     it 'shows activities in ascending order' do
       journals.each_with_index do |journal, idx|
@@ -86,7 +86,6 @@ describe 'Activity tab', js: true, selenium: true do
         expect(page).to have_selector(date_selector,
                                       text: journal.created_at.to_date.strftime("%B %-d, %Y"))
 
-
         activity = page.find("#activity-#{idx + 1}")
 
         if journal.id != note_1.id
@@ -114,15 +113,15 @@ describe 'Activity tab', js: true, selenium: true do
     end
 
     context 'with permission' do
-      let(:role) {
-        FactoryBot.create(:role, permissions: [:view_work_packages,
-                                                :add_work_package_notes])
-      }
-      let(:user) {
+      let(:role) do
+        FactoryBot.create(:role, permissions: %i[view_work_packages
+                                                 add_work_package_notes])
+      end
+      let(:user) do
         FactoryBot.create(:user,
-                           member_in_project: project,
-                           member_through_role: role)
-      }
+                          member_in_project: project,
+                          member_through_role: role)
+      end
 
       context 'with ascending comments' do
         let(:comments_in_reverse) { false }
@@ -155,16 +154,15 @@ describe 'Activity tab', js: true, selenium: true do
         activity_tab.hover_action('1', :quote)
 
         field = WorkPackageEditorField.new work_package_page,
-                                             'comment',
-                                             selector: '.work-packages--activity--add-comment'
+                                           'comment',
+                                           selector: '.work-packages--activity--add-comment'
 
         expect(field.editing?).to be true
 
         # Add our comment
-        quote = field.input_element[:value]
-        expect(quote).to include("> #{initial_comment}")
-        quote << "\nthis is some remark under a quote"
-        field.input_element.set(quote)
+        quote = field.input_element.text
+        expect(quote).to include(initial_comment)
+        field.input_element.base.send_keys "\nthis is some remark under a quote"
         field.submit_by_click
 
         expect(page).to have_selector('.user-comment > .message', count: 3)
@@ -173,14 +171,14 @@ describe 'Activity tab', js: true, selenium: true do
     end
 
     context 'with no permission' do
-      let(:role) {
+      let(:role) do
         FactoryBot.create(:role, permissions: [:view_work_packages])
-      }
-      let(:user) {
+      end
+      let(:user) do
         FactoryBot.create(:user,
-                           member_in_project: project,
-                           member_through_role: role)
-      }
+                          member_in_project: project,
+                          member_through_role: role)
+      end
 
       it 'shows the activities, but does not allow commenting' do
         expect(page).not_to have_selector('.work-packages--activity--add-comment', visible: true)
diff --git a/spec/features/wysiwyg/macros/embedded_tables_spec.rb b/spec/features/wysiwyg/macros/embedded_tables_spec.rb
index 145e46f0b2..5832f2220e 100644
--- a/spec/features/wysiwyg/macros/embedded_tables_spec.rb
+++ b/spec/features/wysiwyg/macros/embedded_tables_spec.rb
@@ -29,7 +29,6 @@
 require 'spec_helper'
 
 describe 'Wysiwyg embedded work package tables',
-         with_settings: { text_formatting: 'markdown', use_wysiwyg?: true },
          type: :feature, js: true do
   let(:user) { FactoryBot.create :admin }
   let(:project) { FactoryBot.create(:project, enabled_module_names: %w[wiki work_package_tracking]) }
diff --git a/spec/features/wysiwyg/macros/include_wiki_page_spec.rb b/spec/features/wysiwyg/macros/include_wiki_page_spec.rb
index 6c3e89cf5e..9cc467d9e9 100644
--- a/spec/features/wysiwyg/macros/include_wiki_page_spec.rb
+++ b/spec/features/wysiwyg/macros/include_wiki_page_spec.rb
@@ -29,7 +29,6 @@
 require 'spec_helper'
 
 describe 'Wysiwyg include wiki page spec',
-         with_settings: { text_formatting: 'markdown', use_wysiwyg?: true },
          type: :feature, js: true do
 
   let(:project) {
diff --git a/spec/features/wysiwyg/macros/work_package_button_spec.rb b/spec/features/wysiwyg/macros/work_package_button_spec.rb
index 8e03c11154..0d660fc6d2 100644
--- a/spec/features/wysiwyg/macros/work_package_button_spec.rb
+++ b/spec/features/wysiwyg/macros/work_package_button_spec.rb
@@ -29,18 +29,16 @@
 require 'spec_helper'
 
 describe 'Wysiwyg work package button spec',
-         with_settings: { text_formatting: 'markdown', use_wysiwyg?: true },
          type: :feature, js: true do
   let(:user) { FactoryBot.create :admin }
   let!(:type) { FactoryBot.create :type, name: 'MyTaskName' }
-  let(:project) {
+  let(:project) do
     FactoryBot.create :valid_project,
                       identifier: 'my-project',
                       enabled_module_names: %w[wiki work_package_tracking],
                       name: 'My project name',
                       types: [type]
-  }
-
+  end
 
   let(:editor) { ::Components::WysiwygEditor.new }
 
diff --git a/spec/features/wysiwyg/tables_spec.rb b/spec/features/wysiwyg/tables_spec.rb
index c8ed2fdc91..9305728c30 100644
--- a/spec/features/wysiwyg/tables_spec.rb
+++ b/spec/features/wysiwyg/tables_spec.rb
@@ -29,7 +29,6 @@
 require 'spec_helper'
 
 describe 'Wysiwyg tables',
-         with_settings: { text_formatting: 'markdown', use_wysiwyg?: true },
          type: :feature, js: true do
   let(:user) { FactoryBot.create :admin }
   let(:project) { FactoryBot.create(:project, enabled_module_names: %w[wiki]) }
diff --git a/spec/lib/api/decorators/formattable_spec.rb b/spec/lib/api/decorators/formattable_spec.rb
index 5a099c88ef..8ab7ff034b 100644
--- a/spec/lib/api/decorators/formattable_spec.rb
+++ b/spec/lib/api/decorators/formattable_spec.rb
@@ -29,15 +29,11 @@
 require 'spec_helper'
 
 describe ::API::Decorators::Formattable do
-  let(:represented) { 'A *raw* string!' }
+  let(:represented) { 'A **raw** string!' }
   subject { described_class.new(represented).to_json }
 
-  before do
-    allow(Setting).to receive(:text_formatting).and_return('textile')
-  end
-
   it 'should indicate its format' do
-    is_expected.to be_json_eql('textile'.to_json).at_path('format')
+    is_expected.to be_json_eql('markdown'.to_json).at_path('format')
   end
 
   it 'should contain the raw string' do
@@ -54,7 +50,7 @@ describe ::API::Decorators::Formattable do
 
     it 'passes that to format_text' do
       expect(subject)
-        .to receive(:format_text).with(anything, format: 'textile', object: object)
+        .to receive(:format_text).with(anything, format: :markdown, object: object)
         .and_call_original
 
       expect(subject.to_json)
@@ -63,29 +59,14 @@ describe ::API::Decorators::Formattable do
   end
 
   context 'format specified explicitly' do
-    subject { described_class.new(represented, format: 'plain').to_json }
+    subject { described_class.new(represented, plain: true).to_json }
 
     it 'should indicate the explicit format' do
       is_expected.to be_json_eql('plain'.to_json).at_path('format')
     end
 
     it 'should format using the explicit format' do
-      is_expected.to be_json_eql('<p>A *raw* string!</p>'.to_json).at_path('html')
-    end
-  end
-
-  context 'format set to plain by Settings' do
-    before do
-      # N.B. Settings may return '' even though they mean 'plain'
-      allow(Setting).to receive(:text_formatting).and_return('')
-    end
-
-    it 'should indicate the plain format' do
-      is_expected.to be_json_eql('plain'.to_json).at_path('format')
-    end
-
-    it 'should format using the plain format' do
-      is_expected.to be_json_eql('<p>A *raw* string!</p>'.to_json).at_path('html')
+      is_expected.to be_json_eql('<p>A **raw** string!</p>'.to_json).at_path('html')
     end
   end
 end
diff --git a/spec/lib/api/v3/activities/activity_representer_spec.rb b/spec/lib/api/v3/activities/activity_representer_spec.rb
index 93a6772ccd..8ea4594318 100644
--- a/spec/lib/api/v3/activities/activity_representer_spec.rb
+++ b/spec/lib/api/v3/activities/activity_representer_spec.rb
@@ -62,7 +62,7 @@ describe ::API::V3::Activities::ActivityRepresenter do
       end
 
       it_behaves_like 'API V3 formattable', 'comment' do
-        let(:format) { 'textile' }
+        let(:format) { 'markdown' }
         let(:raw) { journal.notes }
         let(:html) { "#{journal.notes}" }
       end
diff --git a/spec/lib/api/v3/help_texts/help_text_representer_spec.rb b/spec/lib/api/v3/help_texts/help_text_representer_spec.rb
index 3aab28e7e2..1b6c0a2951 100644
--- a/spec/lib/api/v3/help_texts/help_text_representer_spec.rb
+++ b/spec/lib/api/v3/help_texts/help_text_representer_spec.rb
@@ -35,8 +35,8 @@ describe ::API::V3::HelpTexts::HelpTextRepresenter do
 
   let(:help_text) do
     FactoryBot.build_stubbed :work_package_help_text,
-                              attribute_name: 'status',
-                              help_text: 'This is a help text for *status* attribute.'
+                             attribute_name: 'status',
+                             help_text: 'This is a help text for **status** attribute.'
   end
 
   let(:representer) { described_class.new help_text, current_user: user }
@@ -58,8 +58,8 @@ describe ::API::V3::HelpTexts::HelpTextRepresenter do
       "attribute" => "status",
       "attributeCaption" => "Status",
       "helpText" => {
-        "format" => 'textile',
-        "raw" => 'This is a help text for *status* attribute.',
+        "format" => 'markdown',
+        "raw" => 'This is a help text for **status** attribute.',
         "html" => '<p>This is a help text for <strong>status</strong> attribute.</p>'
       }
     }
diff --git a/spec/lib/api/v3/time_entries/time_entry_representer_rendering_spec.rb b/spec/lib/api/v3/time_entries/time_entry_representer_rendering_spec.rb
index 8dc2c53975..8095a6a027 100644
--- a/spec/lib/api/v3/time_entries/time_entry_representer_rendering_spec.rb
+++ b/spec/lib/api/v3/time_entries/time_entry_representer_rendering_spec.rb
@@ -204,7 +204,7 @@ describe ::API::V3::TimeEntries::TimeEntryRepresenter, 'rendering' do
 
       it "has property for the custom field" do
         expected = {
-          format: "textile",
+          format: "markdown",
           html: "<p>#{custom_value.value}</p>",
           raw: custom_value.value
         }
diff --git a/spec/lib/api/v3/utilities/custom_field_injector_spec.rb b/spec/lib/api/v3/utilities/custom_field_injector_spec.rb
index f4ecd6cee1..685124aa68 100644
--- a/spec/lib/api/v3/utilities/custom_field_injector_spec.rb
+++ b/spec/lib/api/v3/utilities/custom_field_injector_spec.rb
@@ -415,10 +415,10 @@ describe ::API::V3::Utilities::CustomFieldInjector do
     context 'text custom field' do
       it_behaves_like 'injects property custom field' do
         let(:field_format) { 'text' }
-        let(:value) { '*Foobar*' }
+        let(:value) { '**Foobar**' }
         let(:json_value) do
           {
-            format: 'textile',
+            format: 'markdown',
             raw: value,
             html: '<p><strong>Foobar</strong></p>'
           }
diff --git a/spec/lib/api/v3/utilities/path_helper_spec.rb b/spec/lib/api/v3/utilities/path_helper_spec.rb
index 3fe5265167..62ac4123c3 100644
--- a/spec/lib/api/v3/utilities/path_helper_spec.rb
+++ b/spec/lib/api/v3/utilities/path_helper_spec.rb
@@ -191,34 +191,14 @@ describe ::API::V3::Utilities::PathHelper do
   end
 
   describe '#render_markup' do
-    subject { helper.render_markup(format: 'super_fancy', link: 'link-ish') }
+    subject { helper.render_markup(link: 'link-ish') }
 
-    before do
-      allow(Setting).to receive(:text_formatting).and_return('by-the-settings')
-    end
-
-    it_behaves_like 'api v3 path', '/render/super_fancy?context=link-ish'
+    it_behaves_like 'api v3 path', '/render/markdown?context=link-ish'
 
     context 'no link given' do
-      subject { helper.render_markup(format: 'super_fancy') }
-
-      it { is_expected.to eql('/api/v3/render/super_fancy') }
-    end
-
-    context 'no format given' do
       subject { helper.render_markup }
 
-      it { is_expected.to eql('/api/v3/render/by-the-settings') }
-
-      context 'settings set to no formatting' do
-        subject { helper.render_markup }
-
-        before do
-          allow(Setting).to receive(:text_formatting).and_return('')
-        end
-
-        it { is_expected.to eql('/api/v3/render/plain') }
-      end
+      it { is_expected.to eql('/api/v3/render/markdown') }
     end
   end
 
diff --git a/spec/lib/api/v3/work_packages/create_form_representer_spec.rb b/spec/lib/api/v3/work_packages/create_form_representer_spec.rb
index 2eba0973db..09123f7e12 100644
--- a/spec/lib/api/v3/work_packages/create_form_representer_spec.rb
+++ b/spec/lib/api/v3/work_packages/create_form_representer_spec.rb
@@ -95,8 +95,7 @@ describe ::API::V3::WorkPackages::CreateFormRepresenter do
 
         it 'contains link to work package' do
           expected_preview_link =
-            api_v3_paths.render_markup(format: 'textile',
-                                       link: "/api/v3/projects/#{work_package.project_id}")
+            api_v3_paths.render_markup(link: "/api/v3/projects/#{work_package.project_id}")
           expect(subject)
             .to be_json_eql(expected_preview_link.to_json)
             .at_path('_links/previewMarkup/href')
diff --git a/spec/lib/api/v3/work_packages/create_project_form_representer_spec.rb b/spec/lib/api/v3/work_packages/create_project_form_representer_spec.rb
index 7f302da958..3c610b6c6e 100644
--- a/spec/lib/api/v3/work_packages/create_project_form_representer_spec.rb
+++ b/spec/lib/api/v3/work_packages/create_project_form_representer_spec.rb
@@ -35,9 +35,9 @@ describe ::API::V3::WorkPackages::CreateProjectFormRepresenter do
   let(:errors) { [] }
   let(:work_package) {
     FactoryBot.build(:work_package,
-                      id: 42,
-                      created_at: DateTime.now,
-                      updated_at: DateTime.now)
+                     id: 42,
+                     created_at: DateTime.now,
+                     updated_at: DateTime.now)
   }
   let(:current_user) {
     FactoryBot.build(:user, member_in_project: work_package.project)
@@ -86,8 +86,7 @@ describe ::API::V3::WorkPackages::CreateProjectFormRepresenter do
 
         it 'contains link to work package' do
           expected_preview_link =
-            api_v3_paths.render_markup(format: 'textile',
-                                       link: "/api/v3/projects/#{work_package.project_id}")
+            api_v3_paths.render_markup(link: "/api/v3/projects/#{work_package.project_id}")
           expect(subject).to be_json_eql(expected_preview_link.to_json)
             .at_path('_links/previewMarkup/href')
         end
@@ -118,8 +117,8 @@ describe ::API::V3::WorkPackages::CreateProjectFormRepresenter do
           let(:role) { FactoryBot.create(:role, permissions: []) }
           let(:current_user) do
             FactoryBot.build(:user,
-                              member_in_project: work_package.project,
-                              member_through_role: role)
+                             member_in_project: work_package.project,
+                             member_through_role: role)
           end
 
           it do
@@ -192,10 +191,10 @@ describe ::API::V3::WorkPackages::CreateProjectFormRepresenter do
             let(:type) { FactoryBot.build_stubbed(:type) }
             let(:work_package) do
               FactoryBot.build(:work_package,
-                                id: 42,
-                                created_at: DateTime.now,
-                                updated_at: DateTime.now,
-                                type: type)
+                               id: 42,
+                               created_at: DateTime.now,
+                               updated_at: DateTime.now,
+                               type: type)
             end
 
             before do
diff --git a/spec/lib/api/v3/work_packages/update_form_representer_spec.rb b/spec/lib/api/v3/work_packages/update_form_representer_spec.rb
index 389d34edfe..c9b1c85429 100644
--- a/spec/lib/api/v3/work_packages/update_form_representer_spec.rb
+++ b/spec/lib/api/v3/work_packages/update_form_representer_spec.rb
@@ -32,18 +32,18 @@ describe ::API::V3::WorkPackages::UpdateFormRepresenter do
   include API::V3::Utilities::PathHelper
 
   let(:errors) { [] }
-  let(:work_package) {
+  let(:work_package) do
     FactoryBot.build(:work_package,
-                      id: 42,
-                      created_at: DateTime.now,
-                      updated_at: DateTime.now)
-  }
-  let(:current_user) {
+                     id: 42,
+                     created_at: Time.now,
+                     updated_at: Time.now)
+  end
+  let(:current_user) do
     FactoryBot.build(:user, member_in_project: work_package.project)
-  }
-  let(:representer) {
+  end
+  let(:representer) do
     described_class.new(work_package, current_user: current_user, errors: errors)
-  }
+  end
 
   context 'generation' do
     subject(:generated) { representer.to_json }
@@ -67,8 +67,7 @@ describe ::API::V3::WorkPackages::UpdateFormRepresenter do
         it 'contains link to work package' do
           body = parse_json(subject)
           actual_preview_link = body['_links']['previewMarkup']['href']
-          expected_preview_link = api_v3_paths.render_markup format: 'textile',
-                                                             link: body['_links']['commit']['href']
+          expected_preview_link = api_v3_paths.render_markup link: body['_links']['commit']['href']
 
           expect(actual_preview_link).to eq(expected_preview_link)
         end
@@ -89,11 +88,11 @@ describe ::API::V3::WorkPackages::UpdateFormRepresenter do
 
         context 'user with insufficient permissions' do
           let(:role) { FactoryBot.create(:role, permissions: []) }
-          let(:current_user) {
+          let(:current_user) do
             FactoryBot.build(:user,
-                              member_in_project: work_package.project,
-                              member_through_role: role)
-          }
+                             member_in_project: work_package.project,
+                             member_through_role: role)
+          end
 
           it { is_expected.not_to have_json_path('_links/commit/href') }
         end
diff --git a/spec/lib/api/v3/work_packages/work_package_payload_representer_spec.rb b/spec/lib/api/v3/work_packages/work_package_payload_representer_spec.rb
index f386be4256..058f7d6c55 100644
--- a/spec/lib/api/v3/work_packages/work_package_payload_representer_spec.rb
+++ b/spec/lib/api/v3/work_packages/work_package_payload_representer_spec.rb
@@ -66,7 +66,7 @@ describe ::API::V3::WorkPackages::WorkPackagePayloadRepresenter do
       it { is_expected.to have_json_path('subject') }
 
       it_behaves_like 'API V3 formattable', 'description' do
-        let(:format) { 'textile' }
+        let(:format) { 'markdown' }
         let(:raw) { work_package.description }
         let(:html) { '<p>' + work_package.description + '</p>' }
       end
diff --git a/spec/lib/api/v3/work_packages/work_package_representer_spec.rb b/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
index 2e426f30c5..79cfba1930 100644
--- a/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
+++ b/spec/lib/api/v3/work_packages/work_package_representer_spec.rb
@@ -95,7 +95,7 @@ describe ::API::V3::WorkPackages::WorkPackageRepresenter do
       it { is_expected.to have_json_path('id') }
 
       it_behaves_like 'API V3 formattable', 'description' do
-        let(:format) { 'textile' }
+        let(:format) { 'markdown' }
         let(:raw) { work_package.description }
         let(:html) { '<p>' + work_package.description + '</p>' }
       end
diff --git a/spec/lib/open_project/macros/include_wiki_page_macro_spec.rb b/spec/lib/open_project/macros/include_wiki_page_macro_spec.rb
index ecd46192ea..ef271405b1 100644
--- a/spec/lib/open_project/macros/include_wiki_page_macro_spec.rb
+++ b/spec/lib/open_project/macros/include_wiki_page_macro_spec.rb
@@ -86,7 +86,6 @@ describe 'OpenProject include wiki page macro' do
 
   before do
     login_as user
-    allow(Setting).to receive(:text_formatting).and_return('markdown')
   end
 
   def error_html(exception_msg)
diff --git a/spec/lib/open_project/macros/work_package_buttons_macro_spec.rb b/spec/lib/open_project/macros/work_package_buttons_macro_spec.rb
index 049f83b308..1a3601c481 100644
--- a/spec/lib/open_project/macros/work_package_buttons_macro_spec.rb
+++ b/spec/lib/open_project/macros/work_package_buttons_macro_spec.rb
@@ -46,7 +46,6 @@ describe 'OpenProject work package button macros' do
 
   before do
     login_as user
-    allow(Setting).to receive(:text_formatting).and_return('markdown')
   end
 
   def error_html(exception_msg)
diff --git a/spec/lib/open_project/text_formatting/markdown/markdown_formatting_spec.rb b/spec/lib/open_project/text_formatting/markdown/markdown_formatting_spec.rb
index a4ebd61ab1..6876d82419 100644
--- a/spec/lib/open_project/text_formatting/markdown/markdown_formatting_spec.rb
+++ b/spec/lib/open_project/text_formatting/markdown/markdown_formatting_spec.rb
@@ -29,7 +29,7 @@
 
 require 'spec_helper'
 
-describe OpenProject::TextFormatting::Formatters::Markdown::Formatter do
+describe OpenProject::TextFormatting::Formats::Markdown::Formatter do
   it 'should modifiers' do
     assert_html_output(
       '**bold**'                => '<strong>bold</strong>',
diff --git a/spec/lib/open_project/text_formatting/markdown/markdown_spec.rb b/spec/lib/open_project/text_formatting/markdown/markdown_spec.rb
index b89172d743..677ae044e3 100644
--- a/spec/lib/open_project/text_formatting/markdown/markdown_spec.rb
+++ b/spec/lib/open_project/text_formatting/markdown/markdown_spec.rb
@@ -47,20 +47,20 @@ describe OpenProject::TextFormatting,
     let(:identifier) { project.identifier }
     let(:role) do
       FactoryBot.create :role,
-                         permissions: %i(view_work_packages edit_work_packages
-                                         browse_repository view_changesets view_wiki_pages)
+                        permissions: %i(view_work_packages edit_work_packages
+                                        browse_repository view_changesets view_wiki_pages)
     end
 
     let(:project_member) do
       FactoryBot.create :user,
-                         member_in_project: project,
-                         member_through_role: role
+                        member_in_project: project,
+                        member_through_role: role
     end
     let(:issue) do
       FactoryBot.create :work_package,
-                         project: project,
-                         author: project_member,
-                         type: project.types.first
+                        project: project,
+                        author: project_member,
+                        type: project.types.first
     end
 
     let!(:non_member) do
@@ -70,23 +70,22 @@ describe OpenProject::TextFormatting,
     before do
       @project = project
       allow(User).to receive(:current).and_return(project_member)
-      allow(Setting).to receive(:text_formatting).and_return('markdown')
     end
 
     context 'Changeset links' do
       let(:repository) do
         FactoryBot.build_stubbed :repository_subversion,
-                                  project: project
+                                 project: project
       end
       let(:changeset1) do
         FactoryBot.build_stubbed :changeset,
-                                  repository: repository,
-                                  comments: 'My very first commit'
+                                 repository: repository,
+                                 comments: 'My very first commit'
       end
       let(:changeset2) do
         FactoryBot.build_stubbed :changeset,
-                                  repository: repository,
-                                  comments: 'This commit fixes #1, #2 and references #1 & #3'
+                                 repository: repository,
+                                 comments: 'This commit fixes #1, #2 and references #1 & #3'
       end
       let(:changeset_link) do
         link_to("r#{changeset1.revision}",
@@ -146,16 +145,16 @@ describe OpenProject::TextFormatting,
     end
 
     context 'Version link' do
-      let!(:version) {
+      let!(:version) do
         FactoryBot.create :version,
-                           name: '1.0',
-                           project: project
-      }
-      let(:version_link) {
+                          name: '1.0',
+                          project: project
+      end
+      let(:version_link) do
         link_to('1.0',
                 { controller: 'versions', action: 'show', id: version.id },
                 class: 'version')
-      }
+      end
 
       context 'Link with version id' do
         subject { format_text("version##{version.id}") }
@@ -196,11 +195,11 @@ describe OpenProject::TextFormatting,
     context 'Message links' do
       let(:board) { FactoryBot.create :board, project: project }
       let(:message1) { FactoryBot.create :message, board: board }
-      let(:message2) {
+      let(:message2) do
         FactoryBot.create :message,
-                           board: board,
-                           parent: message1
-      }
+                          board: board,
+                          parent: message1
+      end
 
       before do
         message1.reload
@@ -220,11 +219,11 @@ describe OpenProject::TextFormatting,
     end
 
     context 'Issue links' do
-      let(:issue_link) {
+      let(:issue_link) do
         link_to("##{issue.id}",
                 work_package_path(issue),
                 class: 'issue work_package status-3 priority-1 created-by-me', title: "#{issue.subject} (#{issue.status})")
-      }
+      end
 
       context 'Plain issue link' do
         subject { format_text("##{issue.id}, [##{issue.id}], (##{issue.id}) and ##{issue.id}.") }
@@ -251,12 +250,12 @@ describe OpenProject::TextFormatting,
       end
 
       context 'Cyclic Description Links' do
-        let(:issue2) {
+        let(:issue2) do
           FactoryBot.create :work_package,
-                             project: project,
-                             author: project_member,
-                             type: project.types.first
-        }
+                            project: project,
+                            author: project_member,
+                            type: project.types.first
+        end
 
         before do
           issue2.description = "####{issue.id}"
@@ -307,14 +306,14 @@ describe OpenProject::TextFormatting,
     context 'User links' do
       let(:role) do
         FactoryBot.create :role,
-                           permissions: %i[view_work_packages edit_work_packages
-                                           browse_repository view_changesets view_wiki_pages]
+                          permissions: %i[view_work_packages edit_work_packages
+                                          browse_repository view_changesets view_wiki_pages]
       end
 
       let(:linked_project_member) do
         FactoryBot.create :user,
-                           member_in_project: project,
-                           member_through_role: role
+                          member_in_project: project,
+                          member_through_role: role
       end
 
       context 'User link via ID' do
@@ -348,9 +347,9 @@ describe OpenProject::TextFormatting,
           context "with an email address as login name" do
             let(:linked_project_member) do
               FactoryBot.create :user,
-                                 member_in_project: project,
-                                 member_through_role: role,
-                                 login: "foo@bar.com"
+                                member_in_project: project,
+                                member_through_role: role,
+                                login: "foo@bar.com"
             end
             subject { format_text("user:\"#{linked_project_member.login}\"") }
 
@@ -373,15 +372,15 @@ describe OpenProject::TextFormatting,
     context 'Group reference' do
       let(:role) do
         FactoryBot.create :role,
-                           permissions: []
+                          permissions: []
       end
 
       let(:linked_project_member_group) do
         FactoryBot.create(:group).tap do |group|
           FactoryBot.create(:member,
-                             principal: group,
-                             project: project,
-                             roles: [role])
+                            principal: group,
+                            project: project,
+                            roles: [role])
         end
       end
 
@@ -409,37 +408,37 @@ describe OpenProject::TextFormatting,
     end
 
     context 'Wiki links' do
-      let(:project_2) {
+      let(:project_2) do
         FactoryBot.create :valid_project,
-                           identifier: 'onlinestore'
-      }
-      let(:wiki_1) {
+                          identifier: 'onlinestore'
+      end
+      let(:wiki_1) do
         FactoryBot.create :wiki,
-                           start_page: 'CookBook documentation',
-                           project: project
-      }
-      let(:wiki_page_1_1) {
+                          start_page: 'CookBook documentation',
+                          project: project
+      end
+      let(:wiki_page_1_1) do
         FactoryBot.create :wiki_page_with_content,
-                           wiki: wiki_1,
-                           title: 'CookBook documentation'
-      }
-      let(:wiki_page_1_2) {
+                          wiki: wiki_1,
+                          title: 'CookBook documentation'
+      end
+      let(:wiki_page_1_2) do
         FactoryBot.create :wiki_page_with_content,
-                           wiki: wiki_1,
-                           title: 'Another page'
-      }
-      let(:wiki_page_1_3) {
+                          wiki: wiki_1,
+                          title: 'Another page'
+      end
+      let(:wiki_page_1_3) do
         FactoryBot.create :wiki_page_with_content,
-                           wiki: wiki_1,
-                           title: '<script>alert("FOO")</script>'
-      }
+                          wiki: wiki_1,
+                          title: '<script>alert("FOO")</script>'
+      end
 
       before do
         project_2.reload
 
         wiki_page_2_1 = FactoryBot.create :wiki_page_with_content,
-                                           wiki: project_2.wiki,
-                                           title: 'Start Page'
+                                          wiki: project_2.wiki,
+                                          title: 'Start Page'
 
         project_2.wiki.pages << wiki_page_2_1
         project_2.wiki.start_page = 'Start Page'
@@ -606,42 +605,42 @@ describe OpenProject::TextFormatting,
     end
 
     context 'Pre content should not parse wiki and redmine links' do
-      let(:wiki) {
+      let(:wiki) do
         FactoryBot.create :wiki,
-                           start_page: 'CookBook documentation',
-                           project: project
-      }
-      let(:wiki_page) {
+                          start_page: 'CookBook documentation',
+                          project: project
+      end
+      let(:wiki_page) do
         FactoryBot.create :wiki_page_with_content,
-                           wiki: wiki,
-                           title: 'CookBook documentation'
-      }
-      let(:raw) {
-        <<-RAW
-[[CookBook documentation]]
+                          wiki: wiki,
+                          title: 'CookBook documentation'
+      end
+      let(:raw) do
+        <<~RAW
+          [[CookBook documentation]]
 
-##{issue.id}
+          ##{issue.id}
 
-```
-[[CookBook documentation]]
+          ```
+          [[CookBook documentation]]
 
-##{issue.id}
-```
-</pre>
+          ##{issue.id}
+          ```
+          </pre>
         RAW
-      }
+      end
 
-      let(:expected) {
-        <<-EXPECTED
-<p><a class="wiki-page" href="/projects/#{project.identifier}/wiki/cookbook-documentation">CookBook documentation</a></p>
-<p><a class="issue work_package status-3 priority-1 created-by-me" href="/work_packages/#{issue.id}" title="#{issue.subject} (#{issue.status})">##{issue.id}</a></p>
-<pre><code>
-[[CookBook documentation]]
+      let(:expected) do
+        <<~EXPECTED
+          <p><a class="wiki-page" href="/projects/#{project.identifier}/wiki/cookbook-documentation">CookBook documentation</a></p>
+          <p><a class="issue work_package status-3 priority-1 created-by-me" href="/work_packages/#{issue.id}" title="#{issue.subject} (#{issue.status})">##{issue.id}</a></p>
+          <pre><code>
+          [[CookBook documentation]]
 
-##{issue.id}
-</code></pre>
+          ##{issue.id}
+          </code></pre>
         EXPECTED
-      }
+      end
 
       before do
         project.wiki = wiki
@@ -659,7 +658,7 @@ describe OpenProject::TextFormatting,
           expect(format_text('_Stars!_')).to be_html_eql('<p><em>Stars!</em></p>')
         end
 
-        it 'uses format of options, if specified' do
+        it 'allows plain format of options, if specified' do
           expect(format_text('*Stars!*', format: 'plain')).to be_html_eql('<p>*Stars!*</p>')
         end
       end
diff --git a/spec/lib/open_project/text_formatting/plain_spec.rb b/spec/lib/open_project/text_formatting/plain_spec.rb
index 4e6be8d60c..0dc9d64670 100644
--- a/spec/lib/open_project/text_formatting/plain_spec.rb
+++ b/spec/lib/open_project/text_formatting/plain_spec.rb
@@ -29,7 +29,7 @@
 
 require 'spec_helper'
 
-describe OpenProject::TextFormatting::Formatters::Plain::Formatter do
+describe OpenProject::TextFormatting::Formats::Plain::Formatter do
   subject { described_class.new({}) }
 
   it 'should plain text' do
@@ -38,7 +38,7 @@ describe OpenProject::TextFormatting::Formatters::Plain::Formatter do
 
   it 'should escaping' do
     assert_html_output(
-      'this is a <script>'      => 'this is a &lt;script&gt;'
+      'this is a <script>' => 'this is a &lt;script&gt;'
     )
   end
 
diff --git a/spec/lib/open_project/text_formatting/textile/textile_formatting_spec.rb b/spec/lib/open_project/text_formatting/textile/textile_formatting_spec.rb
deleted file mode 100644
index 2986cb4886..0000000000
--- a/spec/lib/open_project/text_formatting/textile/textile_formatting_spec.rb
+++ /dev/null
@@ -1,252 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-
-describe OpenProject::TextFormatting::Formatters::Textile::RedclothWrapper do
-  MODIFIERS = {
-    '*' => 'strong', # bold
-    '_' => 'em',     # italic
-    '+' => 'ins',    # underline
-    '-' => 'del',    # deleted
-    '^' => 'sup',    # superscript
-    '~' => 'sub'     # subscript
-  }
-
-  it 'should modifiers' do
-    assert_html_output(
-      '*bold*'                => '<strong>bold</strong>',
-      'before *bold*'         => 'before <strong>bold</strong>',
-      '*bold* after'          => '<strong>bold</strong> after',
-      '*two words*'           => '<strong>two words</strong>',
-      '*two*words*'           => '<strong>two*words</strong>',
-      '*two * words*'         => '<strong>two * words</strong>',
-      '*two* *words*'         => '<strong>two</strong> <strong>words</strong>',
-      '*(two)* *(words)*'     => '<strong>(two)</strong> <strong>(words)</strong>',
-      # with class
-      '*(foo)two words*'      => '<strong class="foo">two words</strong>'
-    )
-  end
-
-  it 'should modifiers combination' do
-    MODIFIERS.each do |m1, tag1|
-      MODIFIERS.each do |m2, tag2|
-        next if m1 == m2
-        text = "#{m2}#{m1}Phrase modifiers#{m1}#{m2}"
-        html = "<#{tag2}><#{tag1}>Phrase modifiers</#{tag1}></#{tag2}>"
-        assert_html_output text => html
-      end
-    end
-  end
-
-  it 'should inline code' do
-    assert_html_output(
-      'this is @some code@'      => 'this is <code>some code</code>',
-      '@<Location /redmine>@'    => '<code>&lt;Location /redmine&gt;</code>'
-    )
-  end
-
-  it 'should escaping' do
-    assert_html_output(
-      'this is a <script>'      => 'this is a &lt;script&gt;'
-    )
-  end
-
-  it 'should use of backslashes followed by numbers in headers' do
-    assert_html_output({
-                         'h1. 2009\02\09'      => '<h1>2009\02\09</h1>'
-                       }, false)
-  end
-
-  it 'should double dashes should not strikethrough' do
-    assert_html_output(
-      'double -- dashes -- test'  => 'double -- dashes -- test',
-      'double -- *dashes* -- test'  => 'double -- <strong>dashes</strong> -- test'
-    )
-  end
-
-  it 'should acronyms' do
-    assert_html_output(
-      'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>',
-      '2 letters JP(Jean-Philippe) acronym' => '2 letters <acronym title="Jean-Philippe">JP</acronym> acronym',
-      'GPL(This is a double-quoted "title")' => '<acronym title="This is a double-quoted &quot;title&quot;">GPL</acronym>'
-    )
-  end
-
-  it 'should inline auto link' do
-    assert_html_output(
-      'Autolink to http://www.google.com' =>         'Autolink to <a class="external icon-context icon-copy" href="http://www.google.com">http://www.google.com</a>'
-    )
-  end
-
-  it 'should inline auto link email addresses' do
-    assert_html_output(
-      'Mailto link to foo@bar.com' => 'Mailto link to <a class="email" href="mailto:foo@bar.com">foo@bar.com</a>'
-    )
-  end
-
-  it 'should ignore email addresses that are used as login names' do
-    assert_html_output(
-      'No mailto link to user:"foo@bar.com"' => 'No mailto link to user:"foo@bar.com"'
-    )
-  end
-
-  it 'should ignore links inside macros' do
-    assert_html_output(
-      '{{embed_youtube(http://www.google.com)}}' =>         '{{embed_youtube(http://www.google.com)}}'
-    )
-  end
-
-
-  it 'should blockquote' do
-    # orig raw text
-    raw = <<-RAW
-John said:
-> Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
-> Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
-> * Donec odio lorem,
-> * sagittis ac,
-> * malesuada in,
-> * adipiscing eu, dolor.
->
-> >Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.
-> Proin a tellus. Nam vel neque.
-
-He's right.
-RAW
-
-    # expected html
-    expected = <<-EXPECTED
-<p>John said:</p>
-<blockquote class="icon icon-quote2">
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.<br />
-Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
-<ul>
-  <li>Donec odio lorem,</li>
-  <li>sagittis ac,</li>
-  <li>malesuada in,</li>
-  <li>adipiscing eu, dolor.</li>
-</ul>
-<blockquote class="icon icon-quote2">
-<p>Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.</p>
-</blockquote>
-<p>Proin a tellus. Nam vel neque.</p>
-</blockquote>
-<p>He's right.</p>
-EXPECTED
-
-    expect(expected.gsub(%r{\s+}, '')).to eq(to_html(raw).gsub(%r{\s+}, ''))
-  end
-
-  it 'should table' do
-    raw = <<-RAW
-This is a table with empty cells:
-
-|cell11|cell12||
-|cell21||cell23|
-|cell31|cell32|cell33|
-RAW
-
-    expected = <<-EXPECTED
-<p>This is a table with empty cells:</p>
-
-<table>
-  <tr><td>cell11</td><td>cell12</td><td></td></tr>
-  <tr><td>cell21</td><td></td><td>cell23</td></tr>
-  <tr><td>cell31</td><td>cell32</td><td>cell33</td></tr>
-</table>
-EXPECTED
-
-    expect(expected.gsub(%r{\s+}, '')).to eq(to_html(raw).gsub(%r{\s+}, ''))
-  end
-
-  it 'should table with line breaks' do
-    raw = <<-RAW
-This is a table with line breaks:
-
-|cell11
-continued|cell12||
-|-cell21-||cell23
-cell23 line2
-cell23 *line3*|
-|cell31|cell32
-cell32 line2|cell33|
-
-RAW
-
-    expected = <<-EXPECTED
-<p>This is a table with line breaks:</p>
-
-<table>
-  <tr>
-    <td>cell11<br />continued</td>
-    <td>cell12</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td><del>cell21</del></td>
-    <td></td>
-    <td>cell23<br/>cell23 line2<br/>cell23 <strong>line3</strong></td>
-  </tr>
-  <tr>
-    <td>cell31</td>
-    <td>cell32<br/>cell32 line2</td>
-    <td>cell33</td>
-  </tr>
-</table>
-EXPECTED
-
-    expect(expected.gsub(%r{\s+}, '')).to eq(to_html(raw).gsub(%r{\s+}, ''))
-  end
-
-  it 'should textile should not mangle brackets' do
-    expect(to_html('[msg1][msg2]')).to eq '<p>[msg1][msg2]</p>'
-  end
-
-  it 'should textile should escape image urls' do
-    # this is onclick="alert('XSS');" in encoded form
-    raw = '!/images/comment.png"onclick=&#x61;&#x6c;&#x65;&#x72;&#x74;&#x28;&#x27;&#x58;&#x53;&#x53;&#x27;&#x29;;&#x22;!'
-    expected = '<p><img src="/images/comment.png&quot;onclick=&amp;#x61;&amp;#x6c;&amp;#x65;&amp;#x72;&amp;#x74;&amp;#x28;&amp;#x27;&amp;#x58;&amp;#x53;&amp;#x53;&amp;#x27;&amp;#x29;;&amp;#x22;" alt="" /></p>'
-
-    expect(expected.gsub(%r{\s+}, '')).to eq(to_html(raw).gsub(%r{\s+}, ''))
-  end
-
-  private
-
-  def assert_html_output(to_test, expect_paragraph = true)
-    to_test.each do |text, expected|
-      expected = expect_paragraph ? "<p>#{expected}</p>" : expected
-      expect(to_html(text)).to be_html_eql expected
-    end
-  end
-
-  def to_html(text)
-    described_class.new(text).to_html
-  end
-end
diff --git a/spec/lib/open_project/text_formatting/textile/textile_spec.rb b/spec/lib/open_project/text_formatting/textile/textile_spec.rb
deleted file mode 100644
index 498d3b22d8..0000000000
--- a/spec/lib/open_project/text_formatting/textile/textile_spec.rb
+++ /dev/null
@@ -1,734 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-
-describe OpenProject::TextFormatting do
-  include OpenProject::TextFormatting
-  include ERB::Util
-  include WorkPackagesHelper # soft-dependency
-  include ActionView::Helpers::UrlHelper # soft-dependency
-  include ActionView::Context
-  include OpenProject::StaticRouting::UrlHelpers
-
-  def controller
-    # no-op
-  end
-
-  describe '.format_text' do
-    let(:project) { FactoryBot.create :valid_project }
-    let(:identifier) { project.identifier }
-    let(:role) do
-      FactoryBot.create :role,
-                         permissions: %i(view_work_packages edit_work_packages
-                                         browse_repository view_changesets view_wiki_pages)
-    end
-
-    let(:project_member) do
-      FactoryBot.create :user,
-                         member_in_project: project,
-                         member_through_role: role
-    end
-    let(:issue) do
-      FactoryBot.create :work_package,
-                         project: project,
-                         author: project_member,
-                         type: project.types.first
-    end
-
-    let!(:non_member) do
-      FactoryBot.create(:non_member)
-    end
-
-    before do
-      @project = project
-      allow(User).to receive(:current).and_return(project_member)
-      allow(Setting).to receive(:text_formatting).and_return('textile')
-    end
-
-    context 'Changeset links' do
-      let(:repository) do
-        FactoryBot.build_stubbed :repository_subversion,
-                                  project: project
-      end
-      let(:changeset1) do
-        FactoryBot.build_stubbed :changeset,
-                                  repository: repository,
-                                  comments: 'My very first commit'
-      end
-      let(:changeset2) do
-        FactoryBot.build_stubbed :changeset,
-                                  repository: repository,
-                                  comments: 'This commit fixes #1, #2 and references #1 & #3'
-      end
-      let(:changeset_link) do
-        link_to("r#{changeset1.revision}",
-                { controller: 'repositories', action: 'revision', project_id: identifier, rev: changeset1.revision },
-                class: 'changeset', title: 'My very first commit')
-      end
-      let(:changeset_link2) do
-        link_to("r#{changeset2.revision}",
-                { controller: 'repositories', action: 'revision', project_id: identifier, rev: changeset2.revision },
-                class: 'changeset', title: 'This commit fixes #1, #2 and references #1 & #3')
-      end
-
-      before do
-        allow(project).to receive(:repository).and_return(repository)
-
-        changesets = [changeset1, changeset2]
-
-        allow(Changeset).to receive(:visible).and_return(changesets)
-
-        changesets.each do |changeset|
-          allow(changesets)
-            .to receive(:find_by)
-                  .with(repository_id: project.repository.id, revision: changeset.revision)
-                  .and_return(changeset)
-        end
-      end
-
-      context 'Single link' do
-        subject { format_text("r#{changeset1.revision}") }
-
-        it { is_expected.to be_html_eql("<p>#{changeset_link}</p>") }
-      end
-
-      context 'Single link with dot' do
-        subject { format_text("r#{changeset1.revision}.") }
-
-        it { is_expected.to be_html_eql("<p>#{changeset_link}.</p>") }
-      end
-
-      context 'Two links comma separated' do
-        subject { format_text("r#{changeset1.revision}, r#{changeset2.revision}") }
-
-        it { is_expected.to be_html_eql("<p>#{changeset_link}, #{changeset_link2}</p>") }
-      end
-
-      context 'Single link comma separated without a space' do
-        subject { format_text("r#{changeset1.revision},r#{changeset2.revision}") }
-
-        it { is_expected.to be_html_eql("<p>#{changeset_link},#{changeset_link2}</p>") }
-      end
-
-      context 'Escaping' do
-        subject { format_text("!r#{changeset1.id}") }
-
-        it { is_expected.to be_html_eql("<p>r#{changeset1.id}</p>") }
-      end
-    end
-
-    context 'Version link' do
-      let!(:version) {
-        FactoryBot.create :version,
-                           name: '1.0',
-                           project: project
-      }
-      let(:version_link) {
-        link_to('1.0',
-                { controller: 'versions', action: 'show', id: version.id },
-                class: 'version')
-      }
-
-      context 'Link with version id' do
-        subject { format_text("version##{version.id}") }
-
-        it { is_expected.to be_html_eql("<p>#{version_link}</p>") }
-      end
-
-      context 'Link with version' do
-        subject { format_text('version:1.0') }
-        it { is_expected.to be_html_eql("<p>#{version_link}</p>") }
-      end
-
-      context 'Link with quoted version' do
-        subject { format_text('version:"1.0"') }
-
-        it { is_expected.to be_html_eql("<p>#{version_link}</p>") }
-      end
-
-      context 'Escaping link with version id' do
-        subject { format_text("!version##{version.id}") }
-
-        it { is_expected.to be_html_eql("<p>version##{version.id}</p>") }
-      end
-
-      context 'Escaping link with version' do
-        subject { format_text('!version:1.0') }
-
-        it { is_expected.to be_html_eql('<p>version:1.0</p>') }
-      end
-
-      context 'Escaping link with quoted version' do
-        subject { format_text('!version:"1.0"') }
-
-        it { is_expected.to be_html_eql('<p>version:"1.0"</p>') }
-      end
-    end
-
-    context 'Message links' do
-      let(:board) { FactoryBot.create :board, project: project }
-      let(:message1) { FactoryBot.create :message, board: board }
-      let(:message2) {
-        FactoryBot.create :message,
-                           board: board,
-                           parent: message1
-      }
-
-      before do
-        message1.reload
-      end
-
-      context 'Plain message' do
-        subject { format_text("message##{message1.id}") }
-
-        it { is_expected.to be_html_eql("<p>#{link_to(message1.subject, topic_path(message1), class: 'message')}</p>") }
-      end
-
-      context 'Message with parent' do
-        subject { format_text("message##{message2.id}") }
-
-        it { is_expected.to be_html_eql("<p>#{link_to(message2.subject, topic_path(message1, anchor: "message-#{message2.id}", r: message2.id), class: 'message')}</p>") }
-      end
-    end
-
-    context 'Issue links' do
-      let(:issue_link) {
-        link_to("##{issue.id}",
-                work_package_path(issue),
-                class: 'issue work_package status-3 priority-1 created-by-me', title: "#{issue.subject} (#{issue.status})")
-      }
-
-      context 'Plain issue link' do
-        subject { format_text("##{issue.id}, [##{issue.id}], (##{issue.id}) and ##{issue.id}.") }
-
-        it { is_expected.to be_html_eql("<p>#{issue_link}, [#{issue_link}], (#{issue_link}) and #{issue_link}.</p>") }
-      end
-
-      context 'Plain issue link to non-existing element' do
-        subject { format_text('#0123456789') }
-
-        it { is_expected.to be_html_eql('<p>#0123456789</p>') }
-      end
-
-      context 'Escaping issue link' do
-        subject { format_text("!##{issue.id}.") }
-
-        it { is_expected.to be_html_eql("<p>##{issue.id}.</p>") }
-      end
-
-      context 'Cyclic Description Links' do
-        let(:issue2) {
-          FactoryBot.create :work_package,
-                             project: project,
-                             author: project_member,
-                             type: project.types.first
-        }
-
-        before do
-          issue2.description = "####{issue.id}"
-          issue2.save!
-          issue.description = "####{issue2.id}"
-          issue.save!
-        end
-
-        subject { format_text issue, :description }
-
-        it "doesn't replace description links with a cycle" do
-          expect(subject).to match("###{issue.id}")
-        end
-      end
-
-      context 'Description links' do
-        subject { format_text issue, :description }
-
-        it 'replaces the macro with the issue description' do
-          expect(subject).to be_html_eql("<p>#{issue.description}</p>")
-        end
-      end
-    end
-
-    context 'Project links' do
-      let(:subproject) { FactoryBot.create :valid_project, parent: project, is_public: true }
-      let(:project_url) { { controller: 'projects', action: 'show', id: subproject.identifier } }
-
-      context 'Plain project link' do
-        subject { format_text("project##{subproject.id}") }
-
-        it { is_expected.to be_html_eql("<p>#{link_to(subproject.name, project_url, class: 'project')}</p>") }
-      end
-
-      context 'Plain project link via identifier' do
-        subject { format_text("project:#{subproject.identifier}") }
-
-        it { is_expected.to be_html_eql("<p>#{link_to(subproject.name, project_url, class: 'project')}</p>") }
-      end
-
-      context 'Plain project link via name' do
-        subject { format_text("project:\"#{subproject.name}\"") }
-
-        it { is_expected.to be_html_eql("<p>#{link_to(subproject.name, project_url, class: 'project')}</p>") }
-      end
-    end
-
-    context 'User links' do
-      let(:role) do
-        FactoryBot.create :role,
-                           permissions: %i[view_work_packages edit_work_packages
-                                           browse_repository view_changesets view_wiki_pages]
-      end
-
-      let(:linked_project_member) do
-        FactoryBot.create :user,
-                           member_in_project: project,
-                           member_through_role: role
-      end
-
-      context 'User link via ID' do
-        context 'when linked user visible for reader' do
-          subject { format_text("user##{linked_project_member.id}") }
-
-          it {
-            is_expected.to be_html_eql("<p>#{link_to(linked_project_member.name, { controller: :users, action: :show, id: linked_project_member.id }, class: 'user-mention')}</p>")
-          }
-        end
-
-        context 'when linked user not visible for reader' do
-          let(:role) { FactoryBot.create(:non_member) }
-
-          subject { format_text("user##{linked_project_member.id}") }
-
-          it {
-            is_expected.to be_html_eql("<p>user##{linked_project_member.id}</p>")
-          }
-        end
-      end
-
-      context 'User link via login name' do
-        context 'when linked user visible for reader' do
-          context 'with a common login name' do
-            subject { format_text("user:\"#{linked_project_member.login}\"") }
-
-            it { is_expected.to be_html_eql("<p>#{link_to(linked_project_member.name, { controller: :users, action: :show, id: linked_project_member.id }, class: 'user-mention')}</p>") }
-          end
-
-          context "with an email address as login name" do
-            let(:linked_project_member) do
-              FactoryBot.create :user,
-                                 member_in_project: project,
-                                 member_through_role: role,
-                                 login: "foo@bar.com"
-            end
-            subject { format_text("user:\"#{linked_project_member.login}\"") }
-
-            it { is_expected.to be_html_eql("<p>#{link_to(linked_project_member.name, { controller: :users, action: :show, id: linked_project_member.id }, class: 'user-mention')}</p>") }
-          end
-        end
-
-        context 'when linked user not visible for reader' do
-          let(:role) { FactoryBot.create(:non_member) }
-
-          subject { format_text("user:\"#{linked_project_member.login}\"") }
-
-          it {
-            is_expected.to be_html_eql("<p>user:\"#{linked_project_member.login}\"</p>")
-          }
-        end
-      end
-    end
-
-    context 'Group reference' do
-      let(:role) do
-        FactoryBot.create :role,
-                           permissions: []
-      end
-
-      let(:linked_project_member_group) do
-        FactoryBot.create(:group).tap do |group|
-          FactoryBot.create(:member,
-                             principal: group,
-                             project: project,
-                             roles: [role])
-        end
-      end
-
-      context 'group exists' do
-        subject { format_text("group##{linked_project_member_group.id}") }
-
-        it 'produces the expected html' do
-          is_expected.to be_html_eql("<p><span class='user-mention'>#{linked_project_member_group.name}</span></p>")
-        end
-      end
-
-      context 'group does not exist' do
-        subject { format_text("group#000000") }
-
-        it 'leaves the text unchangd' do
-          is_expected.to be_html_eql("<p>group#000000</p>")
-        end
-      end
-    end
-
-    context 'Url links' do
-      subject { format_text('http://foo.bar/FAQ#3') }
-
-      it { is_expected.to be_html_eql('<p><a class="external icon-context icon-copy" href="http://foo.bar/FAQ#3">http://foo.bar/FAQ#3</a></p>') }
-    end
-
-    context 'Wiki links' do
-      let(:project_2) {
-        FactoryBot.create :valid_project,
-                           identifier: 'onlinestore'
-      }
-      let(:wiki_1) {
-        FactoryBot.create :wiki,
-                           start_page: 'CookBook documentation',
-                           project: project
-      }
-      let(:wiki_page_1_1) {
-        FactoryBot.create :wiki_page_with_content,
-                           wiki: wiki_1,
-                           title: 'CookBook documentation'
-      }
-      let(:wiki_page_1_2) {
-        FactoryBot.create :wiki_page_with_content,
-                           wiki: wiki_1,
-                           title: 'Another page'
-      }
-      let(:wiki_page_1_3) {
-        FactoryBot.create :wiki_page_with_content,
-                           wiki: wiki_1,
-                           title: '<script>alert("FOO")</script>'
-      }
-
-      before do
-        project_2.reload
-
-        wiki_page_2_1 = FactoryBot.create :wiki_page_with_content,
-                                           wiki: project_2.wiki,
-                                           title: 'Start Page'
-
-        project_2.wiki.pages << wiki_page_2_1
-        project_2.wiki.start_page = 'Start Page'
-        project_2.wiki.save!
-
-        project.wiki = wiki_1
-
-        wiki_1.pages << wiki_page_1_1
-        wiki_1.pages << wiki_page_1_2
-        wiki_1.pages << wiki_page_1_3
-      end
-
-      context 'Plain wiki link' do
-        subject { format_text('[[CookBook documentation]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page\" href=\"/projects/#{project.identifier}/wiki/cookbook-documentation\">CookBook documentation</a></p>") }
-      end
-
-      context 'Arbitrary wiki link' do
-        title = '<script>alert("FOO")</script>'
-        subject { format_text("[[#{title}]]") }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page\" href=\"/projects/#{project.identifier}/wiki/alert-foo\">#{h(title)}</a></p>") }
-      end
-
-      context 'Plain wiki page link' do
-        subject { format_text('[[Another page|Page]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page\" href=\"/projects/#{project.identifier}/wiki/another-page\">Page</a></p>") }
-      end
-
-      context 'Wiki link with anchor' do
-        subject { format_text('[[CookBook documentation#One-section]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page\" href=\"/projects/#{project.identifier}/wiki/cookbook-documentation#One-section\">CookBook documentation</a></p>") }
-      end
-
-      context 'Wiki page link with anchor' do
-        subject { format_text('[[Another page#anchor|Page]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page\" href=\"/projects/#{project.identifier}/wiki/another-page#anchor\">Page</a></p>") }
-      end
-
-      context 'Wiki link to an unknown page' do
-        subject { format_text('[[Unknown page]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page new\" href=\"/projects/#{project.identifier}/wiki/unknown-page?title=Unknown+page\">Unknown page</a></p>") }
-      end
-
-      context 'Wiki page link to an unknown page' do
-        subject { format_text('[[Unknown page|404]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page new\" href=\"/projects/#{project.identifier}/wiki/unknown-page?title=404\">404</a></p>") }
-      end
-
-      context "Link to another project's wiki" do
-        subject { format_text('[[onlinestore:]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page\" href=\"/projects/onlinestore/wiki/start-page\">onlinestore</a></p>") }
-      end
-
-      context "Link to another project's wiki with label" do
-        subject { format_text('[[onlinestore:|Wiki]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page\" href=\"/projects/onlinestore/wiki/start-page\">Wiki</a></p>") }
-      end
-
-      context "Link to another project's wiki page" do
-        subject { format_text('[[onlinestore:Start page]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page\" href=\"/projects/onlinestore/wiki/start-page\">Start Page</a></p>") }
-      end
-
-      context "Link to another project's wiki page with label" do
-        subject { format_text('[[onlinestore:Start page|Text]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page\" href=\"/projects/onlinestore/wiki/start-page\">Text</a></p>") }
-      end
-
-      context 'Link to an unknown wiki page in another project' do
-        subject { format_text('[[onlinestore:Unknown page]]') }
-
-        it { is_expected.to be_html_eql("<p><a class=\"wiki-page new\" href=\"/projects/onlinestore/wiki/unknown-page?title=Unknown+page\">Unknown page</a></p>") }
-      end
-
-      context 'Struck through link to wiki page' do
-        subject { format_text('-[[Another page|Page]]-') }
-
-        it { is_expected.to be_html_eql("<p><del><a class=\"wiki-page\" href=\"/projects/#{project.identifier}/wiki/another-page\">Page</a></del></p>") }
-      end
-
-      context 'Named struck through link to wiki page' do
-        subject { format_text('-[[Another page|Page]] link-') }
-
-        it { is_expected.to be_html_eql("<p><del><a class=\"wiki-page\" href=\"/projects/#{project.identifier}/wiki/another-page\">Page</a> link</del></p>") }
-      end
-
-      context 'Escaped link to wiki page' do
-        subject { format_text('![[Another page|Page]]') }
-
-        it { is_expected.to be_html_eql('<p>[[Another page|Page]]</p>') }
-      end
-
-      context 'Link to wiki of non-existing project' do
-        subject { format_text('[[unknowproject:Start]]') }
-
-        it { is_expected.to be_html_eql('<p>[[unknowproject:Start]]</p>') }
-      end
-
-      context 'Link to wiki page of non-existing project' do
-        subject { format_text('[[unknowproject:Start|Page title]]') }
-
-        it { is_expected.to be_html_eql('<p>[[unknowproject:Start|Page title]]</p>') }
-      end
-    end
-
-    context 'Redmine links' do
-      let(:repository) do
-        FactoryBot.build_stubbed :repository_subversion, project: project
-      end
-      let(:source_url) do
-        { controller: 'repositories',
-          action: 'entry',
-          project_id: identifier,
-          repo_path: 'some/file' }
-      end
-      let(:source_url_with_ext) do
-        { controller: 'repositories',
-          action: 'entry',
-          project_id: identifier,
-          repo_path: 'some/file.ext' }
-      end
-
-      before do
-        allow(project).to receive(:repository).and_return(repository)
-        allow(User).to receive(:current).and_return(project_member)
-        allow(project_member)
-          .to receive(:allowed_to?)
-                .with(:browse_repository, project)
-                .and_return(true)
-
-        @to_test = {
-          # source
-          'source:/some/file' => link_to('source:/some/file', source_url, class: 'source'),
-          'source:/some/file.' => link_to('source:/some/file', source_url, class: 'source') + '.',
-          'source:/some/file.ext.' => link_to('source:/some/file.ext', source_url_with_ext, class: 'source') + '.',
-          'source:/some/file. ' => link_to('source:/some/file', source_url, class: 'source') + '.',
-          'source:/some/file.ext. ' => link_to('source:/some/file.ext', source_url_with_ext, class: 'source') + '.',
-          'source:/some/file, ' => link_to('source:/some/file', source_url, class: 'source') + ',',
-          'source:/some/file@52' => link_to('source:/some/file@52', source_url.merge(rev: 52), class: 'source'),
-          'source:/some/file.ext@52' => link_to('source:/some/file.ext@52', source_url_with_ext.merge(rev: 52), class: 'source'),
-          'source:/some/file#L110' => link_to('source:/some/file#L110', source_url.merge(anchor: 'L110'), class: 'source'),
-          'source:/some/file.ext#L110' => link_to('source:/some/file.ext#L110', source_url_with_ext.merge(anchor: 'L110'), class: 'source'),
-          'source:/some/file@52#L110' => link_to('source:/some/file@52#L110', source_url.merge(rev: 52, anchor: 'L110'), class: 'source'),
-          'export:/some/file' => link_to('export:/some/file', source_url.merge(format: 'raw'), class: 'source download'),
-          # escaping
-          '!source:/some/file' => 'source:/some/file',
-          # invalid expressions
-          'source:' => 'source:'
-        }
-      end
-
-      it '' do
-        @to_test.each do |text, result|
-          expect(format_text(text)).to be_html_eql("<p>#{result}</p>")
-        end
-      end
-    end
-
-    context 'Pre content should not parse wiki and redmine links' do
-      let(:wiki) {
-        FactoryBot.create :wiki,
-                           start_page: 'CookBook documentation',
-                           project: project
-      }
-      let(:wiki_page) {
-        FactoryBot.create :wiki_page_with_content,
-                           wiki: wiki,
-                           title: 'CookBook documentation'
-      }
-      let(:raw) {
-        <<-RAW
-[[CookBook documentation]]
-
-##{issue.id}
-
-<pre>
-[[CookBook documentation]]
-
-##{issue.id}
-</pre>
-        RAW
-      }
-
-      let(:expected) {
-        <<-EXPECTED
-<p><a class="wiki-page" href="/projects/#{project.identifier}/wiki/cookbook-documentation">CookBook documentation</a></p>
-<p><a class="issue work_package status-3 priority-1 created-by-me" href="/work_packages/#{issue.id}" title="#{issue.subject} (#{issue.status})">##{issue.id}</a></p>
-<pre>
-[[CookBook documentation]]
-
-##{issue.id}
-</pre>
-        EXPECTED
-      }
-
-      before do
-        project.wiki = wiki
-        wiki.pages << wiki_page
-      end
-
-      subject { format_text(raw) }
-
-      it { is_expected.to be_html_eql(expected) }
-    end
-
-    describe 'options' do
-      describe '#format' do
-        it 'uses format of Settings, if nothing is specified' do
-          expect(format_text('*Stars!*')).to be_html_eql('<p><strong>Stars!</strong></p>')
-        end
-
-        it 'uses format of options, if specified' do
-          expect(format_text('*Stars!*', format: 'plain')).to be_html_eql('<p>*Stars!*</p>')
-        end
-      end
-    end
-  end
-
-  describe '{{toc}}', 'table of contents macro' do
-    # Source: http://en.wikipedia.org/wiki/Orange_(fruit)
-    let(:wiki_text) {
-      <<-WIKI_TEXT
-{{toc}}
-
-h1. Orange
-
-h2. Varietes
-
-h3. Common Oranges
-
-h4. Valencia
-
-h5. Naranjito
-
-h4. Hart's Tardiff Valencia
-
-h3. Navel Oranges
-
-h3. Blood Oranges
-
-h3. Acidless Oranges
-
-h2. Attributes
-
-      WIKI_TEXT
-    }
-
-    subject(:html) { format_text(wiki_text) }
-
-    context 'w/o request present' do
-      let(:request) { nil }
-
-      it 'emits a table of contents for headings h1-h4 with anchors' do
-        expect(html).to be_html_eql(%{
-          <fieldset class='form--fieldset -collapsible'>
-            <legend class='form--fieldset-legend' title='Show/Hide table of contents'>
-              <a href='#'>Table of contents</a>
-            </legend>
-            <div>
-              <ul class="toc">
-                <li>
-                  <a href="#Orange">Orange</a>
-                  <ul>
-                    <li>
-                      <a href="#Varietes">Varietes</a>
-                      <ul>
-                        <li>
-                          <a href="#Common-Oranges">Common Oranges</a>
-                          <ul>
-                            <li><a href="#Valencia">Valencia</a></li>
-                            <li><a href="#Harts-Tardiff-Valencia">Hart's Tardiff Valencia</a></li>
-                          </ul>
-                        </li>
-                        <li><a href="#Navel-Oranges">Navel Oranges</a></li>
-                        <li><a href="#Blood-Oranges">Blood Oranges</a></li>
-                        <li><a href="#Acidless-Oranges">Acidless Oranges</a></li>
-                      </ul>
-                    </li>
-                    <li><a href="#Attributes">Attributes</a></li>
-                  </ul>
-                </li>
-              </ul>
-            </div>
-          </fieldset>
-        }).at_path('fieldset')
-      end
-    end
-  end
-end
diff --git a/spec/lib/open_project/text_formatting/wiki_formatting_spec.rb b/spec/lib/open_project/text_formatting/wiki_formatting_spec.rb
index e69ab31443..6f698372e8 100644
--- a/spec/lib/open_project/text_formatting/wiki_formatting_spec.rb
+++ b/spec/lib/open_project/text_formatting/wiki_formatting_spec.rb
@@ -30,21 +30,13 @@ require 'spec_helper'
 
 describe OpenProject::WikiFormatting do
   it 'should markdown formatter' do
-    expect(OpenProject::TextFormatting::Formatters::Markdown::Formatter).to eq(OpenProject::TextFormatting::Formatters.formatter_for('markdown'))
-    expect(OpenProject::TextFormatting::Formatters::Markdown::Helper).to eq(OpenProject::TextFormatting::Formatters.helper_for('markdown'))
-  end
-
-  it 'should textile formatter' do
-    expect(OpenProject::TextFormatting::Formatters::Textile::Formatter).to eq(OpenProject::TextFormatting::Formatters.formatter_for('textile'))
-    expect(OpenProject::TextFormatting::Formatters::Textile::Helper).to eq(OpenProject::TextFormatting::Formatters.helper_for('textile'))
+    expect(OpenProject::TextFormatting::Formats::Markdown::Formatter).to eq(OpenProject::TextFormatting::Formats.rich_formatter)
+    expect(OpenProject::TextFormatting::Formats::Markdown::Helper).to eq(OpenProject::TextFormatting::Formats.rich_helper)
   end
 
   it 'should plain formatter' do
-    expect(OpenProject::TextFormatting::Formatters::Plain::Formatter).to eq(OpenProject::TextFormatting::Formatters.formatter_for('plain'))
-    expect(OpenProject::TextFormatting::Formatters::Plain::Helper).to eq(OpenProject::TextFormatting::Formatters.helper_for('plain'))
-
-    expect(OpenProject::TextFormatting::Formatters::Plain::Formatter).to eq(OpenProject::TextFormatting::Formatters.formatter_for('doesnotexist'))
-    expect(OpenProject::TextFormatting::Formatters::Plain::Helper).to eq(OpenProject::TextFormatting::Formatters.helper_for('doesnotexist'))
+    expect(OpenProject::TextFormatting::Formats::Plain::Formatter).to eq(OpenProject::TextFormatting::Formats.plain_formatter)
+    expect(OpenProject::TextFormatting::Formats::Plain::Helper).to eq(OpenProject::TextFormatting::Formats.plain_helper)
   end
 
   it 'should link urls and email addresses' do
@@ -58,6 +50,6 @@ DIFF
 and an email address <a href="mailto:foo@example.net">foo@example.net</a></p>
 EXPECTED
 
-    assert_equal expected.gsub(%r{[\r\n\t]}, ''),OpenProject::TextFormatting::Formatters::Plain::Formatter.new({}).to_html(raw).gsub(%r{[\r\n\t]}, '')
+    assert_equal expected.gsub(%r{[\r\n\t]}, ''), OpenProject::TextFormatting::Formats::Plain::Formatter.new({}).to_html(raw).gsub(%r{[\r\n\t]}, '')
   end
 end
diff --git a/spec/lib/redcloth/redcloth_spec.rb b/spec/lib/redcloth/redcloth_spec.rb
deleted file mode 100644
index 1876c7b43e..0000000000
--- a/spec/lib/redcloth/redcloth_spec.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-#-- copyright
-# OpenProject is a project management system.
-#
-# Copyright (C) 2012-2013 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# See doc/COPYRIGHT.rdoc for more details.
-#++
-
-require 'spec_helper'
-
-describe RedCloth3 do
-  describe '#to_html', 'with one full heading tree starting at h1' do
-    before(:each) do
-      @text = <<-RAW
-
-      h1#. Title
-
-      Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
-
-      h2#. Subtitle
-
-      Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
-
-      h2#. Subtitle
-
-      h3#. Subsubtitle
-
-      h2#. Subtitle
-
-      h1#. Another title
-
-      h2#. Subtitle
-
-      h2#. Subtitle
-
-      RAW
-    end
-
-    it 'should numerate as specified' do
-      expected = '<h1>1. Title</h1>' +
-                 '<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.</p>' +
-                 '<h2>1.1. Subtitle</h2>' +
-                 '<p>Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.</p>' +
-                 '<h2>1.2. Subtitle</h2>' +
-                 '<h3>1.2.1. Subsubtitle</h3>' +
-                 '<h2>1.3. Subtitle</h2>' +
-                 '<h1>2. Another title</h1>' +
-                 '<h2>2.1. Subtitle</h2>' +
-                 '<h2>2.2. Subtitle</h2>'
-
-      expect(RedCloth3.new(@text).to_html.gsub("\n", '').gsub("\t", '')).to eq(expected)
-    end
-  end
-
-  describe '#to_html', 'with one heading tree starting at h2' do
-    before(:each) do
-      @text = <<-RAW
-
-      h1. Title
-
-      Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
-
-      h2#. Subtitle
-
-      Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
-
-      h2#. Subtitle
-
-      h3#. Subsubtitle
-
-      h2#. Subtitle
-
-      h1. Another title
-
-      h2. Subtitle
-
-      h2. Subtitle
-
-      RAW
-    end
-
-    it 'should numerate as specified' do
-      expected = '<h1>Title</h1>' +
-                 '<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.</p>' +
-                 '<h2>1. Subtitle</h2>' +
-                 '<p>Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.</p>' +
-                 '<h2>2. Subtitle</h2>' +
-                 '<h3>2.1. Subsubtitle</h3>' +
-                 '<h2>3. Subtitle</h2>' +
-                 '<h1>Another title</h1>' +
-                 '<h2>Subtitle</h2>' +
-                 '<h2>Subtitle</h2>'
-
-      expect(RedCloth3.new(@text).to_html.gsub("\n", '').gsub("\t", '')).to eq(expected)
-    end
-  end
-
-  describe '#to_html', 'with two heading trees starting at h2' do
-    before(:each) do
-      @text = <<-RAW
-
-        h1. Title
-
-        Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
-
-        h2#. Subtitle
-
-        Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
-
-        h2#. Subtitle
-
-        h3#. Subsubtitle
-
-        h2#. Subtitle
-
-        h1. Another title
-
-        h2#. Subtitle
-
-        h2#. Subtitle
-
-        RAW
-    end
-
-    it 'should numerate as specified' do
-      expected = '<h1>Title</h1>' +
-                 '<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.</p>' +
-                 '<h2>1. Subtitle</h2>' +
-                 '<p>Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.</p>' +
-                 '<h2>2. Subtitle</h2>' +
-                 '<h3>2.1. Subsubtitle</h3>' +
-                 '<h2>3. Subtitle</h2>' +
-                 '<h1>Another title</h1>' +
-                 '<h2>1. Subtitle</h2>' +
-                 '<h2>2. Subtitle</h2>'
-
-      expect(RedCloth3.new(@text).to_html.gsub("\n", '').gsub("\t", '')).to eq(expected)
-    end
-  end
-
-  describe '#to_html', 'with one heading tree starting at h2 and right after it one starting at h1' do
-    before(:each) do
-      @text = <<-RAW
-
-          h1. Title
-
-          Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
-
-          h2#. Subtitle
-
-          Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
-
-          h2#. Subtitle
-
-          h3#. Subsubtitle
-
-          h2#. Subtitle
-
-          h1#. Another title
-
-          h2#. Subtitle
-
-          h2#. Subtitle
-
-          RAW
-    end
-
-    it 'should numerate as specified' do
-      expected = '<h1>Title</h1>' +
-                 '<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.</p>' +
-                 '<h2>1. Subtitle</h2>' +
-                 '<p>Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.</p>' +
-                 '<h2>2. Subtitle</h2>' +
-                 '<h3>2.1. Subsubtitle</h3>' +
-                 '<h2>3. Subtitle</h2>' +
-                 '<h1>1. Another title</h1>' +
-                 '<h2>1.1. Subtitle</h2>' +
-                 '<h2>1.2. Subtitle</h2>'
-
-      expect(RedCloth3.new(@text).to_html.gsub("\n", '').gsub("\t", '')).to eq(expected)
-    end
-  end
-end
diff --git a/spec/lib/tabular_form_builder_spec.rb b/spec/lib/tabular_form_builder_spec.rb
index 4f0ae4f7cb..3cf39fcfc6 100644
--- a/spec/lib/tabular_form_builder_spec.rb
+++ b/spec/lib/tabular_form_builder_spec.rb
@@ -33,22 +33,22 @@ describe TabularFormBuilder do
   include Capybara::RSpecMatchers
 
   let(:helper)   { ActionView::Base.new }
-  let(:resource) {
+  let(:resource) do
     FactoryBot.build(:user,
-                      firstname:  'JJ',
-                      lastname:   'Abrams',
-                      login:      'lost',
-                      mail:       'jj@lost-mail.com',
-                      failed_login_count: 45)
-  }
+                     firstname:  'JJ',
+                     lastname:   'Abrams',
+                     login:      'lost',
+                     mail:       'jj@lost-mail.com',
+                     failed_login_count: 45)
+  end
   let(:builder) { TabularFormBuilder.new(:user, resource, helper, {}) }
 
   describe '#text_field' do
     let(:options) { { title: 'Name', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.text_field :name, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
 
@@ -126,13 +126,13 @@ describe TabularFormBuilder do
       end
 
       context 'with both prefix and suffix' do
-        let(:options) {
+        let(:options) do
           {
             title: 'Name',
             prefix: %{<span style="color:yellow">PREFIX</span>},
             suffix: %{<span style="color:green">SUFFIX</span>}
           }
-        }
+        end
 
         it 'should output elements' do
           expect(output).to be_html_eql(%{
@@ -172,9 +172,9 @@ describe TabularFormBuilder do
   describe '#text_area' do
     let(:options) { { title: 'Name', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.text_area :name, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -188,13 +188,13 @@ JJ Abrams</textarea>
       }).at_path('textarea')
     end
 
-    context 'when requesting a text formatting wrapper', with_settings: { text_formatting: :markdown } do
+    context 'when requesting a text formatting wrapper' do
       let(:options) { { title: 'Name', class: 'custom-class', with_text_formatting: true } }
 
       context 'an id is missing' do
-        it 'does not output the wrapper' do
+        it 'outputs the wysiwyg wrapper' do
           expect(output).to have_selector 'textarea'
-          expect(output).to have_no_selector 'op-ckeditor-form'
+          expect(output).to have_selector 'op-ckeditor-form'
         end
       end
 
@@ -213,9 +213,9 @@ JJ Abrams</textarea>
     let(:options) { { title: 'Name' } }
     let(:html_options) { { class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.select :name, '<option value="33">FUN</option>'.html_safe, options, html_options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -233,13 +233,13 @@ JJ Abrams</textarea>
     let(:options) { { title: 'Name' } }
     let(:html_options) { { class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.collection_select :name, [
         OpenStruct.new(id: 56, name: 'Diana'),
         OpenStruct.new(id: 46, name: 'Ricky'),
         OpenStruct.new(id: 33, name: 'Jonas')
       ], :id, :name, options, html_options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -255,9 +255,9 @@ JJ Abrams</textarea>
   describe '#date_select' do
     let(:options) { { title: 'Last logged in on' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.date_select :last_login_on, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -272,9 +272,9 @@ JJ Abrams</textarea>
   describe '#check_box' do
     let(:options) { { title: 'Name', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.check_box :first_login, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -292,13 +292,13 @@ JJ Abrams</textarea>
   describe '#collection_check_box' do
     let(:options) { {} }
 
-    subject(:output) {
+    subject(:output) do
       builder.collection_check_box :enabled_module_names,
                                    :repositories,
                                    true,
                                    'name',
                                    options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -319,9 +319,9 @@ JJ Abrams</textarea>
   describe '#radio_button' do
     let(:options) { { title: 'Name', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.radio_button :name, 'John', options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in container'
@@ -342,9 +342,9 @@ JJ Abrams</textarea>
   describe '#number_field' do
     let(:options) { { title: 'Bad logins', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.number_field :failed_login_count, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -362,9 +362,9 @@ JJ Abrams</textarea>
   describe '#range_field' do
     let(:options) { { title: 'Bad logins', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.range_field :failed_login_count, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -382,9 +382,9 @@ JJ Abrams</textarea>
   describe '#search_field' do
     let(:options) { { title: 'Search name', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.search_field :name, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -402,9 +402,9 @@ JJ Abrams</textarea>
   describe '#email_field' do
     let(:options) { { title: 'Email', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.email_field :mail, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -422,9 +422,9 @@ JJ Abrams</textarea>
   describe '#telephone_field' do
     let(:options) { { title: 'Not really email', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.telephone_field :mail, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -442,9 +442,9 @@ JJ Abrams</textarea>
   describe '#password_field' do
     let(:options) { { title: 'Not really password', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.password_field :login, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -462,9 +462,9 @@ JJ Abrams</textarea>
   describe '#file_field' do
     let(:options) { { title: 'Not really file', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.file_field :name, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -481,9 +481,9 @@ JJ Abrams</textarea>
   describe '#url_field' do
     let(:options) { { title: 'Not really file', class: 'custom-class' } }
 
-    subject(:output) {
+    subject(:output) do
       builder.url_field :name, options
-    }
+    end
 
     it_behaves_like 'labelled by default'
     it_behaves_like 'wrapped in field-container by default'
@@ -499,9 +499,9 @@ JJ Abrams</textarea>
   end
 
   describe '#submit' do
-    subject(:output) {
+    subject(:output) do
       Capybara::Node::Simple.new(builder.submit)
-    }
+    end
 
     it_behaves_like 'not labelled'
     it_behaves_like 'not wrapped in container'
@@ -513,9 +513,9 @@ JJ Abrams</textarea>
   end
 
   describe '#button' do
-    subject(:output) {
+    subject(:output) do
       builder.button
-    }
+    end
 
     it_behaves_like 'not labelled'
     it_behaves_like 'not wrapped in container'
@@ -618,14 +618,14 @@ JJ Abrams</textarea>
       end
 
       context 'with ActiveModel and without specified label' do
-        let(:resource) {
+        let(:resource) do
           FactoryBot.build_stubbed(:user,
-                                    firstname:  'JJ',
-                                    lastname:   'Abrams',
-                                    login:      'lost',
-                                    mail:       'jj@lost-mail.com',
-                                    failed_login_count: 45)
-        }
+                                   firstname:  'JJ',
+                                   lastname:   'Abrams',
+                                   login:      'lost',
+                                   mail:       'jj@lost-mail.com',
+                                   failed_login_count: 45)
+        end
 
         it 'uses the human attibute name' do
           expected_label_like(User.human_attribute_name(:name))
@@ -671,18 +671,18 @@ JJ Abrams</textarea>
         check_box
         password_field }.each do |input_type|
       context "for #{input_type}" do
-        subject(:output) {
+        subject(:output) do
           builder.send(input_type, :name, options)
-        }
+        end
 
         it_behaves_like 'generated label'
       end
     end
 
     context 'for select' do
-      subject(:output) {
+      subject(:output) do
         builder.select :name, [], options
-      }
+      end
 
       it_behaves_like 'generated label'
     end
diff --git a/spec/requests/api/v3/render_resource_spec.rb b/spec/requests/api/v3/render_resource_spec.rb
index c5804cb1cf..7a4b4c2034 100644
--- a/spec/requests/api/v3/render_resource_spec.rb
+++ b/spec/requests/api/v3/render_resource_spec.rb
@@ -37,8 +37,7 @@ describe 'API v3 Render resource', type: :request do
   let(:work_package) { FactoryBot.create(:work_package, project: project) }
   let(:user) { FactoryBot.create(:user, member_in_project: project) }
   let(:content_type) { 'text/plain, charset=UTF-8' }
-  let(:path) { api_v3_paths.render_markup format: format, link: context }
-  let(:format) { nil }
+  let(:path) { api_v3_paths.render_markup plain: plain, link: context }
   let(:context) { nil }
 
   before(:each) do
@@ -54,8 +53,8 @@ describe 'API v3 Render resource', type: :request do
     it { expect(subject.body).to be_html_eql(text) }
   end
 
-  describe 'textile' do
-    let(:format) { 'textile' }
+  describe 'markdown' do
+    let(:plain) { false }
 
     describe '#post' do
       subject(:response) { last_response }
@@ -64,14 +63,14 @@ describe 'API v3 Render resource', type: :request do
         describe 'valid' do
           context 'w/o context' do
             let(:params) do
-              'Hello World! This *is* textile with a ' +
-                '"link":http://community.openproject.org and ümläutß.'
+              'Hello World! This *is* markdown with a ' +
+                '[link](http://community.openproject.org) and ümläutß.'
             end
 
             it_behaves_like 'valid response' do
               let(:text) do
-                '<p>Hello World! This <strong>is</strong> textile with a ' +
-                  '<a href="http://community.openproject.org" class="external">link</a> ' +
+                '<p>Hello World! This <em>is</em> markdown with a ' +
+                  '<a href="http://community.openproject.org">link</a> ' +
                   'and ümläutß.</p>'
               end
             end
@@ -162,7 +161,7 @@ describe 'API v3 Render resource', type: :request do
 
   describe 'plain' do
     describe '#post' do
-      let(:format) { 'plain' }
+      let(:plain) { true }
 
       subject(:response) { last_response }
 
diff --git a/spec/requests/api/v3/work_package_resource_spec.rb b/spec/requests/api/v3/work_package_resource_spec.rb
index 8e2b3153d9..273208fd3b 100644
--- a/spec/requests/api/v3/work_package_resource_spec.rb
+++ b/spec/requests/api/v3/work_package_resource_spec.rb
@@ -142,26 +142,26 @@ describe 'API v3 Work package resource', type: :request, content_type: :json do
                                            description: description)
         end
         let(:description) do
-          %{
-      {{>toc}}
+          <<~DESCRIPTION
+            <macro class="toc"><macro>
 
-      h1. OpenProject Masterplan for 2015
+            # OpenProject Masterplan for 2015
 
-      h2. three point plan
+            ## three point plan
 
-      # One ###{other_wp.id}
-      # Two
-      # Three
+            1) One ###{other_wp.id}
+            2) Two
+            3) Three
 
-      h3. random thoughts
+            ### random thoughts
 
-      h4. things we like
+            ### things we like
 
-      * Pointed
-      * Relaxed
-      * Debonaire
-
-      } end
+            * Pointed
+            * Relaxed
+            * Debonaire
+          DESCRIPTION
+        end
 
         it 'should respond with work package in HAL+JSON format' do
           expect(parsed_response['id']).to eq(work_package.id)
@@ -316,7 +316,7 @@ describe 'API v3 Work package resource', type: :request, content_type: :json do
       context 'description' do
         shared_examples_for 'description updated' do
           it_behaves_like 'API V3 formattable', 'description' do
-            let(:format) { 'textile' }
+            let(:format) { 'markdown' }
 
             subject { response.body }
           end
@@ -337,7 +337,7 @@ describe 'API v3 Work package resource', type: :request, content_type: :json do
         end
 
         context 'with value' do
-          let(:raw) { '*Some text* _describing_ *something*...' }
+          let(:raw) { '**Some text** *describing* **something**...' }
           let(:html) do
             '<p><strong>Some text</strong> <em>describing</em> <strong>something</strong>...</p>'
           end
diff --git a/spec/requests/api/v3/work_packages/form/work_package_form_resource_spec.rb b/spec/requests/api/v3/work_packages/form/work_package_form_resource_spec.rb
index 174587db58..4de3a9e9a4 100644
--- a/spec/requests/api/v3/work_packages/form/work_package_form_resource_spec.rb
+++ b/spec/requests/api/v3/work_packages/form/work_package_form_resource_spec.rb
@@ -95,7 +95,7 @@ describe 'API v3 Work package form resource', type: :request do
           it { is_expected.to have_json_path('_embedded/payload/subject') }
 
           it_behaves_like 'API V3 formattable', '_embedded/payload/description' do
-            let(:format) { 'textile' }
+            let(:format) { 'markdown' }
             let(:raw) { defined?(raw_value) ? raw_value : work_package.description.to_s }
             let(:html) do
               defined?(html_value) ? html_value : ('<p>' + work_package.description.to_s + '</p>')
@@ -236,7 +236,7 @@ describe 'API v3 Work package form resource', type: :request do
 
             describe 'description' do
               let(:path) { '_embedded/payload/description/raw' }
-              let(:description) { '*Some text* _describing_ *something*...' }
+              let(:description) { '**Some text** *describing* **something**...' }
               let(:params) { valid_params.merge(description: { raw: description }) }
 
               include_context 'post request'
diff --git a/spec/routing/help_routing_spec.rb b/spec/routing/help_routing_spec.rb
index 0afd971e15..afa1c0cf6f 100644
--- a/spec/routing/help_routing_spec.rb
+++ b/spec/routing/help_routing_spec.rb
@@ -29,18 +29,6 @@
 require 'spec_helper'
 
 describe HelpController, type: :routing do
-  it 'connects GET /help/wiki_syntax to help#wiki_syntax' do
-    expect(get('/help/wiki_syntax'))
-      .to route_to(controller: 'help',
-                   action: 'wiki_syntax')
-  end
-
-  it 'connects GET /help/wiki_syntax_details to help#wiki_syntax_detailed' do
-    expect(get('/help/wiki_syntax_detailed'))
-      .to route_to(controller: 'help',
-                   action: 'wiki_syntax_detailed')
-  end
-
   it 'connects GET /help/keyboard_shortcuts to help#keyboard_shortcuts' do
     expect(get('/help/keyboard_shortcuts'))
       .to route_to(controller: 'help',
diff --git a/spec/support/pages/abstract_work_package.rb b/spec/support/pages/abstract_work_package.rb
index 97b41c4f5c..b594064352 100644
--- a/spec/support/pages/abstract_work_package.rb
+++ b/spec/support/pages/abstract_work_package.rb
@@ -229,14 +229,7 @@ module Pages
     end
 
     def update_comment(comment)
-      add_comment_container.fill_in 'value', with: comment
-    end
-
-    def preview_comment
-      label = I18n.t('js.inplace.btn_preview_enable')
-      add_comment_container
-        .find(:xpath, "//button[@title='#{label}']")
-        .click
+      add_comment_container.find('.op-ckeditor-wrapper').set(comment)
     end
 
     def save_comment
@@ -272,7 +265,7 @@ module Pages
     end
 
     def description_field
-      find('.wp-edit-field.description textarea')
+      find('.wp-edit-field.description .op-ckeditor-wrapper')
     end
 
     private
diff --git a/spec/support/pages/abstract_work_package_create.rb b/spec/support/pages/abstract_work_package_create.rb
index 2f679be6ca..9c1a8ed151 100644
--- a/spec/support/pages/abstract_work_package_create.rb
+++ b/spec/support/pages/abstract_work_package_create.rb
@@ -42,9 +42,8 @@ module Pages
     end
 
     def update_attributes(attribute_map)
-      # Only designed for text fields and selects for now
       attribute_map.each do |label, value|
-        select_attribute(label, value) || fill_in(label, with: value)
+        WorkPackageField.new(page, label.downcase).set_value(value)
       end
     end
 
diff --git a/lib/chili_project/compatibility.rb b/spec/support/pages/messages/base.rb
similarity index 71%
rename from lib/chili_project/compatibility.rb
rename to spec/support/pages/messages/base.rb
index b7ff0fbdad..a99e2b5223 100644
--- a/lib/chili_project/compatibility.rb
+++ b/spec/support/pages/messages/base.rb
@@ -1,4 +1,3 @@
-#-- encoding: UTF-8
 #-- copyright
 # OpenProject is a project management system.
 # Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
@@ -27,23 +26,12 @@
 # See docs/COPYRIGHT.rdoc for more details.
 #++
 
-module ChiliProject
-  class Compatibility
-    # Is acts_as_journalized included?
-    #
-    # Released: ChiliProject 2.0.0
-    def self.using_acts_as_journalized?
-      Journal.included_modules.include?(Redmine::Acts::Journalized)
-    end
+require 'support/pages/page'
 
-    # Is any jQuery version available on all pages?
-    #
-    # This does not take modifications into account, that may be performed by
-    # plugins.
-    #
-    # Released: ChiliProject 2.5.0
-    def self.using_jquery?
-      true
+module Pages::Messages
+  class Base < ::Pages::Page
+    def notification_type
+      :rails
     end
   end
 end
diff --git a/spec/support/pages/messages/create.rb b/spec/support/pages/messages/create.rb
new file mode 100644
index 0000000000..46bd5dd57d
--- /dev/null
+++ b/spec/support/pages/messages/create.rb
@@ -0,0 +1,61 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See docs/COPYRIGHT.rdoc for more details.
+#++
+
+require 'support/pages/messages/base'
+
+module Pages::Messages
+  class Create < ::Pages::Messages::Base
+    attr_accessor(:board)
+
+    def initialize(board)
+      self.board = board
+    end
+
+    def set_subject(subject)
+      fill_in 'Subject', with: subject
+    end
+
+    def add_text(text)
+      find('.ck-content').base.send_keys text
+    end
+
+    def click_save
+      click_button 'Create'
+
+      Pages::Messages::Show.new(Message.last)
+    end
+
+    def created_message
+      Message.last
+    end
+
+    def path
+      new_board_topic_path(board)
+    end
+  end
+end
diff --git a/spec/support/pages/messages/index.rb b/spec/support/pages/messages/index.rb
new file mode 100644
index 0000000000..900d7aa251
--- /dev/null
+++ b/spec/support/pages/messages/index.rb
@@ -0,0 +1,64 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See docs/COPYRIGHT.rdoc for more details.
+#++
+
+require 'support/pages/messages/base'
+
+module Pages::Messages
+  class Index < ::Pages::Messages::Base
+    attr_accessor :project
+
+    def initialize(project)
+      self.project = project
+    end
+
+    def path
+      project_boards_path(project)
+    end
+
+    def click_create_message
+      click_on 'Message'
+
+      ::Pages::Messages::Create.new(project.boards.first)
+    end
+
+    def expect_listed(subject:, replies: nil, last_message: nil)
+      subject = find('table tr td.subject', text: subject)
+
+      row = subject.find(:xpath, '..')
+
+      within(row) do
+        expect(page).to have_selector('td.replies', text: replies) if replies
+        expect(page).to have_selector('td.last_message', text: last_message) if last_message
+      end
+    end
+
+    def expect_num_replies(amount)
+      expect(page).to have_selector('td.replies', text: amount)
+    end
+  end
+end
diff --git a/spec/support/pages/messages/show.rb b/spec/support/pages/messages/show.rb
new file mode 100644
index 0000000000..ca06d6d581
--- /dev/null
+++ b/spec/support/pages/messages/show.rb
@@ -0,0 +1,109 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2017 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# 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.
+#
+# See docs/COPYRIGHT.rdoc for more details.
+#++
+
+require 'support/pages/messages/base'
+
+module Pages::Messages
+  class Show < Pages::Messages::Base
+    attr_accessor(:message)
+
+    def initialize(message)
+      self.message = message
+    end
+
+    def expect_subject(subject)
+      expect(page).to have_selector('.message-title', text: subject)
+    end
+
+    def expect_content(content)
+      expect(page).to have_selector('.message .wiki', text: content)
+    end
+
+    def expect_no_replies
+      expect(page).to have_no_content('Replies')
+    end
+
+    def expect_num_replies(num)
+      expect(page).to have_content("Replies (#{num})")
+    end
+
+    def reply(text)
+      click_on 'Reply'
+
+      find('.ck-content').base.send_keys text
+
+      click_button 'Submit'
+
+      Message.last
+    end
+
+    def quote(quoted_message: nil, subject: nil, content:)
+      if quoted_message
+        within "#message-#{quoted_message.id} .message-reply-menu" do
+          click_on 'Quote'
+        end
+      else
+        within ".toolbar-items" do
+          click_on 'Quote'
+        end
+      end
+
+      fill_in 'reply_subject', with: subject if subject
+
+      editor = find('.ck-content')
+      editor.base.send_keys content
+
+      # For some reason, capybara will click on
+      # the button to add another attachment when being told to click on "Submit".
+      # Therefor, submitting by enter key.
+      subject_field = find('#reply_subject')
+      subject_field.native.send_keys(:return)
+
+      Message.last
+    end
+
+    def expect_reply(subject:, content:, reply: nil)
+      selector = '.message.reply'
+      selector += "#message-#{reply.id}" if reply
+
+      within(selector) do
+        expect(page).to have_content(subject)
+        expect(page).to have_content(content)
+      end
+    end
+
+    def expect_current_path(reply = nil)
+      replies_to = reply ? "r=#{reply.id}" : nil
+      super(replies_to)
+    end
+
+    def path
+      topic_path(message)
+    end
+  end
+end
diff --git a/spec/support/pages/page.rb b/spec/support/pages/page.rb
index f049ac2895..5e86e501c1 100644
--- a/spec/support/pages/page.rb
+++ b/spec/support/pages/page.rb
@@ -74,16 +74,25 @@ module Pages
       Setting.per_page_options = "#{n}, 50, 100"
     end
 
-    def expect_current_path
+    def expect_current_path(query_params = nil)
       uri = URI.parse(current_url)
-      expected_path = uri.path
-      expected_path += '?' + uri.query if uri.query
+      current_path = uri.path
+      current_path += '?' + uri.query if uri.query
 
-      expect(expected_path).to eql path
+      expected_path = path
+      expected_path += "?#{query_params}" if query_params
+
+      expect(current_path).to eql expected_path
     end
 
     def expect_notification(type: :success, message:)
-      expect(page).to have_selector(".notification-box.-#{type}", text: message, wait: 20)
+      if notification_type == :angular
+        expect(page).to have_selector(".notification-box.-#{type}", text: message, wait: 20)
+      elsif type == :error
+        expect(page).to have_selector(".errorExplanation", text: message)
+      else
+        raise NotImplementedError
+      end
     end
 
     def dismiss_notification!
@@ -97,5 +106,9 @@ module Pages
     def path
       nil
     end
+
+    def notification_type
+      :angular
+    end
   end
 end
diff --git a/spec/support/work_packages/work_package_editor_field.rb b/spec/support/work_packages/work_package_editor_field.rb
index 54a122a3e7..9742a4da90 100644
--- a/spec/support/work_packages/work_package_editor_field.rb
+++ b/spec/support/work_packages/work_package_editor_field.rb
@@ -1,17 +1,8 @@
 require_relative './work_package_field'
 
 class WorkPackageEditorField < WorkPackageField
-
   def input_selector
-    if markdown?
-      'div.op-ckeditor-wrapper'
-    else
-      '.textarea-wrapper textarea'
-    end
-  end
-
-  def markdown?
-    Setting.text_formatting == 'markdown'
+    'div.op-ckeditor-wrapper'
   end
 
   def expect_save_button(enabled: true)
@@ -23,11 +14,7 @@ class WorkPackageEditorField < WorkPackageField
   end
 
   def expect_value(value)
-    if markdown?
-      expect(input_element.text).to eq(value)
-    else
-      expect(input_element.value).to eq(value)
-    end
+    expect(input_element.text).to eq(value)
   end
 
   def save!
diff --git a/spec/support/work_packages/work_package_field.rb b/spec/support/work_packages/work_package_field.rb
index 0b1eee7315..8c9401d95b 100644
--- a/spec/support/work_packages/work_package_field.rb
+++ b/spec/support/work_packages/work_package_field.rb
@@ -146,7 +146,11 @@ class WorkPackageField
   end
 
   def input_selector
-    '.wp-inline-edit--field'
+    if property_name == 'description'
+      '.op-ckeditor-wrapper'
+    else
+      '.wp-inline-edit--field'
+    end
   end
 
   def field_type
diff --git a/spec_legacy/unit/helpers/application_helper_spec.rb b/spec_legacy/unit/helpers/application_helper_spec.rb
deleted file mode 100644
index d96877ac77..0000000000
--- a/spec_legacy/unit/helpers/application_helper_spec.rb
+++ /dev/null
@@ -1,513 +0,0 @@
-#-- encoding: UTF-8
-#-- copyright
-# OpenProject is a project management system.
-# Copyright (C) 2012-2018 the OpenProject Foundation (OPF)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version 3.
-#
-# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
-# Copyright (C) 2006-2017 Jean-Philippe Lang
-# Copyright (C) 2010-2013 the ChiliProject Team
-#
-# 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.
-#
-# See docs/COPYRIGHT.rdoc for more details.
-#++
-require 'legacy_spec_helper'
-
-describe ApplicationHelper, type: :helper do
-  include OpenProject::StaticRouting
-  include WorkPackagesHelper
-
-  before do
-    # @project variable is used by helper
-    @project = FactoryBot.create :valid_project
-    @project.reload # reload references to indirectly created entities (e.g. wiki)
-
-    @admin = FactoryBot.create :admin
-    @anonymous = FactoryBot.create :anonymous
-    @non_member = FactoryBot.create :user
-    @project_member = FactoryBot.create :user,
-                                         member_in_project: @project,
-                                         member_through_role: FactoryBot.create(:role,
-                                                                                 permissions: [:view_work_packages, :edit_work_packages,
-                                                                                               :browse_repository, :view_changesets, :view_wiki_pages])
-
-    @issue = FactoryBot.create :work_package, project: @project, author: @project_member, type: @project.types.first
-
-    file = LegacyFileHelpers.mock_uploaded_file name: 'logo.gif',
-                                          content_type: 'image/gif',
-                                          content: 'not actually a gif',
-                                          binary: true
-    @attachment = FactoryBot.create :attachment,
-                                     author: @project_member,
-                                     file: file,
-                                     content_type: 'image/gif',
-                                     container: @issue,
-                                     description: 'This is a logo'
-
-    allow(User).to receive(:current).and_return(@project_member)
-  end
-
-  it 'should auto links' do
-    to_test = {
-      'http://foo.bar' => '<a class="external icon-context icon-copy" href="http://foo.bar">http://foo.bar</a>',
-      'http://foo.bar/~user' => '<a class="external icon-context icon-copy" href="http://foo.bar/~user">http://foo.bar/~user</a>',
-      'http://foo.bar.' => '<a class="external icon-context icon-copy" href="http://foo.bar">http://foo.bar</a>.',
-      'https://foo.bar.' => '<a class="external icon-context icon-copy" href="https://foo.bar">https://foo.bar</a>.',
-      'This is a link: http://foo.bar.' => 'This is a link: <a class="external icon-context icon-copy" href="http://foo.bar">http://foo.bar</a>.',
-      'A link (eg. http://foo.bar).' => 'A link (eg. <a class="external icon-context icon-copy" href="http://foo.bar">http://foo.bar</a>).',
-      'http://foo.bar/foo.bar#foo.bar.' => '<a class="external icon-context icon-copy" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
-      'http://www.foo.bar/Test_(foobar)' => '<a class="external icon-context icon-copy" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>',
-      '(see inline link : http://www.foo.bar/Test_(foobar))' => '(see inline link : <a class="external icon-context icon-copy" href="http://www.foo.bar/Test_(foobar)">http://www.foo.bar/Test_(foobar)</a>)',
-      '(see inline link : http://www.foo.bar/Test)' => '(see inline link : <a class="external icon-context icon-copy" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>)',
-      '(see inline link : http://www.foo.bar/Test).' => '(see inline link : <a class="external icon-context icon-copy" href="http://www.foo.bar/Test">http://www.foo.bar/Test</a>).',
-      '(see "inline link":http://www.foo.bar/Test_(foobar))' => '(see <a href="http://www.foo.bar/Test_(foobar)" class="external">inline link</a>)',
-      '(see "inline link":http://www.foo.bar/Test)' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>)',
-      '(see "inline link":http://www.foo.bar/Test).' => '(see <a href="http://www.foo.bar/Test" class="external">inline link</a>).',
-      'www.foo.bar' => '<a class="external icon-context icon-copy" href="http://www.foo.bar">www.foo.bar</a>',
-      'http://foo.bar/page?p=1&t=z&s=' => '<a class="external icon-context icon-copy" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
-      'http://foo.bar/page#125' => '<a class="external icon-context icon-copy" href="http://foo.bar/page#125">http://foo.bar/page#125</a>',
-      'http://foo@www.bar.com' => '<a class="external icon-context icon-copy" href="http://foo@www.bar.com">http://foo@www.bar.com</a>',
-      'http://foo:bar@www.bar.com' => '<a class="external icon-context icon-copy" href="http://foo:bar@www.bar.com">http://foo:bar@www.bar.com</a>',
-      'ftp://foo.bar' => '<a class="external icon-context icon-copy" href="ftp://foo.bar">ftp://foo.bar</a>',
-      'ftps://foo.bar' => '<a class="external icon-context icon-copy" href="ftps://foo.bar">ftps://foo.bar</a>',
-      'sftp://foo.bar' => '<a class="external icon-context icon-copy" href="sftp://foo.bar">sftp://foo.bar</a>',
-      # two exclamation marks
-      'http://example.net/path!602815048C7B5C20!302.html' => '<a class="external icon-context icon-copy" href="http://example.net/path!602815048C7B5C20!302.html">http://example.net/path!602815048C7B5C20!302.html</a>',
-      # escaping
-      'http://foo"bar' => '<a class="external icon-context icon-copy" href="http://foo&quot;bar">http://foo&quot;bar</a>',
-      # wrap in angle brackets
-      '<http://foo.bar>' => '&lt;<a class="external icon-context icon-copy" href="http://foo.bar">http://foo.bar</a>&gt;'
-    }
-    to_test.each { |text, result| assert_dom_equal "<p>#{result}</p>", helper.format_text(text) }
-  end
-
-  it 'should auto mailto' do
-    assert_dom_equal '<p><a class="email" href="mailto:test@foo.bar">test@foo.bar</a></p>',
-                     helper.format_text('test@foo.bar')
-  end
-
-  it 'should inline images' do
-    to_test = {
-      '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
-      'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
-      'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
-      # inline styles should be stripped
-      'with style !{width:100px;height100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" alt="" />',
-      'with title !http://foo.bar/image.jpg(This is a title)!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a title" alt="This is a title" />',
-      'with title !http://foo.bar/image.jpg(This is a double-quoted "title")!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a double-quoted &quot;title&quot;" alt="This is a double-quoted &quot;title&quot;" />',
-    }
-    to_test.each { |text, result| assert_dom_equal "<p>#{result}</p>", helper.format_text(text) }
-  end
-
-  it 'should inline images inside tags' do
-    raw = <<-RAW
-h1. !foo.png! Heading
-
-Centered image:
-
-p=. !bar.gif!
-RAW
-
-    assert helper.format_text(raw).include?('<img src="foo.png" alt="" />')
-    assert helper.format_text(raw).include?('<img src="bar.gif" alt="" />')
-  end
-
-  it 'should attached images' do
-    to_test = {
-      'Inline image: !logo.gif!' => "Inline image: <img src=\"/attachments/#{@attachment.id}\" title=\"This is a logo\" alt=\"This is a logo\" />",
-      'Inline image: !logo.GIF!' => "Inline image: <img src=\"/attachments/#{@attachment.id}\" title=\"This is a logo\" alt=\"This is a logo\" />",
-      'No match: !ogo.gif!' => 'No match: <img src="ogo.gif" alt="" />',
-      'No match: !ogo.GIF!' => 'No match: <img src="ogo.GIF" alt="" />',
-      # link image
-      '!logo.gif!:http://foo.bar/' => "<a href=\"http://foo.bar/\"><img src=\"/attachments/#{@attachment.id}\" title=\"This is a logo\" alt=\"This is a logo\" /></a>",
-    }
-    to_test.each { |text, result| assert_dom_equal "<p>#{result}</p>", helper.format_text(text, attachments: [@attachment]) }
-  end
-
-  it 'should textile external links' do
-    to_test = {
-      'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
-      'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
-      '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
-      '"link (Link title with "double-quotes")":http://foo.bar' => '<a href="http://foo.bar" title="Link title with &quot;double-quotes&quot;" class="external">link</a>',
-      "This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",
-      # no multiline link text
-      "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />and another on a second line\":test",
-      # mailto link
-      "\"system administrator\":mailto:sysadmin@example.com?subject=redmine%20permissions" => "<a href=\"mailto:sysadmin@example.com?subject=redmine%20permissions\">system administrator</a>",
-      # two exclamation marks
-      '"a link":http://example.net/path!602815048C7B5C20!302.html' => '<a href="http://example.net/path!602815048C7B5C20!302.html" class="external">a link</a>',
-      # escaping
-      '"test":http://foo"bar' => '<a href="http://foo&quot;bar" class="external">test</a>',
-    }
-    to_test.each { |text, result| assert_dom_equal "<p>#{result}</p>", helper.format_text(text) }
-  end
-
-  it 'should textile relative to full links in a controller', :with_mock_request_for_helper do
-    {
-      # shouldn't change non-relative links
-      'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
-      'This is an intern "link":/foo/bar' => 'This is an intern <a href="http://test.host/foo/bar">link</a>',
-      'This is an intern "link":/foo/bar and an extern "link":http://foo.bar' => 'This is an intern <a href="http://test.host/foo/bar">link</a> and an extern <a href="http://foo.bar" class="external">link</a>',
-    }.each { |text, result| assert_dom_equal "<p>#{result}</p>", helper.format_text(text, only_path: false) }
-  end
-
-  it 'should textile relative to full links in the mailer' do
-    # mimic the mailer default_url_options
-    @controller.class.class_eval do
-      def self.default_url_options
-        ::UserMailer.default_url_options
-      end
-    end
-
-    {
-      # shouldn't change non-relative links
-      'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
-      'This is an intern "link":/foo/bar' => 'This is an intern <a href="http://test.host/foo/bar">link</a>',
-      'This is an intern "link":/foo/bar and an extern "link":http://foo.bar' => 'This is an intern <a href="http://test.host/foo/bar">link</a> and an extern <a href="http://foo.bar" class="external">link</a>',
-    }.each { |text, result| assert_dom_equal "<p>#{result}</p>", helper.format_text(text, only_path: false) }
-  end
-
-  it 'should cross project redmine links' do
-    version = FactoryBot.create :version,
-                                 name: '1.0',
-                                 project: @project
-
-    to_test = {
-      # versions
-      'version:"1.0"'                         => 'version:"1.0"',
-      "#{@project.identifier}:version:\"1.0\"" => "<a class=\"version\" href=\"/versions/#{version.id}\">1.0</a>",
-      'invalid:version:"1.0"'                 => 'invalid:version:"1.0"'
-    }
-
-    repository = FactoryBot.create :repository_subversion,
-                                    project: @project
-
-    changeset = FactoryBot.create :changeset,
-                                   repository: repository,
-                                   comments: 'This commit fixes #1, #2 and references #1 & #3'
-    identifier = @project.identifier
-
-    source_link = link_to("#{identifier}:source:/some/file",
-                          { controller: 'repositories',
-                            action: 'entry',
-                            project_id: identifier,
-                            repo_path: 'some/file' },
-                          class: 'source')
-    changeset_link = link_to("#{identifier}:r#{changeset.revision}",
-                             { controller: 'repositories',
-                               action: 'revision',
-                               project_id: identifier,
-                               rev: changeset.revision },
-                             class: 'changeset',
-                             title: 'This commit fixes #1, #2 and references #1 & #3')
-
-    to_test.merge!(
-      # changeset
-      "r#{changeset.revision}"                => "r#{changeset.revision}",
-      "#{@project.identifier}:r#{changeset.revision}"  => changeset_link,
-      "invalid:r#{changeset.revision}"        => "invalid:r#{changeset.revision}",
-      # source
-      'source:/some/file'                     => 'source:/some/file',
-      "#{@project.identifier}:source:/some/file"       => source_link,
-      'invalid:source:/some/file'             => 'invalid:source:/some/file',
-    )
-
-    # helper.format_text "sees" the text is parses from the_other_project (and not @project)
-    the_other_project = FactoryBot.create :valid_project
-
-    to_test.each do |text, result|
-      assert_dom_equal "<p>#{result}</p>",
-                       helper.format_text(text, project: the_other_project), "#{text} failed"
-    end
-  end
-
-  it 'should redmine links git commit' do
-    allow(User).to receive(:current).and_return(@admin)
-    changeset_link = link_to('abcd',
-                             {
-                               controller: 'repositories',
-                               action:     'revision',
-                               project_id: @project.identifier,
-                               rev:        'abcd',
-                             },
-                             class: 'changeset', title: 'test commit')
-    to_test = {
-      'commit:abcd' => changeset_link,
-    }
-    r = Repository::Git.create!(project: @project, scm_type: 'local', url: '/tmp/test/git')
-    assert r
-    c = Changeset.new(repository: r,
-                      committed_on: Time.now,
-                      revision: 'abcd',
-                      scmid: 'abcd',
-                      comments: 'test commit')
-    assert(c.save)
-    @project.reload
-    to_test.each { |text, result| assert_dom_equal "<p>#{result}</p>", helper.format_text(text) }
-  end
-
-  it 'should attachment links' do
-    attachment_link = link_to('logo.gif', { controller: 'attachments', action: 'download', id: @attachment }, class: 'attachment')
-    to_test = {
-      'attachment:logo.gif' => attachment_link
-    }
-    to_test.each { |text, result| assert_dom_equal "<p>#{result}</p>", helper.format_text(text, attachments: [@attachment]), "#{text} failed" }
-  end
-
-  it 'should html tags' do
-    to_test = {
-      '<div>content</div>' => '<p>&lt;div&gt;content&lt;/div&gt;</p>',
-      "<div class=\"bold\">content</div>" => "<p>&lt;div class=\"bold\"&gt;content&lt;/div&gt;</p>",
-      '<script>some script;</script>' => '<p>&lt;script&gt;some script;&lt;/script&gt;</p>',
-      # do not escape pre/code tags
-      "<pre>\nline 1\nline2</pre>" => "<pre>\nline 1\nline2</pre>",
-      "<pre><code>\nline 1\nline2</code></pre>" => "<pre><code>\nline 1\nline2</code></pre>",
-      '<pre><div>content</div></pre>' => '<pre>&lt;div&gt;content&lt;/div&gt;</pre>',
-      'HTML comment: <!-- no comments -->' => '<p>HTML comment: &lt;!-- no comments --&gt;</p>',
-      '<!-- opening comment' => '<p>&lt;!-- opening comment</p>',
-      # remove attributes except class
-      "<pre class='foo'>some text</pre>" => "<pre class='foo'>some text</pre>",
-      '<pre class="foo">some text</pre>' => '<pre class="foo">some text</pre>',
-      "<pre class='foo bar'>some text</pre>" => "<pre class='foo bar'>some text</pre>",
-      '<pre class="foo bar">some text</pre>' => '<pre class="foo bar">some text</pre>',
-      "<pre onmouseover='alert(1)'>some text</pre>" => '<pre>some text</pre>',
-      # xss
-      '<pre><code class=""onmouseover="alert(1)">text</code></pre>' => '<pre><code>text</code></pre>',
-      '<pre class=""onmouseover="alert(1)">text</pre>' => '<pre>text</pre>',
-    }
-    to_test.each { |text, result| assert_dom_equal result, helper.format_text(text) }
-  end
-
-  it 'should allowed html tags' do
-    to_test = {
-      '<pre>preformatted text</pre>' => '<pre>preformatted text</pre>',
-      '<notextile>no *textile* formatting</notextile>' => 'no *textile* formatting',
-      '<notextile>this is <tag>a tag</tag></notextile>' => 'this is &lt;tag&gt;a tag&lt;/tag&gt;'
-    }
-    to_test.each { |text, result| assert_dom_equal result, helper.format_text(text) }
-  end
-
-  it 'should pre tags' do
-    raw = <<-RAW
-Before
-
-<pre>
-<prepared-statement-cache-size>32</prepared-statement-cache-size>
-</pre>
-
-After
-RAW
-
-    expected = <<-EXPECTED
-<p>Before</p>
-<pre>
-&lt;prepared-statement-cache-size&gt;32&lt;/prepared-statement-cache-size&gt;
-</pre>
-<p>After</p>
-EXPECTED
-
-    assert_equal expected.gsub(%r{[\r\n\t]}, ''), helper.format_text(raw).gsub(%r{[\r\n\t]}, '')
-  end
-
-  it 'should syntax highlight' do
-    raw = <<-RAW
-<pre><code class="ruby">
-# Some ruby code here
-</code></pre>
-RAW
-
-    expected = <<-EXPECTED
-<pre><code class="ruby CodeRay"><span class=\"CodeRay\"><span class="line-numbers"><a href=\"#n1\" name=\"n1\">1</a></span><span class="comment"># Some ruby code here</span></span>
-</code></pre>
-EXPECTED
-
-    assert_equal expected.gsub(%r{[\r\n\t]}, ''), helper.format_text(raw).gsub(%r{[\r\n\t]}, '')
-  end
-
-  it 'should wiki links in tables' do
-    @project.wiki.start_page = 'Page'
-    @project.wiki.save!
-    FactoryBot.create :wiki_page_with_content, wiki: @project.wiki, title: 'Other page'
-    FactoryBot.create :wiki_page_with_content, wiki: @project.wiki, title: 'Last page'
-
-    to_test = { "|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
-                 "<tr><td><a class=\"wiki-page new\" href=\"/projects/#{@project.identifier}/wiki/page?title=Link+title\">Link title</a></td>" +
-                 "<td><a class=\"wiki-page\" href=\"/projects/#{@project.identifier}/wiki/other-page\">Other title</a></td>" +
-                 "</tr><tr><td>Cell 21</td><td><a class=\"wiki-page\" href=\"/projects/#{@project.identifier}/wiki/last-page\">Last page</a></td></tr>"
-    }
-
-    to_test.each { |text, result| assert_dom_equal "<table>#{result}</table>", helper.format_text(text).gsub(/[\t\n]/, '') }
-  end
-
-  it 'should text formatting' do
-    to_test = { '*_+bold, italic and underline+_*' => '<strong><em><ins>bold, italic and underline</ins></em></strong>',
-                '(_text within parentheses_)' => '(<em>text within parentheses</em>)',
-                'a *Humane Web* Text Generator' => 'a <strong>Humane Web</strong> Text Generator',
-                'a H *umane* W *eb* T *ext* G *enerator*' => 'a H <strong>umane</strong> W <strong>eb</strong> T <strong>ext</strong> G <strong>enerator</strong>',
-                'a *H* umane *W* eb *T* ext *G* enerator' => 'a <strong>H</strong> umane <strong>W</strong> eb <strong>T</strong> ext <strong>G</strong> enerator',
-              }
-    to_test.each { |text, result| assert_dom_equal "<p>#{result}</p>", helper.format_text(text) }
-  end
-
-  it 'should wiki horizontal rule' do
-    assert_equal '<hr />', helper.format_text('---')
-    assert_equal '<p>Dashes: ---</p>', helper.format_text('Dashes: ---')
-  end
-
-  it 'should footnotes' do
-    raw = <<-RAW
-This is some text[1].
-
-fn1. This is the foot note
-RAW
-
-    expected = <<-EXPECTED
-<p>This is some text<sup><a href=\"#fn1\">1</a></sup>.</p>
-<p id="fn1" class="footnote"><sup>1</sup> This is the foot note</p>
-EXPECTED
-
-    assert_equal expected.gsub(%r{[\r\n\t]}, ''), helper.format_text(raw).gsub(%r{[\r\n\t]}, '')
-  end
-
-  it 'should headings without url' do
-    raw = 'h1. Some heading'
-    expected = %|<a name="Some-heading"></a>\n<h1 >Some heading<a href="#Some-heading" class="wiki-anchor">&para;</a></h1>|
-
-    assert_equal expected, helper.format_text(raw)
-  end
-
-  it 'should table of content' do
-    @project.wiki.start_page = 'Wiki'
-    @project.wiki.save!
-    FactoryBot.create :wiki_page_with_content, wiki: @project.wiki, title: 'Wiki'
-    FactoryBot.create :wiki_page_with_content, wiki: @project.wiki, title: 'another Wiki'
-
-    raw = <<-RAW
-{{toc}}
-
-h1. Title
-
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
-
-h2. Subtitle with a [[Wiki]] link
-
-Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
-
-h2. Subtitle with [[Wiki|another Wiki]] link
-
-h2. Subtitle with %{color:red}red text%
-
-<pre>
-some code
-</pre>
-
-h3. Subtitle with *some* _modifiers_
-
-h1. Another title
-
-h3. An "Internet link":http://www.redmine.org/ inside subtitle
-
-h2. "Project Name !/attachments/#{@attachment.id}/#{@attachment.filename}!":/projects/#{@project.identifier}/issues
-
-RAW
-
-    expected =  '<ul class="toc">' +
-                '<li><a href="#Title">Title</a>' +
-                '<ul>' +
-                '<li><a href="#Subtitle-with-a-Wiki-link">Subtitle with a Wiki link</a></li>' +
-                '<li><a href="#Subtitle-with-another-Wiki-link">Subtitle with another Wiki link</a></li>' +
-                '<li><a href="#Subtitle-with-red-text">Subtitle with red text</a>' +
-                '<ul>' +
-                '<li><a href="#Subtitle-with-some-modifiers">Subtitle with some modifiers</a></li>' +
-                '</ul>' +
-                '</li>' +
-                '</ul>' +
-                '</li>' +
-                '<li><a href="#Another-title">Another title</a>' +
-                '<ul>' +
-                '<li>' +
-                '<ul>' +
-                '<li><a href="#An-Internet-link-inside-subtitle">An Internet link inside subtitle</a></li>' +
-                '</ul>' +
-                '</li>' +
-                '<li><a href="#Project-Name">Project Name </a></li>' +
-                '</ul>' +
-                '</li>' +
-                '</ul>'
-
-    assert helper.format_text(raw).gsub("\n", '').include?(expected), helper.format_text(raw)
-  end
-
-  it 'should default formatter' do
-    Setting.text_formatting = 'unknown'
-    text = 'a *link*: http://www.example.net/'
-    assert_equal '<p>a *link*: <a href="http://www.example.net/">http://www.example.net/</a></p>', helper.format_text(text)
-    Setting.text_formatting = 'textile'
-  end
-
-  it 'should due date distance in words' do
-    to_test = { Date.today => 'Due in 0 days',
-                Date.today + 1 => 'Due in 1 day',
-                Date.today + 100 => 'Due in about 3 months',
-                Date.today + 20000 => 'Due in over 54 years',
-                Date.today - 1 => '1 day late',
-                Date.today - 100 => 'about 3 months late',
-                Date.today - 20000 => 'over 54 years late',
-               }
-    ::I18n.locale = :en
-    to_test.each do |date, expected|
-      assert_equal expected, due_date_distance_in_words(date)
-    end
-  end
-
-  it 'should link to user' do
-    t = link_to_user(@admin)
-    assert_dom_equal "<a href=\"/users/#{@admin.id}\">#{@admin.name}</a>", t
-  end
-
-  it 'should link to user should not link to locked user' do
-    user = FactoryBot.build :user
-    user.lock!
-    assert user.locked?
-    t = link_to_user(user)
-    assert_equal user.name, t
-  end
-
-  it 'should link to user should not link to anonymous' do
-    user = User.anonymous
-    assert user.anonymous?
-    t = link_to_user(user)
-    assert_equal ::I18n.t(:label_user_anonymous), t
-  end
-
-  it 'should link to project' do
-    p_id = @project.identifier
-    p_name = @project.name
-    assert_dom_equal %(<a href="/projects/#{p_id}">#{p_name}</a>),
-                     link_to_project(@project)
-    assert_dom_equal %(<a href="/projects/#{p_id}/settings">#{p_name}</a>),
-                     link_to_project(@project, action: 'settings')
-    assert_dom_equal %(<a href="/projects/#{p_id}/settings/members">#{p_name}</a>),
-                     link_to_project(@project, action: 'settings', tab: 'members')
-    assert_dom_equal %(<a href="#{root_url}projects/#{p_id}?jump=blah">#{p_name}</a>),
-                     link_to_project(@project, only_path: false, jump: 'blah')
-    assert_dom_equal %(<a class="project" href="/projects/#{p_id}/settings">#{p_name}</a>),
-                     link_to_project(@project, { action: 'settings' }, class: 'project')
-  end
-end