summaryrefslogtreecommitdiff
path: root/app/mailers
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove duplicate settings for default_url_optionsRobert Speicher2015-04-251-6/+1
| | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
* Let commit model know about its project.Douwe Maan2015-04-241-3/+3
|
* Merge branch 'emailsonpush-replyto' into 'master'Dmitriy Zaporozhets2015-04-152-12/+24
|\ | | | | | | | | | | | | | | 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
| * Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replytoDouwe Maan2015-04-142-12/+24
| |
* | Follow newline guidelines.Douwe Maan2015-04-142-0/+13
| |
* | Consistently use "invitation" rather than "invite" in text.Douwe Maan2015-04-142-9/+13
| |
* | Let invites be declined.Douwe Maan2015-04-142-0/+26
| |
* | Add emails around invitation.Douwe Maan2015-04-142-4/+42
|/
* Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-134-8/+16
|\ | | | | | | | | | | | | | | 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
| * Fix errors.Douwe Maan2015-04-024-8/+16
| |
* | Add ability to configure Reply-To address in gitlab.ymlStan Hu2015-04-031-1/+1
|/ | | | Closes #1305
* Enable more rubocop style checksDmitriy Zaporozhets2015-03-241-1/+1
|
* Don't use required keyword arguments to maintain support for Ruby 2.0.Douwe Maan2015-03-231-3/+7
|
* 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
|
* Merge branch 'master' into 'master'Hannes Rosenögger2015-03-111-1/+1
|\ | | | | | | | | | | | | | | Make email display name configurable #216 See merge request !80
| * Make email display name configurableVyacheslav Slinko2015-03-111-1/+1
| |
* | 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
|
* Fix EmailsOnPush to allow sending from @company.com for GitLab at ↵Douwe Maan2015-02-251-1/+16
| | | | gitlab.corp.company.com.
* 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-252-4/+9
| | | | 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.
* Merge pull request #8749 from sashkab/b8748-emailheaderDmitriy Zaporozhets2015-02-081-0/+2
|\ | | | | Addex X-GitLab-Project header to GitLab emails.
| * Addex X-GitLab-Project header to GitLab emails.Aleks Bunin2015-02-071-0/+2
| | | | | | | | Fixes #8748.
* | Allow notification email to be set separately from primary email.Douwe Maan2015-02-073-5/+5
|/ | | | Closes #1932.
* Fix various typosSteven Burgart2015-01-182-3/+3
| | | | | | | | | | | | | | | 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
* Add rake task for google schema whitelisting.Marin Jankovski2014-12-041-0/+8
|
* 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.
* Include the helper for mailer, add links to emails.Marin Jankovski2014-11-111-0/+1
|
* 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-074-51/+82
|\ | | | | | | | | | | | | | | | | 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-034-51/+82
| | | | | | | | | | * 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-186-106/+55
| | | | | | | | | 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-104-51/+88
| | | | | | | * 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-106-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-134-0/+26
|\ | | | | 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
| |
View Lorry Controller Status