Merge branch 'pre_trustie_server' into trustie_server

config/routes.rb

@@ -556,7 +556,8 @@ Rails.application.routes.draw do
           post :refuse_merge
           get :files
           get :commits
-          resources :reviews, only: [:create] 
+          resources :reviews, only: [:create]
+          resources :mark_files, only:  [:index, :create]
         end
         collection do
           post :check_can_merge
@@ -583,6 +584,16 @@ Rails.application.routes.draw do
       resources :project_trends, :path => :activity, only: [:index, :create]
       resources :issue_tags, :path => :labels, only: [:create, :edit, :update, :destroy, :index]
       resources :version_releases, :path => :releases, only: [:index,:new, :show, :create, :edit, :update, :destroy]
+      resources :ob_repository_syncs, :path => :synchronizes, only: [:index, :create] do
+        collection do
+          delete :delete
+          get :jobs
+          post :create_jobs
+          delete :delete_job
+          post :start_job
+          post :stop_job
+        end
+      end
 
       scope module: :ci do
         scope do

config/routes/api.rb

@@ -19,7 +19,16 @@ defaults format: :json do
           # projects文件夹下的
           scope module: :projects do 
             resources :issues
-            resources :pull_requests
+            resources :pulls, module: 'pulls' do 
+              resources :versions, only: [:index] do 
+                member do 
+                  get :diff
+                end
+              end
+              resources :journals, except: [:show, :edit]
+              resources :reviews, only: [:index, :create] 
+            end
+
             resources :versions 
             resources :release_versions
             resources :webhooks do