diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-07 14:46:17 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-08-07 14:46:17 +0000 |
| commit | 81fd5764158a00f9cf73144160a8adf045212b0c (patch) | |
| tree | c1d1b51058149a82085536e5103772ba93c6e195 | |
| parent | 3fbb7114e5f5fb818ae5447b879a2194ee5bb701 (diff) | |
| parent | 9c69f8fa6167753af1d00b0631c5ed36bc9c81f1 (diff) | |
| download | gitlab-ce-81fd5764158a00f9cf73144160a8adf045212b0c.tar.gz | |
Merge branch '34764-rename-to-overview' into 'master'
34764 Rename about to overview for group and project page
Closes #34764
See merge request !13318
| -rw-r--r-- | app/views/help/_shortcuts.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_group_sidebar.html.haml | 4 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_project_sidebar.html.haml | 4 | ||||
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/34764-rename-to-overview.yml | 4 |
5 files changed, 11 insertions, 7 deletions
diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index 56e628a2b74..b18b3dd5766 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -121,7 +121,7 @@ .key g .key p %td - Go to the project's home page + Go to the project's overview page %tr %td.shortcut .key g diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index 33a83866cbf..1fc92765c40 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -10,11 +10,11 @@ = icon ('times') %ul.sidebar-top-level-items = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do - = link_to group_path(@group), title: 'About group' do + = link_to group_path(@group), title: 'Group overview' do .nav-icon-container = custom_icon('project') %span.nav-item-name - About + Overview %ul.sidebar-sub-level-items = nav_link(path: ['groups#show', 'groups#subgroups'], html_options: { class: 'home' }) do diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml index 673febbc798..e8fde923134 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -11,11 +11,11 @@ = icon ('times') %ul.sidebar-top-level-items = nav_link(path: ['projects#show', 'projects#activity', 'cycle_analytics#show'], html_options: { class: 'home' }) do - = link_to project_path(@project), title: 'About project', class: 'shortcuts-project' do + = link_to project_path(@project), title: 'Project overview', class: 'shortcuts-project' do .nav-icon-container = custom_icon('project') %span.nav-item-name - About + Overview %ul.sidebar-sub-level-items = nav_link(path: 'projects#show') do diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 9aed498a8a0..f08dcc0c242 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -60,9 +60,9 @@ = f.select :dashboard, dashboard_choices, {}, class: 'form-control' .form-group = f.label :project_view, class: 'label-light' do - Project home page content + Project overview content = f.select :project_view, project_view_choices, {}, class: 'form-control' .help-block - Choose what content you want to see on a project’s home page + Choose what content you want to see on a project’s overview page .form-group = f.submit 'Save changes', class: 'btn btn-save' diff --git a/changelogs/unreleased/34764-rename-to-overview.yml b/changelogs/unreleased/34764-rename-to-overview.yml new file mode 100644 index 00000000000..5b9643285b7 --- /dev/null +++ b/changelogs/unreleased/34764-rename-to-overview.yml @@ -0,0 +1,4 @@ +--- +title: Rename about to overview for group and project page +merge_request: +author: |