Merge branch 'release/6.1' into dev

Gemfile.lock

@@ -60,7 +60,7 @@ GIT
 
 GIT
   remote: https://github.com/opf/openproject-translations.git
-  revision: 03c6ba2095c610180623d49591837ce694ec9e4c
+  revision: 495075444d0227625ea064907a629197e107b3e9
   branch: release/6.1
   specs:
     openproject-translations (6.1.2)

app/assets/fonts/lato/OFL.txt

@@ -1,94 +1,94 @@
-Copyright (c) 2010-2014, Łukasz Dziedzic (dziedzic@typoland.com),
-with Reserved Font Name Lato.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright (c) 2010-2015, Łukasz Dziedzic (dziedzic@typoland.com),
+with Reserved Font Name Lato.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

app/assets/stylesheets/fonts/_lato.sass

@@ -26,7 +26,7 @@
 // See doc/COPYRIGHT.rdoc for more details.
 //++
 
-$lato-file-formats: eot woff ttf
+$lato-file-formats: woff woff2
 
 +font-face(LatoLight, 'lato/Lato-Light', $file-formats: $lato-file-formats)
 +font-face(LatoLight, 'lato/Lato-LightItalic', normal, italic, $file-formats: $lato-file-formats)

app/models/category.rb

@@ -34,7 +34,7 @@ class Category < ActiveRecord::Base
 
   validates_presence_of :name
   validates_uniqueness_of :name, scope: [:project_id]
-  validates_length_of :name, maximum: 30
+  validates_length_of :name, maximum: 256
 
   # validates that assignee is member of the issue category's project
   validates_each :assigned_to_id do |record, attr, value|

app/models/user.rb

@@ -147,7 +147,7 @@ class User < Principal
   }
   scope :admin, -> { where(admin: true) }
 
-  scope :newest, -> { order(created_on: :desc) }
+  scope :newest, -> { not_builtin.order(created_on: :desc) }
 
   def sanitize_mail_notification_setting
     self.mail_notification = Setting.default_notification_option if mail_notification.blank?

app/views/homescreen/blocks/_users.html.erb

@@ -8,10 +8,10 @@
 <% unless @newest_users.empty? %>
 <ul class="widget-box--arrow-links">
   <% @newest_users.each do |user| %>
-  <li>
-    <%= link_to user, user_path(user), title: user.name %>
-    <small>(<%= format_date(user.created_on) %>)</small>
-  </li>
+    <li>
+      <%= link_to user, user_path(user), title: user.name %>
+      <small>(<%= format_date(user.created_on) %>)</small>
+    </li>
   <% end %>
 </ul>
 <% end %>

db/migrate/201612131919190_remove_category_name_restriction.rb

@@ -0,0 +1,5 @@
+class RemoveCategoryNameRestriction < ActiveRecord::Migration[5.0]
+  def change
+    change_column :categories, :name, :string, limit: 256
+  end
+end

doc/operation_guides/incoming_emails.md

@@ -77,9 +77,25 @@ But then no other value is possible (even when you update the work package) unle
 
 ### Work Packages
 
+#### Sending user address
+
+The address the mail is sent from must match an existing account in order to map the user action.
+If a matching account is found, the mail handler impersonates the user to create the ticket.
+
+If no matching account is found, the mail is rejected. To override this behavior and allow unknown mail address
+to create work packages, set the option `no_permission_check=1`.
+
+**Note**: This feature only provides a mapping of mail to user account, it does not authenticate the user based on the mail.
+Since you can easily spoof mail addresses, you should not rely on the authenticity of work packages created that way.
+
 #### Attributes
 
-The Attributes you can use in your email are the same whether you create or update a work package. Only the project is a bit special: If you create a work package and do not specify the project via an environment variable you pass along to the rake task you have to put it into the email. If you specify it via an environment variable or you update a work package you do not need to specify it.
+The Attributes you can use in your email are the same whether you create or update a work package.
+
+Only the `project` attribute is a bit special:
+
+You must either add `project` to the set of allowed overridden attributes with `allow_override=project,..` in order to use it in a mail,
+OR set it as fixed variable with `project=identifier`.
 
 The subject of the work package that shall be created is derived from the subject of the email. The body of the email gets parsed and all lines that contain recognized keys are removed. What is left will become the description.
 

frontend/app/components/wp-relations/wp-relations-create/add-child.template.html

@@ -40,6 +40,7 @@
           <div class="grid-content medium-2 collapse wp-relations-controls-section relation-row">
               <accessible-by-keyboard
                       link-class="wp-create-relation--save"
+                      is-disabled="$ctrl.isDisabled"
                       execute="$ctrl.createRelation()"
                       aria-hidden="false">
                   <icon-wrapper icon-name="checkmark"

