Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
83c1194d
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,发现更多精彩内容 >>
提交
83c1194d
编写于
11月 02, 2011
作者:
G
gitlabhq
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into user_dashboard
上级
a6fa8052
5fb1b9ff
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
67 addition
and
20 deletion
+67
-20
app/controllers/admin/mailer_controller.rb
app/controllers/admin/mailer_controller.rb
+1
-0
app/controllers/admin/projects_controller.rb
app/controllers/admin/projects_controller.rb
+1
-0
app/controllers/admin/team_members_controller.rb
app/controllers/admin/team_members_controller.rb
+1
-0
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+1
-0
app/controllers/keys_controller.rb
app/controllers/keys_controller.rb
+1
-0
app/controllers/profile_controller.rb
app/controllers/profile_controller.rb
+1
-0
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+2
-0
app/views/admin/_top_menu.html.haml
app/views/admin/_top_menu.html.haml
+0
-6
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+1
-1
app/views/admin/team_members/index.html.haml
app/views/admin/team_members/index.html.haml
+1
-1
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+1
-1
app/views/layouts/admin.html.haml
app/views/layouts/admin.html.haml
+27
-0
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+0
-6
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+29
-0
app/views/profile/_top_menu.html.haml
app/views/profile/_top_menu.html.haml
+0
-5
未找到文件。
app/controllers/admin/mailer_controller.rb
浏览文件 @
83c1194d
class
Admin::MailerController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
...
...
app/controllers/admin/projects_controller.rb
浏览文件 @
83c1194d
class
Admin::ProjectsController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
...
...
app/controllers/admin/team_members_controller.rb
浏览文件 @
83c1194d
class
Admin::TeamMembersController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
...
...
app/controllers/admin/users_controller.rb
浏览文件 @
83c1194d
class
Admin::UsersController
<
ApplicationController
layout
"admin"
before_filter
:authenticate_user!
before_filter
:authenticate_admin!
...
...
app/controllers/keys_controller.rb
浏览文件 @
83c1194d
class
KeysController
<
ApplicationController
layout
"profile"
respond_to
:js
def
index
...
...
app/controllers/profile_controller.rb
浏览文件 @
83c1194d
class
ProfileController
<
ApplicationController
layout
"profile"
def
show
@user
=
current_user
end
...
...
app/helpers/application_helper.rb
浏览文件 @
83c1194d
...
...
@@ -28,6 +28,8 @@ module ApplicationHelper
else
"Never"
end
rescue
"Never"
end
def
markdown
(
text
)
...
...
app/views/admin/_top_menu.html.haml
已删除
100644 → 0
浏览文件 @
a6fa8052
%div
.top_project_menu
%span
=
link_to
"Users"
,
admin_users_path
,
:style
=>
"width:50px;"
,
:class
=>
controller
.
controller_name
==
"users"
?
"current"
:
nil
%span
=
link_to
"Projects"
,
admin_projects_path
,
:style
=>
"width:50px;"
,
:class
=>
controller
.
controller_name
==
"projects"
?
"current"
:
nil
%span
=
link_to
"Teams"
,
admin_team_members_path
,
:style
=>
"width:50px;"
,
:class
=>
controller
.
controller_name
==
"team_members"
?
"current"
:
nil
%span
=
link_to
"Emails"
,
admin_emails_path
,
:style
=>
"width:50px;"
,
:class
=>
controller
.
controller_name
==
"mailer"
?
"current"
:
nil
app/views/admin/projects/index.html.haml
浏览文件 @
83c1194d
%table
%t
r
%t
head
%th
Name
%th
Code
%th
Path
...
...
app/views/admin/team_members/index.html.haml
浏览文件 @
83c1194d
-
@admin_team_members
.
group_by
(
&
:project
).
sort
.
each
do
|
project
,
members
|
%h3
=
link_to
project
.
name
,
[
:admin
,
project
]
%table
%t
r
%t
head
%th
Name
%th
Email
%th
Read
...
...
app/views/admin/users/index.html.haml
浏览文件 @
83c1194d
%table
%t
r
%t
head
%th
Admin
%th
Name
%th
Email
...
...
app/views/layouts/admin.html.haml
0 → 100644
浏览文件 @
83c1194d
!!!
%html
%head
%title
GitLab
#{
" - #{@project.name}"
if
@project
&&
!
@project
.
new_record?
}
=
stylesheet_link_tag
"application"
=
javascript_include_tag
"application"
=
csrf_meta_tags
%link
{
:href
=>
"/assets/favicon.png"
,
:rel
=>
"icon"
,
:type
=>
"image/png"
}
/
=
javascript_tag
do
REQ_URI = "
#{
request
.
env
[
"REQUEST_URI"
]
}
";
REQ_REFFER = "
#{
request
.
env
[
"HTTP_REFERER"
]
}
";
%body
{
:class
=>
content_for?
(
:body_class
)
?
yield
(
:body_class
)
:
'project-page'
,
:id
=>
yield
(
:boyd_id
)}
#container
=
render
:partial
=>
"layouts/flash"
=
render
:partial
=>
"layouts/head_panel"
.project-container
.project-sidebar
.fixed
%aside
=
link_to
"Users"
,
admin_users_path
,
:class
=>
controller
.
controller_name
==
"users"
?
"current"
:
nil
=
link_to
"Projects"
,
admin_projects_path
,
:class
=>
controller
.
controller_name
==
"projects"
?
"current"
:
nil
=
link_to
"Teams"
,
admin_team_members_path
,
:class
=>
controller
.
controller_name
==
"team_members"
?
"current"
:
nil
=
link_to
"Emails"
,
admin_emails_path
,
:class
=>
controller
.
controller_name
==
"mailer"
?
"current"
:
nil
.project-content
=
yield
app/views/layouts/application.html.haml
浏览文件 @
83c1194d
...
...
@@ -19,11 +19,5 @@
=
render
:partial
=>
"layouts/flash"
=
render
:partial
=>
"layouts/head_panel"
%div
{
:id
=>
"main"
,
:role
=>
"main"
,
:class
=>
"container_4"
}
-
if
@project
&&
!
@project
.
new_record?
.top_bar.container
=
render
:partial
=>
"projects/top_menu"
-
if
[
"keys"
,
"profile"
].
include?
(
controller
.
controller_name
)
.top_bar.container
=
render
:partial
=>
"profile/top_menu"
-
if
admin_namespace?
.top_bar.container
=
render
:partial
=>
"admin/top_menu"
=
render
:partial
=>
"layouts/page_title"
=
yield
app/views/layouts/profile.html.haml
0 → 100644
浏览文件 @
83c1194d
!!!
%html
%head
%title
GitLab
#{
" - #{@project.name}"
if
@project
&&
!
@project
.
new_record?
}
=
stylesheet_link_tag
"application"
=
javascript_include_tag
"application"
=
csrf_meta_tags
%link
{
:href
=>
"/assets/favicon.png"
,
:rel
=>
"icon"
,
:type
=>
"image/png"
}
/
=
javascript_tag
do
REQ_URI = "
#{
request
.
env
[
"REQUEST_URI"
]
}
";
REQ_REFFER = "
#{
request
.
env
[
"HTTP_REFERER"
]
}
";
%body
{
:class
=>
content_for?
(
:body_class
)
?
yield
(
:body_class
)
:
'project-page'
,
:id
=>
yield
(
:boyd_id
)}
#container
=
render
:partial
=>
"layouts/flash"
=
render
:partial
=>
"layouts/head_panel"
.project-container
.project-sidebar
.fixed
%aside
=
link_to
"Profile"
,
profile_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:show
)
?
"current"
:
nil
=
link_to
"Password"
,
profile_password_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:password
)
?
"current"
:
nil
=
link_to
keys_path
,
:class
=>
controller
.
controller_name
==
"keys"
?
"current"
:
nil
do
Keys
-
unless
current_user
.
keys
.
empty?
%span
{
:class
=>
"number"
}=
current_user
.
keys
.
count
.project-content
=
yield
app/views/profile/_top_menu.html.haml
已删除
100644 → 0
浏览文件 @
a6fa8052
%div
.top_project_menu
%span
=
link_to
"Profile"
,
profile_path
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:show
)
?
"current"
:
nil
%span
=
link_to
"Password"
,
profile_password_path
,
:style
=>
"width:70px;"
,
:class
=>
current_page?
(
:controller
=>
"profile"
,
:action
=>
:password
)
?
"current"
:
nil
%span
=
link_to
"Keys"
,
keys_path
,
:class
=>
controller
.
controller_name
==
"keys"
?
"current"
:
nil
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录