| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requests | Oswaldo Ferreira | 2019-04-08 | 1 | -9/+9 |
| | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder). | ||||
| * | Prevent premailer from converting HTML entities | Heinrich Lee Yu | 2019-04-04 | 1 | -0/+13 |
| | | | | | This prevents `&mdash` in our templates being change to `-` | ||||
| * | Resolve conflicts in spec/mailers/notify_spec.rb | Stan Hu | 2019-03-04 | 1 | -10/+0 |
| | | |||||
| * | Merge dev master into GitLab.com master | Yorick Peterse | 2019-03-04 | 1 | -8/+46 |
| |\ | |||||
| | * | Remove link after issue move when no permissions | Jarka Košanová | 2019-02-20 | 1 | -13/+43 |
| | | | | | | | | | | | | | Don't show new issue link after move when a user does not have permissions to display the new issue | ||||
| * | | Show header and footer system messages in email | Alexandru Croitor | 2019-02-27 | 6 | -13/+155 |
| |/ | | | | | | | | | | | * 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 | ||||
| * | Use `sanitize_name` to sanitize URL in user full name | Kushal Pandya | 2019-01-31 | 1 | -3/+5 |
| | | |||||
| * | Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-cop | Rémy Coutable | 2019-01-24 | 2 | -2/+2 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Remove caching of CSV file49231-import-issues-csv | Heinrich Lee Yu | 2019-01-07 | 1 | -3/+3 |
| | | | | | Load whole file in memory to simplify code | ||||
| * | Import CSV Backend | Heinrich Lee Yu | 2019-01-07 | 1 | -0/+33 |
| | | | | | Process CSV uploads async using a worker then email results | ||||
| * | Always use colon at end of discussion notification email headline | Douwe Maan | 2018-12-20 | 1 | -10/+2 |
| | | |||||
| * | Fix a potential frozen string error in app/mailers/notify.rb | Rémy Coutable | 2018-12-11 | 1 | -9/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Fix a frozen string error in app/mailers/notify.rb | Rémy Coutable | 2018-12-10 | 1 | -2/+2 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'security-guest-comments' into 'master' | Cindy Pallares | 2018-11-28 | 1 | -1/+1 |
| | | | | | | [master]Fixed ability to comment on and edit/delete comments on locked or confidential issues See merge request gitlab/gitlabhq!2612 | ||||
| * | Automatically disable Auto DevOps for project upon first pipeline failure | Mayra Cabrera | 2018-09-06 | 1 | -0/+32 |
| | | |||||
| * | Update notification specs after renaming a class | Grzegorz Bizon | 2018-07-16 | 1 | -2/+4 |
| | | |||||
| * | Resolve "Rename the `Master` role to `Maintainer`" Backend | Mark Chao | 2018-07-11 | 1 | -8/+8 |
| | | |||||
| * | This test was copied from EE | Lin Jen-Shin | 2018-07-10 | 1 | -0/+11 |
| | | |||||
| * | Move spec/mailers/previews to app/mailers/previews | Lin Jen-Shin | 2018-07-06 | 4 | -210/+0 |
| | | |||||
| * | Notify only when unmergeable due to conflict | Mark Chao | 2018-06-20 | 1 | -7/+1 |
| | | | | | | | | | | | | | 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 | ||||
| * | Replace have_html_espaced_body_text after 517598ba | Takuya Noguchi | 2018-06-03 | 1 | -19/+19 |
| | | |||||
| * | Revert "Add a new have_html_escaped_body_text that match an HTML-escaped text" | Takuya Noguchi | 2018-06-03 | 1 | -9/+9 |
| | | | | | This reverts commit 517598ba10793efa02cb90379f78ab97c9c5b25d. | ||||
| * | Fix merge request unmergeable notification email plural interpolation46840-fix-merge-request-unmergeable-email-plural | Mark Chao | 2018-05-31 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'mr-conflict-notification' into 'master' | Douwe Maan | 2018-05-24 | 1 | -0/+40 |
| |\ | | | | | | | | | MR unmergeable notification See merge request gitlab-org/gitlab-ce!18042 | ||||
| | * | Plural reason(s) | Mark Chao | 2018-05-18 | 1 | -0/+1 |
| | | | |||||
| | * | Notify with email when merge request became unmergeable | lulalala | 2018-05-17 | 1 | -0/+39 |
| | | | | | | | | | Display MR unmergeable reasons | ||||
| * | | Resolve "Opening Project with invite but without accepting leads to 404 ↵ | 🙈 jacopo beschi 🙉 | 2018-05-17 | 1 | -1/+1 |
| |/ | | | | error page" | ||||
| * | Backport 5480-epic-notifications from EE | Mario de la Ossa | 2018-05-07 | 1 | -32/+0 |
| | | |||||
| * | Fix undefined method `one?` when pushing to an existing merge requestsh-fix-issue-45152 | Stan Hu | 2018-04-07 | 1 | -2/+14 |
| | | | | | | | | | An untested code path was triggering an Exception because Fixnum doesn't have `one?` implemented in Rails, while arrays and collections do. Closes #45152 | ||||
| * | Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-email | Eric Eastwood | 2018-04-04 | 3 | -10/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Fix body of email when commits are pushed to an MR | Sean McGivern | 2018-04-03 | 1 | -0/+30 |
| | | | | | | This was sending the current user, which is the recipient! It should be the user who pushed the commits. | ||||
| * | Fix unapproved unassigned MR email erroring outce-3092-fix-unassigned-unapproved-mr-email-failing | Eric Eastwood | 2018-03-28 | 1 | -1/+1 |
| | | | | | | | | | 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 | ||||
| * | Replace deprecated name_with_namespace with full_name in app and spec | Dmitriy Zaporozhets | 2018-03-05 | 1 | -11/+11 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add DNS verification to Pages custom domains | Nick Thomas | 2018-02-23 | 1 | -0/+71 |
| | | |||||
| * | Resolve "group request membership mail with too long list of "To:"" | 🙈 jacopo beschi 🙉 | 2018-02-19 | 1 | -48/+22 |
| | | |||||
| * | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 1 | -1/+1 |
| | | |||||
| * | Initial work to add notification reason to emails | Mario de la Ossa | 2018-01-16 | 1 | -0/+49 |
| | | | | | | | | | | | | 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. | ||||
| * | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specs | blackst0ne | 2017-12-22 | 1 | -4/+4 |
| | | |||||
| * | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-to | Toon Claes | 2017-12-13 | 1 | -0/+40 |
| | | | | | | | | | | 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. | ||||
| * | Stop calling #strip in a commit title in Notify specs40691-upgrade-rails-to-4-2-10 | Rémy Coutable | 2017-12-01 | 1 | -2/+2 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Fix image diff notes email | Felipe Artur | 2017-11-13 | 1 | -1/+19 |
| | | |||||
| * | Don't show an "Unsubscribe" link in snippet comment notifications | Rémy Coutable | 2017-10-09 | 1 | -231/+260 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Send a confirmation email when the user adds a secondary email address. ↵ | Brett Walker | 2017-09-23 | 1 | -25/+0 |
| | | | | | Utilizes the Devise `confirmable` capabilities. Issue #37385 | ||||
| * | Remove some empty lines from notify specsbackstage/gb/optimize-notification-specs | Grzegorz Bizon | 2017-09-01 | 1 | -3/+0 |
| | | |||||
| * | Optimize notification emails specs | Grzegorz Bizon | 2017-09-01 | 1 | -63/+31 |
| | | |||||
| * | Enable the RSpec/HookArgument cop and auto-correct offenses | Robert Speicher | 2017-08-10 | 1 | -3/+3 |
| | | |||||
| * | Change all `:empty_project` to `:project`rs-empty_project-default | Robert Speicher | 2017-08-02 | 1 | -9/+9 |
| | | |||||
| * | notification email on add new gpg key | Alexis Reigel | 2017-07-27 | 1 | -0/+30 |
| | | |||||
| * | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 1 | -22/+21 |
| | | |||||
| * | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 1 | -2/+2 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |