Merge branch 'feature/rails5' of github.com:oliverguenther/openproject into feature/rails5

Gemfile

@@ -195,6 +195,8 @@ group :test do
   gem 'json_spec', '~> 1.1.4'
   gem 'codecov', '~> 0.1.5', require: nil
   gem 'equivalent-xml', '~> 0.6'
+
+  gem 'parallel_tests', '~> 2.4.1'
 end
 
 group :ldap do
@@ -206,15 +208,16 @@ group :development do
   gem 'thin', '~> 1.7.0'
   gem 'faker'
   gem 'livingstyleguide', '~> 2.0.0'
-end
 
-group :development, :test do
+  # Pry seems to cause a lot of segfaults in the tests.
+  # Therefore, it has been removed from the :test group for now.
+  # Reevaluate once newer versions of pry have been released.
   gem 'pry-rails', '~> 0.3.4'
   gem 'pry-stack_explorer', '~> 0.4.9.2'
   gem 'pry-rescue', '~> 1.4.4'
   gem 'pry-byebug', '~> 3.4.0', platforms: [:mri]
   gem 'pry-doc', '~> 0.9.0'
-  gem 'parallel_tests', '~> 2.4.1'
+
   gem 'rubocop'
 end
 

Gemfile.lock

@@ -707,4 +707,4 @@ RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.5
+   1.13.0

app/assets/fonts/openproject_icon/openproject-icon-font.svg

@@ -11,7 +11,6 @@
 <glyph glyph-name="align-justify" unicode="&#57347;" d="M0 400l512 0 0 32-512 0z m0-64l512 0 0 32-512 0z m0-64l512 0 0 32-512 0z m0-64l512 0 0 32-512 0z m0-64l512 0 0 32-512 0z m0-64l512 0 0 32-512 0z"/>
 <glyph glyph-name="align-left" unicode="&#57348;" d="M352 400l-352 0 0 32 352 0z m160-64l-512 0 0 32 512 0z m-128-64l-384 0 0 32 384 0z m96-64l-480 0 0 32 480 0z m-128-64l-352 0 0 32 352 0z m96-64l-448 0 0 32 448 0z"/>
 <glyph glyph-name="align-right" unicode="&#57349;" d="M160 400l352 0 0 32-352 0z m-160-64l512 0 0 32-512 0z m128-64l384 0 0 32-384 0z m-96-64l480 0 0 32-480 0z m128-64l352 0 0 32-352 0z m-96-64l448 0 0 32-448 0z"/>
-<glyph glyph-name="add" unicode="&#57344;" d="M216 512l80 0 0-512-80 0z m-216-216l512 0 0-80-512 0z"/>
 <glyph glyph-name="workflow" unicode="&#57350;" d="M437 215l-3-6c-18-81-92-136-177-136-44 0-86 18-118 46l41 29-152 71 14-163 35 23c47-47 111-75 180-75 124 0 229 80 250 199l3 12z m-359 79c18 81 92 140 177 140 44 0 86-16 118-44l-41-28 152-61-14 159-35-26c-47 47-111 74-180 74-124 0-229-88-250-207l-3-21 73 0z"/>
 <glyph glyph-name="arrow-left-right" unicode="&#57351;" d="M511 374l-181 132-3-62c-279 11-317-143-318-174 67 121 282 51 313 49l-2-62z m-184 59l-5-112c1 29 3 58 5 112z m-137-240l2 62-191-117 181-132 5 112c-1-14-1-30-2-50 279-11 317 143 318 174-67-121-282-51-313-49z"/>
 <glyph glyph-name="arrow-left1" unicode="&#57352;" d="M7 235c-1 1-1 2-2 3 0 0-1 1-1 2 0 1-1 1-1 2 0 0 0 0 0 1 0 1-1 2-1 2 0 1-1 2-1 3 0 1 0 2 0 3 0 1 0 1-1 2 0 1 0 2 0 3 0 1 0 2 0 3 1 1 1 2 1 3 0 1 0 1 0 2 0 1 1 2 1 3 0 1 1 2 1 2 0 1 0 1 0 1 0 1 1 2 1 2 0 1 1 2 1 2 1 1 1 2 2 3 0 1 1 1 1 2 1 1 2 2 2 2 1 1 1 1 1 1l175 176c15 14 39 14 53 0 15-15 15-39 0-53l-111-112 347 0c13 0 24-6 31-16 4-6 6-13 6-21 0-10-4-20-11-26-7-7-16-11-26-11l-347 0 111-112c15-14 15-38 0-53-7-7-16-11-26-11-10 0-19 4-27 11l-175 176c0 0 0 0-1 1 0 1-1 1-2 2 0 1-1 1-1 2z"/>
