Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
86ce64f0
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,发现更多精彩内容 >>
提交
86ce64f0
编写于
11月 16, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
上级
a43a218c
5be2191b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
28 deletion
+21
-28
CHANGELOG
CHANGELOG
+1
-0
app/views/devise/shared/_signin_box.html.haml
app/views/devise/shared/_signin_box.html.haml
+19
-27
lib/gitlab/markdown/relative_link_filter.rb
lib/gitlab/markdown/relative_link_filter.rb
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
86ce64f0
...
...
@@ -40,6 +40,7 @@ v 8.2.0 (unreleased)
- Make color of "Accept Merge Request" button consistent with current build status
- Add ignore white space option in merge request diff and commit and compare view
- Ability to add release notes (markdown text and attachments) to git tags (aka Releases)
- Relative links from a repositories README.md now link to the default branch
v 8.1.4
- Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu)
...
...
app/views/devise/shared/_signin_box.html.haml
浏览文件 @
86ce64f0
...
...
@@ -7,34 +7,26 @@
%h3
Sign in
.login-body
-
if
form_based_providers
.
any?
-
if
form_based_providers
.
count
>=
2
||
signin_enabled?
%ul
.nav.nav-tabs
-
if
crowd_enabled?
%li
.active
=
link_to
"Crowd"
,
"#tab-crowd"
,
'data-toggle'
=>
'tab'
-
@ldap_servers
.
each_with_index
do
|
server
,
i
|
%li
{
class:
(
:active
if
i
.
zero?
&&
!
crowd_enabled?
)}
=
link_to
server
[
'label'
],
"#tab-
#{
server
[
'provider_name'
]
}
"
,
'data-toggle'
=>
'tab'
-
if
signin_enabled?
%li
=
link_to
'Standard'
,
'#tab-signin'
,
'data-toggle'
=>
'tab'
.tab-content
-
if
crowd_enabled?
%div
.tab-pane.active
{
id:
"tab-crowd"
}
=
render
'devise/sessions/new_crowd'
-
@ldap_servers
.
each_with_index
do
|
server
,
i
|
%div
.tab-pane
{
id:
"tab-#{server['provider_name']}"
,
class:
(
:active
if
i
.
zero?
&&
!
crowd_enabled?
)}
=
render
'devise/sessions/new_ldap'
,
server:
server
-
if
signin_enabled?
%div
#tab-signin
.tab-pane
=
render
'devise/sessions/new_base'
-
else
%ul
.nav.nav-tabs
-
if
crowd_enabled?
=
render
'devise/sessions/new_crowd'
-
elsif
@ldap_servers
.
any?
=
render
'devise/sessions/new_ldap'
,
server:
@ldap_servers
.
first
-
elsif
signin_enabled?
=
render
'devise/sessions/new_base'
%li
.active
=
link_to
"Crowd"
,
"#tab-crowd"
,
'data-toggle'
=>
'tab'
-
@ldap_servers
.
each_with_index
do
|
server
,
i
|
%li
{
class:
(
:active
if
i
.
zero?
&&
!
crowd_enabled?
)}
=
link_to
server
[
'label'
],
"#tab-
#{
server
[
'provider_name'
]
}
"
,
'data-toggle'
=>
'tab'
-
if
signin_enabled?
%li
=
link_to
'Standard'
,
'#tab-signin'
,
'data-toggle'
=>
'tab'
.tab-content
-
if
crowd_enabled?
%div
.tab-pane.active
{
id:
"tab-crowd"
}
=
render
'devise/sessions/new_crowd'
-
@ldap_servers
.
each_with_index
do
|
server
,
i
|
%div
.tab-pane
{
id:
"tab-#{server['provider_name']}"
,
class:
(
:active
if
i
.
zero?
&&
!
crowd_enabled?
)}
=
render
'devise/sessions/new_ldap'
,
server:
server
-
if
signin_enabled?
%div
#tab-signin
.tab-pane
=
render
'devise/sessions/new_base'
-
elsif
signin_enabled?
=
render
'devise/sessions/new_base'
lib/gitlab/markdown/relative_link_filter.rb
浏览文件 @
86ce64f0
...
...
@@ -51,7 +51,7 @@ module Gitlab
relative_url_root
,
context
[
:project
].
path_with_namespace
,
path_type
(
file_path
),
ref
||
'master'
,
# assume that if no ref exists we can point to master
ref
||
context
[
:project
].
default_branch
,
# if no ref exists, point to the default branch
file_path
].
compact
.
join
(
'/'
).
squeeze
(
'/'
).
chomp
(
'/'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录