Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

This commit is contained in:
“xxq250”
2022-08-09 10:23:01 +08:00
6 changed files with 18 additions and 3 deletions

View File

@@ -2,7 +2,7 @@ class Api::V1::Projects::Pulls::JournalsController < Api::V1::Projects::Pulls::B
def index
@journals = Api::V1::Projects::Pulls::Journals::ListService.call(@project, @pull_request, params, current_user)
@journals = kaminari_paginate(@journals)
@journals = @journals.limit(200)
end
def create

View File

@@ -3,6 +3,7 @@ class Traces::ProjectsController < Traces::BaseController
before_action :require_login
before_action :load_project
before_action :require_project_not_be_forked_project
before_action :set_trace_token_to_cookie
before_action :authorizate_user_can_edit_project!, except: [:task_results]
@@ -95,4 +96,8 @@ class Traces::ProjectsController < Traces::BaseController
:domain => Trace.trace_config[:cookie_domain]
}
end
def require_project_not_be_forked_project
return render_error('fork仓库暂不支持代码溯源服务敬请谅解。') if @project.forked_from_project_id.present?
end
end