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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
bb786527
Commit
bb786527
authored
Apr 27, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new renamed markup method
parent
b6566277
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
app/views/projects/blob/viewers/_markup.html.haml
app/views/projects/blob/viewers/_markup.html.haml
+1
-1
spec/features/copy_as_gfm_spec.rb
spec/features/copy_as_gfm_spec.rb
+2
-0
No files found.
app/views/projects/blob/viewers/_markup.html.haml
View file @
bb786527
-
blob
=
viewer
.
blob
-
blob
=
viewer
.
blob
.file-content.wiki
.file-content.wiki
=
render_
markup
(
blob
.
name
,
blob
.
data
)
=
markup
(
blob
.
name
,
blob
.
data
)
spec/features/copy_as_gfm_spec.rb
View file @
bb786527
...
@@ -479,6 +479,7 @@ describe 'Copy as GFM', feature: true, js: true do
...
@@ -479,6 +479,7 @@ describe 'Copy as GFM', feature: true, js: true do
context
'from a blob'
do
context
'from a blob'
do
before
do
before
do
visit
namespace_project_blob_path
(
project
.
namespace
,
project
,
File
.
join
(
'master'
,
'files/ruby/popen.rb'
))
visit
namespace_project_blob_path
(
project
.
namespace
,
project
,
File
.
join
(
'master'
,
'files/ruby/popen.rb'
))
wait_for_ajax
end
end
context
'selecting one word of text'
do
context
'selecting one word of text'
do
...
@@ -520,6 +521,7 @@ describe 'Copy as GFM', feature: true, js: true do
...
@@ -520,6 +521,7 @@ describe 'Copy as GFM', feature: true, js: true do
context
'from a GFM code block'
do
context
'from a GFM code block'
do
before
do
before
do
visit
namespace_project_blob_path
(
project
.
namespace
,
project
,
File
.
join
(
'markdown'
,
'doc/api/users.md'
))
visit
namespace_project_blob_path
(
project
.
namespace
,
project
,
File
.
join
(
'markdown'
,
'doc/api/users.md'
))
wait_for_ajax
end
end
context
'selecting one word of text'
do
context
'selecting one word of text'
do
...
...
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