summaryrefslogtreecommitdiff
path: root/spec/mailers
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Refactor CI testsDmitriy Zaporozhets2015-09-091-0/+36
|
* Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-231-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb
| * Update email_spec gemRobert Speicher2015-06-221-0/+1
| | | | | | | | | | | | This fixes spec/mailers/notify_spec Also only require email_spec in the one place it's used
* | Fix Style/Blocks cop violationsRobert Speicher2015-06-221-3/+1
|/
* Update ffaker gemRobert Speicher2015-05-201-2/+2
| | | | | | Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.
* Add tests for password reset token changesVinnie Okada2015-05-161-33/+24
|
* Explain reset token expiration in emailsVinnie Okada2015-05-161-0/+5
| | | | | Tell new users when their password reset token expires and provide a link to get a new one.
* Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-061-3/+3
|
* Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-061-3/+3
|
* Make Reply-To config apply to change e-mail confirmation and other notificationsStan Hu2015-05-011-2/+1
| | | | | | | | sent through Devise Fix test case that was passing due to a broken `around` statement. Closes #1556
* Use project.commit convenience method.Douwe Maan2015-04-241-1/+1
|
* Let commit model know about its project.Douwe Maan2015-04-241-3/+3
|
* Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replytoDouwe Maan2015-04-141-0/+15
|
* Revert "Merge branch 'fix_email_images' into 'master'"Hannes Rosenögger2015-04-131-79/+3
| | | | | | | | This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634. This change needed to be reverted, because not enough email clients support inline images.
* Add ability to configure Reply-To address in gitlab.ymlStan Hu2015-04-031-0/+8
| | | | Closes #1305
* Clean up code by using keyword arguments.Douwe Maan2015-03-231-6/+6
|
* Send EmailsOnPush email when branch or tag is created or deleted.Douwe Maan2015-03-181-2/+96
|
* replace images in emails with inline imagesHannes Rosenögger2015-03-121-3/+79
| | | | | | This adds the functionality of replacing all images that were uploaded to gitlab with inline images(base64) in emails. This change fixes the broken images in emails that 7.8 introduced
* Make email display name configurableVyacheslav Slinko2015-03-111-1/+2
|
* Fix EmailsOnPush comparison link to include first commit.Douwe Maan2015-02-251-1/+1
|
* Fix EmailsOnPush to allow sending from @company.com for GitLab at ↵Douwe Maan2015-02-251-4/+25
| | | | gitlab.corp.company.com.
* Send EmailsOnPush when deleting commits using force push.Douwe Maan2015-02-251-1/+1
| | | | See #1924.
* Add option to send EmailsOnPush from committer email if domain matches.Douwe Maan2015-02-251-1/+29
| | | | See #1809.
* Remove incorrect footer from EmailsOnPush body.Douwe Maan2015-02-251-0/+4
| | | | See #1754.
* Change EmailsOnPush subject to include namespace, repo and branch.Douwe Maan2015-02-251-1/+1
| | | | See #1827.
* Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-11/+11
| | | | | | 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.
* Updated rspec to rspec 3.x syntaxJeroen van Baarsen2015-02-121-109/+109
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* 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-071-2/+7
|/ | | | Closes #1932.
* Remove unused password argument from notificationJacob Vosmaer2014-12-011-2/+2
| | | | | | 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.
* Update expected value in notify_specVinnie Okada2014-09-261-2/+7
| | | | | Prevent test failures when Gitlab is configured to use a port other than 80.
* Fix finder and tests for new membership modelsDmitriy Zaporozhets2014-09-151-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix adminarea and emails for new membership logicDmitriy Zaporozhets2014-09-151-3/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'more-email-threading' into 'master'Dmitriy Zaporozhets2014-08-121-0/+29
|\ | | | | | | | | | | | | | | | | | | Additions to email threading This MR follows !142: * Add threading to "Merge request reopened" emails (see 310231dbed83e66ad4d17b8c25f225f60b30eeb7) See merge request !145
| * Include "Merge-request reopened" emails in the proper email threadPierre de La Morinerie2014-07-251-0/+29
| |
* | Fix notify specsDmitriy Zaporozhets2014-08-011-6/+7
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update specs.Marin Jankovski2014-07-161-3/+7
|
* Allow more mail clients to group emails by threadPierre de La Morinerie2014-07-031-16/+27
| | | | | * send a 'In-Reply-To' header along the 'References' header * subject of answers to an existing thread begins with 'Re: '
* Revert "Merge branch 'fix-email-threading' into 'master'"Jacob Vosmaer2014-06-181-32/+21
| | | | | | | | | 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-2/+2
| | | | | If one commit is pushed, display the commit message in the subject line. Otherwise display the number of commits pushed to the repository.
* Delete wall notes testsDmitriy Zaporozhets2014-06-131-16/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Allow more mail clients to group emails by threadPierre de La Morinerie2014-06-101-17/+28
| | | | | | | * 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.
View Lorry Controller Status