summaryrefslogtreecommitdiffstats
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merged r20970 from trunk to 4.0-stable (#35045).Go MAEDA2021-04-251-2/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20973 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r20962 from trunk to 4.0-stable (#35085).Go MAEDA2021-04-231-0/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20965 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r20946 from trunk to 4.0-stable (#34367).Go MAEDA2021-04-191-6/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20952 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r20854 from trunk to 4.0-stable (#34950).Go MAEDA2021-03-261-5/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20856 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r20783 from trunk to 4.0-stable (#33548).Go MAEDA2021-03-141-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20785 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r20693 from trunk to 4.0-stable (#34297).Go MAEDA2020-12-291-4/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20696 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r20094 from trunk to 4.0-stable (#33769).Go MAEDA2020-09-301-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@20096 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r19975 from trunk to 4.0-stable (#33689).Go MAEDA2020-08-151-1/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19979 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r19818 from trunk to 4.0-stable (#33576).Go MAEDA2020-06-141-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19820 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r18743 to 4.0-stable (#31779).Jean-Philippe Lang2019-10-191-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18744 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r18356 from trunk to 4.0-stable (#31778).Go MAEDA2019-08-092-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18359 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backport the fix r18239 to 4.0-stable (#31503).Go MAEDA2019-06-101-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18240 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r18122 from trunk to 4.0-stable (#29259).Go MAEDA2019-05-041-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18123 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r18103 from trunk to 4.0-stable (#31276).Go MAEDA2019-04-301-0/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18104 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r18066 from trunk to 4.0-stable (#30457).Go MAEDA2019-04-201-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18067 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r18008 from trunk to 4.0-stable (#31087).Go MAEDA2019-03-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@18009 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17933 from trunk to 4.0-stable (#30367).Go MAEDA2019-03-131-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17940 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17918 from trunk to 4.0-stable (#30955).Go MAEDA2019-03-031-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17919 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17878 and r17879 from trunk to 4.0-stable (#30785).Go MAEDA2019-02-182-7/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17880 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17869 from trunk to 4.0-stable (#30718).Go MAEDA2019-02-162-10/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17872 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17862 from trunk to 4.0-stable (#30785).Go MAEDA2019-02-132-1/+7
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17863 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17754 to 4.0-stable (#30115).Jean-Philippe Lang2019-01-191-82/+84
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17819 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17817 to 4.0-stable (#30455).Jean-Philippe Lang2019-01-191-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17818 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17786 and r17787 from trunk to 4.0-stable (#30412).Go MAEDA2019-01-121-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17788 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Let admin users unarchive subprojects of archived projects (#29993).Jean-Philippe Lang2018-12-021-8/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@17681 e93f8b46-1217-0410-a6f0-8f06a7374b81
* CSV importer ignores shared version names of other projects (#30001).Jean-Philippe Lang2018-11-291-1/+4
| | | | | | Patch by Yuuki NARA and Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@17658 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fix: Attachments are added even if validation fails when updating an issue ↵Go MAEDA2018-11-231-1/+1
| | | | | | | | | via email (#28576). Patch by Takenori TAKAKI. git-svn-id: http://svn.redmine.org/redmine/trunk@17630 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Sort issues by due date in email reminders (#29771).Go MAEDA2018-11-061-0/+1
| | | | | | | Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@17624 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Remove trailing whitespaces from app/models/mailer.rbGo MAEDA2018-11-061-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@17622 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Filter time entries after project status (#20081).Go MAEDA2018-10-291-0/+10
| | | | | | | Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17608 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Filter issues after project status (#20081).Go MAEDA2018-10-293-0/+24
| | | | | | | Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17607 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Removes method_missing override (#26791).Jean-Philippe Lang2018-10-101-9/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@17591 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Replaces remaining #deliver with #deliver_later (#26791).Jean-Philippe Lang2018-10-101-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@17590 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Send emails asynchronously (#26791).Jean-Philippe Lang2018-10-1012-382/+255
| | | | | | Custom async_* delivery methods are removed in favor of ActiveJob (Async by default). git-svn-id: http://svn.redmine.org/redmine/trunk@17588 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that test_email raises an error with #deliver_later (#26791).Jean-Philippe Lang2018-10-061-41/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@17587 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use find_by instead of where.first to remove unnecessary sorting (#26747).Go MAEDA2018-10-069-16/+16
| | | | | | | Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@17586 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Ensure that ActiveRecord::Base objects are fully serialized for mail sending ↵Jean-Philippe Lang2018-10-061-1/+38
| | | | | | | | (#26791). Patch by Holger Just. git-svn-id: http://svn.redmine.org/redmine/trunk@17585 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Cleanup: Remove Issue#each_notification and Journal#each_notification (#26791).Jean-Philippe Lang2018-10-062-28/+0
| | | | | | Patch by Holger Just. git-svn-id: http://svn.redmine.org/redmine/trunk@17584 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Send individual emails for each mail recipient (#26791).Jean-Philippe Lang2018-10-062-115/+413
| | | | | | | | | | | | | | | | | | | | | | | We are creating multipe mails per class notification event, one per recipient, wrapped in a Mailer::MultiMessage object to send them all at once. We keep the existing interface of all class methods intended to be used by external code the same as they were before, with one exception: We provide additional recipient addresses in options[:recipients] for Mailer.security_notification. Since the first-class recipients have to be users to render individual mails for them, additional recipient addresses have to be provided with some other channel. By providing additional recipients in options[:recipients], we can solve the use-case for address change notifications for users, which probably is the only real use-case for having to use a plain email address instead of a User as a notification recipient. Patch by Holger Just and Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17583 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Custom queries are broken by updating with nil parameter values (#29701).Go MAEDA2018-10-042-6/+6
| | | | | | | Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@17566 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Extend Issue Summary to include subprojects (#2529).Go MAEDA2018-10-031-12/+12
| | | | | | | Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@17563 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Remove unused variable 'filter_options' from Query#add_filter (#29710).Go MAEDA2018-10-021-1/+0
| | | | | | | Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@17560 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use the id field as project_key in ↵Go MAEDA2018-09-241-0/+5
| | | | | | | | | ProjectCustomField#visibility_by_project_condition by default (#29161). Patch by Holger Just. git-svn-id: http://svn.redmine.org/redmine/trunk@17517 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Remove unused and broken method CustomField.visibility_condition (#29160).Jean-Philippe Lang2018-09-231-13/+0
| | | | | | Patch by Holger Just. git-svn-id: http://svn.redmine.org/redmine/trunk@17507 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Support self-signed LDAPS connections (#29606).Jean-Philippe Lang2018-09-232-2/+45
| | | | | | Patch by Gregor Schmidt. git-svn-id: http://svn.redmine.org/redmine/trunk@17505 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Column Project is no longer added by default to the list of default columns ↵Jean-Philippe Lang2018-09-231-3/+2
| | | | | | | | for time entries (#26537). Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17503 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that issue details page shows default values for custom fields that ↵Jean-Philippe Lang2018-09-232-1/+6
| | | | | | aren't actually set (#25726). git-svn-id: http://svn.redmine.org/redmine/trunk@17499 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Replace String#gsub with faster String#tr (#29363).Go MAEDA2018-08-122-2/+2
| | | | | | | Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@17469 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Replace Enumerable#sort with faster Enumerable#sort_by (#29299).Go MAEDA2018-08-021-1/+1
| | | | | | | Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@17462 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Replace Hash#keys.each with faster Hash#each_key (#29305).Go MAEDA2018-08-013-4/+4
| | | | | | | Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@17458 e93f8b46-1217-0410-a6f0-8f06a7374b81