7985071975
Add latest changes from gitlab-org/gitlab@master
2020-09-21 12:09:34 +00:00
477c2c2604
Add latest changes from gitlab-org/gitlab@master
2020-09-04 09:08:38 +00:00
520f317866
Add latest changes from gitlab-org/gitlab@master
2020-08-20 15:10:18 +00:00
d6348d22dd
Add latest changes from gitlab-org/gitlab@master
2020-06-24 09:08:32 +00:00
71221554dd
Add latest changes from gitlab-org/gitlab@master
2019-12-04 21:07:31 +00:00
dea6ebd31a
Add latest changes from gitlab-org/gitlab@master
2019-09-30 12:06:01 +00:00
fb93142488
Prevent disclosure of merge request id via email
...
Do not disclosure merge request id via email for unauthorized users
when closing issues.
2019-08-19 11:51:55 -03:00
aeb67dd489
Upgrade to Rails 5.2
...
Updates changed method names and fixes spec failures
2019-07-12 10:15:31 +08:00
e72efed323
Change s_() calls to _() calls
...
There are no namespaces in the strings so we don't need those
2019-06-04 09:56:32 +00:00
411f545ce6
Include MR information if possible when emailing notification of closing an issue
2019-05-16 11:59:02 +00:00
77985826d9
Show header and footer system messages in email
...
* Add email_header_and_footer_enabled flag to appearances table
* Set email_header_and_footer_enabled default value to false
* Add checkbox to appearance to toggle show header and footer in emails
* Add email_header_and_footer_enabled to allowed params in controller
* Add header and footer messages to the html and text email layouts
* Remove the color styling for emails header and footer
* Add empty_mailer layout for emails without layout,
to have the header and footer applied
2019-02-27 22:07:50 +02:00
1549039602
Add `sanitize_name` helper to sanitize URLs in user full name
2019-01-31 16:52:21 +01:00
a96cd7cb2b
Add List-Id to notification emails
2018-12-13 11:15:48 +00:00
b38c75b3dc
Correct more usages of non-relative `fixture_file_upload` paths
2018-06-07 09:54:41 -05:00
458f3cf9b0
Update specs for new upload path
2017-07-18 15:38:54 +02:00
1d1363e2bb
Bring in security changes from the 9.2.5 release
...
Ran:
- git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
- git checkout -b 9-2-5-security-patch origin/v9.2.2
- git apply patchfile.patch
- git commit
- [Got the sha ref for the commit]
- git checkout -b upstream-9-2-security master
- git cherry-pick <SHA of the patchfile commit>
- [Resolved conflicts]
- git cherry-pick --continue
2017-06-07 21:16:20 -07:00
c1e94479bd
restrict height of the custom brand logo in emails
2017-02-22 12:24:24 +01:00
0df104a389
use custom brand logo in pipeline mails
2017-02-22 12:22:52 +01:00
519275c110
fixes part1 of files to start using active tense
2016-08-09 15:06:23 +01:00
0bfab084a8
Explain reset token expiration in emails
...
Tell new users when their password reset token expires and provide a
link to get a new one.
2015-05-16 14:03:07 -06:00
GitLab Bot