Commit Graph
85 Commits
Author SHA1 Message Date
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
Robert Speicher aa9435cddb Remove duplicate settings for default_url_options
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
2015-04-25 19:46:04 -04:00
Douwe Maan c26b001ebc Set EmailsOnPush reply-to address to committer email when enabled. 2015-04-14 12:52:33 +02:00
Dmitriy Zaporozhets ecb58dacd6 Merge branch 'reference-access-control' into 'master'
Only allow users to reference groups, projects, issues, MRs, commits they have access to.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.

See merge request !1742
2015-04-13 14:10:25 +00:00
Stan Hu 81a5a9713d Add ability to configure Reply-To address in gitlab.yml
Closes #1305
2015-04-03 06:47:54 -07:00
Douwe Maan c5d7660000 Fix errors. 2015-04-02 22:36:54 +02:00
Dmitriy Zaporozhets 6ec8ff069c Enable more rubocop style checks 2015-03-24 18:28:10 -07:00
Vyacheslav Slinko 61ed518781 Make email display name configurable 2015-03-11 11:04:23 +07:00
Douwe Maan 969de4c15a Fix EmailsOnPush to allow sending from @company.com for GitLab at gitlab.corp.company.com. 2015-02-25 15:51:13 +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
Dmitriy Zaporozhets 8c12c93e07 Merge pull request #8749 from sashkab/b8748-emailheader
Addex X-GitLab-Project header to GitLab emails.
2015-02-08 01:06:38 -08:00
Douwe Maan 9dbd7e5aec Allow notification email to be set separately from primary email.
Closes #1932.
2015-02-07 23:19:17 +01:00
Aleks Bunin 36b255e57b Addex X-GitLab-Project header to GitLab emails.
Fixes #8748.
2015-02-07 12:35:50 -05: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
Marin Jankovski cdc62cffcb Add rake task for google schema whitelisting. 2014-12-04 15:22:10 +01:00
Marin Jankovski 3dcb5f8501 Include the helper for mailer, add links to emails. 2014-11-11 16:10:24 +01: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
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 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
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
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 d8a24003cb Don't write the project namespace in email subjects
For instance, the email "Subject" field changes from:

    Mattt / Ground Control | Saving issue doesn't work sometimes (#1234)

to:

    Ground Control | Saving issue doesn't work sometimes (#1234)

Rationale:

* Most people are receiving email notifications about a single fork:
the project activity, issues and merge requests are happening either
in a root repository or in a fork, but less often in several forks.

* It removes noise from the email subject. The namespace of the project
can still be read in the email body.

* For Entreprise users that have a single namespace "MyEntreprise",
having this repeated in every email subject is very noisy.
2014-02-19 18:25:18 +01:00
Pierre de La Morinerie 44ab156ef4 Remove the email subject prefix
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.
2014-02-19 18:25:18 +01:00
Pierre de La Morinerie 49cb1c7277 Fix misleading comment 2014-02-19 18:25:18 +01:00
Jason Hollingsworth 39a2adf4f4 Fix broken test in spec/models/project_spec.rb
A test was broken if running on a non-standard port.
Made checking for (non-)standard port more robust.
Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
2014-01-24 21:14:05 -06:00
Dmitriy Zaporozhets ccf2e48a2c Set noreply@HOSTNAME for reply_to field in all emails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-09 16:36:21 +02:00
Dmitriy Zaporozhets 73446fe15e Email templates when user was added to group 2013-09-11 21:17:28 +03:00
Izaak Alpert 539c70c7d6 Update emails to describe path using for_fork?
Forked MR's will print

Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch>

Non forked MR's will print

Branch <source_branch> -> <target_branch>

Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038
2013-07-17 22:48:03 -04:00
Dmitriy Zaporozhets a3cdaeef66 refactor emails a bit. Add email on ssh key creation 2013-03-19 20:00:41 +02:00
Dmitriy Zaporozhets 591e094e06 Add a delay for sending emails 2013-02-01 17:04:41 +02:00
Dmitriy Zaporozhets cc2484c3e6 Fix sending commit note email to id instead email 2013-02-01 08:59:30 +02:00
Dmitriy Zaporozhets 211c06e419 Fix few test and notify for commit author 2013-01-15 13:37:20 +02:00
Riyad Preukschas 3022786948 Merge commit 'master' into discussions
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
Dmitriy Zaporozhets 71bd956866 email via sidekiq. start and stop rake tasks 2013-01-09 08:44:05 +03:00
Dmitriy Zaporozhets c7bb3a1f72 sidekiq 2013-01-09 08:14:05 +03:00
Riyad Preukschas 621c6b8533 Fix commit note notification 2013-01-02 20:50:24 +01:00
Dmitriy Zaporozhets ffe064a2c1 Bit of cleanup and improving mailer 2012-12-31 19:46:40 +02:00
Dmitriy Zaporozhets e5ff5c2869 Use project with namespace in email subject 2012-12-31 18:22:44 +02:00
Dmitriy Zaporozhets 0a2ac8371d Add missing subject for wall comment 2012-12-30 20:26:09 +02:00
Chris Frohoff 21e55ca318 added RAILS_RELATIVE_URL_ROOT support 2012-12-28 18:11:28 +00:00
Dmitriy Zaporozhets 2a3f5dae0f Fix email send on close/reopen issue. Display project name with namespace. remove css style 2012-12-20 23:04:27 +02:00
Dmitriy Zaporozhets 75dd704294 Send update instructions after project namespace id changed or namespace path changed 2012-12-20 22:16:51 +02:00
Riyad Preukschas 19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets a0aa0212a9 Removed feature: comments on wiki 2012-11-29 06:14:05 +03:00
Riyad Preukschas 853c69c48a Reorder and group methods in Notify mailer 2012-10-18 01:14:09 +02:00
Riyad Preukschas b1461de993 Make Note methods saner 2012-10-13 16:23:12 +02:00
Alex Denisov 09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
Alex Denisov 4d65532158 Issue_status_changed email added 2012-08-29 09:49:39 +03:00