@@ -36,7 +35,6 @@
 <glyph glyph-name="calendar" unicode="&#57371;" d="M240 256l-64 0 0 64 64 0z m96 0l-64 0 0 64 64 0z m96 0l-64 0 0 64 64 0z m-288-96l-64 0 0 64 64 0z m96 0l-64 0 0 64 64 0z m96 0l-64 0 0 64 64 0z m96 0l-64 0 0 64 64 0z m-288-96l-64 0 0 64 64 0z m96 0l-64 0 0 64 64 0z m96 0l-64 0 0 64 64 0z m96 384l0 64-96 0 0-64-160 0 0 64-96 0 0-64-64 0 0-448 480 0 0 448z m-64 32l32 0 0-64-32 0z m-256 0l32 0 0-64-32 0z m352-448l-416 0 0 320 416 0z"/>
 <glyph glyph-name="calendar2" unicode="&#57372;" d="M150 248l-38-9-12 48 66 18 45 0 0-225-61 0 0 168z m217 4l-104 0 0 52 173 0 0-47-99-177-69 0z m65 196l0 64-96 0 0-64-160 0 0 64-96 0 0-64-64 0 0-448 480 0 0 448z m-64 32l32 0 0-64-32 0z m-256 0l32 0 0-64-32 0z m352-448l-416 0 0 320 416 0z"/>
 <glyph glyph-name="camera" unicode="&#57373;" d="M426 342c-16-10-38-23-51-31-13-7-23 1-23 18l0 71c0 18-14 32-32 32l-288 0c-18 0-32-14-32-32l0-288c0-18 14-32 32-32l288 0c18 0 32 14 32 32l0 72c0 18 10 26 23 18 13-8 35-21 51-30l59-36c15-9 27-2 27 16l0 73c0 17 0 46 0 64l0 72c0 18-12 25-27 16z"/>
-<glyph glyph-name="cancel" unicode="&#57374;" d="M451 4l-447 447 57 57 447-447z m56 447l-447-447-56 56 447 447z"/>
 <glyph glyph-name="cart" unicode="&#57375;" d="M468 180l43 213-415 56-33 22c0 2 1 5 1 7 0 18-14 32-32 32-17 0-31-14-31-32 0-17 14-32 31-32 3 0 5 1 7 2l39-26 65-256 19 1-17-56c-1 0-2 0-2 0-31 0-55-24-55-54 0-31 24-55 55-55 22 0 41 13 50 33l172 0c8-19 27-33 49-33 30 0 54 24 54 53 0 30-24 54-54 54-25 0-46-18-51-41l-167 0c-3 13-10 24-20 32l21 68z"/>
 <glyph glyph-name="changeset" unicode="&#57376;" d="M444 432l-376 0-68-160 0-192 512 0 0 192z m-92-128c0-53-43-96-96-96-53 0-96 43-96 96l-112 0 41 96 334 0 41-96z"/>
 <glyph glyph-name="changeset-up" unicode="&#57377;" d="M192 352l0-128 128 0 0 160 64 0-128 128-128-128 64 0z m252 0l-92 0 0-32 71 0 41-96-112 0c0-53-43-96-96-96-53 0-96 43-96 96l-112 0 41 96 71 0 0 32-92 0-68-160 0-192 512 0 0 192z"/>
@@ -52,7 +50,6 @@
 <glyph glyph-name="contacts" unicode="&#57388;" d="M64 512c33 0 0 0 0 0l0-512c0 0 34 0 1 0-33 0-65 32-65 67 0 25 0 271 0 381 0 38 31 64 64 64z m448-224l-64 0 0 96c0 0 0 0 32 0 32 0 32-35 32-35z m0-160l-64 0 0-96c0 0 0 0 32 0 32 0 32 31 32 31z m0 32l-64 0 0 96 64 0z m-161 352c-33 0-255 0-255 0l0-512c0 0 223 0 256 0 33 0 64 26 64 64 0 110 0 356 0 381 0 35-32 67-65 67z m1-320l-192 0c0 0-2 20 4 28 5 9 25 15 44 23 19 8 24 11 24 11l0 18c0 0-7 6-10 23-4-1-9 7-9 11 0 4 1 15 6 14-1 9-2 16-1 21 1 14 16 30 38 30 22 0 37-16 38-30 1-5 0-12-1-21 5 1 6-10 6-14 0-4-5-12-10-11-2-17-9-23-9-23l0-18c0 0 5-3 24-11 19-8 38-14 44-23 5-8 4-28 4-28z"/>
 <glyph glyph-name="custom-fields" unicode="&#57390;" d="M70 220c0 9 4 16 10 21 7 4 17 7 31 7l15 1 0 5c0 5-1 9-4 12-2 3-6 4-12 4-4 0-9 0-13-2-4-1-8-3-12-4l-6 13c5 3 10 4 16 6 6 1 11 2 16 2 11 0 20-3 26-8 5-5 8-12 8-23l0-60-13 0-4 13-1 0c-4-6-8-9-13-11-4-2-10-3-16-3-9 0-16 2-21 7-4 5-7 11-7 20z m19 0c0-4 2-7 4-10 2-2 6-3 11-3 6 0 12 2 16 6 4 4 6 9 6 16l0 8-11-1c-9 0-15-2-20-4-4-3-6-7-6-12z m83-26l0 125 19 0 0-29c0-3 0-6-1-10 0-5 0-7 0-9l1 0c6 9 14 14 26 14 11 0 20-4 26-12 6-8 9-20 9-34 0-15-3-26-9-34-6-8-15-12-26-12-11 0-20 4-26 12l-2 0-3-11z m19 45c0-11 1-19 5-24 3-4 9-7 17-7 6 0 11 3 15 8 3 5 5 13 5 23 0 20-7 30-21 30-7 0-13-2-16-6-3-5-5-12-5-23l0-1z m78-1c0 15 4 27 11 35 7 8 17 12 31 12 10 0 18-2 26-6l-6-15c-8 3-15 5-20 5-15 0-23-10-23-31 0-10 2-17 6-22 4-5 9-7 17-7 8 0 16 2 23 6l0-17c-3-2-7-3-10-4-4-1-9-1-14-1-14 0-24 4-31 11-7 8-10 20-10 34z m243-125l-512 0 0 286 512 0 0-286z m-479 33l446 0 0 220-446 0z"/>
 <glyph glyph-name="cut" unicode="&#57391;" d="M448 190c-28 29-57 44-86 44-30 0-53-15-68-30l-6 7 13 18 63 39 90 146 0 98-196-260-196 260 0-98 89-146 61-39 14-19-6-7c-15 15-38 31-68 31-30 0-59-15-87-44-48-51-48-108-34-142 13-30 43-48 70-48 13 0 56 30 58 33l23 34 75 102 78-105 23-34c2-1 42-30 56-30 27 0 54 18 66 48 15 34 16 91-32 142z m-330-127c-16-19-33-16-42 4-8 20-7 56 25 89 18 19 35 29 50 29 17 0 30-11 38-20l-23-34-9-12 0-1z m319 4c-5-11-12-18-20-18-6 0-14 5-20 12l-39 55 0 3-28 36-6 10c8 9 22 20 38 20 15 0 32-10 50-29 32-33 34-69 25-89z"/>
