summaryrefslogtreecommitdiff
path: root/app/mailers/emails
Commit message (Collapse)AuthorAgeFilesLines
* Clean up code by using keyword arguments.Douwe Maan2015-03-231-1/+7
|
* Send EmailsOnPush email when branch or tag is created or deleted.Douwe Maan2015-03-181-16/+44
|
* Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-151-4/+4
|
* Use Gitlab::Git helper methods and constants as much as possible.Douwe Maan2015-03-101-1/+1
|
* Fix EmailsOnPush comparison link to include first commit.Douwe Maan2015-02-251-2/+2
|
* Send EmailsOnPush when deleting commits using force push.Douwe Maan2015-02-251-1/+5
| | | | See #1924.
* Add option to disable code diffs to EmailOnPush.Douwe Maan2015-02-251-1/+2
| | | | See #1950
* Add option to send EmailsOnPush from committer email if domain matches.Douwe Maan2015-02-251-3/+3
| | | | See #1809.
* Remove incorrect footer from EmailsOnPush body.Douwe Maan2015-02-251-0/+2
| | | | See #1754.
* Change EmailsOnPush subject to include namespace, repo and branch.Douwe Maan2015-02-251-3/+6
| | | | See #1827.
* Upgrade to Rails 4.1.9Vinnie Okada2015-02-144-16/+37
| | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* Allow notification email to be set separately from primary email.Douwe Maan2015-02-072-4/+4
| | | | Closes #1932.
* Fix various typosSteven Burgart2015-01-181-1/+1
| | | | | | | | | | | | | | | signe-in -> signed-in go_to_gihub_for_permissions -> go_to_github_for_permissions descendand -> descendant behavour -> behaviour recepient_email -> recipient_email generate_fingerpint -> generate_fingerprint dependes -> depends Cant't -> Can't wisit -> visit notifcation -> notification sufficent_scope -> sufficient_scope? levet -> level
* Remove unused password argument from notificationJacob Vosmaer2014-12-011-2/+1
| | | | | | We were still passing a 'password' argument around, but it is not used anywhere because we send a password reset link in the welcome email nowadays.
* Fix adminarea and emails for new membership logicDmitriy Zaporozhets2014-09-152-5/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Huge replace of old users_project and users_group referencesDmitriy Zaporozhets2014-09-142-4/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Include "Merge-request reopened" emails in the proper email threadPierre de La Morinerie2014-07-251-3/+4
|
* Update specs.Marin Jankovski2014-07-161-1/+1
|
* Do not sent a generated password via email for admin created user.Marin Jankovski2014-07-151-1/+2
|
* Merge branch 'improve-email-threading' into 'master'Dmitriy Zaporozhets2014-07-073-43/+44
|\ | | | | | | | | | | | | | | | | Improve email threading This is a follow-up to !112 : it improves email threading, without changing the receiver of the emails. * Subject of answers to an existing thread begins with `Re: ` (required by Mail.app) * Send a 'In-Reply-To' header along the 'References' header
| * Allow more mail clients to group emails by threadPierre de La Morinerie2014-07-033-43/+44
| | | | | | | | | | * send a 'In-Reply-To' header along the 'References' header * subject of answers to an existing thread begins with 'Re: '
* | Test if reopen notifications are sent.Marin Jankovski2014-07-031-1/+0
| |
* | Reopen mr email notification.Marin Jankovski2014-07-031-0/+13
|/
* Revert "Merge branch 'fix-email-threading' into 'master'"Jacob Vosmaer2014-06-185-48/+47
| | | | | | | | | This reverts commit 97fd990ecde387290be269ef7daafa5761f94af6, reversing changes made to f451a697e0c018359e6d8ff3aaba4eb0484c4bee. Conflicts: app/mailers/emails/notes.rb app/mailers/emails/projects.rb
* Provide better email subject lines from email on push serviceAlex Elman2014-06-151-1/+3
| | | | | If one commit is pushed, display the commit message in the subject line. Otherwise display the number of commits pushed to the repository.
* Wipe wall notes featureDmitriy Zaporozhets2014-06-131-9/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Allow more mail clients to group emails by threadPierre de La Morinerie2014-06-103-43/+44
| | | | | | | * send a ‘In-Reply-To’ header along the ‘References’ header * subject of answers to an existing thread begins with ‘Re: ’ This fixes threading with at least Mail.app and Airmail.
* Send notification emails to the "project", and put people in CcPierre de La Morinerie2014-06-105-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes email threading in Mail.app, that doesn't like when a thread doesn't have stable recipients. For instance, here is a possible sender-recipient combinations before: From: A To: Me New issue From: B To: Me Reply on new issue From: A To: Me Another reply Mail.app doesn't see B as a participant to the original email thread, and decides to break the thread: it will group all messages from A together, and separately all messages from B. This commit makes the thread look like this: From: A To: gitlab/project Cc: Me New issue From: B To: gitlab/project Cc: Me Reply on new issue From: A To: gitlab/project Cc: Me Another reply Mail.app sees a common recipient, and group the thread correctly.
* Merge pull request #6109 from jamit/masterDmitriy Zaporozhets2014-05-133-0/+10
|\ | | | | Added email threading for update emails on issues and merge requests
| * Now using correct ids as reference if we are informing about a new note.Philip Blatter2014-05-051-2/+2
| |
| * Added email threading for update emails on issues and merge requests (if the ↵Philip Blatter2014-05-053-0/+10
| | | | | | | | mail client support the References: mail header)
* | Remove markdown notation from notification emailsDrew Blessing2014-04-282-5/+5
|/
* Fix emails on push service when a single commit is pushedJonathan A. Sternberg2014-04-111-1/+1
| | | | This fixes issue #161.
* Fix the merge notification email not being sentPierre de La Morinerie2014-03-241-2/+2
| | | | | | | | | | The 'author_id_of_changes' attribute is not persisted in the database. As we retrieve the merge request from the DB just before sending the email, this attribute was always nil. Also there was no tests for the merge notification code - tests have been added. Fix #6605
* Remove custom link to target in notification emailsPierre de La Morinerie2014-03-031-1/+1
| | | | | | Every email has a different way of showing a link to the discussion on the website. We don't need this anymore, as we now have a standard "View in GitLab" link in the footer of every email.
* Add a "View in GitLab" link in notification emailsPierre de La Morinerie2014-03-036-1/+22
| | | | | | | | | | | | | | When an email notification concerns a specific object (issue, note, merge request, etc.), add a link to the footer of the email that opens the item's page in a web browser. Rationale: * The link is predictable: always the same text, always at the same location, like any reliable tool. * It allows to remove the inline-title in many emails, and leave only the actual content of the message.
* Send emails from the authorPierre de La Morinerie2014-02-194-15/+29
| | | | | | | | | | | | This changes the email "From" field from "gitlab@example.com" to either: * "John Doe <gitlab@example.com>" if the author of the action is known, * "GitLab <gitlab@example.com>" otherwise. Rationale: this allow mails to appear as if they were sent by the author. It appears in the mailbox more like a real discussion between the sender and the receiver ("John sent: we should refactor this") and less like a robot notifying about something.
* Write the issue/merge request title in the notification email subjectPierre de La Morinerie2014-02-193-12/+22
| | | | | | | | | | | | | | | | | | | | | This changes the email subjects for issues and merge request notifications from: Team / Project | Note for issue #1234 to: Team / Project | Saving issue doesn't work sometimes (#1234) Rationale: * Scan the subject of the email notification more easily when catching up with a lot of notifications. Instead of having to open the email to get the title of the issue or merge request, one can simply read the subject of the email. * Group messages by subject: email clients will group emails in threads if they have the same subject.
* Remove the email subject prefixPierre de La Morinerie2014-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | This changes email subjects from: GitLab | Team / Project | Note for issue #1234 to: Team / Project | Note for issue #1234 Rationale: * Emails should be as meaningful as possible, and emphasize content over chrome. The "GitLab" name is more chrome than content. * Users can tell an email coming from GitLab by the sender or the header in the email content. * An organization that works mainly with GitLab knows that every SVC email comes from GitLab. For these organizations, having "GitLab" in front of every email is just noise hiding the meaningful information.
* Add email aliases for usersJason Hollingsworth2014-02-131-0/+6
| | | | | | | | Emails are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis. Notifications are sent when an email is added.
* Improve compare logic for EmailOnPush serviceDmitriy Zaporozhets2014-02-121-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove deprecated findersskv2014-01-192-2/+2
|
* Email on push: dont send email if new branch was pushed or branch was removedDmitriy Zaporozhets2013-12-171-4/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add templates for Emails on pushDmitriy Zaporozhets2013-12-171-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add new method to mailer for deliver emails with push infoDmitriy Zaporozhets2013-12-171-0/+10
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add @project variable to merge request emailsDmitriy Zaporozhets2013-12-161-0/+4
| | | | | | | After this change project name appears in the top part of email when you open/close/accept merge request. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix minor errors/annoyances in email templatesDrew Blessing2013-11-085-14/+14
| | | | | | | | There was some funny syntax in merge request email templates. There was a ! before the merge request number when there probably should be a #. This may be some carry over from markdown but should not be in email templates. There were also some capitalization discrepancies among the subject lines. For those OCD people out there I standardized the capitalization. :)
* Fix the sigil for merge request emailsAbe Hassan2013-10-081-1/+1
|
* Email templates when user was added to groupDmitriy Zaporozhets2013-09-113-1/+26
|
* [#4821] - Fix some missing iidsRomain2013-08-261-2/+2
|