Age | Commit message (Collapse) | Author |
|
Fix notes email with group-level notification email
Closes #63355
See merge request gitlab-org/gitlab-ce!29889
(cherry picked from commit 480eb370a477c3a230cec1ff43a71066ab5be6f9)
bf73ecd7 Fix notes email with group-level notification email
8eb2d7bb Apply suggestion to spec/support/helpers/email_helpers.rb
|
|
Blocked admins should not receive notifications about failed repository
checks.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63019
|
|
|
|
- Select notification email by walking up group/subgroup path
- Add settings UI to set group email notification address
- Add tests
|
|
Allows users to leave a project/group
that they have been added to.
Add function to leave a namespace by url param
If the `leave` param is present on a project/group show page,
click the leave link.
|
|
Set pages_domain.remove_at when disabling it
Add specs for marking pages domain for removal
Notify user that domain is being removed
Add documentation
|
|
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
|
|
This prevents `&mdash` in our templates being change to `-`
|
|
|
|
|
|
* 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
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Load whole file in memory to simplify code
|
|
Process CSV uploads async using a worker then email results
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
This reverts commit 517598ba10793efa02cb90379f78ab97c9c5b25d.
|
|
|
|
MR unmergeable notification
See merge request gitlab-org/gitlab-ce!18042
|
|
|
|
error page"
|
|
Display MR unmergeable reasons
|
|
|
|
An untested code path was triggering an Exception because Fixnum
doesn't have `one?` implemented in Rails, while arrays and collections
do.
Closes #45152
|
|
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4474
Conflicts:
db/schema.rb
ee/app/controllers/ee/admin/application_settings_controller.rb
ee/app/helpers/ee/application_settings_helper.rb
ee/app/models/ee/application_setting.rb
ee/app/models/license.rb
ee/app/views/layouts/service_desk.html.haml
ee/app/views/notify/approved_merge_request_email.html.haml
ee/app/views/notify/service_desk_new_note_email.text.erb
ee/app/views/notify/service_desk_thank_you_email.text.erb
ee/app/views/notify/unapproved_merge_request_email.html.haml
ee/lib/ee/api/entities.rb
ee/spec/controllers/admin/application_settings_controller_spec.rb
ee/spec/models/application_setting_spec.rb
ee/spec/requests/api/settings_spec.rb
lib/api/settings.rb
spec/mailers/previews/notify_preview.rb
|
|
This was sending the current user, which is the recipient! It should be the user
who pushed the commits.
|
|
Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/3092
Conflicts:
ee/app/views/notify/unapproved_merge_request_email.html.haml
spec/mailers/notify_spec.rb
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
|
|
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.
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Utilizes the Devise `confirmable` capabilities. Issue #37385
|
|
|