-<glyph glyph-name="delete" unicode="&#57392;" d="M416 409l-320 0c0-1-1-2-1-3l0-372c0-19 12-34 26-34l269 0c15 0 27 15 27 34l0 372c0 1-1 2-1 3z m-238-351c0-13-8-24-18-24-10 0-18 11-18 24l0 283c0 13 8 24 18 24 10 0 18-11 18-24z m97 0c0-13-8-24-17-24-10 0-18 11-18 24l0 283c0 13 8 24 18 24 9 0 17-11 17-24z m95 0c0-13-8-24-18-24-10 0-18 11-18 24l0 283c0 13 8 24 18 24 10 0 18-11 18-24z m60 385c0 13-10 23-23 23l-302 0c-13 0-23-10-23-23 0-6 3-11 6-16l336 0c3 5 6 10 6 16z m-192 45l36 0c7 0 12 5 12 12 0 7-5 12-12 12l-36 0c-7 0-12-5-12-12 0-7 5-12 12-12z"/>
 <glyph glyph-name="delete-folder" unicode="&#57393;" d="M288 160l0 32 192 0 0 160c0 18-14 32-32 32l-192 0c-18 0-41 11-53 24l-14 16c-12 13-35 24-53 24l-104 0c-18 0-32-14-32-32l0-320c0-18 14-32 32-32l256 0z m32-64l0 64 192 0 0-64z"/>
 <glyph glyph-name="dependency" unicode="&#57394;" d="M416 184c-20 0-38-7-53-17l-175 90 173 90c15-12 34-19 55-19 51 0 92 42 92 92 0 51-41 92-92 92-51 0-92-41-92-92 0-1 0-2 0-3l-173-90c-15 12-34 19-55 19-51 0-92-41-92-92 0-51 41-92 92-92 23 0 44 9 60 23l168-88c0-2 0-3 0-5 0-51 41-92 92-92 51 0 92 41 92 92 0 50-41 92-92 92z"/>
 <glyph glyph-name="double-arrow-left" unicode="&#57395;" d="M219 283l218 192c17 14 46 14 62 0 17-15 17-40 0-55l-188-164 188-164c17-15 17-39 0-54-8-8-19-12-31-12-11 0-22 4-31 12l-218 191c-9 7-13 17-13 27 0 10 4 20 13 27z m-206 0l219 192c16 14 45 14 61 0 18-15 18-40 0-55l-187-164 187-164c18-15 18-39 0-54-8-8-19-12-31-12-11 0-22 4-30 12l-219 191c-8 7-13 17-13 27 0 10 5 20 13 27z"/>
