Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--config/initializers/state_machine_patch.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 0bac8978160..ee8b2a7a51a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -113,7 +113,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'
diff --git a/config/initializers/state_machine_patch.rb b/config/initializers/state_machine_patch.rb
index 72d010fa5de..51f05794361 100644
--- a/config/initializers/state_machine_patch.rb
+++ b/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