summaryrefslogtreecommitdiff
path: root/spec/mailers
Commit message (Collapse)AuthorAgeFilesLines
* adds second batch of tests changed to active tenseactive-tense-test-coveragetiagonbotelho2016-08-092-2/+2
|
* Introduce Compare model in the codebase.Paco Guzman2016-08-031-4/+6
| | | This object will manage Gitlab::Git::Compare instances
* Make Notify specs more robust by setting up assignee namesRémy Coutable2016-07-221-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-061-2/+2
|
* Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-011-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude requesters from Project#members, Group#members and User#members ## What does this MR do? It excludes requesters from the `Project#members`, `Group#members` and `User#members` associations, and adds new `Project#requesters` and `Group#requesters` associations. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Without this, if you call `project.members`, requesters are included in the results! This is at best misleading, and at worst can lead to security issues. By excluding requesters from the `#members` associations, we avoid introducing security inadvertently since you have to call the `#requesters` association explicitly to get requesters. ## What are the relevant issue numbers? This is something I realized while fixing the security issue #19102. ## Does this MR meet the acceptance criteria? - [x] I don't think this needs a CHANGELOG since this is an internal change - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4946
| * Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-011-5/+5
| | | | | | | | | | | | And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-011-5/+0
|/
* Fallback to group's owners/masters when a project has none18757-fixRémy Coutable2016-06-201-14/+47
| | | | | | | A project in a group can have no explicit owners/masters, in that case we fallbacks to the group's owners/masters. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add previews for all customized Devise emailsRobert Speicher2016-06-161-2/+21
|
* UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-141-54/+78
| | | | | | | | | + Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
* Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-141-77/+179
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add request access for groupsRémy Coutable2016-06-141-2/+98
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update tests for the current_application_settings request store changesDJ Mountney2016-05-271-3/+3
|
* New confirmation email :fire:Robert Speicher2016-05-251-1/+1
|
* Customize ActionMailer preview pathRobert Speicher2016-05-251-0/+11
|
* Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-241-2/+2
| | | | Also removes the note from the development/testing.md guide
* Syntax-highlight diffs in push emails17464-backport-email-syntax-highlightingSean McGivern2016-05-171-7/+9
| | | | | Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
* Only generate repository push email onceSean McGivern2016-05-111-30/+6
| | | | | | | | | The repository push email can be very expensive to generate, especially with syntax-highlighted diffs. Instead of generating the email for each recipient, generate one email object and reset the Message-Id and To headers for each recipient. (Cloning would also be expensive in the case of large emails, although probably not as bad as generating from scratch.)
* Merge branch 'mr-formatting' into 'master' Robert Speicher2016-04-191-6/+6
|\ | | | | | | | | | | | | use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740
| * format merge request references properlyBen Bodenmiller2016-04-181-6/+6
| |
* | Improve 'auto fsck' admin emailsJacob Vosmaer2016-04-181-1/+1
|/
* More create_listauto-fsckJacob Vosmaer2016-04-141-1/+1
|
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsckJacob Vosmaer2016-04-121-0/+2
|\
| * Premailer shouldn't remove script tags from our emailsRobert Speicher2016-04-051-0/+2
| | | | | | | | Closes #14943.
* | Rename almost all the thingsJacob Vosmaer2016-04-061-1/+1
| |
* | Rebase repo check MRJacob Vosmaer2016-04-041-0/+21
|/
* Improve and finish the fallback to the In-Reply-To and References header for ↵2364-fallback-to-in-reply-to-headerRémy Coutable2016-03-252-36/+111
| | | | | | | | | | | | | | | | the reply-by-email feature A few things to note: - The IncomingEmail feature is now enabled even without a correctly-formatted sub-address - Message-ID for new thread mail are kept the same so that subsequent notifications to this thread are grouped in the thread by the email service that receives the notification (i.e. In-Reply-To of the answer == Message-ID of the first thread message) - To maximize our chance to be able to retrieve the reply key, we look for it in the In-Reply-To header and the References header - The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]" - Improve docs thanks to Axil
* Fix #2364. Fall back to In-Reply-To header when reply key not availableDavid Padilla2016-03-252-2/+7
|
* Add new notifications for issue move actionGrzegorz Bizon2016-03-171-0/+27
| | | | [ci skip]
* Improving the original label-subscribing implementationRémy Coutable2016-03-152-1/+61
| | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
* Ensure "new SSH key" email do not ends up as dead Sidekiq jobsfix/ensure-no-new_ssh_key_email-dead-jobsRémy Coutable2016-03-151-1/+5
| | | | | | | | Related to #2235. This is done by: 1. Delaying the notification sending after the SSH key is commited in DB 2. Gracefully exit the mailer method if the record cannot be found
* Move profile notifications specs to separate filefix/ci-emails-broken-linkGrzegorz Bizon2016-02-122-98/+107
|
* Move build emails specs to separate fileGrzegorz Bizon2016-02-123-177/+186
| | | | | This also extracts shared examples for notification emails to separate file.
* Fix broken link in CI build notification emailsGrzegorz Bizon2016-02-121-38/+40
| | | | Closes #13199
* Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-091-0/+37
|
* Added X-GitLab-... headers to emails from CI and Email On Push servicesAnton Baklanov2016-01-191-2/+55
| | | | Fixes #2098
* Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-091-16/+16
|
* Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-1/+33
|
* Make AbuseReportMailer responsible for knowing if it should deliverRobert Speicher2016-01-041-0/+38
|
* Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-102-35/+29
|
* fix deprecation messages in testsValery Sizov2015-12-031-5/+7
|
* Remove some repetition in notify spec.gmail_actions_links_on_set_of_emailsMarin Jankovski2015-11-251-61/+32
|
* Specs for links in email notifications for Gmail Actions.Marin Jankovski2015-11-251-1/+93
|
* Fix code that depends on incorrect inflector behaviorDmitriy Zaporozhets2015-11-031-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'stanhu/gitlab-ce-fix-message-id-notify'Dmitriy Zaporozhets2015-10-011-0/+1
|\
| * Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being ↵Stan Hu2015-10-011-0/+1
| | | | | | | | | | | | dropped Closes #2867
* | Note the original location of a moved project when notifying users of the moveproject_movingValery Sizov2015-10-011-1/+1
|/
* WIPKamil Trzcinski2015-09-291-2/+1
|
* Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-191-3/+3
|
* fix specs. Stage 6Valery Sizov2015-09-151-6/+6
|