diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:01 +0000 |
| commit | 95ad46159e4cd93f2b31838199180d824e041994 (patch) | |
| tree | d41880d3b6a0093463694978590e590efb08caef /app/views | |
| parent | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (diff) | |
| download | gitlab-ce-95ad46159e4cd93f2b31838199180d824e041994.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/projects/services/_index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/services/edit.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/services/index.html.haml b/app/views/admin/services/index.html.haml index 48f31bd0c6e..e0a1a3549a5 100644 --- a/app/views/admin/services/index.html.haml +++ b/app/views/admin/services/index.html.haml @@ -1,6 +1,6 @@ - page_title "Service Templates" %h3.page-title Service templates -%p.light Service template allows you to set default values for project services +%p.light= s_('AdminSettings|Service template allows you to set default values for integrations') .table-holder %table.table diff --git a/app/views/projects/services/_index.html.haml b/app/views/projects/services/_index.html.haml index a4041d09415..dca324ac846 100644 --- a/app/views/projects/services/_index.html.haml +++ b/app/views/projects/services/_index.html.haml @@ -13,7 +13,7 @@ %thead %tr %th - %th= s_("ProjectService|Service") + %th= _('Integration') %th.d-none.d-sm-block= _("Description") %th= s_("ProjectService|Last edit") - @services.sort_by(&:title).each do |service| diff --git a/app/views/projects/services/edit.html.haml b/app/views/projects/services/edit.html.haml index ef799d2c046..4195dce7780 100644 --- a/app/views/projects/services/edit.html.haml +++ b/app/views/projects/services/edit.html.haml @@ -1,6 +1,6 @@ - breadcrumb_title @service.title - add_to_breadcrumbs _('Integration Settings'), project_settings_integrations_path(@project) -- page_title @service.title, s_("ProjectService|Services") +- page_title @service.title, _('Integrations') = render 'deprecated_message' if @service.deprecation_message |