diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 21:09:05 +0300 |
| commit | c2367afbf57ebc65d5b78a743b5d6a91f0aece9f (patch) | |
| tree | 165c2c54bf72ab3a3a9417d97f63ece5c9eba9f5 /app/views/projects/services | |
| parent | 51a9512965d86e3094968fa514e4ae8a96d38cf3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/services')
| -rw-r--r-- | app/views/projects/services/_index.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/services/edit.html.haml | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/views/projects/services/_index.html.haml b/app/views/projects/services/_index.html.haml index 3f33d72d3ec..a4041d09415 100644 --- a/app/views/projects/services/_index.html.haml +++ b/app/views/projects/services/_index.html.haml @@ -1,8 +1,8 @@ -.row.prepend-top-default.append-bottom-default +.row.prepend-top-default .col-lg-4 %h4.prepend-top-0 - = s_("ProjectService|Project services") - %p= s_("ProjectService|Project services allow you to integrate GitLab with other applications") + = _('Integrations') + %p= _('Integrations allow you to integrate GitLab with other applications') .col-lg-8 %table.table %colgroup diff --git a/app/views/projects/services/edit.html.haml b/app/views/projects/services/edit.html.haml index e3e8a312431..ef799d2c046 100644 --- a/app/views/projects/services/edit.html.haml +++ b/app/views/projects/services/edit.html.haml @@ -1,7 +1,6 @@ - breadcrumb_title @service.title +- add_to_breadcrumbs _('Integration Settings'), project_settings_integrations_path(@project) - page_title @service.title, s_("ProjectService|Services") -- add_to_breadcrumbs(s_("ProjectService|Settings"), edit_project_path(@project)) -- add_to_breadcrumbs(s_("ProjectService|Integrations"), project_settings_integrations_path(@project)) = render 'deprecated_message' if @service.deprecation_message |