frontend/app/components/wp-relations/wp-relations-create/add-fixed-type.template.html

@@ -12,6 +12,7 @@
         <div class="grid-content medium-2 collapse wp-relations-controls-section relation-row">
             <accessible-by-keyboard
                     execute="$ctrl.createRelation()"
+                    is-disabled="$ctrl.isDisabled"
                     aria-hidden="false">
                 <icon-wrapper icon-name="checkmark"
                               icon-title="{{ ::$ctrl.text.save }}">

frontend/app/components/wp-relations/wp-relations-create/dynamic-relation-types.template.html

@@ -35,7 +35,7 @@
             <div class="grid-content medium-2 collapse wp-relations-controls-section relation-row">
                 <accessible-by-keyboard
                         execute="$ctrl.createRelation()"
-                        is-disabled="!$ctrl.selectedWpId"
+                        is-disabled="$ctrl.isDisabled || !$ctrl.selectedWpId"
                         link-class="wp-create-relation--save"
                         aria-hidden="false">
                     <icon-wrapper icon-name="checkmark"

frontend/app/components/wp-relations/wp-relations-create/empty-parents.template.html

@@ -29,6 +29,7 @@
             <div class="grid-content medium-2 collapse wp-relations-controls-section relation-row">
                 <accessible-by-keyboard
                         link-class="wp-create-relation--save"
+                        is-disabled="$ctrl.isDisabled"
                         execute="$ctrl.createRelation()"
                         class="wp-relations--save"
                         aria-hidden="false">

frontend/app/components/wp-relations/wp-relations-create/wp-relations-create.directive.ts

@@ -19,6 +19,7 @@ export class WorkPackageRelationsCreateController {
   public canAddChildren = !!this.workPackage.addChild;
   public canLinkChildren = !!this.workPackage.changeParent;
   public loadingPromise = false;
+  public isDisabled = false;
 
   constructor(protected I18n,
               protected $scope:ng.IScope,
@@ -55,20 +56,26 @@ export class WorkPackageRelationsCreateController {
       return;
     }
 
+    let promise;
+    this.isDisabled = true;
     switch (this.selectedRelationType) {
       case 'parent':
-        this.changeParent();
+        promise = this.changeParent();
         break;
       case 'children':
-        this.addExistingChildRelation();
+        promise = this.addExistingChildRelation();
         break;
       default:
-        this.createCommonRelation();
+        promise = this.createCommonRelation();
     }
+
+    promise.finally(() => {
+      this.isDisabled = false;
+    });
   }
 
   protected addExistingChildRelation() {
-    this.wpRelationsHierarchyService.addExistingChildWp(this.workPackage, this.selectedWpId)
+    return this.wpRelationsHierarchyService.addExistingChildWp(this.workPackage, this.selectedWpId)
       .then(() => this.wpCacheService.loadWorkPackage(<number> this.workPackage.id, true))
       .catch(err => this.wpNotificationsService.handleErrorResponse(err, this.workPackage))
       .finally(() => this.toggleRelationsCreateForm());
@@ -80,18 +87,18 @@ export class WorkPackageRelationsCreateController {
 
   protected changeParent() {
     this.toggleRelationsCreateForm();
-    this.wpRelationsHierarchyService.changeParent(this.workPackage, this.selectedWpId)
+    return this.wpRelationsHierarchyService.changeParent(this.workPackage, this.selectedWpId)
       .then(updatedWp => {
         this.wpNotificationsService.showSave(this.workPackage);
         this.$timeout(() => {
           angular.element('#hierarchy--parent').focus();
         });
       })
-      .catch(err => this.wpNotificationsService.handleErrorResponse(err, this.workPackage))
+      .catch(err => this.wpNotificationsService.handleErrorResponse(err, this.workPackage));
   }
 
   protected createCommonRelation() {
-    this.wpRelationsService.addCommonRelation(this.workPackage, this.selectedRelationType, this.selectedWpId)
+    return this.wpRelationsService.addCommonRelation(this.workPackage, this.selectedRelationType, this.selectedWpId)
       .then(relation => {
         this.$scope.$emit('wp-relations.changed', relation);
         this.wpNotificationsService.showSave(this.workPackage);

spec/models/user_spec.rb

@@ -642,4 +642,14 @@ describe User, type: :model do
       end
     end
   end
+
+  describe 'scope.newest' do
+    let!(:anonymous) { FactoryGirl.create(:anonymous) }
+    let!(:user1) { FactoryGirl.create(:user) }
+    let!(:user2) { FactoryGirl.create(:user) }
+
+    it 'without anonymous user' do
+      expect(User.newest).to match_array([user1, user2])
+    end
+  end
 end