Skip to content
Snippets Groups Projects

Merge Requests - Assignee

Closed Merge Requests - Assignee
master into 11-0-stable
Closed gitlab-qa-bot requested to merge master into 11-0-stable
Viewing commit f3fba178
Prev Next
Show latest version
34 files
+ 217
− 251
Compare changes
  • Side-by-side
  • Inline
Files
34
  • f3fba178 
    This removes the `ForkedProjectLink` model that has been replaced by
the `ForkNetworkMember` and `ForkNetwork` combination. All existing
relations have been adjusted to use these new models.

The `forked_project_link` table has been dropped.

The "Forks" count on the admin dashboard has been updated to count all
`ForkNetworkMember` rows and deduct the number of `ForkNetwork`
rows. This is because now the "root-project" of a fork network also
has a `ForkNetworkMember` row. This count could become inaccurate when
the root of a fork network is deleted.
app/controllers/admin/dashboard_controller.rb
+ 2
− 2
@@ -3,8 +3,8 @@
class Admin::DashboardController < Admin::ApplicationController
include CountHelper
COUNTED_ITEMS = [Project, User, Group, ForkedProjectLink, Issue, MergeRequest,
Note, Snippet, Key, Milestone].freeze
COUNTED_ITEMS = [Project, User, Group, ForkNetworkMember, ForkNetwork, Issue,
MergeRequest, Note, Snippet, Key, Milestone].freeze
# rubocop: disable CodeReuse/ActiveRecord
def index