Merge remote-tracking branch 'origin/release/6.0' into dev

pull/6827/head
Oliver Günther 8 years ago
commit 1b43f0222a
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 4
      .travis.yml
  2. 5
      app/views/my_projects_overviews/blocks/_members.html.erb
  3. 5
      app/views/my_projects_overviews/blocks/_news_latest.html.erb
  4. 5
      app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb

@ -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"

@ -46,7 +46,10 @@ See doc/COPYRIGHT.md for more details.
</div>
<% end %>
<% if current_user.allowed_to?(:manage_members, project) %>
<%= link_to project_members_path(project_id: project.identifier), class: 'button -alt-highlight' do %>
<%= link_to new_project_member_path(project_id: project.identifier),
{ class: 'button -alt-highlight',
title: t(:button_add_member),
aria: { label: t(:button_add_member) }} do %>
<i class="button--icon icon-add"></i>
<span class="button--text"><%= t('activerecord.models.member') %></span>
<% end %>

@ -37,7 +37,10 @@ See doc/COPYRIGHT.md for more details.
:action => 'index',
:project_id => project},
:class => 'button -highlight' %>
<%= link_to new_project_news_path(@project), class: 'button -alt-highlight' do %>
<%= link_to new_project_news_path(@project),
{ class: 'button -alt-highlight',
title: t(:label_news_new),
aria: { label: t(:label_news_new) }} do %>
<i class="button--icon icon-add"></i>
<span class="button--text"><%= l('activerecord.models.news') %></span>
<% end %>

@ -43,7 +43,10 @@ See doc/COPYRIGHT.md for more details.
<% if User.current.allowed_to?(:view_gantt, project, :global => true) %>
<%= link_to(l(:label_gantt), {:controller => '/gantts', :action => 'show', :project_id => project}, :class => 'button -highlight') %>
<% end %>
<%= link_to new_project_work_packages_path(project), class: 'button -alt-highlight' do %>
<%= link_to new_project_work_packages_path(project),
{ class: 'button -alt-highlight',
title: t(:label_keyboard_shortcut_new_work_package),
aria: { label: t(:label_keyboard_shortcut_new_work_package) }} do %>
<i class="button--icon icon-add"></i>
<span class="button--text"><%= l('activerecord.models.work_package') %></span>
<% end %>

Loading…
Cancel
Save