diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-23 14:45:32 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-23 14:45:32 -0500 |
| commit | 51d455d05bfbdba5fac62c799703bd50fe7d70e4 (patch) | |
| tree | a886df6d419378607d4fdf10112f79914613ed32 /lib/banzai | |
| parent | ee16cf15baca0405b0db2db029c0538d8496864f (diff) | |
| parent | 6c51e220ef2774447038a909c4f22ff90eb624fb (diff) | |
| download | gitlab-ce-51d455d05bfbdba5fac62c799703bd50fe7d70e4.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'lib/banzai')
| -rw-r--r-- | lib/banzai/filter/plantuml_filter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/banzai/filter/plantuml_filter.rb b/lib/banzai/filter/plantuml_filter.rb index 5325819d828..28933c78966 100644 --- a/lib/banzai/filter/plantuml_filter.rb +++ b/lib/banzai/filter/plantuml_filter.rb @@ -23,7 +23,7 @@ module Banzai private def settings - ApplicationSetting.current || ApplicationSetting.create_from_defaults + Gitlab::CurrentSettings.current_application_settings end def plantuml_setup |