| Age | Commit message (Collapse) | Author |
|---|
|
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
|
|
Merge dev.gitlab.org master into GitLab.com master
Closes #2794, #2814, #2806, #2805, #2798, #2795, #2788, and #2787
See merge request gitlab-org/gitlab-ce!25746
|
|
fix it ok
Fix
head pipeline
|
|
|
|
* 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
|
|
Don't show new issue link after move
when a user does not have permissions
to display the new issue
|
|
Process CSV uploads async using a worker then email results
|
|
Also refactored issues and MRs to use the same email template file
|
|
|
|
'54650-send-an-email-to-project-owners-when-a-mirror-update-fails' into 'master'
Send a notification email on mirror update errors
Closes #54650
See merge request gitlab-org/gitlab-ce!23595
|
|
The email is sent to project maintainers containing the last mirror
update error. This will allow maintainers to set alarms and react
accordingly.
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
[master]Fixed ability to comment on and edit/delete comments on locked or confidential issues
See merge request gitlab/gitlabhq!2612
|
|
|
|
These headers can be used to build URLs for API requests. Good examples
would be Issues and Merge Requests
|
|
|
|
|
|
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
|
|
|
|
|
|
The References header is an ordered list of mails, and some clients
only look at the last mail in the list to determine to which mail the
mail is in reply to.
Therefore, to be a less obtrusive as possible, put the fallback
address first.
Some info about the reply key lookup in the References header:
https://docs.gitlab.com/ee/administration/reply_by_email.html#how-it-works
|
|
|
|
|
|
There is still the edge case when 'no commits' changes to 'conflict'
would not trigger notification, which we ignore for now.
Calling can_be_merged? can cause exception (e.g. non-UTF8)
Ignore those by rescueing.
Remove unmergeable_reason as now only conflict is notified
Update spec
|
|
|
|
Display MR unmergeable reasons
|
|
|
|
|
|
# Conflicts:
# db/schema.rb
|
|
This was sending the current user, which is the recipient! It should be the user
who pushed the commits.
|
|
|
|
Closes #23460
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
including/extending it
|
|
Adds `#build_notification_recipients` to `NotificationRecipientService`
that returns the `NotificationRecipient` objects in order to be able to
access the new attribute `reason`.
This new attribute is used in the different notifier methods in order to
add the reason as a header: `X-GitLab-NotificationReason`.
Only the reason with the most priority gets sent.
|
|
When a note is part of a discussion, the email sent out will be
`In-Reply-To` the previous note in that discussion. It also
`References` all the previous notes in that discussion, and the
original issue.
Closes gitlab-org/gitlab-ce#36054.
|
|
When a note is part of a discussion, the email sent out should be
`In-Reply-To` the previous note in that discussion.
Closes gitlab-org/gitlab-ce#36054
|
|
Utilizes the Devise `confirmable` capabilities. Issue #37385
|
|
The initializers including this were doing so at the top level, so every object
loaded after them had a `current_application_settings` method. However, if
someone had rack-attack enabled (which was loaded before these initializers), it
would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't
have that method.
To fix this:
1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need
`Object.new.current_application_settings` to work.
2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it
like that in several places.
3. Change the initializers to use that new form.
|
|
|
|
|
|
|
|
|
|
|
|
|
