diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 18:07:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 18:07:48 +0000 |
| commit | e20baee820ea2c76ee16980a98e8080f255d9035 (patch) | |
| tree | 6e13a73bee42b7ef310850d03982faebea17a0b1 /app/views | |
| parent | 71c5863d7b1ca9836a7d7703f35750cd726a9846 (diff) | |
| download | gitlab-ce-e20baee820ea2c76ee16980a98e8080f255d9035.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/services/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/clusters/clusters/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/serverless/functions/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/services/_integrations.html.haml | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/app/views/admin/services/index.html.haml b/app/views/admin/services/index.html.haml index 89872c1b91a..48f31bd0c6e 100644 --- a/app/views/admin/services/index.html.haml +++ b/app/views/admin/services/index.html.haml @@ -10,7 +10,7 @@ %th Service %th Description %th Last edit - - @services.sort_by(&:title).each do |service| + - @services.each do |service| %tr %td = boolean_to_icon service.activated? diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index 4aa5b6af636..8797178f920 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -39,6 +39,8 @@ .js-cluster-application-notice .flash-container + .js-serverless-survey-banner{ data: { user_name: current_user.name, user_email: current_user.email } } + %h4= @cluster.name = render 'banner' diff --git a/app/views/projects/serverless/functions/index.html.haml b/app/views/projects/serverless/functions/index.html.haml index 09f4e556949..2f1da453c0a 100644 --- a/app/views/projects/serverless/functions/index.html.haml +++ b/app/views/projects/serverless/functions/index.html.haml @@ -10,6 +10,8 @@ help_path: help_page_path('user/project/clusters/serverless/index') } } %div{ class: [('limit-container-width' unless fluid_layout)] } + .js-serverless-survey-banner{ data: { user_name: current_user.name, user_email: current_user.email } } + .js-serverless-functions-notice .flash-container diff --git a/app/views/projects/services/_integrations.html.haml b/app/views/projects/services/_integrations.html.haml index e51585e55a4..24aeb598d7b 100644 --- a/app/views/projects/services/_integrations.html.haml +++ b/app/views/projects/services/_integrations.html.haml @@ -12,7 +12,7 @@ %th{ role: 'columnheader', scope: 'col', 'aria-colindex': 4 }= _('Last updated') %tbody{ role: 'rowgroup' } - - @integrations&.each do |integration| + - @integrations.each do |integration| %tr{ role: 'row' } %td{ role: 'cell', 'aria-colindex': 1 } = boolean_to_icon integration.activated? |