Merge tag 'v5.0.10' into stable/5

Author: oliverguenther

.pkgr.yml

@@ -2,8 +2,6 @@ user: openproject
 group: openproject
 targets:
   debian-7: &debian
-    dependencies:
-      - imagemagick
     build_dependencies:
       - libmagickwand-dev
       - libsqlite3-dev
@@ -12,8 +10,6 @@ targets:
   ubuntu-14.04:
     <<: *debian
   fedora-20: &redhat
-    dependencies:
-      - ImageMagick
     build_dependencies:
       - ImageMagick-devel
   centos-6:
@@ -22,13 +18,10 @@ targets:
     <<: *redhat
     dependencies:
       - epel-release
-      - ImageMagick
   sles-11:
     env:
       - EMBED_IMAGEMAGICK=true
   sles-12:
-    dependencies:
-      - ImageMagick
     build_dependencies:
       - ImageMagick-devel
 before_precompile: "packaging/setup"

Gemfile.lock

@@ -41,132 +41,132 @@ GIT
 
 GIT
   remote: https://github.com/finnlabs/openproject-announcements.git
-  revision: bd87f65c2a1b08db1106a824c265cf940a70dd32
-  tag: v5.0.9
+  revision: 0227b6a23e02b0d1b83674a1023075af6829ad03
+  branch: release/5.0
   specs:
-    openproject-announcements (5.0.9)
+    openproject-announcements (5.0.10)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-backlogs.git
-  revision: 892b8326949c5d2a6c9451d30ec3e07e7fbcae6f
-  tag: v5.0.9
+  revision: 1f5885d98225b84948735408f02b9d75ddda94f0
+  branch: release/5.0
   specs:
-    openproject-backlogs (5.0.9)
+    openproject-backlogs (5.0.10)
       acts_as_silent_list (~> 2.0.0)
       openproject-pdf_export
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-costs.git
-  revision: eba6e144f88d2313eadc8e8c63b5d0db5c7b4371
-  tag: v5.0.9
+  revision: 081633d0080ab530b1aca14a0c5a1d1de990bb94
+  branch: release/5.0
   specs:
-    openproject-costs (5.0.9)
+    openproject-costs (5.0.10)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-github_integration
-  revision: f47859a64173b157083340d553d990d35f07c82a
-  tag: v5.0.9
+  revision: 531a8bc565333513cf9ec74f42b1b3d5f016c379
+  branch: release/5.0
   specs:
-    openproject-github_integration (5.0.9)
+    openproject-github_integration (5.0.10)
       openproject-webhooks (~> 5.0.1)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-global_roles.git
-  revision: 2a55267407142393fa92a38f2d15d79942d71536
-  tag: v5.0.9
+  revision: 49ffcaa65bb670cc4df01cd674f9d22efd65cfbb
+  branch: release/5.0
   specs:
-    openproject-global_roles (5.0.9)
+    openproject-global_roles (5.0.10)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-help_link.git
-  revision: 03c3e43cdaedef417748371b736d85f9a8e17e07
-  tag: v5.0.9
+  revision: 41505497b1553fa30966b991c5e9c2eac30270fd
+  branch: release/5.0
   specs:
-    openproject-help_link (5.0.9)
+    openproject-help_link (5.0.10)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-local_avatars
-  revision: 95913a2272b6abc01269e49641a85c13c0468233
-  tag: v5.0.9
+  revision: 4224c3f2ff6b25460413ea975ad06364ee125aa9
+  branch: release/5.0
   specs:
