diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-04 13:46:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-04 18:25:50 +0100 |
| commit | bf66346fdb6c8433c3d29db8786e0d7f07ff8787 (patch) | |
| tree | 41f61ee2628d682f3f552f3c0de4aee1cc4de94d | |
| parent | 7d30503fe8a809d1c433a97bfd334ad05c97a76f (diff) | |
| download | gitlab-ce-bf66346fdb6c8433c3d29db8786e0d7f07ff8787.tar.gz | |
Merge branch '23961-can-t-share-project-with-groups' into 'master'
Only skip group when it's actually a group in the "Share with group" select
Fixes #23961
See merge request !7262
| -rw-r--r-- | app/controllers/projects/group_links_controller.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/23961-can-t-share-project-with-groups.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb index ae060abee5c..9eaf26a0dbf 100644 --- a/app/controllers/projects/group_links_controller.rb +++ b/app/controllers/projects/group_links_controller.rb @@ -7,7 +7,7 @@ class Projects::GroupLinksController < Projects::ApplicationController @group_links = project.project_group_links.all @skip_groups = @group_links.pluck(:group_id) - @skip_groups << project.group.try(:id) + @skip_groups << project.namespace_id unless project.personal? end def create diff --git a/changelogs/unreleased/23961-can-t-share-project-with-groups.yml b/changelogs/unreleased/23961-can-t-share-project-with-groups.yml new file mode 100644 index 00000000000..b3bfcbda4b7 --- /dev/null +++ b/changelogs/unreleased/23961-can-t-share-project-with-groups.yml @@ -0,0 +1,4 @@ +--- +title: Only skip group when it's actually a group in the "Share with group" select +merge_request: 7262 +author: |