diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-29 19:36:22 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-29 19:36:22 +0300 |
| commit | 066a6c8ba8900f0883ee788d901d300850b1ae61 (patch) | |
| tree | d84020e3dbf166a993b9aaad06dbe188e429750c /app | |
| parent | 5a983ac431affc800d5e9db9e83c14710ec29c36 (diff) | |
| parent | 289fae78e971e117e69fb87602f5f6284419b863 (diff) | |
Merge branch '34078-allow-to-enable-feature-flags-with-more-granularity' into 'master'
Allow the feature flags to be enabled/disabled with more granularity
Closes #34078
See merge request !12357
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/concerns/feature_gate.rb | 7 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/models/concerns/feature_gate.rb b/app/models/concerns/feature_gate.rb new file mode 100644 index 00000000000..5db64fe82c4 --- /dev/null +++ b/app/models/concerns/feature_gate.rb @@ -0,0 +1,7 @@ +module FeatureGate + def flipper_id + return nil if new_record? + + "#{self.class.name}:#{id}" + end +end diff --git a/app/models/user.rb b/app/models/user.rb index 35e0d021c47..0febae84873 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -11,6 +11,7 @@ class User < ActiveRecord::Base include CaseSensitivity include TokenAuthenticatable include IgnorableColumn + include FeatureGate DEFAULT_NOTIFICATION_LEVEL = :participating |