Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
56a17a77
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,体验更适合开发者的 AI 搜索 >>
提交
56a17a77
编写于
6月 02, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Put project Files and Commits tabs under Code tab
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
ae5f17ae
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
16 addition
and
17 deletion
+16
-17
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/branches_controller.rb
app/controllers/projects/branches_controller.rb
+1
-1
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+9
-10
app/views/projects/branches/destroy.js.haml
app/views/projects/branches/destroy.js.haml
+0
-1
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
+4
-4
app/views/projects/tags/destroy.js.haml
app/views/projects/tags/destroy.js.haml
+0
-1
app/views/projects/tree/show.html.haml
app/views/projects/tree/show.html.haml
+1
-0
未找到文件。
CHANGELOG
浏览文件 @
56a17a77
...
...
@@ -32,6 +32,7 @@ v 8.9.0 (unreleased)
- Cache project build count in sidebar nav
- Reduce number of queries needed to render issue labels in the sidebar
- Improve error handling importing projects
- Put project Files and Commits tabs under Code tab
v 8.8.3
- Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
...
...
app/controllers/projects/branches_controller.rb
浏览文件 @
56a17a77
...
...
@@ -50,7 +50,7 @@ class Projects::BranchesController < Projects::ApplicationController
redirect_to
namespace_project_branches_path
(
@project
.
namespace
,
@project
),
status:
303
end
format
.
js
{
render
status:
status
[
:return_code
]
}
format
.
js
{
head
:ok
}
end
end
...
...
app/views/layouts/nav/_project.html.haml
浏览文件 @
56a17a77
...
...
@@ -33,18 +33,11 @@
%span
Activity
-
if
project_nav_tab?
:files
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file)
)
do
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file
commit commits compare repositories tags branches releases network
)
)
do
=
link_to
project_files_path
(
@project
),
title:
'Files'
,
class:
'shortcuts-tree'
do
=
icon
(
'
files-o
fw'
)
=
icon
(
'
code
fw'
)
%span
Files
-
if
project_nav_tab?
:commits
=
nav_link
(
controller:
%w(commit commits compare repositories tags branches releases network)
)
do
=
link_to
project_commits_path
(
@project
),
title:
'Commits'
,
class:
'shortcuts-commits'
do
=
icon
(
'history fw'
)
%span
Commits
Code
-
if
project_nav_tab?
:pipelines
=
nav_link
(
controller: :pipelines
)
do
...
...
@@ -129,4 +122,10 @@
=
link_to
project_builds_path
(
@project
),
title:
'Builds'
,
class:
'shortcuts-builds'
do
Builds
-# Shortcut to commits page
-
if
project_nav_tab?
:commits
%li
.hidden
=
link_to
project_commits_path
(
@project
),
title:
'Commits'
,
class:
'shortcuts-commits'
do
Commits
.fade-right
app/views/projects/branches/destroy.js.haml
已删除
100644 → 0
浏览文件 @
ae5f17ae
$('.js-totalbranch-count').html("
#{
@repository
.
branch_count
}
")
app/views/projects/commits/_head.html.haml
浏览文件 @
56a17a77
%ul
.nav-links
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree find_file)
)
do
=
link_to
project_files_path
(
@project
)
do
Files
=
nav_link
(
controller:
[
:commit
,
:commits
])
do
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
current_ref
)
do
Commits
%span
.badge
=
number_with_delimiter
(
@repository
.
commit_count
)
=
nav_link
(
controller:
%w(network)
)
do
=
link_to
namespace_project_network_path
(
@project
.
namespace
,
@project
,
current_ref
)
do
...
...
@@ -16,9 +18,7 @@
=
nav_link
(
html_options:
{
class:
branches_tab_class
})
do
=
link_to
namespace_project_branches_path
(
@project
.
namespace
,
@project
)
do
Branches
%span
.badge.js-totalbranch-count
=
@repository
.
branch_count
=
nav_link
(
controller:
[
:tags
,
:releases
])
do
=
link_to
namespace_project_tags_path
(
@project
.
namespace
,
@project
)
do
Tags
%span
.badge.js-totaltags-count
=
@repository
.
tag_count
app/views/projects/tags/destroy.js.haml
浏览文件 @
56a17a77
$('.js-totaltags-count').html("
#{
@repository
.
tags
.
size
}
");
-
if
@repository
.
tags
.
empty?
$('.tags').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000)
app/views/projects/tree/show.html.haml
浏览文件 @
56a17a77
...
...
@@ -3,6 +3,7 @@
-
if
current_user
=
auto_discovery_link_tag
(
:atom
,
namespace_project_commits_url
(
@project
.
namespace
,
@project
,
@ref
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"
#{
@project
.
name
}
:
#{
@ref
}
commits"
)
=
render
'projects/last_push'
=
render
"projects/commits/head"
.tree-controls
=
render
'projects/find_file_link'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录