Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
fdbaffdc
Commit
fdbaffdc
authored
Jul 10, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ce
parents
d1261d88
360ee25d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
7 deletions
+13
-7
app/helpers/gitlab_markdown_helper.rb
app/helpers/gitlab_markdown_helper.rb
+1
-1
app/views/projects/_zen.html.haml
app/views/projects/_zen.html.haml
+1
-1
app/views/projects/notes/_edit_form.html.haml
app/views/projects/notes/_edit_form.html.haml
+2
-2
app/views/projects/notes/_form.html.haml
app/views/projects/notes/_form.html.haml
+8
-2
spec/helpers/gitlab_markdown_helper_spec.rb
spec/helpers/gitlab_markdown_helper_spec.rb
+1
-1
No files found.
app/helpers/gitlab_markdown_helper.rb
View file @
fdbaffdc
...
@@ -118,7 +118,7 @@ module GitlabMarkdownHelper
...
@@ -118,7 +118,7 @@ module GitlabMarkdownHelper
# Returns a random markdown tip for use as a textarea placeholder
# Returns a random markdown tip for use as a textarea placeholder
def
random_markdown_tip
def
random_markdown_tip
"Tip:
#{
MARKDOWN_TIPS
.
sample
}
"
MARKDOWN_TIPS
.
sample
end
end
private
private
...
...
app/views/projects/_zen.html.haml
View file @
fdbaffdc
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%input
#zen-toggle-comment
.zen-toggle-comment
{
tabindex:
'-1'
,
type:
'checkbox'
}
%input
#zen-toggle-comment
.zen-toggle-comment
{
tabindex:
'-1'
,
type:
'checkbox'
}
.zen-backdrop
.zen-backdrop
-
classes
<<
' js-gfm-input markdown-area'
-
classes
<<
' js-gfm-input markdown-area'
=
f
.
text_area
attr
,
class:
classes
,
placeholder:
random_markdown_tip
=
f
.
text_area
attr
,
class:
classes
,
placeholder:
''
=
link_to
nil
,
class:
'zen-enter-link'
,
tabindex:
'-1'
do
=
link_to
nil
,
class:
'zen-enter-link'
,
tabindex:
'-1'
do
%i
.fa.fa-expand
%i
.fa.fa-expand
Edit in fullscreen
Edit in fullscreen
...
...
app/views/projects/notes/_edit_form.html.haml
View file @
fdbaffdc
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
=
render
'projects/zen'
,
f:
f
,
attr: :note
,
classes:
'note_text js-note-text js-task-list-field'
=
render
'projects/zen'
,
f:
f
,
attr: :note
,
classes:
'note_text js-note-text js-task-list-field'
.comment-hints.clearfix
.comment-hints.clearfix
.pull-left
Comments are parsed with
#{
link_to
'GitLab Flavored Markdown
'
,
help_page_path
(
'markdown'
,
'markdown'
),{
target:
'_blank'
,
tabindex:
-
1
}
}
.pull-left
#{
link_to
'Markdown
'
,
help_page_path
(
'markdown'
,
'markdown'
),{
target:
'_blank'
,
tabindex:
-
1
}
}
.pull-right
Attach files by dragging
&
dropping or
#{
link_to
'selecting them'
,
'#'
,
class:
'markdown-selector'
,
tabindex:
-
1
}
.
.pull-right
#{
link_to
'Attach a file'
,
'#'
,
class:
'markdown-selector'
,
tabindex:
-
1
}
.note-form-actions
.note-form-actions
.buttons
.buttons
...
...
app/views/projects/notes/_form.html.haml
View file @
fdbaffdc
...
@@ -12,8 +12,14 @@
...
@@ -12,8 +12,14 @@
classes:
'note_text js-note-text'
classes:
'note_text js-note-text'
.comment-hints.clearfix
.comment-hints.clearfix
.pull-left
Comments are parsed with
#{
link_to
"GitLab Flavored Markdown"
,
help_page_path
(
"markdown"
,
"markdown"
),{
target:
'_blank'
,
tabindex:
-
1
}
}
.pull-left
.pull-right
Attach files by dragging
&
dropping or
#{
link_to
"selecting them"
,
'#'
,
class:
'markdown-selector'
,
tabindex:
-
1
}
.
=
link_to
"Markdown "
,
help_page_path
(
"markdown"
,
"markdown"
),{
target:
'_blank'
,
tabindex:
-
1
}
tip:
=
random_markdown_tip
.pull-right
=
link_to
'#'
,
class:
'markdown-selector'
,
tabindex:
-
1
do
Attach a file
=
icon
(
'paperclip'
)
.error-alert
.error-alert
.note-form-actions
.note-form-actions
...
...
spec/helpers/gitlab_markdown_helper_spec.rb
View file @
fdbaffdc
...
@@ -137,7 +137,7 @@ describe GitlabMarkdownHelper do
...
@@ -137,7 +137,7 @@ describe GitlabMarkdownHelper do
describe
'random_markdown_tip'
do
describe
'random_markdown_tip'
do
it
'returns a random Markdown tip'
do
it
'returns a random Markdown tip'
do
stub_const
(
"
#{
described_class
}
::MARKDOWN_TIPS"
,
[
'Random tip'
])
stub_const
(
"
#{
described_class
}
::MARKDOWN_TIPS"
,
[
'Random tip'
])
expect
(
random_markdown_tip
).
to
eq
'
Tip:
Random tip'
expect
(
random_markdown_tip
).
to
eq
'Random tip'
end
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment