Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
740e54c3
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 搜索 >>
提交
740e54c3
编写于
4月 11, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #667 from keikubo/master
The indents errors of pre blocks in haml
上级
e7add858
42f04bf7
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
25 addition
and
15 deletion
+25
-15
app/views/errors/gitolite.html.haml
app/views/errors/gitolite.html.haml
+3
-2
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+2
-1
app/views/merge_requests/_how_to_merge.html.haml
app/views/merge_requests/_how_to_merge.html.haml
+6
-5
app/views/milestones/show.html.haml
app/views/milestones/show.html.haml
+2
-1
app/views/notes/_show.html.haml
app/views/notes/_show.html.haml
+2
-1
app/views/projects/empty.html.haml
app/views/projects/empty.html.haml
+6
-3
app/views/refs/_tree.html.haml
app/views/refs/_tree.html.haml
+2
-1
app/views/wikis/show.html.haml
app/views/wikis/show.html.haml
+2
-1
未找到文件。
app/views/errors/gitolite.html.haml
浏览文件 @
740e54c3
...
...
@@ -14,5 +14,6 @@
%p
Try:
%pre
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
=
preserve
do
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
app/views/issues/show.html.haml
浏览文件 @
740e54c3
...
...
@@ -42,7 +42,8 @@
-
if
@issue
.
description
.
present?
.bottom_box_content
=
markdown
@issue
.
description
=
preserve
do
=
markdown
@issue
.
description
.issue_notes
#notes
=
render
"notes/notes"
,
:tid
=>
@issue
.
id
,
:tt
=>
"issue"
app/views/merge_requests/_how_to_merge.html.haml
浏览文件 @
740e54c3
...
...
@@ -4,11 +4,12 @@
%h3
How To Merge
.modal-body
%pre
:erb
git checkout
<%=
@merge_request
.
target_branch
%>
git fetch origin
git merge origin/
<%=
@merge_request
.
source_branch
%>
git push origin
<%=
@merge_request
.
target_branch
%>
=
preserve
do
:erb
git checkout
<%=
@merge_request
.
target_branch
%>
git fetch origin
git merge origin/
<%=
@merge_request
.
source_branch
%>
git push origin
<%=
@merge_request
.
target_branch
%>
:javascript
...
...
app/views/milestones/show.html.haml
浏览文件 @
740e54c3
...
...
@@ -39,7 +39,8 @@
-
if
@milestone
.
description
.
present?
.bottom_box_content
=
markdown
@milestone
.
description
=
preserve
do
=
markdown
@milestone
.
description
:javascript
...
...
app/views/notes/_show.html.haml
浏览文件 @
740e54c3
...
...
@@ -9,7 +9,8 @@
%strong
=
link_to
"Remove"
,
[
@project
,
note
],
:confirm
=>
'Are you sure?'
,
:method
=>
:delete
,
:remote
=>
true
,
:class
=>
"cred delete-note btn small"
%div
.note-title
=
markdown
(
note
.
note
)
=
preserve
do
=
markdown
(
note
.
note
)
-
if
note
.
attachment
.
url
.right
%div
.file
...
...
app/views/projects/empty.html.haml
浏览文件 @
740e54c3
...
...
@@ -15,7 +15,8 @@
%h3
Git global setup:
-
setup_str
=
[
"git config --global user.name
\"
#{
current_user
.
name
}
\"
"
,
"git config --global user.email \"
#{
current_user
.
email
}
\""].join("\n")
=
raw
bash_lexer
.
highlight
(
setup_str
,
:lexer
=>
'bash'
,
:options
=>
{
:encoding
=>
'utf-8'
})
=
preserve
do
=
raw
bash_lexer
.
highlight
(
setup_str
,
:lexer
=>
'bash'
,
:options
=>
{
:encoding
=>
'utf-8'
})
%br
%br
...
...
@@ -29,7 +30,8 @@
"git remote add origin
#{
@project
.
url_to_repo
}
",
"git push -u origin master"].join("\n")
=
raw
bash_lexer
.
highlight
(
repo_setup_str
)
=
preserve
do
=
raw
bash_lexer
.
highlight
(
repo_setup_str
)
%br
%br
...
...
@@ -37,7 +39,8 @@
-
exist_repo_setup_str
=
[
"cd existing_git_repo"
,
"git remote add origin
#{
@project
.
url_to_repo
}
"
,
"git push -u origin master"
].
join
(
"
\n
"
)
=
raw
bash_lexer
.
highlight
(
exist_repo_setup_str
)
=
preserve
do
=
raw
bash_lexer
.
highlight
(
exist_repo_setup_str
)
-
if
can?
current_user
,
:admin_project
,
@project
.alert-message.block-message.error.prepend-top-20
...
...
app/views/refs/_tree.html.haml
浏览文件 @
740e54c3
...
...
@@ -41,7 +41,8 @@
%h3
=
content
.
name
.readme
-
if
content
.
name
=~
/\.(md|markdown)$/i
=
markdown
(
content
.
data
)
=
preserve
do
=
markdown
(
content
.
data
)
-
else
=
simple_format
(
content
.
data
)
...
...
app/views/wikis/show.html.haml
浏览文件 @
740e54c3
...
...
@@ -8,7 +8,8 @@
Edit
%hr
.wiki_content
=
markdown_to_html
@wiki
.
content
=
preserve
do
=
markdown_to_html
@wiki
.
content
%p
.time
Last edited by
#{
@wiki
.
user
.
name
}
, in
#{
time_ago_in_words
@wiki
.
created_at
}
-
if
can?
current_user
,
:admin_wiki
,
@project
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录