Merge branch 'issue_im'

Conflicts:
	config/initializers/rails_footnotes.rb

2 files changed, 3 insertions, 1 deletions

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 0399607efe6..9b1b923eaa0 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -21,6 +21,8 @@ class Issue < ActiveRecord::Base
   scope :opened, where(:closed => false)
   scope :closed, where(:closed => true)
   scope :assigned, lambda { |u| where(:assignee_id => u.id)}
+
+  acts_as_list
 end
 # == Schema Information
 #
diff --git a/app/models/project.rb b/app/models/project.rb
index 0d90af866bf..3c07976d24e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -3,7 +3,7 @@ require "grit"
 class Project < ActiveRecord::Base
   belongs_to :owner, :class_name => "User"
 
-  has_many :issues, :dependent => :destroy
+  has_many :issues, :dependent => :destroy, :order => "position"
   has_many :users_projects, :dependent => :destroy
   has_many :users, :through => :users_projects
   has_many :notes, :dependent => :destroy