Commit Graph
73 Commits
Author SHA1 Message Date
Douwe Maan 59f0d91a20 Prefix EmailsOnPush email subject with [Git]. 2015-05-25 16:35:37 +02:00
Dmitriy Zaporozhets 317ed1fa90 Revert "Allow to configure smtp and sendmail in gitlab.yml" 2015-05-06 17:39:18 +03:00
Jakub Jirutka b4be7aed77 Allow to configure smtp and sendmail in gitlab.yml 2015-05-06 13:15:33 +02:00
Douwe Maan 84a1590252 Let commit model know about its project. 2015-04-24 12:29:36 +02:00
Dmitriy Zaporozhets d2a895dad8 Merge branch 'emailsonpush-replyto' into 'master'
Set EmailsOnPush reply-to address to committer email when enabled.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2227.

See merge request !520
2015-04-15 12:37:51 +00:00
Douwe Maan cb5362e7ce Follow newline guidelines. 2015-04-14 15:16:00 +02:00
Douwe Maan c26b001ebc Set EmailsOnPush reply-to address to committer email when enabled. 2015-04-14 12:52:33 +02:00
Douwe Maan 1b5c483d89 Consistently use "invitation" rather than "invite" in text. 2015-04-14 12:25:16 +02:00
Douwe Maan e50556fcc8 Let invites be declined. 2015-04-14 12:08:11 +02:00
Douwe Maan 717fa136a5 Add emails around invitation. 2015-04-14 12:08:10 +02:00
Douwe Maan c5d7660000 Fix errors. 2015-04-02 22:36:54 +02:00
Douwe Maan f039e8e03f Don't use required keyword arguments to maintain support for Ruby 2.0. 2015-03-23 21:20:48 +01:00
Douwe Maan b13bed62ea Clean up code by using keyword arguments. 2015-03-23 15:08:19 +01:00
Douwe Maan bf235053ad Send EmailsOnPush email when branch or tag is created or deleted. 2015-03-18 14:07:28 +01:00
Douwe Maan 99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Douwe Maan 383c56efa1 Use Gitlab::Git helper methods and constants as much as possible. 2015-03-10 13:39:31 +01:00
Douwe Maan 4658e554b7 Fix EmailsOnPush comparison link to include first commit. 2015-02-25 18:14:29 +01:00
Douwe Maan 5d86332153 Send EmailsOnPush when deleting commits using force push.
See #1924.
2015-02-25 15:12:19 +01:00
Douwe Maan 85af3e82bf Add option to disable code diffs to EmailOnPush.
See #1950
2015-02-25 14:29:49 +01:00
Douwe Maan e0c186c357 Add option to send EmailsOnPush from committer email if domain matches.
See #1809.
2015-02-25 14:20:35 +01:00
Douwe Maan 6afb03ee96 Remove incorrect footer from EmailsOnPush body.
See #1754.
2015-02-25 13:13:46 +01:00
Douwe Maan 607f0c05fe Change EmailsOnPush subject to include namespace, repo and branch.
See #1827.
2015-02-25 13:13:27 +01:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
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.
2015-02-14 11:09:23 -07:00
Douwe Maan 9dbd7e5aec Allow notification email to be set separately from primary email.
Closes #1932.
2015-02-07 23:19:17 +01:00
Steven Burgart 5c80160218 Fix various typos
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
2015-01-18 10:29:37 -05:00
Jacob Vosmaer 25a566da0a Remove unused password argument from notification
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.
2014-12-01 15:11:26 +01:00
Dmitriy Zaporozhets bdbadebe3e Fix adminarea and emails for new membership logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-15 10:57:02 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
Pierre de La Morinerie 32a6f41f1c Include "Merge-request reopened" emails in the proper email thread 2014-07-25 10:50:58 +02:00
Marin Jankovski 8968f6d874 Update specs. 2014-07-16 09:51:20 +02:00
Marin Jankovski 56398ea161 Do not sent a generated password via email for admin created user. 2014-07-15 13:25:11 +02:00
Dmitriy Zaporozhets 664112b47e Merge branch 'improve-email-threading' into 'master'
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
2014-07-07 14:06:40 +00:00
Pierre de La Morinerie 6dafbf2412 Allow more mail clients to group emails by thread
* send a 'In-Reply-To' header along the 'References' header
* subject of answers to an existing thread begins with 'Re: '
2014-07-03 16:58:42 +02:00
Marin Jankovski 16068f3bfe Test if reopen notifications are sent. 2014-07-03 14:05:07 +02:00
Marin Jankovski 310231dbed Reopen mr email notification. 2014-07-03 13:40:21 +02:00
Jacob Vosmaer 780d868fec Revert "Merge branch 'fix-email-threading' into 'master'"
This reverts commit 97fd990ecd, reversing
changes made to f451a697e0.

Conflicts:
	app/mailers/emails/notes.rb
	app/mailers/emails/projects.rb
2014-06-18 13:41:12 +02:00
Alex Elman e6722cb178 Provide better email subject lines from email on push service
If one commit is pushed, display the commit message in the subject
line. Otherwise display the number of commits pushed to the repository.
2014-06-15 09:53:00 -05:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 14:24:54 +03:00
Pierre de La Morinerie de90b572d8 Allow more mail clients to group emails by thread
* 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.
2014-06-10 17:09:15 +02:00
Pierre de La Morinerie 466b768bb3 Send notification emails to the "project", and put people in Cc
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.
2014-06-10 17:09:15 +02:00
Dmitriy Zaporozhets 17858d49f6 Merge pull request #6109 from jamit/master
Added email threading for update emails on issues and merge requests
2014-05-13 12:35:33 +03:00
Philip Blatter 11bedfe37d Now using correct ids as reference if we are informing about a new note. 2014-05-05 21:48:49 +02:00
Philip Blatter 06bed543e6 Added email threading for update emails on issues and merge requests (if the mail client support the References: mail header) 2014-05-05 21:46:51 +02:00
Drew Blessing 17b3da07ce Remove markdown notation from notification emails 2014-04-28 14:33:17 -05:00
Jonathan A. Sternberg 9cb2a4ac8a Fix emails on push service when a single commit is pushed
This fixes issue #161.
2014-04-11 11:54:02 -04:00
Pierre de La Morinerie 65f5496e02 Fix the merge notification email not being sent
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
2014-03-24 15:11:35 +01:00
Pierre de La Morinerie edd6028bdb Remove custom link to target in notification emails
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.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 7ba0b502d3 Add a "View in GitLab" link in notification emails
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.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 96dded3ec8 Send emails from the author
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.
2014-02-19 18:25:18 +01:00
Pierre de La Morinerie 57cb1ca791 Write the issue/merge request title in the notification email subject
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.
2014-02-19 18:25:18 +01:00