Merge remote-tracking branch 'origin/dev' into feature/rails5

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();
 

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>

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();
     };
 
   }));