From f7a220a89fdaa77041bdea72b73cbbd8ab6d6364 Mon Sep 17 00:00:00 2001
From: Henriette Dinger <h.dinger@finn.de>
Date: Fri, 16 Sep 2016 13:12:37 +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 d43743ac35b0ff58d8bc1a22dcc6b90fdde12d10 Mon Sep 17 00:00:00 2001
From: Henriette Dinger <h.dinger@finn.de>
Date: Thu, 15 Sep 2016 15:29:26 +0200
Subject: [PATCH 2/3] Remove obselete info from add button

---
 app/views/meetings/index.html.erb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/meetings/index.html.erb b/app/views/meetings/index.html.erb
index 0623e07759..1f2f86f4cf 100644
--- a/app/views/meetings/index.html.erb
+++ b/app/views/meetings/index.html.erb
@@ -23,9 +23,13 @@ See doc/COPYRIGHT.md for more details.
 
 <%= toolbar title: l(:label_meeting_plural) do %>
   <% if authorize_for(:meetings, :new) %>
-      <a href="<%= new_meeting_path %>" id="add-meeting-button" title="Add meeting" class="button -alt-highlight">
+      <a href="<%= new_meeting_path %>"
+         id="add-meeting-button"
+         title="<%= I18n.t(:label_meeting_new) %>"
+         arial-label="<%= I18n.t(:label_meeting_new) %>"
+         class="button -alt-highlight">
         <i class="button--icon icon-add"></i>
-        <span class="button--text"><%= I18n.t(:label_meeting_new) %></span>
+        <span class="button--text"><%= t(:label_meeting) %></span>
       </a>
   <% end %>
 <% end %>

From 8853797ebe901fa4c8be1121f39e14d3cb043c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Tue, 18 Oct 2016 18:08:34 +0200
Subject: [PATCH 3/3] Bump VERSION to 6.0.6

---
 lib/open_project/meeting/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/open_project/meeting/version.rb b/lib/open_project/meeting/version.rb
index 3869ff2e02..9f4a092749 100644
--- a/lib/open_project/meeting/version.rb
+++ b/lib/open_project/meeting/version.rb
@@ -20,6 +20,6 @@
 
 module OpenProject
   module Meeting
-    VERSION = "6.0.5"
+    VERSION = "6.0.6"
   end
 end