Merge remote-tracking branch 'tootsuite/master'

2017-11-27 22:33:26 -06:00
parent 8bad6bdd00 706e534455
commit 7463d80ff4
11 changed files with 195 additions and 1 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -103,6 +103,7 @@ Rails.application.routes.draw do
    end

    resource :delete, only: [:show, :destroy]
+    resource :migration, only: [:show, :update]

    resources :sessions, only: [:destroy]
  end