-    openproject-local_avatars (5.0.9)
+    openproject-local_avatars (5.0.10)
       rails (~> 4.2.4)
       rmagick (~> 2.15.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-meeting.git
-  revision: 23d4ffe50b8ead6605a66cd5ae5ed6076124b100
-  tag: v5.0.9
+  revision: 6ccb0da6e4c8240d9334e611c410b21abdf078c2
+  branch: release/5.0
   specs:
-    openproject-meeting (5.0.9)
+    openproject-meeting (5.0.10)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-my_project_page.git
-  revision: fcaed62d0e94af91c1664ddaced7a71ad38c0c53
-  tag: v5.0.9
+  revision: 185218356fb7348a3763a92b1cc39713e8fb2273
+  branch: release/5.0
   specs:
-    openproject-my_project_page (5.0.9)
+    openproject-my_project_page (5.0.10)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-openid_connect.git
-  revision: d9391f3b93bd39df6d72096f8a8fe2560036c6ac
-  tag: v5.0.9
+  revision: e3d32394b8d042cdfca195d5f1e2e694d4181099
+  branch: release/5.0
   specs:
-    openproject-openid_connect (5.0.9)
+    openproject-openid_connect (5.0.10)
       lobby_boy (~> 0.1)
       omniauth-openid_connect-providers (~> 0.1)
       openproject-auth_plugins (~> 5.0.1)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-pdf_export.git
-  revision: bfc5f099d1a38f64ee86f56dd57dc758b91fcc80
-  tag: v5.0.9
+  revision: 937400760f70cb6a4d362d70f850ec1e6c1d1908
+  branch: release/5.0
   specs:
-    openproject-pdf_export (5.0.9)
+    openproject-pdf_export (5.0.10)
       prawn (~> 0.14.0)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-reporting.git
-  revision: c658a041887f884d4dfb6b203954694dfea82abb
-  tag: v5.0.9
+  revision: 944f251962fd5c89b6a968efd22b5b49de3f6d94
+  branch: release/5.0
   specs:
-    openproject-reporting (5.0.9)
+    openproject-reporting (5.0.10)
       openproject-costs (>= 5.0.1)
       rails (~> 4.2.4)
       reporting_engine (>= 1.1.0)
 
 GIT
   remote: https://github.com/finnlabs/openproject-themes-dark.git
-  revision: 662f3bb525f99738ec7128bb6b981c27c66e1cc7
-  tag: v5.0.9
+  revision: 09f50ff82489390910a2afe1d6affeccda09c6c0
+  branch: release/5.0
   specs:
-    openproject-themes-dark (5.0.9)
+    openproject-themes-dark (5.0.10)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-webhooks
-  revision: 79ed21b40ee588127d011d360b6be51bd9e46d9c
-  tag: v5.0.9
+  revision: 23edcf48401f075407a489824688ada593f5c3c9
+  branch: release/5.0
   specs:
-    openproject-webhooks (5.0.9)
+    openproject-webhooks (5.0.10)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/finnlabs/openproject-xls_export.git
-  revision: 601f1036d9fdaf24f934c2fedf2fe395cd387a3c
-  tag: v5.0.9
+  revision: cdde695086e1d35e0d2a11dbecd412eb793ad120
+  branch: release/5.0
   specs:
-    openproject-xls_export (5.0.9)
+    openproject-xls_export (5.0.10)
       rails (~> 4.2.4)
       spreadsheet (~> 0.8.9)
 
@@ -203,27 +203,27 @@ GIT
 
 GIT
   remote: https://github.com/opf/openproject-auth_plugins.git
-  revision: b65041ede419506c76cf6d4f265fc6c3e45a9b39
-  tag: v5.0.9
+  revision: 75851e32206bc34fb79880fb1e0bb63f93a2f3e0
+  branch: release/5.0
   specs:
-    openproject-auth_plugins (5.0.9)
+    openproject-auth_plugins (5.0.10)
       omniauth (~> 1.0)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/opf/openproject-documents.git
-  revision: 1846b99faffecdfc87609d26c9073189bcec23c8
-  tag: v5.0.9
+  revision: 522c6fefd4612b94387d817cbb20c841143df6e7
+  branch: release/5.0
   specs:
-    openproject-documents (5.0.9)
+    openproject-documents (5.0.10)
       rails (~> 4.2.4)
 
 GIT
   remote: https://github.com/opf/openproject-translations.git
-  revision: 87b499116bd30679916dda76609d22065e0970be
-  tag: v5.0.9
+  revision: e5ecc7e6bd7b0c0c65ae382ae752cf747bb1d0b0
+  branch: release/5.0
   specs:
-    openproject-translations (5.0.9)
+    openproject-translations (5.0.10)
       crowdin-api (~> 0.4.0)
       mixlib-shellout (~> 2.1.0)
       rails (~> 4.2.3)

Gemfile.plugins

@@ -32,8 +32,8 @@ group :opf_plugins do
 
   gem "openproject-backlogs",               git: "https://github.com/finnlabs/openproject-backlogs.git",              tag: CORE_VERSION
 
-  gem 'openproject-themes-dark',            git: "https://github.com/finnlabs/openproject-themes-dark.git",           tag: CORE_VERSION
-  gem 'openproject-local_avatars',          git: "https://github.com/finnlabs/openproject-local_avatars",             tag: CORE_VERSION
-  gem 'openproject-webhooks',               git: "https://github.com/finnlabs/openproject-webhooks",                  tag: CORE_VERSION
-  gem 'openproject-github_integration',     git: "https://github.com/finnlabs/openproject-github_integration",        tag: CORE_VERSION
+  gem 'openproject-themes-dark',            git: "https://github.com/finnlabs/openproject-themes-dark.git",           branch: CORE_VERSION
+  gem 'openproject-local_avatars',          git: "https://github.com/finnlabs/openproject-local_avatars",             branch: CORE_VERSION
+  gem 'openproject-webhooks',               git: "https://github.com/finnlabs/openproject-webhooks",                  branch: CORE_VERSION
+  gem 'openproject-github_integration',     git: "https://github.com/finnlabs/openproject-github_integration",        branch: CORE_VERSION
 end

frontend/app/components/common/services/api-paths.service.js renamed to frontend/app/components/common/api-paths/api-paths.service.js

@@ -0,0 +1,43 @@
+// -- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+// ++
+
+var expect = chai.expect;
+
+describe('lodash service', () => {
+  var lodash;
+
+  beforeEach(angular.mock.module('openproject.services'));
+
+  beforeEach(angular.mock.inject((___) => {
+    lodash = ___;
+  }));
+
+  it('should return the global lodash instance', () => {
+    expect(lodash.name).to.eq('lodash');
+  });
+});

frontend/app/components/common/services/api-paths.service.test.js renamed to frontend/app/components/common/api-paths/api-paths.service.test.js

@@ -0,0 +1,37 @@
+// -- copyright
+// OpenProject is a project management system.
+// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License version 3.
+//
+// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+// Copyright (C) 2006-2013 Jean-Philippe Lang
+// Copyright (C) 2010-2013 the ChiliProject Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+// See doc/COPYRIGHT.rdoc for more details.
+// ++
+
+import LoDashStatic = _.LoDashStatic;
+
+function lodash():LoDashStatic {
+  return _;
+}
+
+angular
+  .module('openproject.services')
+  .factory('_', lodash);

frontend/app/components/common/services/hal-api-resource.service.js renamed to frontend/app/components/common/hal-api-resource/hal-api-resource.service.js

@@ -11,6 +11,6 @@
       class="focus-input inplace-edit-select form--select"
       id="inplace-edit--write-value--{{::field.name}}"
       ng-options="option.name group by option.group for option in customEditorController.allowedValues track by option.href">
-    <option value="" ng-show="customEditorController.hasNullOption()">{{field.placeholder}}</option>
+    <option value="" ng-if="customEditorController.hasNullOption()">{{field.placeholder}}</option>
   </select>
 </div>

frontend/app/components/common/services/hal-api-resource.service.test.js renamed to frontend/app/components/common/hal-api-resource/hal-api-resource.service.test.js

@@ -152,7 +152,7 @@ function workPackageComment($timeout, $location, EditableFieldsState, FocusHelpe
     restrict: 'E',
     replace: true,
     transclude: true,
-    templateUrl: '/components/work-packages/directives/work-package-comment/' +
+    templateUrl: '/components/work-packages/work-package-comment/' +
       'work-package-comment.directive.html',
     scope: {
       workPackage: '=',

frontend/app/components/common/filters/latest-items.filter.js renamed to frontend/app/components/common/latest-items/latest-items.filter.js

@@ -33,7 +33,7 @@ angular
 function wpCreateButton() {
   return {
     restrict: 'E',
-    templateUrl: '/components/wp-buttons/wp-create-button/wp-create-button.directive.html',
+    templateUrl: '/components/work-packages/wp-create-button/wp-create-button.directive.html',
 
     scope: {
       projectIdentifier: '=',

frontend/app/components/common/filters/latest-items.filter.test.js renamed to frontend/app/components/common/latest-items/latest-items.filter.test.js

@@ -34,7 +34,7 @@ function wpCreateForm() {
   return {
     restrict: 'E',
     templateUrl: function (element, attrs) {
-      var directory = '/components/work-packages/directives/wp-create-form/',
+      var directory = '/components/work-packages/wp-create-form/',
           template = 'wp-create-form.directive.html';
 
       if (attrs.formTemplate === 'full-create') {

frontend/app/components/common/services/loading-indicator.service.js renamed to frontend/app/components/common/loading-indicator/loading-indicator.service.js

@@ -33,7 +33,7 @@ angular
 function wpWatcherButton() {
   return {
     replace: true,
-    templateUrl: '/components/wp-buttons/wp-watcher-button/wp-watcher-button.directive.html',
+    templateUrl: '/components/work-packages/wp-watcher-button/wp-watcher-button.directive.html',
 
     scope: {
       workPackage: '=',

frontend/app/components/common/lodash/lodash.service.test.ts

@@ -215,5 +215,7 @@ gulp.task('tests:karma', ['typescript-tests'], function () {
     } else {
       console.log('An error occurred. Temporary test files can be found in ' + tsOutDir);
     }
+
+    process.exit(exitCode);
   });
 });