@@ -205,7 +202,6 @@
 <glyph glyph-name="export-xls" unicode="&#57520;" d="M227 171l-16 0c-2 0-3-1-4-2l-19-31c-1 0-1-1-1-1 0-1-1-1-1-2l-21 34c0 1-1 1-1 1-1 1-2 1-3 1l-17 0 29-45-30-48 16 0c1 0 2 1 2 1 1 1 2 2 2 2l21 33c0 1 0 1 0 1 1 1 1 1 1 2l21-36c1 0 1-1 2-2 1 0 2-1 3-1l17 0-31 49z m28 0l-17 0 0-93 54 0 0 15-37 0z m103-54c-1 3-3 5-5 7-2 2-4 3-7 5-2 1-5 2-8 3-2 1-5 1-7 2-3 1-5 2-7 3-2 1-4 2-5 4-1 1-2 3-2 5 0 2 1 4 1 5 1 1 2 3 3 4 1 1 3 1 4 2 2 1 4 1 7 1 2 0 4 0 6-1 2-1 4-2 5-2 2-1 3-2 4-2 1-1 2-1 3-1 1 0 2 0 2 0 1 1 2 1 2 2l4 8c-3 3-7 6-12 7-4 2-9 3-15 3-5 0-9-1-13-2-3-2-7-4-9-6-3-3-5-6-6-9-1-3-2-6-2-10 0-4 1-7 2-10 1-3 3-5 5-7 2-2 4-4 6-5 3-1 6-2 8-3 3-1 6-2 8-2 3-1 5-2 7-3 2-1 4-3 5-4 1-2 2-4 2-6 0-4-2-8-4-10-3-2-7-3-12-3-3 0-6 0-8 1-2 1-4 2-6 3-2 1-3 2-4 3-2 1-3 1-4 1-1 0-1 0-2-1-1 0-1-1-2-1l-5-8c2-2 4-4 6-5 3-2 5-3 8-4 2-1 5-2 8-3 3 0 6-1 9-1 5 0 9 1 13 3 4 1 8 3 11 6 2 3 4 6 6 10 1 3 2 7 2 11 0 4-1 7-2 10z m90 277l-119 118 0 0 0 0-275 0 0-512 394 0 0 394z m-348-348l0 420 210 0 92-92 0-328-302 0z"/>
 <glyph glyph-name="export-pdf-descr" unicode="&#57521;" d="M159 259l186 0 0-31-186 0z m1 61l186 0 0-32-186 0z m0 61l186 0 0-32-186 0z m290 13l-118 118-1 0 0 0-274 0 0-512 393 0 0 394z m-347-348l0 420 210 0 91-92 0-328-301 0z m92 117c-3 2-7 4-11 6-5 1-10 2-16 2l-30 0 0-93 17 0 0 33 13 0c6 0 11 1 15 2 5 2 9 4 12 7 3 2 5 5 6 9 2 4 3 8 3 12 0 5-1 9-2 12-2 4-4 7-7 10z m-10-29c-1-2-2-4-3-5-2-1-4-3-6-3-2-1-5-2-8-2l-13 0 0 34 13 0c3 0 6-1 8-1 2-1 4-2 6-4 1-1 2-3 3-5 1-2 1-4 1-6 0-3 0-5-1-8z m101 24c-4 4-9 7-15 10-5 2-12 3-19 3l-35 0 0-93 35 0c7 0 14 2 19 4 6 2 11 5 15 9 4 4 8 9 10 15 2 6 3 12 3 19 0 6-1 13-3 18-2 6-6 11-10 15z m-7-47c-1-4-3-7-5-10-3-3-6-5-10-7-3-1-7-2-12-2l-18 0 0 65 18 0c5 0 9 0 12-2 4-1 7-4 10-6 2-3 4-7 5-11 2-4 3-8 3-13 0-5-1-10-3-14z m92 46l0 14-58 0 0-93 17 0 0 38 35 0 0 14-35 0 0 27z"/>
 <glyph glyph-name="compare2" unicode="&#57386;" d="M175 141l159 0 0-39-159 0z m99 192l0 60-39 0 0-60-60 0 0-39 60 0 0-60 39 0 0 60 60 0 0 39z m179 60l-119 119 0 0 0 0-275 0 0-512 394 0z m-348-347l0 420 210 0 92-92 0-328-302 0z"/>
-<glyph glyph-name="close" unicode="&#57522;" d="M451 4l-447 447 57 57 447-447z m56 447l-447-447-56 56 447 447z"/>
 <glyph glyph-name="arrow-right6" unicode="&#57544;" d="M0 512l0-512 512 0 0 512z m283-395l-91 0 105 106-207 0 0 67 207 0-105 105 91 0 139-139z"/>
 <glyph glyph-name="presentation" unicode="&#57545;" d="M77 225c5-2 9 0 11 5l20 58 46-70 47 73 48-78 44 137c1 4-1 8-6 10-4 1-8-1-10-6l-33-103-43 70-47-74-50 77-32-89c-1-4 1-9 5-10z m227 255l0 32-64 0 0-32-224 0 0-320 224 0 0-61-127-99 32 0 95 65 0-1 64 0 0 1 95-65 32 0-127 99 0 61 192 0 0 320z m160-288l-416 0 0 216 416 0z m-43 134c0-23-19-42-43-42-23 0-42 19-42 42 0 23 19 42 42 42 24 0 43-19 43-42z m-85-70l32 0 0-32-32 0z m64 0l32 0 0-32-32 0z"/>
 <glyph glyph-name="publish" unicode="&#57546;" d="M256 510c-141 0-255-114-255-254 0-140 114-254 255-254 141 0 255 114 255 254 0 140-114 254-255 254z m102-366c0-2 0-5-2-7 0 0 0 1 0 1-12-9-12-35-27-41-8-4-7 7-4 11 5 6-2 10 1 16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0-3 1-6 8-6 11 3 1 5 3 5 2 1 1 5 8 5 9 1-6-7-17-4-22 0 0 0 0 0 0 1 0 1 0 3 2 0-3 0-6 2-9-4 14 10 14 17 23 2 3 6 12 9 13 2-2 2-5 1-8 1 2 0 0 0-1z m71 164c-5 9-9 23-17 29 2-2 2-4 1-7-4 1-8 4-10 7 0 2 4-2 2 3-7-1-12 6-17 10-9 1-19-7-29-2-2 2-4 9-8 5-2-2-4-2-6-2-11 4-16 13-25 13 0-4 7-10 10-12 4-2 7-13 8-4 6-3 1-11 10-8 7-3 5 8 7 11 2-1 3-6 4-8 4-3 9-2 12-5 4-4 7-11 6-16-4 1-1-4-4-8-2-4-2-5-4-9-4-1-10-3-9-9-3-4-31-24-35-18-4 6-5 16-9 23-6 2-17 16-19 21 1 10-24 28-28 29 3-13 14-20 19-30 5-9 13-29 19-31 12 1 18-19 24-23 8-6 24 12 31 10 0-9 0-12-3-22-5-21-15-30-27-46-7-10-12-17-17-27-4-9 8-26 5-31 2-13-2-21-14-28-8-5-16-10-13-19 3-10-9-11-10-17-4-8-9-13-15-16-4-1-8-1-12-1-7 0-15 1-22 1-10 12-20 25-30 37-6 7-15 20-5 29 1 6-6 20-10 25-5 9-30 28-20 39 1 6-5 13-5 19-5 4-10-6-15 3-6 9-16 7-24 1-2-1-25-5-27-3-17 15-22 40-16 60 2 9 2 24 9 30 3 9 13 18 18 25 3 4 8 4 11 8 6 6 8 13 15 19 6 5 21 14 9 16 4 7 12 15 15 23 4 3 12 2 17 4 4 9 5 8 4 14 1 3 11 6 14 6 4 2 8 6 12 9 16 4 33 7 50 7 93 0 170-68 184-156-4 8-8 18-11 22z m-176 112c1 0 1 1 2 2-6-2-3 4-8-2 1-5-5-9-2-14 5-5 11 3 17 4 0-4 12-3 14-4-3 1 1 1 0 0 11 7-23 14-23 14z m-9-33c0 3-3 3-5 7 5 5-3 2 1 8-2 1-4 1-7 0-1-4 2-3-3-2-1-4 4-6 3-10 0 1-1 1-2 1-1-3 0-2 0-6-8 1-4 7-10 15 6 5-12 14-10 17-12-4 10-17 7-20-6 3-2-1-5-5-6-6-5-8-13-5 0 6 15 0 8 13-4 5-7 13-13 8-7-4-18-6-23-15-3-3-23-19-23-20 8-6 39 19 46 11 0-5-6-9-6-14 2-1 3-3 5-3 10 2 8-5 15-7 13-3 3-1 11 7 2 2 16 2 17-2 0 3 6 1 0 0 6 1 12-5 17-1 3 4 5 3 8 1 11-8 7 23 7 25-3-3-26-5-25-3z m-49 5c-2-1-3-1-4-1 1 3 5 15 8 15 0-4-4-10-4-14z m0 0c0 3-2 0 0 0z m98 28c1 1 1 4 3 4-2 8-10 1-10-4 3-4 16-10 17-14-3-1 1-10 6-10 3-3 7-3 11-2-1 8-21 23-27 26z m16-24c-4 0 2-2 0 0z m9 23c-3 1-6 8-9 9-1-2-1-2-1-3 0 1 1-2 0 0 1-2 7-9 10-6z m-139-11c-1-1-2-1-3-2 0 0 0 0-1 0 2 0 3 3 4 2z"/>
