Merge branch 'issue_im'

Conflicts:
	config/initializers/rails_footnotes.rb

2 files changed, 7 insertions, 3 deletions

diff --git a/config/initializers/rails_footnotes.rb b/config/initializers/rails_footnotes.rb
index 2e578ec961f..db71e39c608 100644
--- a/config/initializers/rails_footnotes.rb
+++ b/config/initializers/rails_footnotes.rb
@@ -1,5 +1,5 @@
-if defined?(Footnotes) && Rails.env.development?
+#if defined?(Footnotes) && Rails.env.development?
   #Footnotes.run! # first of all
 
   # ... other init code
-end
+#end
diff --git a/config/routes.rb b/config/routes.rb
index cd8dc4ceef3..acf92536e3f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -40,7 +40,11 @@ Gitlab::Application.routes.draw do
     end
     resources :commits
     resources :team_members
-    resources :issues
+    resources :issues do
+      collection do
+        post :sort
+      end
+    end
     resources :notes, :only => [:create, :destroy]
   end
   root :to => "projects#index"