Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2c48e99e
Commit
2c48e99e
authored
Mar 15, 2021
by
Quang-Minh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename EE::ApplicationRecord to EE::ApplicationRecordHelpers
Issue
https://gitlab.com/gitlab-org/gitlab/-/issues/322133
parent
eb9a94bc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
app/models/application_record.rb
app/models/application_record.rb
+1
-1
ee/app/models/ee/application_record_helpers.rb
ee/app/models/ee/application_record_helpers.rb
+2
-1
ee/spec/models/ee/application_record_helpers_spec.rb
ee/spec/models/ee/application_record_helpers_spec.rb
+0
-0
No files found.
app/models/application_record.rb
View file @
2c48e99e
...
@@ -80,4 +80,4 @@ class ApplicationRecord < ActiveRecord::Base
...
@@ -80,4 +80,4 @@ class ApplicationRecord < ActiveRecord::Base
end
end
end
end
ApplicationRecord
.
prepend_if_ee
(
'EE::ApplicationRecord'
)
ApplicationRecord
.
prepend_if_ee
(
'EE::ApplicationRecord
Helpers
'
)
ee/app/models/ee/application_record.rb
→
ee/app/models/ee/application_record
_helpers
.rb
View file @
2c48e99e
# frozen_string_literal: true
# frozen_string_literal: true
module
EE
module
EE
module
ApplicationRecord
# Intentionally pick a different name, to prevent naming conflicts
module
ApplicationRecordHelpers
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
class_methods
do
class_methods
do
...
...
ee/spec/models/ee/application_record_spec.rb
→
ee/spec/models/ee/application_record_
helpers_
spec.rb
View file @
2c48e99e
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment