Merge branch 'pre_trustie_server' into trustie_server

config/routes/api.rb

@@ -9,7 +9,12 @@ defaults format: :json do
 
         scope ':repo' do 
           # projects
-          resource :projects, path: '/', only: [:show, :update, :edit, :destroy]
+          resource :projects, path: '/', only: [:show, :update, :edit, :destroy] do 
+            collection do 
+              get :compare
+              get :blame
+            end
+          end
 
           # projects文件夹下的
           scope module: :projects do 
@@ -23,6 +28,21 @@ defaults format: :json do
                 get :hooktasks 
               end
             end
+            resources :branches, only:[:index, :create] do 
+              collection do 
+                get :all 
+              end
+            end
+            resources :commits, only: [:index]
+            get '/commits/:sha/diff', to: 'commits#diff'
+            get '/git/blobs/:sha', to: 'git#blobs'
+            get '/git/trees/:sha', to: 'git#trees'
+
+            resources :contents, only: [:index] do 
+              collection do 
+                post :batch
+              end
+            end
           end
         end