debian-mirror-gitlab/debian/patches/0200-switch-to-state-machine.patch

36 lines
1.2 KiB
Diff
Raw Normal View History

2015-11-08 23:00:13 +05:30
From 2e5d32e07a75b98e57a0476a4cdb7a1ec41cadda Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sun, 8 Nov 2015 12:15:58 -0500
Subject: [PATCH] Switch to state_machines-activerecord (Fixes: #3374)
---
Gemfile | 2 +-
config/initializers/state_machine_patch.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
@@ -112,7 +112,7 @@ group :unicorn do
end
# State machine
-gem "state_machine", '~> 1.2.0'
+gem "state_machines-activerecord", '~> 0.3.0'
# Run events after state machine commits
gem 'after_commit_queue'
Index: gitlab/config/initializers/state_machine_patch.rb
===================================================================
--- gitlab.orig/config/initializers/state_machine_patch.rb
+++ gitlab/config/initializers/state_machine_patch.rb
@@ -1,6 +1,6 @@
# This is a patch to address the issue in https://github.com/pluginaweek/state_machine/issues/251
# where gem 'state_machine' was not working for Rails 4.1
-module StateMachine
+module StateMachines
module Integrations
module ActiveModel
public :around_validation