Merge branch 'bug/project-feature-compatibility' into 'master'

Mutate the attribute instead of issuing a write operation to the DB in `ProjectFeaturesCompatibility` concern. Closes gitlab-ee#1520 See merge request !8552

Merge branch 'bug/project-feature-compatibility' into 'master'
28f633a9 · Douwe Maan · 28c23d99 · e1521b74 · 28f633a9 · 28f633a9
Commit 28f633a9 authored Jan 14, 2017 by Douwe Maan
Showing with 6 additions and 1 deletion

project_features_compatibility.rb app/models/concerns/project_features_compatibility.rb +1 -1

bug-project-feature-compatibility.yml changelogs/unreleased/bug-project-feature-compatibility.yml +5 -0

No files found.
--- a/app/models/concerns/project_features_compatibility.rb
+++ b/app/models/concerns/project_features_compatibility.rb
@@ -32,6 +32,6 @@ module ProjectFeaturesCompatibility
    build_project_feature unless project_feature

    access_level = Gitlab::Utils.to_boolean(value) ? ProjectFeature::ENABLED : ProjectFeature::DISABLED
-    project_feature.update_attribute(field, access_level)
+    project_feature.send(:write_attribute, field, access_level)
  end
 end
--- a/changelogs/unreleased/bug-project-feature-compatibility.yml
+++ b/changelogs/unreleased/bug-project-feature-compatibility.yml
+---
+title: Mutate the attribute instead of issuing a write operation to the DB in `ProjectFeaturesCompatibility`
+  concern.
+merge_request: 8552
+author: