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
d95bffc6
Commit
d95bffc6
authored
Apr 03, 2017
by
Toon Claes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename GitlabMarkdownHelper -> MarkupHelper
It does more than solely GitLab Markdown, so rename to MarkupHelper.
parent
025b04f3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
6 deletions
+6
-6
app/helpers/markup_helper.rb
app/helpers/markup_helper.rb
+1
-1
app/mailers/base_mailer.rb
app/mailers/base_mailer.rb
+1
-1
spec/features/copy_as_gfm_spec.rb
spec/features/copy_as_gfm_spec.rb
+1
-1
spec/features/markdown_spec.rb
spec/features/markdown_spec.rb
+1
-1
spec/helpers/markup_helper_spec.rb
spec/helpers/markup_helper_spec.rb
+1
-1
spec/services/system_note_service_spec.rb
spec/services/system_note_service_spec.rb
+1
-1
No files found.
app/helpers/
gitlab_markdown
_helper.rb
→
app/helpers/
markup
_helper.rb
View file @
d95bffc6
require
'nokogiri'
require
'nokogiri'
module
GitlabMarkdown
Helper
module
Markup
Helper
# Use this in places where you would normally use link_to(gfm(...), ...).
# Use this in places where you would normally use link_to(gfm(...), ...).
#
#
# It solves a problem occurring with nested links (i.e.
# It solves a problem occurring with nested links (i.e.
...
...
app/mailers/base_mailer.rb
View file @
d95bffc6
class
BaseMailer
<
ActionMailer
::
Base
class
BaseMailer
<
ActionMailer
::
Base
helper
ApplicationHelper
helper
ApplicationHelper
helper
GitlabMarkdown
Helper
helper
Markup
Helper
attr_accessor
:current_user
attr_accessor
:current_user
helper_method
:current_user
,
:can?
helper_method
:current_user
,
:can?
...
...
spec/features/copy_as_gfm_spec.rb
View file @
d95bffc6
require
'spec_helper'
require
'spec_helper'
describe
'Copy as GFM'
,
feature:
true
,
js:
true
do
describe
'Copy as GFM'
,
feature:
true
,
js:
true
do
include
GitlabMarkdown
Helper
include
Markup
Helper
include
RepoHelpers
include
RepoHelpers
include
ActionView
::
Helpers
::
JavaScriptHelper
include
ActionView
::
Helpers
::
JavaScriptHelper
...
...
spec/features/markdown_spec.rb
View file @
d95bffc6
...
@@ -26,7 +26,7 @@ require 'erb'
...
@@ -26,7 +26,7 @@ require 'erb'
describe
'GitLab Markdown'
,
feature:
true
do
describe
'GitLab Markdown'
,
feature:
true
do
include
Capybara
::
Node
::
Matchers
include
Capybara
::
Node
::
Matchers
include
GitlabMarkdown
Helper
include
Markup
Helper
include
MarkdownMatchers
include
MarkdownMatchers
# Sometimes it can be useful to see the parsed output of the Markdown document
# Sometimes it can be useful to see the parsed output of the Markdown document
...
...
spec/helpers/
gitlab_markdown
_helper_spec.rb
→
spec/helpers/
markup
_helper_spec.rb
View file @
d95bffc6
require
'spec_helper'
require
'spec_helper'
describe
GitlabMarkdown
Helper
do
describe
Markup
Helper
do
include
ApplicationHelper
include
ApplicationHelper
let!
(
:project
)
{
create
(
:project
,
:repository
)
}
let!
(
:project
)
{
create
(
:project
,
:repository
)
}
...
...
spec/services/system_note_service_spec.rb
View file @
d95bffc6
...
@@ -595,7 +595,7 @@ describe SystemNoteService, services: true do
...
@@ -595,7 +595,7 @@ describe SystemNoteService, services: true do
end
end
shared_examples
'cross project mentionable'
do
shared_examples
'cross project mentionable'
do
include
GitlabMarkdown
Helper
include
Markup
Helper
it
'contains cross reference to new noteable'
do
it
'contains cross reference to new noteable'
do
expect
(
subject
.
note
).
to
include
cross_project_reference
(
new_project
,
new_noteable
)
expect
(
subject
.
note
).
to
include
cross_project_reference
(
new_project
,
new_noteable
)
...
...
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