Merge branch 'standalone_develop' into pm_project_develop

# Conflicts:
#	app/models/attachment.rb
#	app/views/api/v1/attachments/_simple_detail.json.jbuilder

config/routes.rb

@@ -19,11 +19,13 @@ Rails.application.routes.draw do
   get 'attachments/entries/get_file', to: 'attachments#get_file'
   get 'attachments/download/:id', to: 'attachments#show'
   get 'attachments/download/:id/:filename', to: 'attachments#show'
+  get ':owner/:repo/releases/download/:tag_name/:filename',  to:  'version_releases#download', constraints: { repo: /[^\/]+/, tag_name: /[^\/]+/, filename: /[^\/]+/ }
   get 'check_pr_url',to: "settings#check_url"
 
   # get 'auth/qq/callback', to: 'oauth/qq#create'
   get 'auth/failure', to: 'oauth/base#auth_failure'
   get 'auth/cas/callback', to: 'oauth/cas#create'
+  get 'auth/acge/callback', to: "oauth/acge#create"
   get 'auth/:provider/callback', to: 'oauth/callbacks#create'
 
   get 'oauth/bind', to: 'oauth/educoder#bind'

config/routes/api.rb

@@ -108,6 +108,7 @@ defaults format: :json do
 
           # projects文件夹下的
           scope module: :projects do 
+            resource :dataset, only: [:create, :update, :show]
             resources :actions, module: 'actions' do
               collection do 
                 post :disable
@@ -174,7 +175,7 @@ defaults format: :json do
 
       resources :projects, only: [:index]
       resources :project_topics, only: [:index, :create, :destroy]
-
+      resources :project_datasets, only: [:index]
       
     end
   end