change bug
This commit is contained in:
		
							parent
							
								
									eee699300c
								
							
						
					
					
						commit
						16a5887d66
					
				
							
								
								
									
										1
									
								
								Gemfile
								
								
								
								
							
							
						
						
									
										1
									
								
								Gemfile
								
								
								
								
							| 
						 | 
				
			
			@ -66,6 +66,7 @@ group :development, :test do
 | 
			
		|||
end
 | 
			
		||||
 | 
			
		||||
group :development do
 | 
			
		||||
  gem 'prettier'
 | 
			
		||||
  gem 'rubocop', '~> 0.52.0'
 | 
			
		||||
  gem 'solargraph', '~> 0.38.0'
 | 
			
		||||
  gem 'awesome_print'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -218,6 +218,7 @@ GEM
 | 
			
		|||
      activerecord (>= 5.2.1)
 | 
			
		||||
    popper_js (1.16.0)
 | 
			
		||||
    powerpack (0.1.2)
 | 
			
		||||
    prettier (0.18.2)
 | 
			
		||||
    public_suffix (4.0.3)
 | 
			
		||||
    puma (3.12.2)
 | 
			
		||||
    rack (2.0.9)
 | 
			
		||||
| 
						 | 
				
			
			@ -466,6 +467,7 @@ DEPENDENCIES
 | 
			
		|||
  omniauth-oauth2 (~> 1.6.0)
 | 
			
		||||
  parallel (~> 1.19, >= 1.19.1)
 | 
			
		||||
  pdfkit
 | 
			
		||||
  prettier
 | 
			
		||||
  puma (~> 3.11)
 | 
			
		||||
  rack-cors
 | 
			
		||||
  rack-mini-profiler
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -46,7 +46,7 @@ class Projects::CreateService < ApplicationService
 | 
			
		|||
  end
 | 
			
		||||
 | 
			
		||||
  def get_is_public
 | 
			
		||||
    params[:private] || true
 | 
			
		||||
    params[:private] || false
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def repo_is_public
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1 +1,16 @@
 | 
			
		|||
json.partial! 'users/user', user: @user
 | 
			
		||||
# json.partial! 'users/user', user: @user
 | 
			
		||||
 | 
			
		||||
json.username @user.full_name
 | 
			
		||||
json.real_name @user.real_name
 | 
			
		||||
json.login @user.login
 | 
			
		||||
json.user_id @user.id
 | 
			
		||||
json.image_url url_to_avatar(@user)
 | 
			
		||||
json.admin @user.admin?
 | 
			
		||||
json.user_identity @user.identity
 | 
			
		||||
json.is_watch current_user&.watched?(@user)
 | 
			
		||||
# json.watched_count @user.fan_count   #粉丝
 | 
			
		||||
# json.watching_count @user.follow_count   #关注数
 | 
			
		||||
# json.undo_events @undo_events
 | 
			
		||||
# json.user_composes_count @user_composes_count
 | 
			
		||||
# json.common_projects_count @projects_common_count
 | 
			
		||||
# json.mirror_projects_count @projects_mirrior_count
 | 
			
		||||
		Loading…
	
		Reference in New Issue