Merge pull request #606 from opf/bugfix/2567_double_escaped_characters

Fix double escaping in timelines select2 (fixes #2567)

app/assets/javascripts/timelines_autocompleter.js

@@ -164,7 +164,7 @@
       return markup.join("");
     },
     formatSelection: function (item) {
-      return OpenProject.Helpers.markupEscape(item.name);
+      return item.name;
     },
     initSelection: function (element, callback) {
       var data = [];

app/views/timelines/filter/_projects.html.erb

@@ -65,7 +65,7 @@ See doc/COPYRIGHT.rdoc for more details.
                      {:multiple => true,
                       :size => 12}) %>
         <% else %>
-         <%= select("timeline[options]",
+          <%= select("timeline[options]",
                    :project_types,
                    options_for_select([]),
                    {},

doc/CHANGELOG.md

@@ -31,6 +31,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 * `#2697` Fix: Missing migration of planning element watchers
 * `#2564` Support custom fields in REST API v2 for work packages and projects
+* `#2567` [Timelines] Select2 selection shows double escaped character
 * `#2586` Query available custom fields in REST API v2
 * Reverts `#2645` Remove usage of eval()