Commit graph

16 commits

Author SHA1 Message Date
GitLab Bot
5e99b288a0 Add latest changes from gitlab-org/gitlab@master 2020-05-14 03:07:52 +00:00
Rémy Coutable
6d103a2f47 Factorize members mails into a new Emails::Members module
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-14 13:07:26 +02:00
Rémy Coutable
d26f81239a Add request access for groups
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-14 13:07:26 +02:00
Douwe Maan
cb5362e7ce Follow newline guidelines. 2015-04-14 15:16:00 +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
99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +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
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
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
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
Drew Blessing
57ad81a9c5 Fix minor errors/annoyances in email templates
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. :)
2013-11-08 10:20:15 -06:00
Dmitriy Zaporozhets
73446fe15e Email templates when user was added to group 2013-09-11 21:17:28 +03:00