summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Wu <victor@gitlab.com>2017-10-20 15:47:39 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-20 15:47:39 +0000
commit775c43cc083d5c3a570ed1f2e9cd7597e7491d84 (patch)
tree2604127e2487842f9cddfefacafb73ff9b1c0543
parent40ded704cc9b535bee9afd45512d52173c3fc0e7 (diff)
downloadgitlab-ce-775c43cc083d5c3a570ed1f2e9cd7597e7491d84.tar.gz
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
-rw-r--r--app/views/groups/issues.html.haml7
-rw-r--r--app/views/groups/merge_requests.html.haml7
-rw-r--r--changelogs/unreleased/39297-remove-help-text-group-lists.yml5
3 files changed, 5 insertions, 14 deletions
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index 07e64d9aeaf..00909982d59 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -19,13 +19,6 @@
= render 'shared/issuable/search_bar', type: :issues
- .row-content-block.second-block
- Only issues from the
- %strong= @group.name
- group are listed here.
- - if current_user
- To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page.
-
= render 'shared/issues'
- else
= render 'shared/empty_states/issues', project_select_button: true
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index e56dc1fb9c2..694292aa7c1 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -15,11 +15,4 @@
= render 'shared/issuable/search_bar', type: :merge_requests
- .row-content-block.second-block
- Only merge requests from
- %strong= @group.name
- group are listed here.
- - if current_user
- To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page.
-
= render 'shared/merge_requests'
diff --git a/changelogs/unreleased/39297-remove-help-text-group-lists.yml b/changelogs/unreleased/39297-remove-help-text-group-lists.yml
new file mode 100644
index 00000000000..4773d3c5176
--- /dev/null
+++ b/changelogs/unreleased/39297-remove-help-text-group-lists.yml
@@ -0,0 +1,5 @@
+---
+title: Remove help text from group issues page and group merge requests page
+merge_request: 14963
+author:
+type: removed