Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f79f7585
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,发现更多精彩内容 >>
提交
f79f7585
编写于
1月 27, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
上级
50297f71
6290b75d
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
2 addition
and
10 deletion
+2
-10
CHANGELOG
CHANGELOG
+1
-1
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-0
app/views/layouts/admin.html.haml
app/views/layouts/admin.html.haml
+0
-1
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+0
-1
app/views/layouts/group.html.haml
app/views/layouts/group.html.haml
+0
-1
app/views/layouts/profile.html.haml
app/views/layouts/profile.html.haml
+0
-1
app/views/layouts/project_settings.html.haml
app/views/layouts/project_settings.html.haml
+0
-1
app/views/layouts/projects.html.haml
app/views/layouts/projects.html.haml
+0
-1
app/views/layouts/public_group.html.haml
app/views/layouts/public_group.html.haml
+0
-1
app/views/layouts/public_projects.html.haml
app/views/layouts/public_projects.html.haml
+0
-1
app/views/layouts/public_users.html.haml
app/views/layouts/public_users.html.haml
+0
-1
未找到文件。
CHANGELOG
浏览文件 @
f79f7585
...
@@ -33,7 +33,7 @@ v 7.8.0
...
@@ -33,7 +33,7 @@ v 7.8.0
-
-
-
-
-
-
-
-
Fix long broadcast message cut-off on left sidebar (Visay Keo)
- Add Project Avatars (Steven Thonus and Hannes Rosenögger)
- Add Project Avatars (Steven Thonus and Hannes Rosenögger)
-
-
-
-
...
...
app/views/layouts/_page.html.haml
浏览文件 @
f79f7585
-
if
defined?
(
sidebar
)
-
if
defined?
(
sidebar
)
.page-with-sidebar
.page-with-sidebar
=
render
"layouts/broadcast"
.sidebar-wrapper
.sidebar-wrapper
=
render
(
sidebar
)
=
render
(
sidebar
)
.content-wrapper
.content-wrapper
...
...
app/views/layouts/admin.html.haml
浏览文件 @
f79f7585
...
@@ -2,6 +2,5 @@
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Admin area"
=
render
"layouts/head"
,
title:
"Admin area"
%body
{
class:
"#{app_theme} #{theme_type} admin"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} admin"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Admin area"
=
render
"layouts/head_panel"
,
title:
"Admin area"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/admin'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/admin'
app/views/layouts/application.html.haml
浏览文件 @
f79f7585
...
@@ -2,6 +2,5 @@
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Dashboard"
=
render
"layouts/head"
,
title:
"Dashboard"
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/dashboard'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/dashboard'
app/views/layouts/group.html.haml
浏览文件 @
f79f7585
...
@@ -2,6 +2,5 @@
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
group_head_title
=
render
"layouts/head"
,
title:
group_head_title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
@group
.
name
=
render
"layouts/head_panel"
,
title:
@group
.
name
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
app/views/layouts/profile.html.haml
浏览文件 @
f79f7585
...
@@ -2,6 +2,5 @@
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Profile"
=
render
"layouts/head"
,
title:
"Profile"
%body
{
class:
"#{app_theme} #{theme_type} profile"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} profile"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Profile"
=
render
"layouts/head_panel"
,
title:
"Profile"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/profile'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/profile'
app/views/layouts/project_settings.html.haml
浏览文件 @
f79f7585
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
%body
{
class:
"#{app_theme} #{theme_type} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
%body
{
class:
"#{app_theme} #{theme_type} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/init_auto_complete"
=
render
"layouts/init_auto_complete"
-
@project_settings_nav
=
true
-
@project_settings_nav
=
true
...
...
app/views/layouts/projects.html.haml
浏览文件 @
f79f7585
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
project_head_title
=
render
"layouts/head"
,
title:
project_head_title
%body
{
class:
"#{app_theme} #{theme_type} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
%body
{
class:
"#{app_theme} #{theme_type} project"
,
:'data-page'
=>
body_data_page
,
:'data-project-id'
=>
@project
.
id
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/init_auto_complete"
=
render
"layouts/init_auto_complete"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
app/views/layouts/public_group.html.haml
浏览文件 @
f79f7585
...
@@ -2,6 +2,5 @@
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
group_head_title
=
render
"layouts/head"
,
title:
group_head_title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
"group:
#{
@group
.
name
}
"
=
render
"layouts/public_head_panel"
,
title:
"group:
#{
@group
.
name
}
"
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/group'
app/views/layouts/public_projects.html.haml
浏览文件 @
f79f7585
...
@@ -2,6 +2,5 @@
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
=
render
"layouts/head"
,
title:
@project
.
name_with_namespace
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/public_head_panel"
,
title:
project_title
(
@project
)
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
=
render
'layouts/page'
,
sidebar:
'layouts/nav/project'
app/views/layouts/public_users.html.haml
浏览文件 @
f79f7585
...
@@ -2,6 +2,5 @@
...
@@ -2,6 +2,5 @@
%html
{
lang:
"en"
}
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
@title
=
render
"layouts/head"
,
title:
@title
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme} #{theme_type} application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/public_head_panel"
,
title:
@title
=
render
"layouts/public_head_panel"
,
title:
@title
=
render
'layouts/page'
=
render
'layouts/page'
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录