@@ -219,4 +215,15 @@
 <glyph glyph-name="project-types" unicode="&#57553;" d="M426 393l-118 119 0 0 0 0-275 0 0-512 178 0 0 46-132 0 0 420 210 0 91-92 0-94 46 0 0 113z m-164-231l108-54 107 54-107 53z m108-74l-67 33-41-13 108-54 107 54-38 14z m0-54l-67 33-41-13 108-54 107 54-38 14z"/>
 <glyph glyph-name="cost-types" unicode="&#57554;" d="M278 419l0 35-278 0 0-48 278 0z m0-51l0 13-278 0 0-48 243 0c13 9 23 19 35 25z m-278-58l0-48 198 0c7 16 16 32 26 48z m192-70l-192 0 0-48 189 0c0 3 0 10 0 13 0 9 0 22 3 35z m-192-74l0-48 208 0c-6 16-13 32-16 48z m224-70l-224 0 0-48 278 0c-22 13-38 29-54 48z m134 253c-76 0-137-64-137-144 0-80 61-144 137-144 77 0 138 64 138 144 0 80-61 144-138 144z m7-227l0-26-16 0 0 26c-16 0-32 6-42 12l7 16c9-6 22-12 38-12 19 0 32 9 32 25 0 16-10 23-29 32-25 10-45 23-45 45 0 22 16 38 39 42l0 28 16 0 0-25c16 0 25-3 35-10l-6-16c-7 3-16 10-32 10-20 0-29-13-29-23 0-12 9-19 32-28 25-10 41-26 41-48 0-23-16-42-41-48z"/>
 <glyph glyph-name="plugins" unicode="&#57555;" d="M176 406l-96-118c-35-48-16-122 45-173 61-51 141-51 176-6l96 121z m121 84l32-26-73-92-33 25z m119-92l33-26-73-93-33 26z m-352-344l16-12 54 70-9 3-7 7z"/>
