summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix tests for subject updatesLin Jen-Shin2016-10-081-2/+2
* add message subject to the title tagMike Greiling2016-10-082-2/+2
* manually generate XHTML doctype since haml :format config cannot be overriddenMike Greiling2016-10-082-2/+2
* skip the premailer compilation step since css is already inlined for the pipe...Mike Greiling2016-10-081-1/+1
* prevent pipeline emails from using the normal layout wrapperMike Greiling2016-10-071-1/+4
* remove corporate address from email footer and add reference to domain of originMike Greiling2016-10-074-2/+10
* include pipeline ref in subject lineMike Greiling2016-10-061-3/+3
* update subject and email header messageMike Greiling2016-10-065-6/+8
* update plain text version of pipeline success emailMike Greiling2016-10-051-7/+23
* add pipeline succeeded email notificationMike Greiling2016-10-052-26/+153
* update pipeline failed email marginsMike Greiling2016-10-052-4/+6
* move merge request link next to the commit sha and expose reference numberMike Greiling2016-10-051-4/+4
* Add pipeline_email_service. Fixes:Lin Jen-Shin2016-10-041-1/+2
* Update plain text version failed emailLin Jen-Shin2016-10-041-15/+30
* Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-04466-2648/+8923
|\
| * Merge branch 'rs-string-conversion-in-interpolation' into 'master' Rémy Coutable2016-10-0311-14/+13
| |\
| | * Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolationRobert Speicher2016-10-0311-14/+13
| * | Merge branch 'master' into 'master' Rémy Coutable2016-10-0310-24/+25
| |\ \
| | * \ Merge branch 'master' of https://gitlab.com/secustor/gitlab-ce.gitsecustor2016-10-030-0/+0
| | |\ \
| | | * \ Merge branch 'master' of https://gitlab.com/secustor/gitlab-ce.gitsebastian.poxhofer2016-10-020-0/+0
| | | |\ \
| | | | * | adapted tests for usage of the usernamesecustor2016-10-015-20/+20
| | | | * | Changed Slack service user referencing from full name to usernamesecustor2016-09-305-4/+5
| | | * | | adapted tests for usage of the usernamesecustor2016-10-025-20/+20
| | | * | | Changed Slack service user referencing from full name to usernamesecustor2016-10-025-4/+5
| | * | | | Changed Slack service user referencing from full name to usernamesecustor2016-10-0310-24/+25
| * | | | | Merge branch 'add-email-subject-suffix' into 'master' Rémy Coutable2016-10-039-11/+36
| |\ \ \ \ \
| | * | | | | resolve duplicated changelog entryFu Xu2016-10-031-1/+0
| | * | | | | credit myself :smile:Fu Xu2016-10-031-0/+1
| | * | | | | change determine conditionsFu Xu2016-10-032-2/+2
| | * | | | | override subject method in devise mailerFu Xu2016-10-032-1/+10
| | * | | | | follow the styleguide: Don't use parentheses around a literalFu Xu2016-10-031-1/+1
| | * | | | | wrap subject with method subjectFu Xu2016-10-031-1/+1
| | * | | | | move spec back into shared example `an email sent from GitLab`Fu Xu2016-10-032-7/+10
| | * | | | | stub config settings in specFu Xu2016-10-031-5/+2
| | * | | | | remove empty line at block body endFu Xu2016-10-031-1/+0
| | * | | | | remove extra entryFu Xu2016-10-031-3/+0
| | * | | | | create new test in `spec/mailers/notify_spec.rb`Fu Xu2016-10-032-4/+11
| | * | | | | move changelog to 8.13Fu Xu2016-10-031-1/+1
| | * | | | | add configurable email subject suffixFu Xu2016-10-036-9/+22
| * | | | | | Merge branch 'aiionx_sidekiq_log_patch' into 'master' Rémy Coutable2016-10-031-1/+1
| |\ \ \ \ \ \
| | * | | | | | aiionx_sidekiq_log_patchDavid2016-04-151-1/+1
| * | | | | | | Merge branch '22466-task-list-fork' into 'master' Rémy Coutable2016-10-034-52/+16
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Remove the task_list test since it is patched upstreamJared Deckard2016-09-301-16/+0
| | * | | | | | Align gem version stringsJared Deckard2016-09-301-10/+10
| | * | | | | | Replace talk_list patch with a patched forkJared Deckard2016-09-303-26/+6
| * | | | | | | Merge branch 'zj-grape-award-emoji' into 'master' Robert Speicher2016-10-031-33/+31
| |\ \ \ \ \ \ \
| | * | | | | | | GrapeDSL for Award Emoji endpointszj-grape-award-emojiZ.J. van de Weg2016-10-031-33/+31
| * | | | | | | | Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-036-9/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-036-9/+7
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'use-custom-ruby-images' into 'master' Rémy Coutable2016-10-033-19/+3
| |\ \ \ \ \ \ \ \