diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-04 15:07:23 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-04 15:07:23 +0000 |
| commit | 54ced8d531cf14e8f15de3f0d446262129412786 (patch) | |
| tree | ae34b73e1eceb52cad8638951979f1c100343aa6 | |
| parent | b7ba5571128a59f12cbef40652717925ff779f4e (diff) | |
| parent | de69040f70718042d7041752ef64bc15d97b3191 (diff) | |
| download | gitlab-ce-54ced8d531cf14e8f15de3f0d446262129412786.tar.gz | |
Merge branch '12556-flash-message' into 'master'
Removes EE differences for app/views/projects/_flash_messages.html.haml
Closes gitlab-ee#12556
See merge request gitlab-org/gitlab-ce!30344
| -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 b2dab0b5348..d95045c9cce 100644 --- a/app/views/projects/_flash_messages.html.haml +++ b/app/views/projects/_flash_messages.html.haml @@ -5,6 +5,7 @@ - if current_user && can?(current_user, :download_code, project) = render 'shared/no_ssh' = render 'shared/no_password' + = render_if_exists 'shared/shared_runners_minutes_limit', project: project - unless project.empty_repo? = render 'shared/auto_devops_implicitly_enabled_banner', project: project = render_if_exists 'projects/above_size_limit_warning', project: project |