Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
193f9050
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,发现更多精彩内容 >>
提交
193f9050
编写于
4月 22, 2015
作者:
M
Marin Jankovski
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:gitlabhq/gitlabhq
上级
2c4eef58
5e9d4a08
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
5 addition
and
3 deletion
+5
-3
CHANGELOG
CHANGELOG
+1
-0
app/models/project_services/hipchat_service.rb
app/models/project_services/hipchat_service.rb
+3
-2
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
193f9050
...
@@ -11,6 +11,7 @@ v 7.11.0 (unreleased)
...
@@ -11,6 +11,7 @@ v 7.11.0 (unreleased)
-
-
-
-
- Improve new project command options (Ben Bodenmiller)
- Improve new project command options (Ben Bodenmiller)
- Prevent sending empty messages to HipChat (Chulki Lee)
v 7.10.0 (unreleased)
v 7.10.0 (unreleased)
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
...
...
app/models/project_services/hipchat_service.rb
浏览文件 @
193f9050
...
@@ -50,8 +50,9 @@ class HipchatService < Service
...
@@ -50,8 +50,9 @@ class HipchatService < Service
def
execute
(
data
)
def
execute
(
data
)
return
unless
supported_events
.
include?
(
data
[
:object_kind
])
return
unless
supported_events
.
include?
(
data
[
:object_kind
])
message
=
create_message
(
data
)
gate
[
room
].
send
(
'GitLab'
,
create_message
(
data
))
return
unless
message
.
present?
gate
[
room
].
send
(
'GitLab'
,
message
)
end
end
private
private
...
...
app/views/projects/_md_preview.html.haml
浏览文件 @
193f9050
...
@@ -9,5 +9,5 @@
...
@@ -9,5 +9,5 @@
%div
%div
.md-write-holder
.md-write-holder
=
yield
=
yield
.md-preview-holder.hide
.md
.md
-preview-holder.hide
.js-md-preview
{
class:
(
preview_class
if
defined?
(
preview_class
))}
.js-md-preview
{
class:
(
preview_class
if
defined?
(
preview_class
))}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录