Resolve conflicts in app/models/group.rb
Ash McKenzie authored
149a1be2
Name Last commit Last update
application_setting
badges
blob_viewer
ci
clusters
concerns
conversational_development_index
diff_viewer
hooks
issue
members
merge_request
network
project_services
protected_branch
protected_tag
storage
.gitkeep
ability.rb
abuse_report.rb
active_session.rb
appearance.rb
application_setting.rb
audit_event.rb
award_emoji.rb
badge.rb
blob.rb
board.rb
broadcast_message.rb
chat_name.rb
chat_team.rb
commit.rb
commit_collection.rb
commit_range.rb
commit_status.rb
compare.rb
container_repository.rb
cycle_analytics.rb
dashboard_milestone.rb
deploy_key.rb
deploy_keys_project.rb
deploy_token.rb
deployment.rb
diff_discussion.rb
diff_note.rb
directly_addressed_user.rb
discussion.rb
discussion_note.rb
email.rb
environment.rb
epic.rb
event.rb
event_collection.rb
external_issue.rb
fork_network.rb
fork_network_member.rb
forked_project_link.rb
generic_commit_status.rb
global_label.rb
global_milestone.rb
gpg_key.rb
gpg_key_subkey.rb
gpg_signature.rb
group.rb
group_custom_attribute.rb
group_label.rb
group_milestone.rb
guest.rb
identity.rb
individual_note_discussion.rb
instance_configuration.rb
internal_id.rb
issue.rb
issue_assignee.rb
issue_collection.rb
key.rb
label.rb
label_link.rb
label_priority.rb
legacy_diff_discussion.rb
legacy_diff_note.rb
lfs_file_lock.rb
lfs_object.rb
lfs_objects_project.rb
list.rb
member.rb
merge_request.rb
merge_request_diff.rb
merge_request_diff_commit.rb
merge_request_diff_file.rb
merge_requests_closing_issues.rb
milestone.rb
namespace.rb
note.rb
notification_reason.rb
notification_recipient.rb
notification_setting.rb
oauth_access_grant.rb
oauth_access_token.rb
out_of_context_discussion.rb
pages_domain.rb
personal_access_token.rb
personal_snippet.rb
project.rb
project_authorization.rb
project_auto_devops.rb
project_ci_cd_setting.rb
project_custom_attribute.rb
project_deploy_token.rb
project_feature.rb
project_group_link.rb
project_import_data.rb
project_import_state.rb
project_label.rb
project_snippet.rb
project_statistics.rb
project_team.rb