Merge branch 'jc-fix-set-project-writable' into 'master'

Fix method to mark a project repository as writable

See merge request gitlab-org/gitlab-ce!25546

(cherry picked from commit a8a02387a7ea5c5a4a6f733a043adf2b1f907e3c)

df044542 Fix project set_repository_writable!

3 files changed, 16 insertions, 1 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 8f746f6e094..daa018d6f89 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1830,7 +1830,7 @@ class Project < ActiveRecord::Base
   # Set repository as writable again
   def set_repository_writable!
     with_lock do
-      update_column(repository_read_only, false)
+      update_column(:repository_read_only, false)
     end
   end
 
diff --git a/changelogs/unreleased/jc-fix-set-project-writable.yml b/changelogs/unreleased/jc-fix-set-project-writable.yml
new file mode 100644
index 00000000000..0bfd90c3967
--- /dev/null
+++ b/changelogs/unreleased/jc-fix-set-project-writable.yml
@@ -0,0 +1,5 @@
+---
+title: Fix method to mark a project repository as writable
+merge_request: 25546
+author:
+type: fixed
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index c1767ed0535..851b796c731 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -2487,6 +2487,16 @@ describe Project do
     end
   end
 
+  describe '#set_repository_writable!' do
+    it 'sets repository_read_only to false' do
+      project = create(:project, :read_only)
+
+      expect { project.set_repository_writable! }
+        .to change(project, :repository_read_only)
+        .from(true).to(false)
+    end
+  end
+
   describe '#pushes_since_gc' do
     let(:project) { create(:project) }