diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-03-28 13:17:42 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-03-28 16:18:23 +0000 |
| commit | 013f7cd24c4359d5d704b719d85b6df7ca1fdd55 (patch) | |
| tree | 4bd076e21ec1d094fd23a506fef80350f63fd9f1 /app/models/protected_branch | |
| parent | a74c3e6c3b418ea585f02ba15af1c7292f895a1a (diff) | |
| download | gitlab-ce-013f7cd24c4359d5d704b719d85b6df7ca1fdd55.tar.gz | |
Inherit from ApplicationRecord instead of ActiveRecord::Base
Diffstat (limited to 'app/models/protected_branch')
| -rw-r--r-- | app/models/protected_branch/merge_access_level.rb | 2 | ||||
| -rw-r--r-- | app/models/protected_branch/push_access_level.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/protected_branch/merge_access_level.rb b/app/models/protected_branch/merge_access_level.rb index b0d5c64e931..de240e40316 100644 --- a/app/models/protected_branch/merge_access_level.rb +++ b/app/models/protected_branch/merge_access_level.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -class ProtectedBranch::MergeAccessLevel < ActiveRecord::Base +class ProtectedBranch::MergeAccessLevel < ApplicationRecord include ProtectedBranchAccess end diff --git a/app/models/protected_branch/push_access_level.rb b/app/models/protected_branch/push_access_level.rb index b2a88229853..bde1d29ad7f 100644 --- a/app/models/protected_branch/push_access_level.rb +++ b/app/models/protected_branch/push_access_level.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -class ProtectedBranch::PushAccessLevel < ActiveRecord::Base +class ProtectedBranch::PushAccessLevel < ApplicationRecord include ProtectedBranchAccess end |