Skip to content
Snippets Groups Projects
Commit 122acb22 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

fix unauth for public

parent 4c6224aa
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -6,6 +6,6 @@ class Public::ProjectsController < ApplicationController
layout 'public'
 
def index
@projects = Project.where(public: true)
@projects = Project.public
end
end
Loading
Loading
@@ -81,6 +81,7 @@ class Project < ActiveRecord::Base
scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
scope :public, where(public: true)
 
class << self
def active
Loading
Loading
Loading
Loading
@@ -6,12 +6,14 @@
= favicon_link_tag 'favicon.ico'
= stylesheet_link_tag "application"
= javascript_include_tag "application"
-# Atom feed
- if controller_name == 'projects' && action_name == 'index'
= auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed"
- if @project && !@project.new_record?
- if current_controller?(:tree, :commits)
= auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, format: :atom, private_token: current_user.private_token), title: "Recent commits to #{@project.name}:#{@ref}")
- if current_controller?(:issues)
= auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
= csrf_meta_tags
-# Atom feed
- if current_user
- if controller_name == 'projects' && action_name == 'index'
= auto_discovery_link_tag :atom, projects_url(:atom, private_token: current_user.private_token), title: "Dashboard feed"
- if @project && !@project.new_record?
- if current_controller?(:tree, :commits)
= auto_discovery_link_tag(:atom, project_commits_url(@project, @ref, format: :atom, private_token: current_user.private_token), title: "Recent commits to #{@project.name}:#{@ref}")
- if current_controller?(:issues)
= auto_discovery_link_tag(:atom, project_issues_url(@project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: "Error"
= render "layouts/head", title: "Public Area"
%body{class: "#{app_theme} application"}
%header.navbar.navbar-static-top.navbar-gitlab
.navbar-inner
.container
%div.app_logo
%span.separator
= link_to public_root_path, class: "home" do
= link_to root_path, class: "home" do
%h1 GITLAB
%span.separator
%h1.project_name Public
%h1.project_name Public Area
.container
.content
.prepend-top-20
Loading
Loading
Loading
Loading
@@ -3,7 +3,7 @@
%small Read-Only Access
%hr
 
%ul.well-list
%ul.unstyled
- @projects.each do |project|
%li.clearfix
%h5
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment