summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-08 21:29:59 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-07-08 21:29:59 +0000
commitc8e9246ef65da784d6b9d48fb77e66989cea2534 (patch)
tree7c1b4aa32c794ca70dcc68938112c251aa650901 /app/controllers/projects_controller.rb
parentd991e3e41a83c9479d0f5d95732f998cf352c57d (diff)
parenta0b9fe12886f55875bc4bce49f2566be3bff79cd (diff)
downloadgitlab-ce-c8e9246ef65da784d6b9d48fb77e66989cea2534.tar.gz
Merge branch 'project-home-page' into 'master'
New project home page ## Why? Because current project page is overloaded with information ## Changes * move activity to separate tab * make project show page cleaner by removing redundant information * render README as main content of project page cc @sytses @JobV See merge request !938
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb26
1 files changed, 16 insertions, 10 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index be5968cd7b0..be85521ffa5 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -6,7 +6,7 @@ class ProjectsController < ApplicationController
# Authorize
before_action :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive]
- before_action :event_filter, only: :show
+ before_action :event_filter, only: [:show, :activity]
layout :determine_layout
@@ -59,14 +59,22 @@ class ProjectsController < ApplicationController
end
end
+ def activity
+ respond_to do |format|
+ format.html
+ format.json do
+ load_events
+ pager_json('events/_events', @events.count)
+ end
+ end
+ end
+
def show
if @project.import_in_progress?
redirect_to namespace_project_import_path(@project.namespace, @project)
return
end
- @show_star = !(current_user && current_user.starred?(@project))
-
respond_to do |format|
format.html do
if @project.repository_exists?
@@ -81,11 +89,6 @@ class ProjectsController < ApplicationController
end
end
- format.json do
- load_events
- pager_json('events/_events', @events.count)
- end
-
format.atom do
load_events
render layout: false
@@ -147,11 +150,14 @@ class ProjectsController < ApplicationController
def toggle_star
current_user.toggle_star(@project)
@project.reload
- render json: { star_count: @project.star_count }
+
+ render json: {
+ html: view_to_html_string("projects/buttons/_star")
+ }
end
def markdown_preview
- text = params[:text]
+ text = params[:text]
ext = Gitlab::ReferenceExtractor.new(@project, current_user)
ext.analyze(text)