summaryrefslogtreecommitdiff
path: root/app/mailers
Commit message (Collapse)AuthorAgeFilesLines
* Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-2/+4
|
* Rename GitlabMarkdownHelper -> MarkupHelperToon Claes2017-04-271-1/+1
| | | | It does more than solely GitLab Markdown, so rename to MarkupHelper.
* Address review commentsDouwe Maan2017-04-051-9/+7
|
* Address review commentsDouwe Maan2017-04-051-5/+0
|
* Fix specsDouwe Maan2017-04-052-2/+3
|
* Better notification emails for notes and (diff) discussionsDouwe Maan2017-04-051-2/+5
|
* Enable Style/Proc cop for rubocopmhasbini2017-04-021-2/+2
|
* All CI offline migrationsKamil Trzciński2017-03-172-31/+0
|
* Fix code for copsDouwe Maan2017-02-231-5/+6
|
* Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-3/+3
|
* extract pipeline mails layoutAlexis Reigel2017-02-221-2/+2
|
* Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-071-1/+1
|
* Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-251-0/+8
|\ | | | | | | | | Support notes without a project (personal snippets notes) See merge request !8468
| * Support notes without projectJarka Kadlecova2017-01-181-0/+8
| |
* | Handles unsubscribe from notifications via emailPawel Chojnacki2017-01-131-6/+14
|/ | | | | - allows unsubscription processing of email in format "reply+%{key}+unsubscribe@acme.com" (example) - if config.address includes %{key} and replies are enabled every unsubscriable message will include mailto: link in its List-Unsubscribe header
* Add new template to handle both commit & mr noteshhoopes2016-11-251-0/+2
| | | | | | | | Currently comments on commits and merge requests do not require merge request- or commit-specific information, but can use the same template. Rather than change the method which calls the template, I opted to keep the templates separate and create a new template to highlight their identicality, while preserving the option to distinguish them from each other in the future. Also removed some of the inconsistencies between text and html email versions. Still needed is a text-only version of git diffs and testing.
* Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-082-8/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (70 commits) Fix routing spec for group controller Add small improvements to constrainers and specs Faster search Fix broken commits search Changed helper method to check for none on params Moved if statements around in view API: Return 400 when creating a systemhook fails Update non-exist group spinach test to match routing Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2 Replace trigger with the new ID of the docs project Refactor method name 17492 Update link color for more accessible contrast Fixed todos empty state when filtering Refactor namespace regex implements reset incoming email token on issues modal and account page, reactivates all tests and writes more tests for it Use separate email-friendly token for incoming email and let incoming email token be reset Use the Gitlab Workhorse HTTP header in the admin dashboard Refactor project routing Fix 404 when visit /projects page Rewritten spinach git_blame tests to rspec feature tests Add tests for project#index routing ...
| * Use method helper instead of add_template_helperbogdanvlviv2016-11-062-8/+8
| |
* | Use bcc for pipeline emails because:Lin Jen-Shin2016-10-181-6/+11
|/ | | | | | We use bcc here because we don't want to generate this emails for a thousand times. This could be potentially expensive in a loop, and recipients would contain all project watchers so it could be a lot.
* Just show the first merge request we found, feedback:Lin Jen-Shin2016-10-141-1/+1
| | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16963209
* Introduce Pipeline#merge_requests_with_active_first,Lin Jen-Shin2016-10-141-4/+1
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16956802
* skip the premailer compilation step since css is already inlined for the ↵Mike Greiling2016-10-081-1/+1
| | | | pipeline emails
* prevent pipeline emails from using the normal layout wrapperMike Greiling2016-10-071-1/+4
|
* include pipeline ref in subject lineMike Greiling2016-10-061-3/+3
|
* update subject and email header messageMike Greiling2016-10-061-2/+4
|
* Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-043-2/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (372 commits) Enable Lint/StringConversionInInterpolation cop and autocorrect offenses resolve duplicated changelog entry credit myself :smile: change determine conditions override subject method in devise mailer follow the styleguide: Don't use parentheses around a literal wrap subject with method subject move spec back into shared example `an email sent from GitLab` stub config settings in spec remove empty line at block body end remove extra entry create new test in `spec/mailers/notify_spec.rb` move changelog to 8.13 add configurable email subject suffix Fixes sidebar navigation. Convert "SSH Keys" Spinach features to RSpec Enable import/export back for non-admins Update gitlab-shell to 3.6.3 Updated artwork of empty group state. Better empty state for Groups view. ...
| * change determine conditionsFu Xu2016-10-032-2/+2
| |
| * override subject method in devise mailerFu Xu2016-10-031-0/+8
| |
| * wrap subject with method subjectFu Xu2016-10-031-1/+1
| |
| * add configurable email subject suffixFu Xu2016-10-031-0/+1
| |
| * Wrap List-Unsubscribe link in angle bracketsfix-unsubscribe-headerSean McGivern2016-09-261-1/+1
| |
* | Show open merge request against default branch if existsLin Jen-Shin2016-09-261-0/+4
| |
* | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-211-0/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (206 commits) Implement fourth round of comments from @DouweM. Fix `CreateDeploymentService` spec. Reload issues in spec to ensure label<->issue mapping properly loaded Fix build. Remove unnecessary #{} in cycle analytics template. Update cycle analytics icon and fix color of the dismiss button. Use triple dashes for the empty value in cycle analytics. Fix typo on cycle analytics copy. Add page title and fix sub menu width in Cycle Analytics page. Update Cycle Analytics Read more link URL. Display the cycle analytics navbar based on the `:read_cycle_analytics` ability. Improve indentation in `Gitlab::Database::Median` Add a spec for merge request metric caching while refreshing a merge request from a forked project. Use the `IssuableBaseService` lifecycle hooks to cache `MergeRequestsClosingIssues` Implement a second round of review comments from @DouweM. Add docs on Cycle Analytics Test if issue authors can access private projects Update .pkgr.yml with Ubuntu 16.04 dependencies fix issues mr counter Move JSON generation (cycle analytics) into a controller method. ...
| * Fix "Unsubscribe" link in notification emails that is triggered by anti-virusMaximiliano Perez Coto2016-09-201-0/+6
| | | | | | | | | | | | | | | | | | * Created a force=true param that will continue with the previous behaviour of the unsubscribe method * Created a filter for not-logged users so they see a unsubsribe confirmation page * Added the List-Unsubscribe header on emails so the email client can display it on top
* | Try to integrate the email into notification systemLin Jen-Shin2016-09-131-7/+7
| |
* | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (671 commits) Only check :can_resolve permission if the note is resolvable Use Search::GlobalService.new in the `GET /projects/search/:query` endpoint Improve PipelinesFinder spec so that it does not depend on hard-coded database IDs Add changelogs/unreleased/.gitkeep Archive CHANGELOG entries prior to 8.0 in changelogs/archive.md Request only the LDAP attributes we need Add notification_settings API calls Use NotificationSetting::EMAIL_EVENTS for params Pull import sources from Gitlab::ImportSources Fix API issues sorting Use gitlab-workhorse 0.8.1 Update CHANGELOG Avoid conflict with admin labels when importing GitHub labels Search should compare only the lowercase versions of the project names Enable pipeline events by default Minor update on CI docs examples Move write_note into SlashCommandsHelper and update other dependent specs Wait for logout message in login_helpers Use wait_for_ajax to avoid database deadlocks after specs are cleaned Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rb Require comments must be included before code ...
| * remove Ability.abilitieshttp://jneen.net/2016-08-301-1/+1
| |
* | no longer TODOLin Jen-Shin2016-09-011-2/+2
| |
* | Add mock email templatesLin Jen-Shin2016-09-011-9/+8
| |
* | We don't need thisLin Jen-Shin2016-08-311-0/+0
| |
* | Fix copy pastaLin Jen-Shin2016-08-311-1/+1
| |
* | Add a new pipeline email service. TODO: email templates and testsLin Jen-Shin2016-08-262-0/+39
|/
* Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-182-0/+10
|\
| * Add notifications for new user mentions in merge requestsNick Thomas2016-08-151-0/+5
| |
| * Send notification emails when users are newly mentioned in issue editsNick Thomas2016-08-121-0/+5
| |
* | Send notification email when all discussions are resolvedDouwe Maan2016-07-281-0/+7
|/
* Allow build email service to be testedissue_13343Felipe Artur2016-07-151-0/+1
|
* Simplify HAML code using unless condition and nestingPaco Guzman2016-07-061-1/+0
| | | Extract diff line data attributes to helper methods
* Diffs will create button/diff form on demand no on server sideJacob Schatz2016-07-061-0/+1
|
* Fallback to group's owners/masters when a project has none18757-fixRémy Coutable2016-06-201-0/+5
| | | | | | | A project in a group can have no explicit owners/masters, in that case we fallbacks to the group's owners/masters. Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status