delta/gitlab/gitlab-ce.git/app/mailers, branch docs-trigger-variable

Just show the first merge request we found, feedback:

2016-10-14T11:54:51+00:00

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16963209

Introduce Pipeline#merge_requests_with_active_first,

2016-10-14T11:13:11+00:00

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 pipeline emails

2016-10-08T05:58:49+00:00

prevent pipeline emails from using the normal layout wrapper

2016-10-07T23:30:42+00:00

include pipeline ref in subject line

2016-10-06T15:12:59+00:00

update subject and email header message

2016-10-06T15:09:24+00:00

Merge remote-tracking branch 'upstream/master' into pipeline-emails

2016-10-03T18:38:25+00:00

* 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 conditions

2016-10-03T10:07:28+00:00

override subject method in devise mailer

2016-10-03T10:07:28+00:00

wrap subject with method subject

2016-10-03T10:07:28+00:00