diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-16 13:35:49 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-16 13:35:49 +0000 |
| commit | 166ac53c70e96e538703264dda169266fde6b030 (patch) | |
| tree | bc838413b01d6e5d1728525d309b86d5bac331c0 /app | |
| parent | fcc810a1d91d0c2e6cf9726b943e06ee64b97a60 (diff) | |
| parent | 1d78d88ef0e8c3e20e0a93487b44f37026f33660 (diff) | |
| download | gitlab-ce-166ac53c70e96e538703264dda169266fde6b030.tar.gz | |
Merge branch 'flash-messages-scb' into 'master'
Resolve CE/EE diffs in _flash_messages
Closes gitlab-ee#11037
See merge request gitlab-org/gitlab-ce!28333
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/_flash_messages.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/_flash_messages.html.haml b/app/views/projects/_flash_messages.html.haml index b72f0e39b23..b2dab0b5348 100644 --- a/app/views/projects/_flash_messages.html.haml +++ b/app/views/projects/_flash_messages.html.haml @@ -7,3 +7,4 @@ = render 'shared/no_password' - unless project.empty_repo? = render 'shared/auto_devops_implicitly_enabled_banner', project: project + = render_if_exists 'projects/above_size_limit_warning', project: project |