Merge branch 'dev_trustie' into dev_devops

This commit is contained in:
sylor_huang@126.com 2020-07-16 13:55:48 +08:00
commit a10a3768c9
2 changed files with 11 additions and 1 deletions

View File

@ -121,6 +121,7 @@ class RepositoriesController < ApplicationController
end end
def authorizate! def authorizate!
return if current_user && current_user.admin?
if @project.repository.hidden? && !@project.member?(current_user) if @project.repository.hidden? && !@project.member?(current_user)
render_forbidden render_forbidden
end end
@ -141,7 +142,7 @@ class RepositoriesController < ApplicationController
@ref = params[:ref] || "master" @ref = params[:ref] || "master"
end end
def get_latest_commit def get_latest_commit
latest_commit = project_commits latest_commit = project_commits
@latest_commit = latest_commit[:body][0] if latest_commit.present? @latest_commit = latest_commit[:body][0] if latest_commit.present?
@commits_count = latest_commit[:total_count] if latest_commit.present? @commits_count = latest_commit[:total_count] if latest_commit.present?

View File

@ -0,0 +1,9 @@
class ResetProjectIssuesCounte < ActiveRecord::Migration[5.2]
def change
projects = Project.select(:id, :issues_count).all
projects.each do |p|
puts p.id
Project.reset_counters( p.id, :issues_count, touch: false )
end
end
end