+<glyph glyph-name="installation-services" unicode="&#57556;" d="M182 144l253 0c26 0 45 19 45 45l0 192c0 25-19 45-45 45l-358 0c-26 0-45-20-45-45l0-192c0-26 19-45 45-45z m-118 45l0 192c0 6 6 13 13 13l358 0c7 0 13-7 13-13l0-192c0-7-6-13-13-13l-358 0c-7 0-13 6-13 13z m150-80l0 9-201 0 0-16c0-9 6-16 16-16l451 0c10 0 16 7 16 16l0 16-198 0 0-9m-138 96c0 51 42 93 96 93 51 0 96-42 96-93l58 0 0 35-32 0c-4 6-4 13-7 19l29 19-22 32-29-22c-7 6-13 10-16 16l16 29-35 19-16-29c-7 3-16 3-23 7l0 32-38 0 0-36c-7 0-13 0-19-3l-16 29-32-19 16-26c-10-3-16-9-23-16l-25 19-23-32 26-16c-3-6-7-16-10-22l-22 0 0-35z"/>
+<glyph glyph-name="custom-development" unicode="&#57557;" d="M515 400l-3 26-458 0 0-215 32 32 0 125 397 0 0-240-304 0-32-32 368 0z m-365 6c4 0 10-3 10-9 0-7-6-10-10-10-3 0-9 3-9 10 0 6 3 9 9 9z m-28 0c6 0 9-3 9-9 0-7-3-10-9-10-7 0-10 3-10 10 0 6 3 9 10 9z m-29 0c6 0 9-3 9-9 0-7-3-10-9-10-7 0-10 3-10 10 0 6 7 9 10 9z m208-86l112 0 0-22-112 0z m0-35l150 0 0-23-150 0z m0-39l131 0 0-22-131 0z m0-32l112 0 0-22-112 0z m-125-25c3 0 3 0 0 0 6 0 10 0 16 0 35 0 67 29 67 67 0 6 0 13-3 16l-32-38-38 9-10 39 35 35c-6 0-9 3-16 3-38 0-67-29-67-67 0-7 0-16 3-23l-118-118c-13-13-16-35-3-48 12-13 35-10 48 3l22 23z"/>
+<glyph glyph-name="maintenance-support" unicode="&#57558;" d="M150 38c-3 0-3 4-6 4-10-7-26-10-38-10-45 0-84 38-84 83 0 16 4 32 13 45 0 0-3 3-3 3 0 3 0 3-3 7 0 3 0 3-3 6-13-16-23-38-23-61 0-54 45-99 99-99 23 0 42 6 58 19-3 0-6 3-10 3z m324 112c0 0-4-3 0 0 3-12 6-25 6-35 0-45-38-83-83-83-13 0-26 3-35 10-4-4-10-4-13-7-3 0-3 0-7-3 16-10 32-16 55-16 54 0 99 45 99 99 0 19-6 35-16 51-3-6-6-12-6-16z m-442 199c3 3 3 3 3 6-3 13-6 23-6 35 0 45 38 84 83 84 10 0 22-4 32-7 3 0 6 3 6 3 4 0 7 4 10 4-16 12-32 16-48 16-54 0-99-45-99-100 0-19 6-38 16-54 0 3 0 3 3 6 0 0 0 4 0 7z m330 125c3 0 6-4 6-4 10 4 19 7 32 7 45 0 83-39 83-83 0-13-3-26-9-36 3-6 3-6 6-9 0-3 0-3 3-7 0-3 0-3 3-6 10 16 16 35 16 54 0 55-44 100-99 100-19 0-35-7-48-13 0 0 3-3 7-3z m131-263c3 13 3 29 3 45 0 16-3 32-3 45 6-29 6-61 0-90z m-7-25c-3-7-3-10-6-16 3 6 6 12 6 16z m-163 304c-22 3-45 6-67 6-22 0-45-3-67-10 45 13 89 13 134 4z m167-170c3-6 3-13 3-19 0 6-3 13-3 19z m-279-301c13-3 29-3 45-3 16 0 32 3 45 3-29-6-61-6-90 0z m-189 304c-3-22-6-45-6-67 0-22 3-45 10-67-13 45-13 89-4 134z m304 163c7-3 13-3 16-6-6 3-12 6-16 6z m167-275c0-6-3-13-3-19 0 6 3 13 3 19z m-282-192c-6 0-13 3-19 3 6 0 13-3 19-3z m109 3c-6-3-13-3-19-3 6 0 13 3 19 3z m-150 458c6 3 9 3 16 6-4 0-10-3-16-6z m172-448c-6-3-9-3-16-6 4 0 10 3 16 6z m-156-6c-7 3-10 3-16 6 6-3 12-6 16-6z m-160 160c0-4 3-7 3-10 0-3 0-3 3-6-3 6-6 12-6 16z m124-148c4-3 7-3 13-6 0 0 0 0 3 0-6 3-12 3-16 6z m330 125c-3-3-3-9-6-13 0 4 3 10 6 13z m-448 179c0-3 0-3-3-6 0-3-3-6-3-10 0 4 3 10 6 16z m131 138c0 0-3-3-3-3-3 0-6-3-10-3 4 0 10 3 13 6z m199-6c-4 0-7 3-10 3-3 0-3 0-6 3 6-3 12-6 16-6z m124-148c0 4-3 7-3 10 0 3 0 3-3 6 3-6 6-12 6-16z m0-140c0 0 0 3 0 3 4 6 4 13 4 19 6 29 6 61 0 93 0 6-4 13-4 19 0 0 0 3 0 3-3 7-3 10-6 16 0 3 0 3-3 7-13 28-29 54-51 80-16 16-36 32-58 41-3 0-6 3-6 3-4 4-10 7-13 10-3 0-3 0-7 3-6 3-12 3-16 7 0 0-3 0-3 0-45 12-89 12-131 0 0 0-3 0-3 0-7-4-13-7-19-10 0 0-4 0-7 0-3-3-9-6-13-6-3 0-6-4-6-4-22-12-42-25-58-44-25-23-41-48-54-77 0-3 0-7 0-7-3-6-6-12-6-16 0 0 0-3 0-3-13-45-13-89 0-131 0 0 0-3 0-3 3-7 3-13 6-16 0-3 0-3 3-7 13-28 29-54 51-80 20-19 39-32 61-44 3 0 3-4 7-4 0-3 6-3 9-6 3 0 3 0 7-3 6-3 9-3 16-7 0 0 3 0 3 0 6-3 13-3 19-3 29-6 61-6 93 0 6 0 13 3 19 3 0 0 3 0 3 0 7 4 10 4 16 7 3 0 3 0 7 3 28 13 54 29 80 51 19 19 32 39 44 61 0 0 0 3 0 3 4 3 4 10 7 13 0 3 0 3 3 6 3 10 6 16 6 20z m-80-80c-19-20-44-36-70-48l-22 54c38 16 67 45 83 83l54-22c-9-23-25-45-45-67z m-9 208c-7 19-19 35-32 51-16 16-32 25-51 32l22 54c26-9 51-25 70-48 20-19 36-45 48-70z m-221 137l22-54c-35-16-67-48-83-83l-54 22c19 51 64 96 115 115z m-61-253c7-19 19-35 32-51 16-16 32-25 51-32l-22-54c-26 9-51 25-70 48-20 19-36 45-48 70z m55-28c-48 48-48 124 0 169 48 48 124 48 169 0 48-48 48-125 0-169-45-45-121-45-169 0z"/>
+<glyph glyph-name="training-consulting" unicode="&#57559;" d="M3 442l0-384 509 0 0 384z m144-368l-134 0c0 0-3 54 6 64 3 3 10 9 16 12l0 260 445 0 0-320-202 0c0-10 0-16 0-16z m128 64c-9 12-35 19-61 32-25 9-32 16-32 16l0 25c0 0 10 7 13 32 3-3 10 7 10 13 0 6 0 22-10 19 0 13 3 23 3 29 0 22-22 42-51 42-32 0-51-23-54-42 0-6 0-16 3-29-10 3-10-13-10-19 0-6 7-16 13-16 3-26 13-32 13-32l0-26c0 0-6-3-32-16-16-6-32-12-45-19-6-3-13-6-16-13-6-12-6-64-6-64l269 0c0 0 0 7 0 16-4 20-4 45-7 52z m10 96l-29-32 45 22c9-3 19-6 29-6l51 0c45 0 80 35 80 80 0 44-35 80-80 80l-51 0c-45 0-80-36-80-80 0-26 12-52 35-64z m45 131l51 0c35 0 64-29 64-64 0-35-29-64-64-64l-51 0c-36 0-64 29-64 64 0 35 28 64 64 64z m-26-39l99 0 0-9-99 0z m0-22l99 0 0-10-99 0z m0-19l99 0 0-10-99 0z"/>
+<glyph glyph-name="concept" unicode="&#57392;" d="M256 355c-64 0-112-48-112-109 0-38 19-70 51-92l0-58 125 0 0 58c32 19 51 54 51 92-3 58-51 109-115 109z m42-185l0-55-87 0 0 55c-29 16-45 41-45 73 0 48 42 87 90 87 48 0 90-39 90-87 0-32-20-57-48-73z m-42 220c3 0 10 4 10 10l0 90c0 6-4 9-10 9-3 0-10-3-10-9l0-87c0-9 7-13 10-13z m83-12l48 73c3 3 3 10 0 13-3 3-9 0-13-3l-48-74c-3-3-3-9 0-13 4-3 10 0 13 4z m141-7c-3 3-6 7-13 3l-77-41c-3-3-6-10-3-13 3-3 7-6 13-3l77 41c3 4 6 7 3 13z m-307 7c3-4 9-7 13-4 3 4 3 10 0 13l-48 74c-4 6-10 6-13 3-3-3-3-10 0-13z m-128-7c-7 3-13 3-13 0-3-6 0-9 3-13l77-41c6-3 10-3 13 3 3 3 0 10-3 13z m275-285l-128 0 0-35c0-19 16-32 32-32l0-16 64 0 0 16c16 0 29 13 29 29l0 38z"/>
+<glyph glyph-name="delete" unicode="&#57560;" d="M416 409l-320 0c0-1-1-2-1-3l0-372c0-19 12-34 26-34l269 0c15 0 27 15 27 34l0 372c0 1-1 2-1 3z m-238-351c0-13-8-24-18-24-10 0-18 11-18 24l0 283c0 13 8 24 18 24 10 0 18-11 18-24z m97 0c0-13-8-24-17-24-10 0-18 11-18 24l0 283c0 13 8 24 18 24 9 0 17-11 17-24z m95 0c0-13-8-24-18-24-10 0-18 11-18 24l0 283c0 13 8 24 18 24 10 0 18-11 18-24z m60 385c0 13-10 23-23 23l-302 0c-13 0-23-10-23-23 0-6 3-11 6-16l336 0c3 5 6 10 6 16z m-192 45l36 0c7 0 12 5 12 12 0 7-5 12-12 12l-36 0c-7 0-12-5-12-12 0-7 5-12 12-12z"/>
+<glyph glyph-name="mobile" unicode="&#57561;" d="M326 198l-291 0 0 215c0 6 7 13 13 13l374 0c7 0 13-7 13-13l0-61 26 0 0 61c0 19-16 35-35 35l-381 0c-19 0-35-16-35-35l0-240c0-19 16-35 35-35l281 0z m-35-80l-112 0c-9 0-16-6-16-16 0-9 7-16 16-16l112 0c10 0 16 7 16 16 0 10-9 16-16 16z m205 199c-3 3-6 3-10 6-3 0-6 0-6 0l-106 0c-6 0-9-3-16-6-3-3-6-10-6-16l0-218c0-13 10-22 22-22l106 0c13 0 22 9 22 22l0 218c0 6-3 13-6 16z m-10-215l-115 0 0 192 115 0z m-76 208c0 0 3 4 3 4l25 0c4 0 4 0 4-4 0-3-4-3-4-3l-22 0c-3 0-6 0-6 3z m19-240c-3 0-7 0-7 4-3 3-3 6-3 9 0 7 7 13 13 13 6 0 13-6 13-13 0-3-3-6-3-9-7 0-10-4-13-4z m13 237c3 0 3 0 3 3 0 4-3 4-3 4l-26 0c-3 0-3 0-3-4 0-3 3-3 3-3"/>
+<glyph glyph-name="accessibility" unicode="&#57562;" d="M256 499c-134 0-243-109-243-243 0-134 109-243 243-243 134 0 243 109 243 243 0 134-109 243-243 243z m0-448c-112 0-205 93-205 205 0 112 93 205 205 205 112 0 205-93 205-205 0-112-93-205-205-205z m0 368c-90 0-163-73-163-163 0-90 73-163 163-163 90 0 163 73 163 163 0 90-73 163-163 163z m0-32c10 0 16-3 22-9 7-7 10-13 10-23 0-19-13-32-32-32-19 0-32 13-32 32 0 10 3 16 10 23 6 6 12 9 22 9z m51-256c-6-3-13 0-19 7 0 0 0 0 0 3-13 19-22 45-32 70-10-25-19-51-32-73 0 0 0 0 0-4-6-6-13-9-19-6-3 3-7 10-3 16 0 3 0 3 3 6 13 26 25 55 32 84l0 48c-26 0-51 3-77 6-6 0-13 6-13 13 0 6 7 13 13 13 64-7 125-7 189 0 6 0 13-4 16-13 0-7-7-13-13-13-26-3-51-3-77-3l0-45c7-32 19-58 32-83 0-3 3-3 3-7 4-9 4-16-3-19z"/>
+<glyph glyph-name="add" unicode="&#57563;" d="M288 288l0 224-64 0 0-224-224 0 0-64 224 0 0-224 64 0 0 224 224 0 0 64z"/>
+<glyph glyph-name="close" unicode="&#57564;" d="M256 301l-160 160-45-48 160-157-160-157 45-48 160 160 160-160 45 48-160 157 160 157-45 48z"/>
+<glyph glyph-name="cancel" unicode="&#57344;" d="M256 301l-160 160-45-48 160-157-160-157 45-48 160 160 160-160 45 48-160 157 160 157-45 48z"/>
 </font></defs></svg>

