Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9562f028
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,发现更多精彩内容 >>
提交
9562f028
编写于
6月 09, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
上级
4e9de952
18e33e03
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
32 addition
and
7 deletion
+32
-7
app/models/concerns/mentionable.rb
app/models/concerns/mentionable.rb
+7
-1
app/views/layouts/_head.html.haml
app/views/layouts/_head.html.haml
+0
-2
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+3
-0
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml
+2
-2
doc_styleguide.md
doc_styleguide.md
+1
-0
spec/models/concerns/mentionable_spec.rb
spec/models/concerns/mentionable_spec.rb
+19
-2
未找到文件。
app/models/concerns/mentionable.rb
浏览文件 @
9562f028
...
...
@@ -67,7 +67,13 @@ module Mentionable
# Create a cross-reference Note for each GFM reference to another Mentionable found in +mentionable_text+.
def
create_cross_references!
(
p
=
project
,
a
=
author
,
without
=
[])
refs
=
references
(
p
)
-
without
refs
=
references
(
p
)
# We're using this method instead of Array diffing because that requires
# both of the object's `hash` values to be the same, which may not be the
# case for otherwise identical Commit objects.
refs
.
reject!
{
|
ref
|
without
.
include?
(
ref
)
}
refs
.
each
do
|
ref
|
Note
.
create_cross_reference_note
(
ref
,
local_reference
,
a
)
end
...
...
app/views/layouts/_head.html.haml
浏览文件 @
9562f028
...
...
@@ -20,5 +20,3 @@
=
render
'layouts/google_analytics'
if
extra_config
.
has_key?
(
'google_analytics_id'
)
=
render
'layouts/piwik'
if
extra_config
.
has_key?
(
'piwik_url'
)
&&
extra_config
.
has_key?
(
'piwik_site_id'
)
=
render
'layouts/bootlint'
if
Rails
.
env
.
development?
=
yield
:scripts_head
app/views/layouts/application.html.haml
浏览文件 @
9562f028
...
...
@@ -2,6 +2,9 @@
%html
{
lang:
"en"
}
=
render
"layouts/head"
%body
{
class:
"#{app_theme}"
,
:'data-page'
=>
body_data_page
}
/ Ideally this would be inside the head, but turbolinks only evaluates page-specific JS in the body.
=
yield
:scripts_body_top
-
if
current_user
=
render
"layouts/header/default"
,
title:
header_title
-
else
...
...
app/views/layouts/project.html.haml
浏览文件 @
9562f028
...
...
@@ -2,8 +2,8 @@
-
header_title
project_title
(
@project
)
-
sidebar
"project"
unless
sidebar
-
content_for
:scripts_
head
do
-
if
current_user
-
content_for
:scripts_
body_top
do
-
if
current_user
:javascript
window
.
project_uploads_path
=
"
#{
namespace_project_uploads_path
@project
.
namespace
,
@project
}
"
;
window
.
markdown_preview_path
=
"
#{
markdown_preview_namespace_project_path
(
@project
.
namespace
,
@project
)
}
"
;
...
...
doc_styleguide.md
浏览文件 @
9562f028
...
...
@@ -12,6 +12,7 @@ This styleguide recommends best practices to improve documentation and to keep i
*
Be brief and clear.
*
Whenever it applies, add documents in alphabetical order.
## When adding images to a document
...
...
spec/models/concerns/mentionable_spec.rb
浏览文件 @
9562f028
require
'spec_helper'
describe
Issue
,
"Mentionable"
do
describe
:mentioned_users
do
describe
'#mentioned_users'
do
let!
(
:user
)
{
create
(
:user
,
username:
'stranger'
)
}
let!
(
:user2
)
{
create
(
:user
,
username:
'john'
)
}
let!
(
:issue
)
{
create
(
:issue
,
description:
'@stranger mentioned'
)
}
let!
(
:issue
)
{
create
(
:issue
,
description:
"
#{
user
.
to_reference
}
mentioned"
)
}
subject
{
issue
.
mentioned_users
}
it
{
is_expected
.
to
include
(
user
)
}
it
{
is_expected
.
not_to
include
(
user2
)
}
end
describe
'#create_cross_references!'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:author
)
{
double
(
'author'
)
}
let
(
:commit
)
{
project
.
commit
}
let
(
:commit2
)
{
project
.
commit
}
let!
(
:issue
)
do
create
(
:issue
,
project:
project
,
description:
commit
.
to_reference
)
end
it
'correctly removes already-mentioned Commits'
do
expect
(
Note
).
not_to
receive
(
:create_cross_reference_note
)
issue
.
create_cross_references!
(
project
,
author
,
[
commit2
])
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录