diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-12-12 18:50:37 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-12 18:50:37 +0000 |
commit | b544ec8670f8a14d205fa0b13e8ca37fad795686 (patch) | |
tree | 6d7bf7c42dac42f2f6c1e6f0f83be80f8f3b2d81 | |
parent | 01b767bd98237fc669b0576062341c91d519b60d (diff) | |
parent | c877b152d1354946d0a1299e672c1be0aaafdfdf (diff) | |
download | gitlab-ce-b544ec8670f8a14d205fa0b13e8ca37fad795686.tar.gz |
Merge branch '25106-hide-issue-mr-button-for-not-loggedin' into 'master'
hide new issue or MR button for not signed users for a group
## What does this MR do?
This MR prevents user creating issues or MR without signing in
## Are there points in the code the reviewer needs to double check?
NR
## Why was this MR needed?
This issue is needed to ensure an user to be logged in before creating an issue or MR
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25106
See merge request !7902
-rw-r--r-- | app/views/groups/issues.html.haml | 6 | ||||
-rw-r--r-- | app/views/groups/merge_requests.html.haml | 5 | ||||
-rw-r--r-- | changelogs/unreleased/25106-hide-issue-mr-button-for-not-loggedin.yml | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 324a116a50e..b4aa4f24d9e 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -6,13 +6,13 @@ - if group_issues(@group).exists? .top-area = render 'shared/issuable/nav', type: :issues - .nav-controls - - if current_user + - if current_user + .nav-controls = link_to url_for(params.merge(format: :atom, private_token: current_user.private_token)), class: 'btn' do = icon('rss') %span.icon-label Subscribe - = render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue" + = render 'shared/new_project_item_select', path: 'issues/new', label: "New Issue" = render 'shared/issuable/filter', type: :issues diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index e6953d94531..dbbdb583a24 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -2,8 +2,9 @@ .top-area = render 'shared/issuable/nav', type: :merge_requests - .nav-controls - = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New Merge Request" + - if current_user + .nav-controls + = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New Merge Request" = render 'shared/issuable/filter', type: :merge_requests diff --git a/changelogs/unreleased/25106-hide-issue-mr-button-for-not-loggedin.yml b/changelogs/unreleased/25106-hide-issue-mr-button-for-not-loggedin.yml new file mode 100644 index 00000000000..62030d3fc45 --- /dev/null +++ b/changelogs/unreleased/25106-hide-issue-mr-button-for-not-loggedin.yml @@ -0,0 +1,4 @@ +--- +title: Prevent user creating issue or MR without signing in for a group +merge_request: 7902 +author: |