app/assets/stylesheets/fonts/_openproject_icon_definitions.scss

@@ -38,9 +38,6 @@
 .icon-align-right:before {
   content: "\e005";
 }
-.icon-add:before {
-  content: "\e000";
-}
 .icon-workflow:before {
   content: "\e006";
 }
@@ -119,9 +116,6 @@
 .icon-camera:before {
   content: "\e01d";
 }
-.icon-cancel:before {
-  content: "\e01e";
-}
 .icon-cart:before {
   content: "\e01f";
 }
@@ -167,9 +161,6 @@
 .icon-cut:before {
   content: "\e02f";
 }
-.icon-delete:before {
-  content: "\e030";
-}
 .icon-delete-folder:before {
   content: "\e031";
 }
@@ -626,9 +617,6 @@
 .icon-compare:before {
   content: "\e02a";
 }
-.icon-close:before {
-  content: "\e0b2";
-}
 .icon-presentation:before {
   content: "\e0c9";
 }
@@ -662,3 +650,36 @@
 .icon-plugins:before {
   content: "\e0d3";
 }
+.icon-installation-services:before {
+  content: "\e0d4";
+}
+.icon-custom-development:before {
+  content: "\e0d5";
+}
+.icon-maintenance-support:before {
+  content: "\e0d6";
+}
+.icon-training-consulting:before {
+  content: "\e0d7";
+}
+.icon-concept:before {
+  content: "\e030";
+}
+.icon-delete:before {
+  content: "\e0d8";
+}
+.icon-mobile:before {
+  content: "\e0d9";
+}
+.icon-accessibility:before {
+  content: "\e0da";
+}
+.icon-add:before {
+  content: "\e0db";
+}
+.icon-close:before {
+  content: "\e0dc";
+}
+.icon-cancel:before {
+  content: "\e000";
+}

