Merge branch 'release/6.0' into dev

.travis.yml

@@ -91,7 +91,9 @@ before_install:
   - git checkout openproject/$TRAVIS_BRANCH
 
   # End of custom plugin instructions.
-
+  - "rvm @default,@global do gem uninstall bundler -a -x"
+  - gem install bundler -v 1.12.5
+  - echo `bundle -v`
   - "echo `firefox -v`"
   - "export DISPLAY=:99.0"
   - "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16"

app/assets/stylesheets/backlogs/master_backlog.css.sass

@@ -256,10 +256,10 @@
         width: 68px
       .story_points
         float: right
-        padding: 5px 3px 4px 2px
-        margin-right: 2.1em
-        width: 28px
+        padding: 5px 1rem 4px 2px
+        width: 3.5rem
         min-height: 14px
+        height: 2rem
         text-align: right
       .type_id .v, .id .v, .status_id .v, .fixed_version_id, .higher_item_id
         display: none

app/views/projects/settings/_versions.html.erb

@@ -156,9 +156,11 @@ See doc/COPYRIGHT.rdoc for more details.
     </div>
     <div class="generic-table--action-buttons">
       <%= link_to_if_authorized({ controller: '/versions', action: 'new', project_id: @project },
-                            class: 'button -alt-highlight') do %>
+                            { class: 'button -alt-highlight',
+                              aria: {label: t(:label_version_new)},
+                              title: t(:label_version_new)}) do %>
         <i class="button--icon icon-add"></i>
-        <span class="button--text"><%= l(:label_version_new) %></span>
+        <span class="button--text"><%= l(:label_version) %></span>
       <% end %>
     </div>
   <% else %>