diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-12-22 12:06:54 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-12-22 12:06:54 +0000 |
commit | 38fe3418d891fa892d777d3d44717eb3e0c106c7 (patch) | |
tree | a9ffee3672320d53cf8a53878285eb0f17d13a8b | |
parent | 2972352a9c6912adfd77b480472eb13b832a6c3b (diff) | |
parent | 8c0e571a2b9e0516f7e2f8e267896fdf8f2eb3b7 (diff) | |
download | gitlab-ce-38fe3418d891fa892d777d3d44717eb3e0c106c7.tar.gz |
Merge branch 'dz-fix-seed-fu' into 'master'
Explictly require Gitlab::Utils in ProjectFeaturesCompatibility
Closes #41390
See merge request gitlab-org/gitlab-ce!16107
-rw-r--r-- | app/models/concerns/project_features_compatibility.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/concerns/project_features_compatibility.rb b/app/models/concerns/project_features_compatibility.rb index cb59b4da3d7..b3fec99c816 100644 --- a/app/models/concerns/project_features_compatibility.rb +++ b/app/models/concerns/project_features_compatibility.rb @@ -2,6 +2,7 @@ # # After migrating issues_enabled merge_requests_enabled builds_enabled snippets_enabled and wiki_enabled # fields to a new table "project_features", support for the old fields is still needed in the API. +require 'gitlab/utils' module ProjectFeaturesCompatibility extend ActiveSupport::Concern |