Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
bdf317ad
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bdf317ad
编写于
9月 26, 2012
作者:
C
Cyril
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
layout selected by controller name
上级
078a8f0e
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
12 addition
and
30 deletion
+12
-30
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+6
-16
app/controllers/errors_controller.rb
app/controllers/errors_controller.rb
+0
-2
app/controllers/profile_controller.rb
app/controllers/profile_controller.rb
+0
-1
app/controllers/project_controller.rb
app/controllers/project_controller.rb
+0
-11
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+2
-0
app/views/layouts/errors.html.haml
app/views/layouts/errors.html.haml
+0
-0
config/application.rb
config/application.rb
+4
-0
未找到文件。
app/controllers/application_controller.rb
浏览文件 @
bdf317ad
...
...
@@ -11,19 +11,17 @@ class ApplicationController < ActionController::Base
helper_method
:abilities
,
:can?
rescue_from
Gitlab
::
Gitolite
::
AccessDenied
do
|
exception
|
render
"errors/gitolite"
,
layout:
"error"
,
status:
500
render
"errors/gitolite"
,
layout:
"error
s
"
,
status:
500
end
rescue_from
Encoding
::
CompatibilityError
do
|
exception
|
render
"errors/encoding"
,
layout:
"error"
,
status:
500
render
"errors/encoding"
,
layout:
"error
s
"
,
status:
500
end
rescue_from
ActiveRecord
::
RecordNotFound
do
|
exception
|
render
"errors/not_found"
,
layout:
"error"
,
status:
404
render
"errors/not_found"
,
layout:
"error
s
"
,
status:
404
end
layout
:layout_by_resource
protected
def
check_token_auth
...
...
@@ -51,14 +49,6 @@ class ApplicationController < ActionController::Base
end
end
def
layout_by_resource
if
devise_controller?
"devise_layout"
else
"application"
end
end
def
set_current_user_for_mailer
MailerObserver
.
current_user
=
current_user
end
...
...
@@ -93,15 +83,15 @@ class ApplicationController < ActionController::Base
end
def
access_denied!
render
"errors/access_denied"
,
layout:
"error"
,
status:
404
render
"errors/access_denied"
,
layout:
"error
s
"
,
status:
404
end
def
not_found!
render
"errors/not_found"
,
layout:
"error"
,
status:
404
render
"errors/not_found"
,
layout:
"error
s
"
,
status:
404
end
def
git_not_found!
render
"errors/git_not_found"
,
layout:
"error"
,
status:
404
render
"errors/git_not_found"
,
layout:
"error
s
"
,
status:
404
end
def
method_missing
(
method_sym
,
*
arguments
,
&
block
)
...
...
app/controllers/errors_controller.rb
浏览文件 @
bdf317ad
class
ErrorsController
<
ApplicationController
layout
"error"
def
githost
render
"errors/gitolite"
end
...
...
app/controllers/profile_controller.rb
浏览文件 @
bdf317ad
class
ProfileController
<
ApplicationController
layout
"profile"
before_filter
:user
def
show
...
...
app/controllers/project_controller.rb
浏览文件 @
bdf317ad
...
...
@@ -2,15 +2,4 @@ class ProjectController < ApplicationController
before_filter
:project
# Authorize
before_filter
:add_project_abilities
layout
:determine_layout
protected
def
determine_layout
if
@project
&&
!
@project
.
new_record?
'project'
else
'application'
end
end
end
app/controllers/projects_controller.rb
浏览文件 @
bdf317ad
...
...
@@ -8,6 +8,8 @@ class ProjectsController < ProjectController
before_filter
:authorize_admin_project!
,
only:
[
:edit
,
:update
,
:destroy
]
before_filter
:require_non_empty_project
,
only:
[
:blob
,
:tree
,
:graph
]
layout
'application'
,
only:
[
:new
,
:create
]
def
new
@project
=
Project
.
new
end
...
...
app/views/layouts/error.html.haml
→
app/views/layouts/error
s
.html.haml
浏览文件 @
bdf317ad
文件已移动
config/application.rb
浏览文件 @
bdf317ad
...
...
@@ -53,5 +53,9 @@ module Gitlab
# Add fonts
config
.
assets
.
paths
<<
"
#{
Rails
.
root
}
/app/assets/fonts"
config
.
to_prepare
do
Devise
::
SessionsController
.
layout
'devise_layout'
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录