From 77392fd196e993d2500033480188b737d4ae740a Mon Sep 17 00:00:00 2001
From: Jens Ulferts <j.ulferts@finn.de>
Date: Tue, 6 Sep 2016 11:37:32 +0200
Subject: [PATCH 1/2] move attachment upload button

---
 .../components/wp-details/wp-details-toolbar.directive.html  | 5 +++--
 .../directives/work-package-details-toolbar-test.js          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/app/components/wp-details/wp-details-toolbar.directive.html b/frontend/app/components/wp-details/wp-details-toolbar.directive.html
index b746266203..0192a7df70 100644
--- a/frontend/app/components/wp-details/wp-details-toolbar.directive.html
+++ b/frontend/app/components/wp-details/wp-details-toolbar.directive.html
@@ -10,6 +10,9 @@
                      disabled="wpEditModeState.active"
                      ng-if="displayWatchButton">
   </wp-watcher-button>
+
+  <wp-upload-button work-package="workPackage"></wp-upload-button>
+
   <button class="button dropdown-relative"
           ng-disabled="!actionsAvailable"
           has-dropdown-menu
@@ -19,6 +22,4 @@
     <span class="button--text" ng-bind="::I18n.t('js.button_more')"></span>
     <i class="button--dropdown-indicator"></i>
   </button>
-
-  <wp-upload-button work-package="workPackage"></wp-upload-button>
 </div>
diff --git a/frontend/tests/unit/tests/work_packages/directives/work-package-details-toolbar-test.js b/frontend/tests/unit/tests/work_packages/directives/work-package-details-toolbar-test.js
index 8b342fd618..155f221d4f 100644
--- a/frontend/tests/unit/tests/work_packages/directives/work-package-details-toolbar-test.js
+++ b/frontend/tests/unit/tests/work_packages/directives/work-package-details-toolbar-test.js
@@ -83,7 +83,7 @@ describe('workPackageDetailsToolbar', function() {
       element = $compile(element)(scope);
       angular.element(document.body).append(element);
       scope.$digest();
-      element.find('button:eq(1)').click();
+      element.find('button:eq(2)').click();
     };
 
   }));

From 2ff7e923cd38a0a18b72eadc8d263abd1c8b5daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Wed, 7 Sep 2016 16:25:46 +0200
Subject: [PATCH 2/2] Explicitly require LWP::Protocol::http

This should resolve `Attempt to reload LWP/Protocol/http.pm aborted.` on
the apache authorization mod_perl script.

[ci skip]
---
 extra/Apache/OpenProjectAuthentication.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extra/Apache/OpenProjectAuthentication.pm b/extra/Apache/OpenProjectAuthentication.pm
index ad0dba71a8..58ffd55372 100644
--- a/extra/Apache/OpenProjectAuthentication.pm
+++ b/extra/Apache/OpenProjectAuthentication.pm
@@ -16,6 +16,8 @@ use APR::Table ();
 
 use HTTP::Request::Common qw(POST);
 use LWP::UserAgent;
+use LWP::Protocol::http;
+
 
 # use Apache2::Directive qw();