app/controllers/api/experimental/concerns/grape_routing.rb

@@ -32,9 +32,13 @@ module Api::Experimental::Concerns::GrapeRouting
     # development mode because the routes otherwise are not within the
     # "api/:version" namespace.
     API::Root
-    query_route = API::V3::Queries::QueriesAPI.routes.detect { |r| r.route_path.match(Regexp.new("\/#{route}")) }
+    query_route = API::V3::Queries::QueriesAPI
+                  .routes
+                  .detect { |r| r.path.match(Regexp.new("\/#{route}")) }
 
-    query_route.route_path.gsub(':version', query_route.route_version)
+    query_route
+      .path
+      .gsub(':version', query_route.route_version)
       .gsub(':id', query.id.to_s)
       .gsub(/\(\.:format\)/, '')
   end

app/models/setting.rb

@@ -237,7 +237,7 @@ class Setting < ActiveRecord::Base
     # I'm not sure this is a good idea, but that's the way it is right now,
     # and caching this improves performance significantly for actions
     # accessing settings a lot.
-    @settings_table_exists_yet ||= connection.table_exists?(table_name)
+    @settings_table_exists_yet ||= connection.data_source_exists?(table_name)
   end
 
   # Unserialize a serialized settings value

app/views/members/_member_form_non_impaired.html.erb

@@ -74,9 +74,9 @@ See doc/COPYRIGHT.rdoc for more details.
         </div>
       </div>
       <div id="member-add-submit-button--container">
-        <%= f.button l(:button_add), id: 'member-add-submit',
-              class: 'button -highlight -with-icon icon-checkmark',
-              id: 'add-member--submit-button' %>
+        <%= f.button l(:button_add),
+                     class: 'button -highlight -with-icon icon-checkmark',
+                     id: 'add-member--submit-button' %>
       </div>
     </div>
   </div>

packaging/setup

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-echo "ruby '2.1.6'" > Gemfile.local
 
 # Set RELEASE_DATE for the application
 date +%F > config/RELEASE_DATE