Commit graph

13 commits

Author SHA1 Message Date
GitLab Bot
458209640c Add latest changes from gitlab-org/gitlab@master 2020-11-12 21:09:19 +00:00
GitLab Bot
477c2c2604 Add latest changes from gitlab-org/gitlab@master 2020-09-04 09:08:38 +00:00
Luke Bennett
974e71a9c5
Resolve CE/EE diffs in app/views/layouts view
Part of single codebase changes.
2019-05-11 23:38:41 +01:00
gfyoung
8184ce7fb7 Enable frozen in app/mailers/**/*.rb 2018-08-15 21:45:57 +00:00
Alexis Reigel
a3bd6ce8a3 use common devise layout and use heading style 2017-06-13 22:36:45 +02:00
Alexis Reigel
b0e0bfc8e7 use common layout for devise mailer 2017-06-13 22:36:45 +02:00
Fu Xu
867b9b4347 change determine conditions 2016-10-03 18:07:28 +08:00
Fu Xu
76463c2cb4 override subject method in devise mailer 2016-10-03 18:07:28 +08:00
Robert Speicher
3e3463218d New confirmation email 🔥 2016-05-25 16:56:06 -04:00
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
Stan Hu
1dc906d586 Use the configured display name in e-mails from Devise mailer 2015-05-05 19:54:21 -07:00
Stan Hu
4dda17a5bf Make Reply-To config apply to change e-mail confirmation and other notifications
sent through Devise

Fix test case that was passing due to a broken `around` statement.

Closes #1556
2015-05-01 22:57:10 -07:00