Merge branch 'standalone_develop' into pm_project_develop

config/routes/api.rb

@@ -126,6 +126,9 @@ defaults format: :json do
                 post :enable
                 resources :runs, only: [:index] do 
                   post '/jobs/:job', to: 'runs#job_show'
+                  post '/rerun', to: 'runs#rerun'
+                  post '/jobs/:job/rerun', to: 'runs#job_rerun'
+                  get '/jobs/:job/logs', to: 'runs#job_logs'
                 end 
               end
             end
@@ -152,6 +155,8 @@ defaults format: :json do
             end
             resources :branches, param: :name, only:[:index, :create, :destroy] do 
               collection do 
+                get :gitee 
+                get :github
                 get :all
                 post :restore
                 patch :update_default_branch
@@ -191,6 +196,7 @@ defaults format: :json do
       resources :projects, only: [:index]
       resources :project_topics, only: [:index, :create, :destroy]
       resources :project_datasets, only: [:index]
+      resources :gitlink_competition_applies, only: [:create]
       
     end
   end