From 6623da9d71da9d145ccb7c635e2ec02d75471114 Mon Sep 17 00:00:00 2001 From: Alexander Machehin Date: Tue, 29 May 2012 14:59:24 +0600 Subject: [PATCH] [refs #90] fixed state_machine --- Gemfile | 2 +- app/models/pull_request.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index fb1f84078..1691f9efd 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ gem 'paperclip', '~> 3.0.2' gem 'delayed_job_active_record', '~> 0.3.2' gem 'russian', '~> 0.6.0' gem 'highline', '~> 1.6.11' +gem 'state_machine' gem 'jbuilder' @@ -44,7 +45,6 @@ gem 'rails3-jquery-autocomplete', '~> 1.0.7' gem 'will_paginate', '~> 3.0.3' gem 'meta-tags', '~> 1.2.5', :require => 'meta_tags' gem "haml-rails", '~> 0.3.4' -gem 'state_machine', :require => 'state_machine/core' gem 'jquery-rails', '~> 2.0.2' gem 'ruby-haml-js', '~> 0.0.3' gem 'rails-backbone', '~> 0.7.2' diff --git a/app/models/pull_request.rb b/app/models/pull_request.rb index a82fa1999..dabb87eb9 100644 --- a/app/models/pull_request.rb +++ b/app/models/pull_request.rb @@ -1,7 +1,4 @@ class PullRequest < ActiveRecord::Base - extend StateMachine::MacroMethods # no method state_machine WTF?! - #TODO add validates to serialized data - belongs_to :issue, :autosave => true, :dependent => :destroy, :touch => true, :validate => true belongs_to :base_project, :class_name => 'Project', :foreign_key => 'base_project_id' belongs_to :head_project, :class_name => 'Project', :foreign_key => 'head_project_id'