Merge branch 'pre_trustie_server' into trustie_server

config/initializers/doorkeeper.rb

@@ -18,7 +18,7 @@ Doorkeeper.configure do
     User.authenticate!(params[:username], params[:password])
   end
 
-  access_token_generator '::Doorkeeper::JWT'
+  # access_token_generator '::Doorkeeper::JWT'
 
   admin_authenticator do
     user = current_user

config/routes.rb

@@ -1047,6 +1047,19 @@ Rails.application.routes.draw do
 
   resources :commit_logs, :only => [:create]
 
+  scope '/app' do
+    post ':id/auth_active', to: 'installations#auth_active'
+    post ':id/update_private_key', to: 'installations#update_private_key'
+    post ':id/update_secret', to: 'installations#update_secret'
+    resources :installations do
+      get :repositories, on: :collection
+      member do
+        post :access_tokens
+        put :suspended
+      end
+    end
+  end
+
   root 'main#index'