Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9e806fd4
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,发现更多精彩内容 >>
提交
9e806fd4
编写于
7月 28, 2017
作者:
J
Jacob Schatz
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide
上级
0c560cbb
a536a9ed
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
6 addition
and
8 deletion
+6
-8
app/helpers/tree_helper.rb
app/helpers/tree_helper.rb
+1
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-3
app/views/layouts/header/_new.html.haml
app/views/layouts/header/_new.html.haml
+1
-3
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+2
-0
app/views/shared/_user_dropdown_experimental_features.html.haml
...ews/shared/_user_dropdown_experimental_features.html.haml
+1
-0
app/views/shared/repo/_user_dropdown_link.html.haml
app/views/shared/repo/_user_dropdown_link.html.haml
+0
-1
未找到文件。
app/helpers/tree_helper.rb
浏览文件 @
9e806fd4
...
...
@@ -14,7 +14,7 @@ module TreeHelper
def
repo_url
(
project
)
if
controller_name
==
'projects'
readme_path
(
project
)
readme_path
(
project
)
||
project_tree_path
(
project
,
project
.
default_branch
)
else
request
.
original_url
end
...
...
app/views/layouts/header/_default.html.haml
浏览文件 @
9e806fd4
...
...
@@ -74,9 +74,7 @@
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
data:
{
user:
current_user
.
username
}
%li
=
link_to
"Settings"
,
profile_path
%li
=
link_to
"Turn on new navigation"
,
profile_preferences_path
(
anchor:
"new-navigation"
)
=
render
'shared/repo/user_dropdown_link'
=
render
'shared/user_dropdown_experimental_features'
%li
.divider
%li
=
link_to
"Sign out"
,
destroy_user_session_path
,
method: :delete
,
class:
"sign-out-link"
...
...
app/views/layouts/header/_new.html.haml
浏览文件 @
9e806fd4
...
...
@@ -68,9 +68,7 @@
=
link_to
"Profile"
,
current_user
,
class:
'profile-link'
,
data:
{
user:
current_user
.
username
}
%li
=
link_to
"Settings"
,
profile_path
%li
=
link_to
"Turn off new navigation"
,
profile_preferences_path
(
anchor:
"new-navigation"
)
=
render
'shared/repo/user_dropdown_link'
=
render
'shared/user_dropdown_experimental_features'
%li
.divider
%li
=
link_to
"Sign out"
,
destroy_user_session_path
,
method: :delete
,
class:
"sign-out-link"
...
...
app/views/profiles/preferences/show.html.haml
浏览文件 @
9e806fd4
...
...
@@ -18,6 +18,8 @@
=
scheme
.
name
.col-sm-12
%hr
%h3
#experimental-features
Experimental features
%hr
.col-lg-4.profile-settings-sidebar
#new-navigation
%h4
.prepend-top-0
New Navigation
...
...
app/views/shared/_user_dropdown_experimental_features.html.haml
0 → 100644
浏览文件 @
9e806fd4
%li
=
link_to
'Experimental features'
,
profile_preferences_path
(
anchor:
'experimental-features'
)
app/views/shared/repo/_user_dropdown_link.html.haml
已删除
100644 → 0
浏览文件 @
0c560cbb
%li
=
link_to
"Turn
#{
show_new_repo?
?
'off'
:
'on'
}
new repository"
,
profile_preferences_path
(
anchor:
"new-repository"
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录