From 93ea1dae2bda7e432455e4f56720d66e53986790 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 16 Sep 2016 13:06:25 +0200 Subject: [PATCH 1/3] Fix bundler on travis --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 93d28d4675..889302151f 100644 --- a/.travis.yml +++ b/.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" From 049900bfa2c8c465abb9a36a110fd30251b89461 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Thu, 15 Sep 2016 15:05:32 +0200 Subject: [PATCH 2/3] Add hidden label --- app/views/my_projects_overviews/blocks/_members.html.erb | 5 ++++- app/views/my_projects_overviews/blocks/_news_latest.html.erb | 5 ++++- .../blocks/_work_package_tracking.html.erb | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/views/my_projects_overviews/blocks/_members.html.erb b/app/views/my_projects_overviews/blocks/_members.html.erb index 5b48a118a3..1cd1bd1f8f 100644 --- a/app/views/my_projects_overviews/blocks/_members.html.erb +++ b/app/views/my_projects_overviews/blocks/_members.html.erb @@ -46,7 +46,10 @@ See doc/COPYRIGHT.md for more details. <% end %> <% if current_user.admin? %> - <%= link_to new_project_member_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 %> <%= t('activerecord.models.member') %> <% end %> diff --git a/app/views/my_projects_overviews/blocks/_news_latest.html.erb b/app/views/my_projects_overviews/blocks/_news_latest.html.erb index 3a29ea7380..5761a236da 100644 --- a/app/views/my_projects_overviews/blocks/_news_latest.html.erb +++ b/app/views/my_projects_overviews/blocks/_news_latest.html.erb @@ -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 %> <%= l('activerecord.models.news') %> <% end %> diff --git a/app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb b/app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb index 5f3865f79e..229ee5e712 100644 --- a/app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb +++ b/app/views/my_projects_overviews/blocks/_work_package_tracking.html.erb @@ -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 %> <%= l('activerecord.models.work_package') %> <% end %> From 7134cafd7c3e739180ec142cd483d4ce29057281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Tue, 18 Oct 2016 18:08:34 +0200 Subject: [PATCH 3/3] Bump VERSION to 6.0.6 --- lib/open_project/my_project_page/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/my_project_page/version.rb b/lib/open_project/my_project_page/version.rb index 54e96dbea4..47642ea521 100644 --- a/lib/open_project/my_project_page/version.rb +++ b/lib/open_project/my_project_page/version.rb @@ -20,6 +20,6 @@ module OpenProject module MyProjectPage - VERSION = "6.0.5" + VERSION = "6.0.6" end end