diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-31 21:08:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-31 21:08:25 +0000 |
| commit | 83c5e07949cb1023dde1d282b3969def6f182472 (patch) | |
| tree | 6f5980b7a5d79fc9d97c782713423f368c66e572 /app/models | |
| parent | 4747b1ebc408204ff9ac4e6b9afa1d97fcf8c91a (diff) | |
| download | gitlab-ce-83c5e07949cb1023dde1d282b3969def6f182472.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/event.rb | 3 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 333841b1f90..76a34bf7810 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -9,6 +9,9 @@ class Event < ApplicationRecord include Gitlab::Utils::StrongMemoize include UsageStatistics include ShaAttribute + include IgnorableColumns + + ignore_column :target_id_convert_to_bigint, remove_with: '16.2', remove_after: '2023-07-22' ACTIONS = HashWithIndifferentAccess.new( created: 1, diff --git a/app/models/user.rb b/app/models/user.rb index 3bd8a035357..ff131b9093b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -366,6 +366,7 @@ class User < ApplicationRecord :diffs_addition_color, :diffs_addition_color=, :use_legacy_web_ide, :use_legacy_web_ide=, :use_new_navigation, :use_new_navigation=, + :achievements_enabled, :achievements_enabled=, to: :user_preference delegate :path, to: :namespace, allow_nil: true, prefix: true |