Add latest changes from gitlab-org/gitlab@master

5 files changed, 9 insertions, 7 deletions

diff --git a/app/assets/javascripts/boards/components/board_list.vue b/app/assets/javascripts/boards/components/board_list.vue
index 1e54d4d6b7d..ee889e0f7e0 100644
--- a/app/assets/javascripts/boards/components/board_list.vue
+++ b/app/assets/javascripts/boards/components/board_list.vue
@@ -256,7 +256,7 @@ export default {
         let toList;
         if (to) {
           const containerEl = to.closest('.js-board-list');
-          toList = boardsStore.findList('id', Number(containerEl.dataset.board));
+          toList = boardsStore.findList('id', Number(containerEl.dataset.board), '');
         }
 
         /**
diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue
index 51a1ae50467..65cd2f044ae 100644
--- a/app/assets/javascripts/error_tracking/components/error_details.vue
+++ b/app/assets/javascripts/error_tracking/components/error_details.vue
@@ -251,8 +251,8 @@ export default {
           <li>
             <strong class="bold">{{ __('Sentry event') }}:</strong>
             <gl-link
-              class="d-inline-flex align-items-center"
               v-track-event="trackClickErrorLinkToSentryOptions(GQLerror.externalUrl)"
+              class="d-inline-flex align-items-center"
               :href="GQLerror.externalUrl"
               target="_blank"
             >
@@ -264,7 +264,9 @@ export default {
             <strong class="bold">{{ __('First seen') }}:</strong>
             {{ formatDate(GQLerror.firstSeen) }}
             <gl-link :href="firstReleaseLink" target="_blank">
-              <span>{{ __('Release') }}: {{ GQLerror.firstReleaseShortVersion.substr(0, 10) }}</span>
+              <span>
+                {{ __('Release') }}: {{ GQLerror.firstReleaseShortVersion.substr(0, 10) }}
+              </span>
             </gl-link>
           </li>
           <li v-if="GQLerror.lastReleaseShortVersion">
diff --git a/app/controllers/groups/group_links_controller.rb b/app/controllers/groups/group_links_controller.rb
index 6796a862c00..d3360acd245 100644
--- a/app/controllers/groups/group_links_controller.rb
+++ b/app/controllers/groups/group_links_controller.rb
@@ -53,6 +53,6 @@ class Groups::GroupLinksController < Groups::ApplicationController
   end
 
   def check_feature_flag!
-    render_404 unless Feature.enabled?(:share_group_with_group)
+    render_404 unless Feature.enabled?(:share_group_with_group, default_enabled: true)
   end
 end
diff --git a/app/models/group.rb b/app/models/group.rb
index 186253619fe..51b4fe4c1ce 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -496,7 +496,7 @@ class Group < Namespace
   end
 
   def max_member_access_for_user_from_shared_groups(user)
-    return unless Feature.enabled?(:share_group_with_group)
+    return unless Feature.enabled?(:share_group_with_group, default_enabled: true)
 
     group_group_link_table = GroupGroupLink.arel_table
     group_member_table = GroupMember.arel_table
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index 6eb8a8947cc..048edb80d99 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -9,7 +9,7 @@
     = _("Group members")
   %hr
   - if can_manage_members
-    - if Feature.enabled?(:share_group_with_group)
+    - if Feature.enabled?(:share_group_with_group, default_enabled: true)
       %ul.nav-links.nav.nav-tabs.gitlab-tabs{ role: 'tablist' }
         %li.nav-tab{ role: 'presentation' }
           %a.nav-link.active{ href: '#invite-member-pane', id: 'invite-member-tab', data: { toggle: 'tab' }, role: 'tab' }= _("Invite member")
@@ -18,7 +18,7 @@
       .tab-content.gitlab-tab-content
         .tab-pane.active{ id: 'invite-member-pane', role: 'tabpanel' }
           = render_invite_member_for_group(@group, @group_member.access_level)
-        - if Feature.enabled?(:share_group_with_group)
+        - if Feature.enabled?(:share_group_with_group, default_enabled: true)
           .tab-pane{ id: 'invite-group-pane', role: 'tabpanel' }
             = render 'shared/members/invite_group', submit_url: group_group_links_path(@group), access_levels: GroupMember.access_level_roles, default_access_level: @group_member.access_level, group_link_field: 'shared_with_group_id', group_access_field: 'shared_group_access'
     - else