diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-11 15:36:42 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-20 00:14:58 -0500 |
| commit | 2b05bf4be5c01c2b6b09a8c0792d1c9dd8afe6e7 (patch) | |
| tree | 6135f723e3b1966438eb217921ae2f02efbfcb0b /app/controllers/projects/forks_controller.rb | |
| parent | 7765ce187590408fe424403a92402531fdbc8f60 (diff) | |
| download | gitlab-ce-2b05bf4be5c01c2b6b09a8c0792d1c9dd8afe6e7.tar.gz | |
Use Project creator's avatar in fork listing. #2406
Diffstat (limited to 'app/controllers/projects/forks_controller.rb')
| -rw-r--r-- | app/controllers/projects/forks_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb index 92c91fc539a..2e01352169d 100644 --- a/app/controllers/projects/forks_controller.rb +++ b/app/controllers/projects/forks_controller.rb @@ -4,6 +4,7 @@ class Projects::ForksController < Projects::ApplicationController before_action :authorize_download_code! def index + @forked_projects = project.forks.includes(:creator) end def new @@ -13,7 +14,7 @@ class Projects::ForksController < Projects::ApplicationController def create namespace = Namespace.find(params[:namespace_key]) - + @forked_project = namespace.projects.find_by(path: project.path) @forked_project = nil unless @forked_project && @forked_project.forked_from_project == project |