Change param name for consistency

app/assets/javascripts/boards/components/project_select.vue

@@ -50,7 +50,7 @@ export default {
         this.loading = true;
         return Api.groupProjects(this.groupId, term, {
           with_issues_enabled: true,
-          include_shared: false,
+          with_shared: false,
           include_subgroups: true
         }, projects => {
           this.loading = false;

app/assets/javascripts/project_select.js

@@ -14,7 +14,7 @@ export default function projectSelect() {
     this.orderBy = $(select).data('orderBy') || 'id';
     this.withIssuesEnabled = $(select).data('withIssuesEnabled');
     this.withMergeRequestsEnabled = $(select).data('withMergeRequestsEnabled');
-    this.includeShared = $(select).data('includeShared') === undefined ? true : $(select).data('includeShared');
+    this.withShared = $(select).data('withShared') === undefined ? true : $(select).data('withShared');
     this.includeProjectsInSubgroups = $(select).data('includeProjectsInSubgroups') || false;
     this.allowClear = $(select).data('allowClear') || false;
@@ -56,7 +56,7 @@ export default function projectSelect() {
               {
                 with_issues_enabled: _this.withIssuesEnabled,
                 with_merge_requests_enabled: _this.withMergeRequestsEnabled,
-                include_shared: _this.includeShared,
+                with_shared: _this.withShared,
                 include_subgroups: _this.includeProjectsInSubgroups,
               },
               projectsCallback,

app/views/groups/issues.html.haml

@@ -9,7 +9,7 @@
     = render 'shared/issuable/nav', type: :issues
     .nav-controls
       = render 'shared/issuable/feed_buttons'
-      = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues', include_shared: false, include_projects_in_subgroups: true
+      = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues', with_shared: false, include_projects_in_subgroups: true
   = render 'shared/issuable/search_bar', type: :issues

app/views/groups/merge_requests.html.haml

@@ -7,7 +7,7 @@
     = render 'shared/issuable/nav', type: :merge_requests
     - if current_user
       .nav-controls
-        = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request",  type: :merge_requests, with_feature_enabled: 'merge_requests', include_shared: false, include_projects_in_subgroups: true
+        = render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request",  type: :merge_requests, with_feature_enabled: 'merge_requests', with_shared: false, include_projects_in_subgroups: true
   = render 'shared/issuable/search_bar', type: :merge_requests

app/views/shared/_new_project_item_select.html.haml

@@ -2,6 +2,6 @@
   .project-item-select-holder.btn-group
     %a.btn.btn-success.new-project-item-link.qa-new-project-item-link{ href: '', data: { label: local_assigns[:label], type: local_assigns[:type] } }
       = icon('spinner spin')
-    = project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path], include_shared: local_assigns[:include_shared], include_projects_in_subgroups: local_assigns[:include_projects_in_subgroups] }, with_feature_enabled: local_assigns[:with_feature_enabled]
+    = project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path], with_shared: local_assigns[:with_shared], include_projects_in_subgroups: local_assigns[:include_projects_in_subgroups] }, with_feature_enabled: local_assigns[:with_feature_enabled]
     %button.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button
       = icon('caret-down')

lib/api/groups.rb

@@ -61,7 +61,7 @@ module API
       def find_group_projects(params)
         group = find_group!(params[:id])
         options = {
-          only_owned: !params[:include_shared],
+          only_owned: !params[:with_shared],
           include_subgroups: params[:include_subgroups]
         }
@@ -211,8 +211,8 @@ module API
         optional :starred, type: Boolean, default: false, desc: 'Limit by starred status'
         optional :with_issues_enabled, type: Boolean, default: false, desc: 'Limit by enabled issues feature'
         optional :with_merge_requests_enabled, type: Boolean, default: false, desc: 'Limit by enabled merge requests feature'
+        optional :with_shared, type: Boolean, default: true, desc: 'Include projects shared to this group'
         optional :include_subgroups, type: Boolean, default: false, desc: 'Includes projects in subgroups of this group'
-        optional :include_shared, type: Boolean, default: true, desc: 'Include projects shared to this group'
         use :pagination
         use :with_custom_attributes

spec/requests/api/groups_spec.rb

@@ -507,7 +507,7 @@ describe API::Groups do
         create(:project_group_link, project: create(:project), group: group1)
         create(:project_group_link, project: create(:project), group: group1)
-        get api("/groups/#{group1.id}/projects", user1), include_shared: false
+        get api("/groups/#{group1.id}/projects", user1), with_shared: false
         expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers