diff --git a/app/controllers/public/projects_controller.rb b/app/controllers/public/projects_controller.rb index 3504bd3f1a5..87e903a1d2d 100644 --- a/app/controllers/public/projects_controller.rb +++ b/app/controllers/public/projects_controller.rb @@ -10,17 +10,4 @@ class Public::ProjectsController < ApplicationController @projects = @projects.search(params[:search]) if params[:search].present? @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(20) end - - def show - @project = Project.public_only.find_with_namespace(params[:id]) - render_404 and return unless @project - - @repository = @project.repository - unless @project.empty_repo? - @recent_tags = @repository.tags.first(10) - - @commit = @repository.commit(params[:ref]) - @tree = Tree.new(@repository, @commit.id) - end - end end diff --git a/app/views/public/projects/_tree.html.haml b/app/views/public/projects/_tree.html.haml deleted file mode 100644 index bd09c236a0b..00000000000 --- a/app/views/public/projects/_tree.html.haml +++ /dev/null @@ -1,5 +0,0 @@ -- if tree.readme - = render "projects/tree/readme", readme: tree.readme -- else - .alert - %h3.nothing_here_message This project does not have README file diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml index 7dbe560e7fc..bea99b54ef7 100644 --- a/app/views/public/projects/index.html.haml +++ b/app/views/public/projects/index.html.haml @@ -17,7 +17,7 @@ %li .project-title %i.icon-share.cgray - = link_to public_project_path(project) do + = link_to project_path(project) do %strong= project.name_with_namespace .pull-right %pre.public-clone git clone #{project.http_url_to_repo} diff --git a/app/views/public/projects/show.html.haml b/app/views/public/projects/show.html.haml deleted file mode 100644 index 195b9bc07d2..00000000000 --- a/app/views/public/projects/show.html.haml +++ /dev/null @@ -1,49 +0,0 @@ -%h3.page-title - = @project.name_with_namespace - .pull-right - %pre.public-clone git clone #{@project.http_url_to_repo} - .pull-right - - if current_user - = link_to 'Browse project', @project, class: 'btn btn-create append-right-10' - - -%div - = link_to public_root_path do - ← To projects list - .pull-right - %span.light= @project.description - -%br -.row - - unless @project.empty_repo? - .span9 - = render 'tree', tree: @tree - .span3 - %h5 Repository: - %div - %p - %span.light Bare size is - #{@project.repository.size} MB - - %p - = pluralize(@repository.round_commit_count, 'commit') - %p - = pluralize(@repository.branch_names.count, 'branch') - %p - = pluralize(@repository.tag_names.count, 'tag') - - - if @recent_tags.present? - %hr - %h5 Most Recent Tags: - %ul.unstyled - - @recent_tags.each do |tag| - %li - %p - %i.icon-tag - %strong= tag.name - %small.light.pull-right - %i.icon-calendar - = time_ago_in_words(tag.commit.committed_date) - ago - - else - = 'Empty Repository'