summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-10 12:20:59 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-10 12:20:59 +0000
commit8972aef55865263833f7d30188c4a49c83e7f001 (patch)
tree0ec942a4a69f0df195a05f0fc6194c7928defc05 /config
parent354b69dde2ba399a4269a0f544fd7a4e399d8b7e (diff)
parentddd3dd72fec5d31fc76023e10f824cc079f65b63 (diff)
downloadgitlab-ce-8972aef55865263833f7d30188c4a49c83e7f001.tar.gz
Merge branch 'state-machine-to-state-machines-activerecord' into 'master'
Switch to state_machines-activerecord (Fixes: #3374) state_machine is unmaintained See merge request !1764
Diffstat (limited to 'config')
-rw-r--r--config/initializers/state_machine_patch.rb9
1 files changed, 0 insertions, 9 deletions
diff --git a/config/initializers/state_machine_patch.rb b/config/initializers/state_machine_patch.rb
deleted file mode 100644
index 72d010fa5de..00000000000
--- a/config/initializers/state_machine_patch.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 Integrations
- module ActiveModel
- public :around_validation
- end
- end
-end