diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-10 16:04:34 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-10 16:04:34 +0300 |
| commit | 10387f6b8a9071688d7db9a12c910ca02660ca87 (patch) | |
| tree | 211b55d18305793aa76fa6260ff25ca1b74dc36e /app/mailers/notify.rb | |
| parent | bcd89a58e736685bcce662fe0acf793ee925b536 (diff) | |
| parent | bdc62d704c79b8f4e39dc7b5660b8d657a434895 (diff) | |
Merge branch 'master' into tmp-reference-pipeline-and-caching
# Conflicts:
# spec/lib/gitlab/markdown/autolink_filter_spec.rb
# spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
# spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
# spec/lib/gitlab/markdown/cross_project_reference_spec.rb
# spec/lib/gitlab/markdown/emoji_filter_spec.rb
# spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/external_link_filter_spec.rb
# spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
# spec/lib/gitlab/markdown/label_reference_filter_spec.rb
# spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
# spec/lib/gitlab/markdown/redactor_filter_spec.rb
# spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
# spec/lib/gitlab/markdown/relative_link_filter_spec.rb
# spec/lib/gitlab/markdown/sanitization_filter_spec.rb
# spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
# spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
# spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
# spec/lib/gitlab/markdown/task_list_filter_spec.rb
# spec/lib/gitlab/markdown/upload_link_filter_spec.rb
# spec/lib/gitlab/markdown/user_reference_filter_spec.rb
Diffstat (limited to 'app/mailers/notify.rb')
0 files changed, 0 insertions, 0 deletions