diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-01 19:11:53 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-01 19:11:53 +0300 |
| commit | 5b92d405fd6e52e6bf1ab1d440ece5a5c1654198 (patch) | |
| tree | 25240fdea6b8f18e15223715b632d55407117c40 /lib | |
| parent | 110a3779249a2d0516ed03e0eaf36881fb47359e (diff) | |
| parent | 35227d3b9a3ed4483cf4a2195ab80f7082c9a81e (diff) | |
Merge branch 'dm-commit-trailer-without-gravatar' into 'master'
Fix commit trailer rendering when Gravatar is disabled
Closes #45633
See merge request gitlab-org/gitlab-ce!18586
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/commit_trailers_filter.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/banzai/filter/commit_trailers_filter.rb b/lib/banzai/filter/commit_trailers_filter.rb index ef16df1f3ae..7b55e8b36f6 100644 --- a/lib/banzai/filter/commit_trailers_filter.rb +++ b/lib/banzai/filter/commit_trailers_filter.rb @@ -13,7 +13,6 @@ module Banzai # * https://git.wiki.kernel.org/index.php/CommitMessageConventions class CommitTrailersFilter < HTML::Pipeline::Filter include ActionView::Helpers::TagHelper - include ApplicationHelper include AvatarsHelper TRAILER_REGEXP = /(?<label>[[:alpha:]-]+-by:)/i.freeze |