diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-08-31 18:25:28 -0700 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-08-31 18:28:54 -0700 |
| commit | 6dc252e4066d4e9100954f51e357bdaaffba6e64 (patch) | |
| tree | b3620c9a11aaf22f0205a7cc214827cea0eb45ab /app | |
| parent | a1cd338c6c31fbfde155adb4620f5314b45ca0ce (diff) | |
| download | gitlab-ce-6dc252e4066d4e9100954f51e357bdaaffba6e64.tar.gz | |
Fix incorrect `page_title`, `nav`, and `header_title` usage in views
During https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19766,
several usages of these helper methods were mistakenly changed to
instead assign to a (completely unused) local variable.
When `page_title` was misused, for example, this resulted in the page no
longer having a custom title set.
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/explore.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/group_settings.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/pipelines/new.html.haml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml index 2ab9e55441b..80bda34a3f5 100644 --- a/app/views/layouts/explore.html.haml +++ b/app/views/layouts/explore.html.haml @@ -1,5 +1,5 @@ -- page_title = _("Explore") +- page_title _("Explore") - unless current_user - - header_title = _("Explore GitLab"), explore_root_path + - header_title _("Explore GitLab"), explore_root_path = render template: "layouts/application" diff --git a/app/views/layouts/group_settings.html.haml b/app/views/layouts/group_settings.html.haml index 14c5f0ce04c..9db78ec58e4 100644 --- a/app/views/layouts/group_settings.html.haml +++ b/app/views/layouts/group_settings.html.haml @@ -1,4 +1,4 @@ -- page_title = _("Settings") -- nav "group" +- page_title _("Settings") +- nav "group" = render template: "layouts/group" diff --git a/app/views/projects/pipelines/new.html.haml b/app/views/projects/pipelines/new.html.haml index c13e3194340..5b6823da1f6 100644 --- a/app/views/projects/pipelines/new.html.haml +++ b/app/views/projects/pipelines/new.html.haml @@ -1,5 +1,5 @@ - breadcrumb_title "Pipelines" -- page_title = s_("Pipeline|Run Pipeline") +- page_title s_("Pipeline|Run Pipeline") - settings_link = link_to _('CI/CD settings'), project_settings_ci_cd_path(@project) %h3.page-title |