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
Kazuhiko Shiozaki
gitlab-ce
Commits
0430c00c
Commit
0430c00c
authored
Jan 14, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
fc9a2a3e
b6454fef
Changes
34
Show whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
633 additions
and
135 deletions
+633
-135
CHANGELOG
CHANGELOG
+2
-0
app/assets/javascripts/wikis.js.coffee
app/assets/javascripts/wikis.js.coffee
+13
-12
app/controllers/sent_notifications_controller.rb
app/controllers/sent_notifications_controller.rb
+25
-0
app/helpers/gitlab_markdown_helper.rb
app/helpers/gitlab_markdown_helper.rb
+1
-1
app/mailers/emails/issues.rb
app/mailers/emails/issues.rb
+18
-20
app/mailers/emails/merge_requests.rb
app/mailers/emails/merge_requests.rb
+21
-34
app/mailers/emails/notes.rb
app/mailers/emails/notes.rb
+21
-23
app/mailers/notify.rb
app/mailers/notify.rb
+2
-3
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+6
-0
app/models/project_wiki.rb
app/models/project_wiki.rb
+4
-0
app/models/sent_notification.rb
app/models/sent_notification.rb
+9
-3
app/models/wiki_page.rb
app/models/wiki_page.rb
+1
-1
app/views/layouts/notify.html.haml
app/views/layouts/notify.html.haml
+6
-2
app/views/projects/wikis/_new.html.haml
app/views/projects/wikis/_new.html.haml
+4
-7
config/routes.rb
config/routes.rb
+7
-1
features/project/wiki.feature
features/project/wiki.feature
+0
-5
features/steps/project/wiki.rb
features/steps/project/wiki.rb
+0
-10
lib/banzai/filter/gollum_tags_filter.rb
lib/banzai/filter/gollum_tags_filter.rb
+151
-0
lib/banzai/pipeline/wiki_pipeline.rb
lib/banzai/pipeline/wiki_pipeline.rb
+11
-0
lib/gitlab/github_import/importer.rb
lib/gitlab/github_import/importer.rb
+23
-4
lib/gitlab/github_import/project_creator.rb
lib/gitlab/github_import/project_creator.rb
+2
-1
lib/gitlab/github_import/wiki_formatter.rb
lib/gitlab/github_import/wiki_formatter.rb
+19
-0
spec/controllers/sent_notification_controller_spec.rb
spec/controllers/sent_notification_controller_spec.rb
+26
-0
spec/factories.rb
spec/factories.rb
+7
-0
spec/features/markdown_spec.rb
spec/features/markdown_spec.rb
+58
-5
spec/fixtures/markdown.md.erb
spec/fixtures/markdown.md.erb
+9
-0
spec/helpers/gitlab_markdown_helper_spec.rb
spec/helpers/gitlab_markdown_helper_spec.rb
+3
-2
spec/lib/banzai/filter/gollum_tags_filter_spec.rb
spec/lib/banzai/filter/gollum_tags_filter_spec.rb
+89
-0
spec/lib/gitlab/github_import/wiki_formatter_spec.rb
spec/lib/gitlab/github_import/wiki_formatter_spec.rb
+22
-0
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+33
-1
spec/models/project_wiki_spec.rb
spec/models/project_wiki_spec.rb
+7
-0
spec/support/markdown_feature.rb
spec/support/markdown_feature.rb
+4
-0
spec/support/matchers/markdown_matchers.rb
spec/support/matchers/markdown_matchers.rb
+18
-0
vendor/assets/javascripts/latinise.js
vendor/assets/javascripts/latinise.js
+11
-0
No files found.
CHANGELOG
View file @
0430c00c
...
@@ -51,6 +51,7 @@ v 8.4.0 (unreleased)
...
@@ -51,6 +51,7 @@ v 8.4.0 (unreleased)
- Add API support for managing build variables of project
- Add API support for managing build variables of project
- Allow broadcast messages to be edited
- Allow broadcast messages to be edited
- Autosize Markdown textareas
- Autosize Markdown textareas
- Import GitHub wiki into GitLab
v 8.3.4
v 8.3.4
- Use gitlab-workhorse 0.5.4 (fixes API routing bug)
- Use gitlab-workhorse 0.5.4 (fixes API routing bug)
...
@@ -88,6 +89,7 @@ v 8.3.0
...
@@ -88,6 +89,7 @@ v 8.3.0
- Add open_issues_count to project API (Stan Hu)
- Add open_issues_count to project API (Stan Hu)
- Expand character set of usernames created by Omniauth (Corey Hinshaw)
- Expand character set of usernames created by Omniauth (Corey Hinshaw)
- Add button to automatically merge a merge request when the build succeeds (Zeger-Jan van de Weg)
- Add button to automatically merge a merge request when the build succeeds (Zeger-Jan van de Weg)
- Add unsubscribe link in the email footer (Zeger-Jan van de Weg)
- Provide better diagnostic message upon project creation errors (Stan Hu)
- Provide better diagnostic message upon project creation errors (Stan Hu)
- Bump devise to 3.5.3 to fix reset token expiring after account creation (Stan Hu)
- Bump devise to 3.5.3 to fix reset token expiring after account creation (Stan Hu)
- Remove api credentials from link to build_page
- Remove api credentials from link to build_page
...
...
app/assets/javascripts/wikis.js.coffee
View file @
0430c00c
#= require latinise
class
@
Wikis
class
@
Wikis
constructor
:
->
constructor
:
->
$
(
'.build-new-wiki'
).
bind
"click"
,
(
e
)
->
$
(
'.build-new-wiki'
).
bind
'click'
,
(
e
)
=>
$
(
'[data-error~=slug]'
).
addClass
(
"hidden"
)
$
(
'[data-error~=slug]'
).
addClass
(
'hidden'
)
$
(
'p.hint'
).
show
()
field
=
$
(
'#new_wiki_path'
)
field
=
$
(
'#new_wiki_path'
)
valid_slug_pattern
=
/^[\w\/-]+$/
slug
=
@
slugify
(
field
.
val
())
slug
=
field
.
val
()
if
(
slug
.
length
>
0
)
if
slug
.
match
valid_slug_pattern
path
=
field
.
attr
(
'data-wikis-path'
)
path
=
field
.
attr
(
'data-wikis-path'
)
if
(
slug
.
length
>
0
)
location
.
href
=
path
+
'/'
+
slug
location
.
href
=
path
+
"/"
+
slug
else
dasherize
:
(
value
)
->
e
.
preventDefault
()
value
.
replace
(
/[_\s]+/g
,
'-'
)
$
(
'p.hint'
).
hide
()
$
(
'[data-error~=slug]'
).
removeClass
(
"hidden"
)
slugify
:
(
value
)
=>
@
dasherize
(
value
.
trim
().
toLowerCase
().
latinise
())
app/controllers/sent_notifications_controller.rb
0 → 100644
View file @
0430c00c
class
SentNotificationsController
<
ApplicationController
skip_before_action
:authenticate_user!
def
unsubscribe
@sent_notification
=
SentNotification
.
for
(
params
[
:id
])
return
render_404
unless
@sent_notification
&&
@sent_notification
.
unsubscribable?
noteable
=
@sent_notification
.
noteable
noteable
.
unsubscribe
(
@sent_notification
.
recipient
)
flash
[
:notice
]
=
"You have been unsubscribed from this thread."
if
current_user
case
noteable
when
Issue
redirect_to
issue_path
(
noteable
)
when
MergeRequest
redirect_to
merge_request_path
(
noteable
)
else
redirect_to
root_path
end
else
redirect_to
new_user_session_path
end
end
end
app/helpers/gitlab_markdown_helper.rb
View file @
0430c00c
...
@@ -91,7 +91,7 @@ module GitlabMarkdownHelper
...
@@ -91,7 +91,7 @@ module GitlabMarkdownHelper
def
render_wiki_content
(
wiki_page
)
def
render_wiki_content
(
wiki_page
)
case
wiki_page
.
format
case
wiki_page
.
format
when
:markdown
when
:markdown
markdown
(
wiki_page
.
content
)
markdown
(
wiki_page
.
content
,
pipeline: :wiki
,
project_wiki:
@project_wiki
)
when
:asciidoc
when
:asciidoc
asciidoc
(
wiki_page
.
content
)
asciidoc
(
wiki_page
.
content
)
else
else
...
...
app/mailers/emails/issues.rb
View file @
0430c00c
module
Emails
module
Emails
module
Issues
module
Issues
def
new_issue_email
(
recipient_id
,
issue_id
)
def
new_issue_email
(
recipient_id
,
issue_id
)
issue_mail_with_notification
(
issue_id
,
recipient_id
)
do
setup_issue_mail
(
issue_id
,
recipient_id
)
mail_new_thread
(
@issue
,
issue_thread_options
(
@issue
.
author_id
,
recipient_id
))
mail_new_thread
(
@issue
,
issue_thread_options
(
@issue
.
author_id
,
recipient_id
))
end
end
end
def
reassigned_issue_email
(
recipient_id
,
issue_id
,
previous_assignee_id
,
updated_by_user_id
)
def
reassigned_issue_email
(
recipient_id
,
issue_id
,
previous_assignee_id
,
updated_by_user_id
)
issue_mail_with_notification
(
issue_id
,
recipient_id
)
do
setup_issue_mail
(
issue_id
,
recipient_id
)
@previous_assignee
=
User
.
find_by
(
id:
previous_assignee_id
)
if
previous_assignee_id
@previous_assignee
=
User
.
find_by
(
id:
previous_assignee_id
)
if
previous_assignee_id
mail_answer_thread
(
@issue
,
issue_thread_options
(
updated_by_user_id
,
recipient_id
))
mail_answer_thread
(
@issue
,
issue_thread_options
(
updated_by_user_id
,
recipient_id
))
end
end
end
def
closed_issue_email
(
recipient_id
,
issue_id
,
updated_by_user_id
)
def
closed_issue_email
(
recipient_id
,
issue_id
,
updated_by_user_id
)
issue_mail_with_notification
(
issue_id
,
recipient_id
)
do
setup_issue_mail
(
issue_id
,
recipient_id
)
@updated_by
=
User
.
find
updated_by_user_id
@updated_by
=
User
.
find
updated_by_user_id
mail_answer_thread
(
@issue
,
issue_thread_options
(
updated_by_user_id
,
recipient_id
))
mail_answer_thread
(
@issue
,
issue_thread_options
(
updated_by_user_id
,
recipient_id
))
end
end
end
def
issue_status_changed_email
(
recipient_id
,
issue_id
,
status
,
updated_by_user_id
)
def
issue_status_changed_email
(
recipient_id
,
issue_id
,
status
,
updated_by_user_id
)
issue_mail_with_notification
(
issue_id
,
recipient_id
)
do
setup_issue_mail
(
issue_id
,
recipient_id
)
@issue_status
=
status
@issue_status
=
status
@updated_by
=
User
.
find
updated_by_user_id
@updated_by
=
User
.
find
updated_by_user_id
mail_answer_thread
(
@issue
,
issue_thread_options
(
updated_by_user_id
,
recipient_id
))
mail_answer_thread
(
@issue
,
issue_thread_options
(
updated_by_user_id
,
recipient_id
))
end
end
end
private
private
...
@@ -38,14 +38,12 @@ module Emails
...
@@ -38,14 +38,12 @@ module Emails
}
}
end
end
def
issue_mail_with_notification
(
issue_id
,
recipient_id
)
def
setup_issue_mail
(
issue_id
,
recipient_id
)
@issue
=
Issue
.
find
(
issue_id
)
@issue
=
Issue
.
find
(
issue_id
)
@project
=
@issue
.
project
@project
=
@issue
.
project
@target_url
=
namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)
@target_url
=
namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)
yield
@sent_notification
=
SentNotification
.
record
(
@issue
,
recipient_id
,
reply_key
)
SentNotification
.
record
(
@issue
,
recipient_id
,
reply_key
)
end
end
end
end
end
end
app/mailers/emails/merge_requests.rb
View file @
0430c00c
module
Emails
module
Emails
module
MergeRequests
module
MergeRequests
def
new_merge_request_email
(
recipient_id
,
merge_request_id
)
def
new_merge_request_email
(
recipient_id
,
merge_request_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
setup_merge_request_mail
(
merge_request_id
,
recipient_id
)
@project
=
@merge_request
.
project
@target_url
=
namespace_project_merge_request_url
(
@project
.
namespace
,
@project
,
@merge_request
)
mail_new_thread
(
@merge_request
,
mail_new_thread
(
@merge_request
,
from:
sender
(
@merge_request
.
author_id
),
from:
sender
(
@merge_request
.
author_id
),
to:
recipient
(
recipient_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
SentNotification
.
record
(
@merge_request
,
recipient_id
,
reply_key
)
end
end
def
reassigned_merge_request_email
(
recipient_id
,
merge_request_id
,
previous_assignee_id
,
updated_by_user_id
)
def
reassigned_merge_request_email
(
recipient_id
,
merge_request_id
,
previous_assignee_id
,
updated_by_user_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
setup_merge_request_mail
(
merge_request_id
,
recipient_id
)
@previous_assignee
=
User
.
find_by
(
id:
previous_assignee_id
)
if
previous_assignee_id
@previous_assignee
=
User
.
find_by
(
id:
previous_assignee_id
)
if
previous_assignee_id
@project
=
@merge_request
.
project
@target_url
=
namespace_project_merge_request_url
(
@project
.
namespace
,
@project
,
@merge_request
)
mail_answer_thread
(
@merge_request
,
mail_answer_thread
(
@merge_request
,
from:
sender
(
updated_by_user_id
),
from:
sender
(
updated_by_user_id
),
to:
recipient
(
recipient_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
SentNotification
.
record
(
@merge_request
,
recipient_id
,
reply_key
)
end
end
def
closed_merge_request_email
(
recipient_id
,
merge_request_id
,
updated_by_user_id
)
def
closed_merge_request_email
(
recipient_id
,
merge_request_id
,
updated_by_user_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
setup_merge_request_mail
(
merge_request_id
,
recipient_id
)
@updated_by
=
User
.
find
updated_by_user_id
@updated_by
=
User
.
find
updated_by_user_id
@project
=
@merge_request
.
project
@target_url
=
namespace_project_merge_request_url
(
@project
.
namespace
,
@project
,
@merge_request
)
mail_answer_thread
(
@merge_request
,
mail_answer_thread
(
@merge_request
,
from:
sender
(
updated_by_user_id
),
from:
sender
(
updated_by_user_id
),
to:
recipient
(
recipient_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
SentNotification
.
record
(
@merge_request
,
recipient_id
,
reply_key
)
end
end
def
merged_merge_request_email
(
recipient_id
,
merge_request_id
,
updated_by_user_id
)
def
merged_merge_request_email
(
recipient_id
,
merge_request_id
,
updated_by_user_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
setup_merge_request_mail
(
merge_request_id
,
recipient_id
)
@project
=
@merge_request
.
project
@target_url
=
namespace_project_merge_request_url
(
@project
.
namespace
,
@project
,
@merge_request
)
mail_answer_thread
(
@merge_request
,
mail_answer_thread
(
@merge_request
,
from:
sender
(
updated_by_user_id
),
from:
sender
(
updated_by_user_id
),
to:
recipient
(
recipient_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
SentNotification
.
record
(
@merge_request
,
recipient_id
,
reply_key
)
end
end
def
merge_request_status_email
(
recipient_id
,
merge_request_id
,
status
,
updated_by_user_id
)
def
merge_request_status_email
(
recipient_id
,
merge_request_id
,
status
,
updated_by_user_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
setup_merge_request_mail
(
merge_request_id
,
recipient_id
)
@mr_status
=
status
@mr_status
=
status
@project
=
@merge_request
.
project
@updated_by
=
User
.
find
updated_by_user_id
@updated_by
=
User
.
find
updated_by_user_id
@target_url
=
namespace_project_merge_request_url
(
@project
.
namespace
,
@project
,
@merge_request
)
mail_answer_thread
(
@merge_request
,
mail_answer_thread
(
@merge_request
,
from:
sender
(
updated_by_user_id
),
from:
sender
(
updated_by_user_id
),
to:
recipient
(
recipient_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(#
#{
@merge_request
.
iid
}
)"
))
end
private
def
setup_merge_request_mail
(
merge_request_id
,
recipient_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@project
=
@merge_request
.
project
@target_url
=
namespace_project_merge_request_url
(
@project
.
namespace
,
@project
,
@merge_request
)
SentNotification
.
record
(
@merge_request
,
recipient_id
,
reply_key
)
@sent_notification
=
SentNotification
.
record
(
@merge_request
,
recipient_id
,
reply_key
)
end
end
end
end
end
end
app/mailers/emails/notes.rb
View file @
0430c00c
module
Emails
module
Emails
module
Notes
module
Notes
def
note_commit_email
(
recipient_id
,
note_id
)
def
note_commit_email
(
recipient_id
,
note_id
)
note_mail_with_notification
(
note_id
,
recipient_id
)
do
setup_note_mail
(
note_id
,
recipient_id
)
@commit
=
@note
.
noteable
@commit
=
@note
.
noteable
@target_url
=
namespace_project_commit_url
(
*
note_target_url_options
)
@target_url
=
namespace_project_commit_url
(
*
note_target_url_options
)
...
@@ -10,23 +11,22 @@ module Emails
...
@@ -10,23 +11,22 @@ module Emails
to:
recipient
(
recipient_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@commit
.
title
}
(
#{
@commit
.
short_id
}
)"
))
subject:
subject
(
"
#{
@commit
.
title
}
(
#{
@commit
.
short_id
}
)"
))
end
end
end
def
note_issue_email
(
recipient_id
,
note_id
)
def
note_issue_email
(
recipient_id
,
note_id
)
note_mail_with_notification
(
note_id
,
recipient_id
)
do
setup_note_mail
(
note_id
,
recipient_id
)
@issue
=
@note
.
noteable
@issue
=
@note
.
noteable
@target_url
=
namespace_project_issue_url
(
*
note_target_url_options
)
@target_url
=
namespace_project_issue_url
(
*
note_target_url_options
)
mail_answer_thread
(
@issue
,
note_thread_options
(
recipient_id
))
mail_answer_thread
(
@issue
,
note_thread_options
(
recipient_id
))
end
end
end
def
note_merge_request_email
(
recipient_id
,
note_id
)
def
note_merge_request_email
(
recipient_id
,
note_id
)
note_mail_with_notification
(
note_id
,
recipient_id
)
do
setup_note_mail
(
note_id
,
recipient_id
)
@merge_request
=
@note
.
noteable
@merge_request
=
@note
.
noteable
@target_url
=
namespace_project_merge_request_url
(
*
note_target_url_options
)
@target_url
=
namespace_project_merge_request_url
(
*
note_target_url_options
)
mail_answer_thread
(
@merge_request
,
note_thread_options
(
recipient_id
))
mail_answer_thread
(
@merge_request
,
note_thread_options
(
recipient_id
))
end
end
end
private
private
...
@@ -42,13 +42,11 @@ module Emails
...
@@ -42,13 +42,11 @@ module Emails
}
}
end
end
def
note_mail_with_notification
(
note_id
,
recipient_id
)
def
setup_note_mail
(
note_id
,
recipient_id
)
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@project
=
@note
.
project
@project
=
@note
.
project
yield
@sent_notification
=
SentNotification
.
record_note
(
@note
,
recipient_id
,
reply_key
)
SentNotification
.
record_note
(
@note
,
recipient_id
,
reply_key
)
end
end
end
end
end
end
app/mailers/notify.rb
View file @
0430c00c
...
@@ -107,10 +107,9 @@ class Notify < BaseMailer
...
@@ -107,10 +107,9 @@ class Notify < BaseMailer
end
end
headers
[
"X-GitLab-
#{
model
.
class
.
name
}
-ID"
]
=
model
.
id
headers
[
"X-GitLab-
#{
model
.
class
.
name
}
-ID"
]
=
model
.
id
if
reply_key
headers
[
'X-GitLab-Reply-Key'
]
=
reply_key
headers
[
'X-GitLab-Reply-Key'
]
=
reply_key
if
Gitlab
::
IncomingEmail
.
enabled?
address
=
Mail
::
Address
.
new
(
Gitlab
::
IncomingEmail
.
reply_address
(
reply_key
))
address
=
Mail
::
Address
.
new
(
Gitlab
::
IncomingEmail
.
reply_address
(
reply_key
))
address
.
display_name
=
@project
.
name_with_namespace
address
.
display_name
=
@project
.
name_with_namespace
...
...
app/models/concerns/issuable.rb
View file @
0430c00c
...
@@ -119,6 +119,12 @@ module Issuable
...
@@ -119,6 +119,12 @@ module Issuable
update
(
subscribed:
!
subscribed?
(
user
))
update
(
subscribed:
!
subscribed?
(
user
))
end
end
def
unsubscribe
(
user
)
subscriptions
.
find_or_initialize_by
(
user_id:
user
.
id
).
update
(
subscribed:
false
)
end
def
to_hook_data
(
user
)
def
to_hook_data
(
user
)
{
{
object_kind:
self
.
class
.
name
.
underscore
,
object_kind:
self
.
class
.
name
.
underscore
,
...
...
app/models/project_wiki.rb
View file @
0430c00c
...
@@ -38,6 +38,10 @@ class ProjectWiki
...
@@ -38,6 +38,10 @@ class ProjectWiki
[
Gitlab
.
config
.
gitlab
.
url
,
"/"
,
path_with_namespace
,
".git"
].
join
(
''
)
[
Gitlab
.
config
.
gitlab
.
url
,
"/"
,
path_with_namespace
,
".git"
].
join
(
''
)
end
end
def
wiki_base_path
[
"/"
,
@project
.
path_with_namespace
,
"/wikis"
].
join
(
''
)
end
# Returns the Gollum::Wiki object.
# Returns the Gollum::Wiki object.
def
wiki
def
wiki
@wiki
||=
begin
@wiki
||=
begin
...
...
app/models/sent_notification.rb
View file @
0430c00c
...
@@ -25,8 +25,6 @@ class SentNotification < ActiveRecord::Base
...
@@ -25,8 +25,6 @@ class SentNotification < ActiveRecord::Base
class
<<
self
class
<<
self
def
reply_key
def
reply_key
return
nil
unless
Gitlab
::
IncomingEmail
.
enabled?
SecureRandom
.
hex
(
16
)
SecureRandom
.
hex
(
16
)
end
end
...
@@ -64,6 +62,10 @@ class SentNotification < ActiveRecord::Base
...
@@ -64,6 +62,10 @@ class SentNotification < ActiveRecord::Base
end
end
end
end
def
unsubscribable?
!
for_commit?
end
def
for_commit?
def
for_commit?
noteable_type
==
"Commit"
noteable_type
==
"Commit"
end
end
...
@@ -75,4 +77,8 @@ class SentNotification < ActiveRecord::Base
...
@@ -75,4 +77,8 @@ class SentNotification < ActiveRecord::Base
super
super
end
end
end
end
def
to_param
self
.
reply_key
end
end
end
app/models/wiki_page.rb
View file @
0430c00c
...
@@ -169,7 +169,7 @@ class WikiPage
...
@@ -169,7 +169,7 @@ class WikiPage
private
private
def
set_attributes
def
set_attributes
attributes
[
:slug
]
=
@page
.
escaped_
url_path
attributes
[
:slug
]
=
@page
.
url_path
attributes
[
:title
]
=
@page
.
title
attributes
[
:title
]
=
@page
.
title
attributes
[
:format
]
=
@page
.
format
attributes
[
:format
]
=
@page
.
format
end
end
...
...
app/views/layouts/notify.html.haml
View file @
0430c00c
...
@@ -44,6 +44,10 @@
...
@@ -44,6 +44,10 @@
%br
%br
-# Don't link the host is the line below, one link in the email is easier to quickly click than two.
-# Don't link the host is the line below, one link in the email is easier to quickly click than two.
You're receiving this email because of your account on
#{
Gitlab
.
config
.
gitlab
.
host
}
.
You're receiving this email because of your account on
#{
Gitlab
.
config
.
gitlab
.
host
}
.
If you'd like to receive fewer emails, you can adjust your notification settings.
If you'd like to receive fewer emails, you can
-
if
@sent_notification
&&
@sent_notification
.
unsubscribable?
=
link_to
"unsubscribe"
,
unsubscribe_sent_notification_url
(
@sent_notification
)
from this thread or
adjust your notification settings.
=
email_action
@target_url
=
email_action
@target_url
app/views/projects/wikis/_new.html.haml
View file @
0430c00c
...
@@ -5,12 +5,9 @@
...
@@ -5,12 +5,9 @@
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
.page-title
New Wiki Page
%h3
.page-title
New Wiki Page
.modal-body
.modal-body
.form-group
=
label_tag
:new_wiki_path
do
=
label_tag
:new_wiki_path
do
%span
Page slug
%span
Page slug
=
text_field_tag
:new_wiki_path
,
nil
,
placeholder:
'how-to-setup'
,
class:
'form-control'
,
required:
true
,
:'data-wikis-path'
=>
namespace_project_wikis_path
(
@project
.
namespace
,
@project
)
=
text_field_tag
:new_wiki_path
,
nil
,
placeholder:
'how-to-setup'
,
class:
'form-control'
,
required:
true
,
:'data-wikis-path'
=>
namespace_project_wikis_path
(
@project
.
namespace
,
@project
)
%p
.hidden.text-danger
{
data:
{
error:
"slug"
}}
The page slug is invalid. Please don't use characters other then: a-z 0-9 _ - and /
%p
.hint
Please don't use spaces.
.form-actions
.form-actions
=
link_to
'Create Page'
,
'#'
,
class:
'build-new-wiki btn btn-create'
=
link_to
'Create Page'
,
'#'
,
class:
'build-new-wiki btn btn-create'
config/routes.rb
View file @
0430c00c
...
@@ -88,6 +88,12 @@ Rails.application.routes.draw do
...
@@ -88,6 +88,12 @@ Rails.application.routes.draw do
end
end
end
end
resources
:sent_notifications
,
only:
[],
constraints:
{
id:
/\h{32}/
}
do
member
do
get
:unsubscribe
end
end
# Spam reports
# Spam reports
resources
:abuse_reports
,
only:
[
:new
,
:create
]
resources
:abuse_reports
,
only:
[
:new
,
:create
]
...
@@ -513,7 +519,7 @@ Rails.application.routes.draw do
...
@@ -513,7 +519,7 @@ Rails.application.routes.draw do
end
end
end
end
WIKI_SLUG_ID
=
{
id:
/
[a-zA-Z.0-9_\-\/]
+/
}
unless
defined?
WIKI_SLUG_ID
WIKI_SLUG_ID
=
{
id:
/
\S
+/
}
unless
defined?
WIKI_SLUG_ID
scope
do
scope
do
# Order matters to give priority to these matches
# Order matters to give priority to these matches
...
...
features/project/wiki.feature
View file @
0430c00c
...
@@ -69,11 +69,6 @@ Feature: Project Wiki
...
@@ -69,11 +69,6 @@ Feature: Project Wiki
And
I click on the
"Pages"
button
And
I click on the
"Pages"
button
Then
I should see non-escaped link in the pages list
Then
I should see non-escaped link in the pages list
@javascript
Scenario
:
Creating an invalid new page
Given
I create a New page with an invalid name
Then
I should see an error message
@javascript
@javascript
Scenario
:
Edit Wiki page that has a path
Scenario
:
Edit Wiki page that has a path
Given
I create a New page with paths
Given
I create a New page with paths
...
...
features/steps/project/wiki.rb
View file @
0430c00c
...
@@ -132,16 +132,6 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
...
@@ -132,16 +132,6 @@ class Spinach::Features::ProjectWiki < Spinach::FeatureSteps
expect
(
current_path
).
to
include
'one/two/three'
expect
(
current_path
).
to
include
'one/two/three'
end
end
step
'I create a New page with an invalid name'
do
click_on
'New Page'
fill_in
'Page slug'
,
with:
'invalid name'
click_on
'Create Page'
end
step
'I should see an error message'
do
expect
(
page
).
to
have_content
"The page slug is invalid"
end
step
'I should see non-escaped link in the pages list'
do
step
'I should see non-escaped link in the pages list'
do
expect
(
page
).
to
have_xpath
(
"//a[@href='/
#{
project
.
path_with_namespace
}
/wikis/one/two/three']"
)
expect
(
page
).
to
have_xpath
(
"//a[@href='/
#{
project
.
path_with_namespace
}
/wikis/one/two/three']"
)
end
end
...
...
lib/banzai/filter/gollum_tags_filter.rb
0 → 100644
View file @
0430c00c
require
'banzai'
require
'html/pipeline/filter'
module
Banzai
module
Filter
# HTML Filter for parsing Gollum's tags in HTML. It's only parses the
# following tags:
#
# - Link to internal pages:
#
# * [[Bug Reports]]
# * [[How to Contribute|Contributing]]
#
# - Link to external resources:
#
# * [[http://en.wikipedia.org/wiki/Git_(software)]]
# * [[Git|http://en.wikipedia.org/wiki/Git_(software)]]
#
# - Link internal images, the special attributes will be ignored:
#
# * [[images/logo.png]]
# * [[images/logo.png|alt=Logo]]
#
# - Link external images, the special attributes will be ignored:
#
# * [[http://example.com/images/logo.png]]
# * [[http://example.com/images/logo.png|alt=Logo]]
#
# Based on Gollum::Filter::Tags
#
# Context options:
# :project_wiki (required) - Current project wiki.
#
class
GollumTagsFilter
<
HTML
::
Pipeline
::
Filter
include
ActionView
::
Helpers
::
TagHelper
# Pattern to match tags content that should be parsed in HTML.
#
# Gollum's tags have been made to resemble the tags of other markups,
# especially MediaWiki. The basic syntax is:
#
# [[tag]]
#
# Some tags will accept attributes which are separated by pipe
# symbols.Some attributes must precede the tag and some must follow it:
#
# [[prefix-attribute|tag]]
# [[tag|suffix-attribute]]
#
# See https://github.com/gollum/gollum/wiki
#
# Rubular: http://rubular.com/r/7dQnE5CUCH
TAGS_PATTERN
=
%r{
\[\[
(.+?)
\]\]
}
# Pattern to match allowed image extensions
ALLOWED_IMAGE_EXTENSIONS
=
%r{.+(jpg|png|gif|svg|bmp)
\z
}i
def
call
search_text_nodes
(
doc
).
each
do
|
node
|
content
=
node
.
content
next
unless
content
.
match
(
TAGS_PATTERN
)
html
=
process_tag
(
$1
)
if
html
&&
html
!=
node
.
content
node
.
replace
(
html
)
end
end
doc
end
private
# Process a single tag into its final HTML form.
#
# tag - The String tag contents (the stuff inside the double brackets).
#
# Returns the String HTML version of the tag.
def
process_tag
(
tag
)
parts
=
tag
.
split
(
'|'
)
return
if
parts
.
size
.
zero?
process_image_tag
(
parts
)
||
process_page_link_tag
(
parts
)
end
# Attempt to process the tag as an image tag.
#
# tag - The String tag contents (the stuff inside the double brackets).
#
# Returns the String HTML if the tag is a valid image tag or nil
# if it is not.
def
process_image_tag
(
parts
)
content
=
parts
[
0
].
strip
return
unless
image?
(
content
)
if
url?
(
content
)
path
=
content
elsif
file
=
project_wiki
.
find_file
(
content
)
path
=
::
File
.
join
project_wiki_base_path
,
file
.
path
end
if
path
content_tag
(
:img
,
nil
,
src:
path
)
end
end
def
image?
(
path
)
path
=~
ALLOWED_IMAGE_EXTENSIONS
end
def
url?
(
path
)
path
.
start_with?
(
*
%w(http https)
)
end
# Attempt to process the tag as a page link tag.
#
# tag - The String tag contents (the stuff inside the double brackets).
#
# Returns the String HTML if the tag is a valid page link tag or nil
# if it is not.
def
process_page_link_tag
(
parts
)
if
parts
.
size
==
1
url
=
parts
[
0
].
strip
else
name
,
url
=
*
parts
.
compact
.
map
(
&
:strip
)
end
content_tag
(
:a
,
name
||
url
,
href:
url
)
end
def
project_wiki
context
[
:project_wiki
]
end
def
project_wiki_base_path
project_wiki
&&
project_wiki
.
wiki_base_path
end
# Ensure that a :project_wiki key exists in context
#
# Note that while the key might exist, its value could be nil!
def
validate
needs
:project_wiki
end
end
end
end
lib/banzai/pipeline/wiki_pipeline.rb
0 → 100644
View file @
0430c00c
require
'banzai'
module
Banzai
module
Pipeline
class
WikiPipeline
<
FullPipeline
def
self
.
filters
super
.
insert
(
1
,
Filter
::
GollumTagsFilter
)
end
end
end
end
lib/gitlab/github_import/importer.rb
View file @
0430c00c
module
Gitlab
module
Gitlab
module
GithubImport
module
GithubImport
class
Importer
class
Importer
include
Gitlab
::
ShellAdapter
attr_reader
:project
,
:client
attr_reader
:project
,
:client
def
initialize
(
project
)
def
initialize
(
project
)
...
@@ -12,10 +14,7 @@ module Gitlab
...
@@ -12,10 +14,7 @@ module Gitlab
end
end
def
execute
def
execute
import_issues
import_issues
&&
import_pull_requests
&&
import_wiki
import_pull_requests
true
end
end
private
private
...
@@ -34,6 +33,10 @@ module Gitlab
...
@@ -34,6 +33,10 @@ module Gitlab
end
end
end
end
end
end
true
rescue
ActiveRecord
::
RecordInvalid
false
end
end
def
import_pull_requests
def
import_pull_requests
...
@@ -48,6 +51,10 @@ module Gitlab
...
@@ -48,6 +51,10 @@ module Gitlab
import_comments_on_diff
(
pull_request
.
number
,
merge_request
)
import_comments_on_diff
(
pull_request
.
number
,
merge_request
)
end
end
end
end
true
rescue
ActiveRecord
::
RecordInvalid
false
end
end
def
import_comments
(
issue_number
,
noteable
)
def
import_comments
(
issue_number
,
noteable
)
...
@@ -66,6 +73,18 @@ module Gitlab
...
@@ -66,6 +73,18 @@ module Gitlab
noteable
.
notes
.
create!
(
comment
.
attributes
)
noteable
.
notes
.
create!
(
comment
.
attributes
)
end
end
end
end
def
import_wiki
unless
project
.
wiki_enabled?
wiki
=
WikiFormatter
.
new
(
project
)
gitlab_shell
.
import_repository
(
wiki
.
path_with_namespace
,
wiki
.
import_url
)
project
.
update_attribute
(
:wiki_enabled
,
true
)
end
true
rescue
Gitlab
::
Shell
::
Error
false
end
end
end
end
end
end
end
lib/gitlab/github_import/project_creator.rb
View file @
0430c00c
...
@@ -20,7 +20,8 @@ module Gitlab
...
@@ -20,7 +20,8 @@ module Gitlab
visibility_level:
repo
.
private
?
Gitlab
::
VisibilityLevel
::
PRIVATE
:
Gitlab
::
VisibilityLevel
::
PUBLIC
,
visibility_level:
repo
.
private
?
Gitlab
::
VisibilityLevel
::
PRIVATE
:
Gitlab
::
VisibilityLevel
::
PUBLIC
,
import_type:
"github"
,
import_type:
"github"
,
import_source:
repo
.
full_name
,
import_source:
repo
.
full_name
,
import_url:
repo
.
clone_url
.
sub
(
"https://"
,
"https://
#{
@session_data
[
:github_access_token
]
}
@"
)
import_url:
repo
.
clone_url
.
sub
(
"https://"
,
"https://
#{
@session_data
[
:github_access_token
]
}
@"
),
wiki_enabled:
!
repo
.
has_wiki?
# If repo has wiki we'll import it later
).
execute
).
execute
project
.
create_import_data
(
data:
{
"github_session"
=>
session_data
}
)
project
.
create_import_data
(
data:
{
"github_session"
=>
session_data
}
)
...
...
lib/gitlab/github_import/wiki_formatter.rb
0 → 100644
View file @
0430c00c
module
Gitlab
module
GithubImport
class
WikiFormatter
attr_reader
:project
def
initialize
(
project
)
@project
=
project
end
def
path_with_namespace
"
#{
project
.
path_with_namespace
}
.wiki"
end
def
import_url
project
.
import_url
.
sub
(
/\.git\z/
,
".wiki.git"
)
end
end
end
end
spec/controllers/sent_notification_controller_spec.rb
0 → 100644
View file @
0430c00c
require
'rails_helper'
describe
SentNotificationsController
,
type: :controller
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:issue
)
{
create
(
:issue
,
author:
user
)
}
let
(
:sent_notification
)
{
create
(
:sent_notification
,
noteable:
issue
)
}
describe
'GET #unsubscribe'
do
it
'returns a 404 when calling without existing id'
do
get
(
:unsubscribe
,
id:
'0'
*
32
)
expect
(
response
.
status
).
to
be
404
end
context
'calling with id'
do
it
'shows a flash message to the user'
do
get
(
:unsubscribe
,
id:
sent_notification
.
reply_key
)
expect
(
response
.
status
).
to
be
302
expect
(
response
).
to
redirect_to
new_user_session_path
expect
(
controller
).
to
set_flash
[
:notice
].
to
(
/unsubscribed/
).
now
end
end
end
end
spec/factories.rb
View file @
0430c00c
...
@@ -212,4 +212,11 @@ FactoryGirl.define do
...
@@ -212,4 +212,11 @@ FactoryGirl.define do
provider
'ldapmain'
provider
'ldapmain'
extern_uid
'my-ldap-id'
extern_uid
'my-ldap-id'
end
end
factory
:sent_notification
do
project
recipient
factory: :user
noteable
factory: :issue
reply_key
"0123456789abcdef"
*
2
end
end
end
spec/features/markdown_spec.rb
View file @
0430c00c
...
@@ -175,13 +175,15 @@ describe 'GitLab Markdown', feature: true do
...
@@ -175,13 +175,15 @@ describe 'GitLab Markdown', feature: true do
end
end
end
end
context
'default pipeline'
do
before
(
:all
)
do
before
(
:all
)
do
@feat
=
MarkdownFeature
.
new
@feat
=
MarkdownFeature
.
new
# `markdown` helper expects a `@project` variable
# `markdown` helper expects a `@project` variable
@project
=
@feat
.
project
@project
=
@feat
.
project
end
context
'default pipeline'
do
before
(
:all
)
do
@html
=
markdown
(
@feat
.
raw_markdown
)
@html
=
markdown
(
@feat
.
raw_markdown
)
end
end
...
@@ -221,6 +223,57 @@ describe 'GitLab Markdown', feature: true do
...
@@ -221,6 +223,57 @@ describe 'GitLab Markdown', feature: true do
end
end
end
end
context
'wiki pipeline'
do
before
do
@project_wiki
=
@feat
.
project_wiki
file
=
Gollum
::
File
.
new
(
@project_wiki
.
wiki
)
expect
(
file
).
to
receive
(
:path
).
and_return
(
'images/example.jpg'
)
expect
(
@project_wiki
).
to
receive
(
:find_file
).
with
(
'images/example.jpg'
).
and_return
(
file
)
@html
=
markdown
(
@feat
.
raw_markdown
,
{
pipeline: :wiki
,
project_wiki:
@project_wiki
})
end
it_behaves_like
'all pipelines'
it
'includes RelativeLinkFilter'
do
expect
(
doc
).
not_to
parse_relative_links
end
it
'includes EmojiFilter'
do
expect
(
doc
).
to
parse_emoji
end
it
'includes TableOfContentsFilter'
do
expect
(
doc
).
to
create_header_links
end
it
'includes AutolinkFilter'
do
expect
(
doc
).
to
create_autolinks
end
it
'includes all reference filters'
do
aggregate_failures
do
expect
(
doc
).
to
reference_users
expect
(
doc
).
to
reference_issues
expect
(
doc
).
to
reference_merge_requests
expect
(
doc
).
to
reference_snippets
expect
(
doc
).
to
reference_commit_ranges
expect
(
doc
).
to
reference_commits
expect
(
doc
).
to
reference_labels
expect
(
doc
).
to
reference_milestones
end
end
it
'includes TaskListFilter'
do
expect
(
doc
).
to
parse_task_lists
end
it
'includes GollumTagsFilter'
do
expect
(
doc
).
to
parse_gollum_tags
end
end
# Fake a `current_user` helper
# Fake a `current_user` helper
def
current_user
def
current_user
@feat
.
user
@feat
.
user
...
...
spec/fixtures/markdown.md.erb
View file @
0430c00c
...
@@ -230,3 +230,12 @@ References should be parseable even inside _<%= merge_request.to_reference %>_ e
...
@@ -230,3 +230,12 @@ References should be parseable even inside _<%= merge_request.to_reference %>_ e
- [ ] Incomplete sub-task 2
- [ ] Incomplete sub-task 2
- [x] Complete sub-task 1
- [x] Complete sub-task 1
- [X] Complete task 2
- [X] Complete task 2
#### Gollum Tags
- [[linked-resource]]
- [[link-text|linked-resource]]
- [[http://example.com]]
- [[link-text|http://example.com/pdfs/gollum.pdf]]
- [[images/example.jpg]]
- [[http://example.com/images/example.jpg]]
spec/helpers/gitlab_markdown_helper_spec.rb
View file @
0430c00c
...
@@ -121,12 +121,13 @@ describe GitlabMarkdownHelper do
...
@@ -121,12 +121,13 @@ describe GitlabMarkdownHelper do
before
do
before
do
@wiki
=
double
(
'WikiPage'
)
@wiki
=
double
(
'WikiPage'
)
allow
(
@wiki
).
to
receive
(
:content
).
and_return
(
'wiki content'
)
allow
(
@wiki
).
to
receive
(
:content
).
and_return
(
'wiki content'
)
helper
.
instance_variable_set
(
:@project_wiki
,
@wiki
)
end
end
it
"should use
GitLab Flavored Markdown
for markdown files"
do
it
"should use
Wiki pipeline
for markdown files"
do
allow
(
@wiki
).
to
receive
(
:format
).
and_return
(
:markdown
)
allow
(
@wiki
).
to
receive
(
:format
).
and_return
(
:markdown
)
expect
(
helper
).
to
receive
(
:markdown
).
with
(
'wiki content'
)
expect
(
helper
).
to
receive
(
:markdown
).
with
(
'wiki content'
,
pipeline: :wiki
,
project_wiki:
@wiki
)
helper
.
render_wiki_content
(
@wiki
)
helper
.
render_wiki_content
(
@wiki
)
end
end
...
...
spec/lib/banzai/filter/gollum_tags_filter_spec.rb
0 → 100644
View file @
0430c00c
require
'spec_helper'
describe
Banzai
::
Filter
::
GollumTagsFilter
,
lib:
true
do
include
FilterSpecHelper
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
double
}
let
(
:project_wiki
)
{
ProjectWiki
.
new
(
project
,
user
)
}
describe
'validation'
do
it
'ensure that a :project_wiki key exists in context'
do
expect
{
filter
(
"See [[images/image.jpg]]"
,
{})
}.
to
raise_error
ArgumentError
,
"Missing context keys for Banzai::Filter::GollumTagsFilter: :project_wiki"
end
end
context
'linking internal images'
do
it
'creates img tag if image exists'
do
file
=
Gollum
::
File
.
new
(
project_wiki
.
wiki
)
expect
(
file
).
to
receive
(
:path
).
and_return
(
'images/image.jpg'
)
expect
(
project_wiki
).
to
receive
(
:find_file
).
with
(
'images/image.jpg'
).
and_return
(
file
)
tag
=
'[[images/image.jpg]]'
doc
=
filter
(
"See
#{
tag
}
"
,
project_wiki:
project_wiki
)
expect
(
doc
.
at_css
(
'img'
)[
'src'
]).
to
eq
"
#{
project_wiki
.
wiki_base_path
}
/images/image.jpg"
end
it
'does not creates img tag if image does not exist'
do
expect
(
project_wiki
).
to
receive
(
:find_file
).
with
(
'images/image.jpg'
).
and_return
(
nil
)
tag
=
'[[images/image.jpg]]'
doc
=
filter
(
"See
#{
tag
}
"
,
project_wiki:
project_wiki
)
expect
(
doc
.
css
(
'img'
).
size
).
to
eq
0
end
end
context
'linking external images'
do
it
'creates img tag for valid URL'
do
tag
=
'[[http://example.com/image.jpg]]'
doc
=
filter
(
"See
#{
tag
}
"
,
project_wiki:
project_wiki
)
expect
(
doc
.
at_css
(
'img'
)[
'src'
]).
to
eq
"http://example.com/image.jpg"
end
it
'does not creates img tag for invalid URL'
do
tag
=
'[[http://example.com/image.pdf]]'
doc
=
filter
(
"See
#{
tag
}
"
,
project_wiki:
project_wiki
)
expect
(
doc
.
css
(
'img'
).
size
).
to
eq
0
end
end
context
'linking external resources'
do
it
"the created link's text will be equal to the resource's text"
do
tag
=
'[[http://example.com]]'
doc
=
filter
(
"See
#{
tag
}
"
,
project_wiki:
project_wiki
)
expect
(
doc
.
at_css
(
'a'
).
text
).
to
eq
'http://example.com'
expect
(
doc
.
at_css
(
'a'
)[
'href'
]).
to
eq
'http://example.com'
end
it
"the created link's text will be link-text"
do
tag
=
'[[link-text|http://example.com/pdfs/gollum.pdf]]'
doc
=
filter
(
"See
#{
tag
}
"
,
project_wiki:
project_wiki
)
expect
(
doc
.
at_css
(
'a'
).
text
).
to
eq
'link-text'
expect
(
doc
.
at_css
(
'a'
)[
'href'
]).
to
eq
'http://example.com/pdfs/gollum.pdf'
end
end
context
'linking internal resources'
do
it
"the created link's text will be equal to the resource's text"
do
tag
=
'[[wiki-slug]]'
doc
=
filter
(
"See
#{
tag
}
"
,
project_wiki:
project_wiki
)
expect
(
doc
.
at_css
(
'a'
).
text
).
to
eq
'wiki-slug'
expect
(
doc
.
at_css
(
'a'
)[
'href'
]).
to
eq
'wiki-slug'
end
it
"the created link's text will be link-text"
do
tag
=
'[[link-text|wiki-slug]]'
doc
=
filter
(
"See
#{
tag
}
"
,
project_wiki:
project_wiki
)
expect
(
doc
.
at_css
(
'a'
).
text
).
to
eq
'link-text'
expect
(
doc
.
at_css
(
'a'
)[
'href'
]).
to
eq
'wiki-slug'
end
end
end
spec/lib/gitlab/github_import/wiki_formatter_spec.rb
0 → 100644
View file @
0430c00c
require
'spec_helper'
describe
Gitlab
::
GithubImport
::
WikiFormatter
,
lib:
true
do
let
(
:project
)
do
create
(
:project
,
namespace:
create
(
:namespace
,
path:
'gitlabhq'
),
import_url:
'https://xxx@github.com/gitlabhq/sample.gitlabhq.git'
)
end
subject
(
:wiki
)
{
described_class
.
new
(
project
)}
describe
'#path_with_namespace'
do
it
'appends .wiki to project path'
do
expect
(
wiki
.
path_with_namespace
).
to
eq
'gitlabhq/gitlabhq.wiki'
end
end
describe
'#import_url'
do
it
'returns URL of the wiki repository'
do
expect
(
wiki
.
import_url
).
to
eq
'https://xxx@github.com/gitlabhq/sample.gitlabhq.wiki.git'
end
end
end
spec/mailers/notify_spec.rb
View file @
0430c00c
...
@@ -104,6 +104,14 @@ describe Notify do
...
@@ -104,6 +104,14 @@ describe Notify do
it
{
is_expected
.
to
have_body_text
/View Commit/
}
it
{
is_expected
.
to
have_body_text
/View Commit/
}
end
end
shared_examples
'an unsubscribeable thread'
do
it
{
is_expected
.
to
have_body_text
/unsubscribe/
}
end
shared_examples
"a user cannot unsubscribe through footer link"
do
it
{
is_expected
.
not_to
have_body_text
/unsubscribe/
}
end
describe
'for new users, the email'
do
describe
'for new users, the email'
do
let
(
:example_site_path
)
{
root_path
}
let
(
:example_site_path
)
{
root_path
}
let
(
:new_user
)
{
create
(
:user
,
email:
new_user_address
,
created_by_id:
1
)
}
let
(
:new_user
)
{
create
(
:user
,
email:
new_user_address
,
created_by_id:
1
)
}
...
@@ -115,6 +123,7 @@ describe Notify do
...
@@ -115,6 +123,7 @@ describe Notify do
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'a new user email'
,
new_user_address
it_behaves_like
'a new user email'
,
new_user_address
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'a user cannot unsubscribe through footer link'
it
'contains the password text'
do
it
'contains the password text'
do
is_expected
.
to
have_body_text
/Click here to set your password/
is_expected
.
to
have_body_text
/Click here to set your password/
...
@@ -134,7 +143,6 @@ describe Notify do
...
@@ -134,7 +143,6 @@ describe Notify do
end
end
end
end
describe
'for users that signed up, the email'
do
describe
'for users that signed up, the email'
do
let
(
:example_site_path
)
{
root_path
}
let
(
:example_site_path
)
{
root_path
}
let
(
:new_user
)
{
create
(
:user
,
email:
new_user_address
,
password:
"securePassword"
)
}
let
(
:new_user
)
{
create
(
:user
,
email:
new_user_address
,
password:
"securePassword"
)
}
...
@@ -144,6 +152,7 @@ describe Notify do
...
@@ -144,6 +152,7 @@ describe Notify do
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'a new user email'
,
new_user_address
it_behaves_like
'a new user email'
,
new_user_address
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'a user cannot unsubscribe through footer link'
it
'should not contain the new user\'s password'
do
it
'should not contain the new user\'s password'
do
is_expected
.
not_to
have_body_text
/password/
is_expected
.
not_to
have_body_text
/password/
...
@@ -157,6 +166,7 @@ describe Notify do
...
@@ -157,6 +166,7 @@ describe Notify do
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'a user cannot unsubscribe through footer link'
it
'is sent to the new user'
do
it
'is sent to the new user'
do
is_expected
.
to
deliver_to
key
.
user
.
email
is_expected
.
to
deliver_to
key
.
user
.
email
...
@@ -181,6 +191,7 @@ describe Notify do
...
@@ -181,6 +191,7 @@ describe Notify do
subject
{
Notify
.
new_email_email
(
email
.
id
)
}
subject
{
Notify
.
new_email_email
(
email
.
id
)
}
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'a user cannot unsubscribe through footer link'
it
'is sent to the new user'
do
it
'is sent to the new user'
do
is_expected
.
to
deliver_to
email
.
user
.
email
is_expected
.
to
deliver_to
email
.
user
.
email
...
@@ -227,6 +238,7 @@ describe Notify do
...
@@ -227,6 +238,7 @@ describe Notify do
it_behaves_like
'an assignee email'
it_behaves_like
'an assignee email'
it_behaves_like
'an email starting a new thread'
,
'issue'
it_behaves_like
'an email starting a new thread'
,
'issue'
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
'an unsubscribeable thread'
it
'has the correct subject'
do
it
'has the correct subject'
do
is_expected
.
to
have_subject
/
#{
project
.
name
}
\|
#{
issue
.
title
}
\(#
#{
issue
.
iid
}
\)/
is_expected
.
to
have_subject
/
#{
project
.
name
}
\|
#{
issue
.
title
}
\(#
#{
issue
.
iid
}
\)/
...
@@ -253,6 +265,7 @@ describe Notify do
...
@@ -253,6 +265,7 @@ describe Notify do
it_behaves_like
'a multiple recipients email'
it_behaves_like
'a multiple recipients email'
it_behaves_like
'an answer to an existing thread'
,
'issue'
it_behaves_like
'an answer to an existing thread'
,
'issue'
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
"an unsubscribeable thread"
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -283,6 +296,7 @@ describe Notify do
...
@@ -283,6 +296,7 @@ describe Notify do
it_behaves_like
'an answer to an existing thread'
,
'issue'
it_behaves_like
'an answer to an existing thread'
,
'issue'
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
'an unsubscribeable thread'
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -319,6 +333,7 @@ describe Notify do
...
@@ -319,6 +333,7 @@ describe Notify do
it_behaves_like
'an assignee email'
it_behaves_like
'an assignee email'
it_behaves_like
'an email starting a new thread'
,
'merge_request'
it_behaves_like
'an email starting a new thread'
,
'merge_request'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
"an unsubscribeable thread"
it
'has the correct subject'
do
it
'has the correct subject'
do
is_expected
.
to
have_subject
/
#{
merge_request
.
title
}
\(#
#{
merge_request
.
iid
}
\)/
is_expected
.
to
have_subject
/
#{
merge_request
.
title
}
\(#
#{
merge_request
.
iid
}
\)/
...
@@ -345,6 +360,7 @@ describe Notify do
...
@@ -345,6 +360,7 @@ describe Notify do
subject
{
Notify
.
new_merge_request_email
(
merge_request_with_description
.
assignee_id
,
merge_request_with_description
.
id
)
}
subject
{
Notify
.
new_merge_request_email
(
merge_request_with_description
.
assignee_id
,
merge_request_with_description
.
id
)
}
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
"an unsubscribeable thread"
it
'contains the description'
do
it
'contains the description'
do
is_expected
.
to
have_body_text
/
#{
merge_request_with_description
.
description
}
/
is_expected
.
to
have_body_text
/
#{
merge_request_with_description
.
description
}
/
...
@@ -357,6 +373,7 @@ describe Notify do
...
@@ -357,6 +373,7 @@ describe Notify do
it_behaves_like
'a multiple recipients email'
it_behaves_like
'a multiple recipients email'
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
"an unsubscribeable thread"
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -387,6 +404,7 @@ describe Notify do
...
@@ -387,6 +404,7 @@ describe Notify do
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
"an unsubscribeable thread"
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -417,6 +435,7 @@ describe Notify do
...
@@ -417,6 +435,7 @@ describe Notify do
it_behaves_like
'a multiple recipients email'
it_behaves_like
'a multiple recipients email'
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
"an unsubscribeable thread"
it
'is sent as the merge author'
do
it
'is sent as the merge author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -446,6 +465,7 @@ describe Notify do
...
@@ -446,6 +465,7 @@ describe Notify do
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'has the correct subject'
do
it
'has the correct subject'
do
is_expected
.
to
have_subject
/Project was moved/
is_expected
.
to
have_subject
/Project was moved/
...
@@ -468,6 +488,7 @@ describe Notify do
...
@@ -468,6 +488,7 @@ describe Notify do
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'has the correct subject'
do
it
'has the correct subject'
do
is_expected
.
to
have_subject
/Access to project was granted/
is_expected
.
to
have_subject
/Access to project was granted/
...
@@ -518,6 +539,7 @@ describe Notify do
...
@@ -518,6 +539,7 @@ describe Notify do
it_behaves_like
'a note email'
it_behaves_like
'a note email'
it_behaves_like
'an answer to an existing thread'
,
'commit'
it_behaves_like
'an answer to an existing thread'
,
'commit'
it_behaves_like
'it should show Gmail Actions View Commit link'
it_behaves_like
'it should show Gmail Actions View Commit link'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'has the correct subject'
do
it
'has the correct subject'
do
is_expected
.
to
have_subject
/
#{
commit
.
title
}
\(
#{
commit
.
short_id
}
\)/
is_expected
.
to
have_subject
/
#{
commit
.
title
}
\(
#{
commit
.
short_id
}
\)/
...
@@ -538,6 +560,7 @@ describe Notify do
...
@@ -538,6 +560,7 @@ describe Notify do
it_behaves_like
'a note email'
it_behaves_like
'a note email'
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'an answer to an existing thread'
,
'merge_request'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
'it should show Gmail Actions View Merge request link'
it_behaves_like
'an unsubscribeable thread'
it
'has the correct subject'
do
it
'has the correct subject'
do
is_expected
.
to
have_subject
/
#{
merge_request
.
title
}
\(#
#{
merge_request
.
iid
}
\)/
is_expected
.
to
have_subject
/
#{
merge_request
.
title
}
\(#
#{
merge_request
.
iid
}
\)/
...
@@ -558,6 +581,7 @@ describe Notify do
...
@@ -558,6 +581,7 @@ describe Notify do
it_behaves_like
'a note email'
it_behaves_like
'a note email'
it_behaves_like
'an answer to an existing thread'
,
'issue'
it_behaves_like
'an answer to an existing thread'
,
'issue'
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
'it should show Gmail Actions View Issue link'
it_behaves_like
'an unsubscribeable thread'
it
'has the correct subject'
do
it
'has the correct subject'
do
is_expected
.
to
have_subject
/
#{
issue
.
title
}
\(#
#{
issue
.
iid
}
\)/
is_expected
.
to
have_subject
/
#{
issue
.
title
}
\(#
#{
issue
.
iid
}
\)/
...
@@ -579,6 +603,7 @@ describe Notify do
...
@@ -579,6 +603,7 @@ describe Notify do
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'has the correct subject'
do
it
'has the correct subject'
do
is_expected
.
to
have_subject
/Access to group was granted/
is_expected
.
to
have_subject
/Access to group was granted/
...
@@ -607,6 +632,7 @@ describe Notify do
...
@@ -607,6 +632,7 @@ describe Notify do
subject
{
ActionMailer
::
Base
.
deliveries
.
last
}
subject
{
ActionMailer
::
Base
.
deliveries
.
last
}
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'an email sent from GitLab'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'is sent to the new user'
do
it
'is sent to the new user'
do
is_expected
.
to
deliver_to
'new-email@mail.com'
is_expected
.
to
deliver_to
'new-email@mail.com'
...
@@ -629,6 +655,7 @@ describe Notify do
...
@@ -629,6 +655,7 @@ describe Notify do
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/heads/master'
,
action: :create
)
}
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/heads/master'
,
action: :create
)
}
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -657,6 +684,7 @@ describe Notify do
...
@@ -657,6 +684,7 @@ describe Notify do
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/tags/v1.0'
,
action: :create
)
}
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/tags/v1.0'
,
action: :create
)
}
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -684,6 +712,7 @@ describe Notify do
...
@@ -684,6 +712,7 @@ describe Notify do
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/heads/master'
,
action: :delete
)
}
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/heads/master'
,
action: :delete
)
}
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -707,6 +736,7 @@ describe Notify do
...
@@ -707,6 +736,7 @@ describe Notify do
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/tags/v1.0'
,
action: :delete
)
}
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/tags/v1.0'
,
action: :delete
)
}
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -734,6 +764,7 @@ describe Notify do
...
@@ -734,6 +764,7 @@ describe Notify do
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/heads/master'
,
action: :push
,
compare:
compare
,
reverse_compare:
false
,
send_from_committer_email:
send_from_committer_email
)
}
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/heads/master'
,
action: :push
,
compare:
compare
,
reverse_compare:
false
,
send_from_committer_email:
send_from_committer_email
)
}
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
@@ -839,6 +870,7 @@ describe Notify do
...
@@ -839,6 +870,7 @@ describe Notify do
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/heads/master'
,
action: :push
,
compare:
compare
)
}
subject
{
Notify
.
repository_push_email
(
project
.
id
,
'devs@company.name'
,
author_id:
user
.
id
,
ref:
'refs/heads/master'
,
action: :push
,
compare:
compare
)
}
it_behaves_like
'it should show Gmail Actions View Commit link'
it_behaves_like
'it should show Gmail Actions View Commit link'
it_behaves_like
"a user cannot unsubscribe through footer link"
it
'is sent as the author'
do
it
'is sent as the author'
do
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
sender
=
subject
.
header
[
:from
].
addrs
[
0
]
...
...
spec/models/project_wiki_spec.rb
View file @
0430c00c
...
@@ -36,6 +36,13 @@ describe ProjectWiki, models: true do
...
@@ -36,6 +36,13 @@ describe ProjectWiki, models: true do
end
end
end
end
describe
"#wiki_base_path"
do
it
"returns the wiki base path"
do
wiki_base_path
=
"/
#{
project
.
path_with_namespace
}
/wikis"
expect
(
subject
.
wiki_base_path
).
to
eq
(
wiki_base_path
)
end
end
describe
"#wiki"
do
describe
"#wiki"
do
it
"contains a Gollum::Wiki instance"
do
it
"contains a Gollum::Wiki instance"
do
expect
(
subject
.
wiki
).
to
be_a
Gollum
::
Wiki
expect
(
subject
.
wiki
).
to
be_a
Gollum
::
Wiki
...
...
spec/support/markdown_feature.rb
View file @
0430c00c
...
@@ -28,6 +28,10 @@ class MarkdownFeature
...
@@ -28,6 +28,10 @@ class MarkdownFeature
end
end
end
end
def
project_wiki
@project_wiki
||=
ProjectWiki
.
new
(
project
,
user
)
end
def
issue
def
issue
@issue
||=
create
(
:issue
,
project:
project
)
@issue
||=
create
(
:issue
,
project:
project
)
end
end
...
...
spec/support/matchers/markdown_matchers.rb
View file @
0430c00c
...
@@ -66,6 +66,24 @@ module MarkdownMatchers
...
@@ -66,6 +66,24 @@ module MarkdownMatchers
end
end
end
end
# GollumTagsFilter
matcher
:parse_gollum_tags
do
def
have_image
(
src
)
have_css
(
"img[src$='
#{
src
}
']"
)
end
set_default_markdown_messages
match
do
|
actual
|
expect
(
actual
).
to
have_link
(
'linked-resource'
,
href:
'linked-resource'
)
expect
(
actual
).
to
have_link
(
'link-text'
,
href:
'linked-resource'
)
expect
(
actual
).
to
have_link
(
'http://example.com'
,
href:
'http://example.com'
)
expect
(
actual
).
to
have_link
(
'link-text'
,
href:
'http://example.com/pdfs/gollum.pdf'
)
expect
(
actual
).
to
have_image
(
'/gitlabhq/wikis/images/example.jpg'
)
expect
(
actual
).
to
have_image
(
'http://example.com/images/example.jpg'
)
end
end
# UserReferenceFilter
# UserReferenceFilter
matcher
:reference_users
do
matcher
:reference_users
do
set_default_markdown_messages
set_default_markdown_messages
...
...
vendor/assets/javascripts/latinise.js
0 → 100644
View file @
0430c00c
// Converting text to basic latin (aka removing accents)
//
// Based on: http://semplicewebsites.com/removing-accents-javascript
//
var
Latinise
=
{
map
:
{
"
Á
"
:
"
A
"
,
"
Ă
"
:
"
A
"
,
"
Ắ
"
:
"
A
"
,
"
Ặ
"
:
"
A
"
,
"
Ằ
"
:
"
A
"
,
"
Ẳ
"
:
"
A
"
,
"
Ẵ
"
:
"
A
"
,
"
Ǎ
"
:
"
A
"
,
"
Â
"
:
"
A
"
,
"
Ấ
"
:
"
A
"
,
"
Ậ
"
:
"
A
"
,
"
Ầ
"
:
"
A
"
,
"
Ẩ
"
:
"
A
"
,
"
Ẫ
"
:
"
A
"
,
"
Ä
"
:
"
A
"
,
"
Ǟ
"
:
"
A
"
,
"
Ȧ
"
:
"
A
"
,
"
Ǡ
"
:
"
A
"
,
"
Ạ
"
:
"
A
"
,
"
Ȁ
"
:
"
A
"
,
"
À
"
:
"
A
"
,
"
Ả
"
:
"
A
"
,
"
Ȃ
"
:
"
A
"
,
"
Ā
"
:
"
A
"
,
"
Ą
"
:
"
A
"
,
"
Å
"
:
"
A
"
,
"
Ǻ
"
:
"
A
"
,
"
Ḁ
"
:
"
A
"
,
"
Ⱥ
"
:
"
A
"
,
"
Ã
"
:
"
A
"
,
"
Ꜳ
"
:
"
AA
"
,
"
Æ
"
:
"
AE
"
,
"
Ǽ
"
:
"
AE
"
,
"
Ǣ
"
:
"
AE
"
,
"
Ꜵ
"
:
"
AO
"
,
"
Ꜷ
"
:
"
AU
"
,
"
Ꜹ
"
:
"
AV
"
,
"
Ꜻ
"
:
"
AV
"
,
"
Ꜽ
"
:
"
AY
"
,
"
Ḃ
"
:
"
B
"
,
"
Ḅ
"
:
"
B
"
,
"
Ɓ
"
:
"
B
"
,
"
Ḇ
"
:
"
B
"
,
"
Ƀ
"
:
"
B
"
,
"
Ƃ
"
:
"
B
"
,
"
Ć
"
:
"
C
"
,
"
Č
"
:
"
C
"
,
"
Ç
"
:
"
C
"
,
"
Ḉ
"
:
"
C
"
,
"
Ĉ
"
:
"
C
"
,
"
Ċ
"
:
"
C
"
,
"
Ƈ
"
:
"
C
"
,
"
Ȼ
"
:
"
C
"
,
"
Ď
"
:
"
D
"
,
"
Ḑ
"
:
"
D
"
,
"
Ḓ
"
:
"
D
"
,
"
Ḋ
"
:
"
D
"
,
"
Ḍ
"
:
"
D
"
,
"
Ɗ
"
:
"
D
"
,
"
Ḏ
"
:
"
D
"
,
"
Dz
"
:
"
D
"
,
"
Dž
"
:
"
D
"
,
"
Đ
"
:
"
D
"
,
"
Ƌ
"
:
"
D
"
,
"
DZ
"
:
"
DZ
"
,
"
DŽ
"
:
"
DZ
"
,
"
É
"
:
"
E
"
,
"
Ĕ
"
:
"
E
"
,
"
Ě
"
:
"
E
"
,
"
Ȩ
"
:
"
E
"
,
"
Ḝ
"
:
"
E
"
,
"
Ê
"
:
"
E
"
,
"
Ế
"
:
"
E
"
,
"
Ệ
"
:
"
E
"
,
"
Ề
"
:
"
E
"
,
"
Ể
"
:
"
E
"
,
"
Ễ
"
:
"
E
"
,
"
Ḙ
"
:
"
E
"
,
"
Ë
"
:
"
E
"
,
"
Ė
"
:
"
E
"
,
"
Ẹ
"
:
"
E
"
,
"
Ȅ
"
:
"
E
"
,
"
È
"
:
"
E
"
,
"
Ẻ
"
:
"
E
"
,
"
Ȇ
"
:
"
E
"
,
"
Ē
"
:
"
E
"
,
"
Ḗ
"
:
"
E
"
,
"
Ḕ
"
:
"
E
"
,
"
Ę
"
:
"
E
"
,
"
Ɇ
"
:
"
E
"
,
"
Ẽ
"
:
"
E
"
,
"
Ḛ
"
:
"
E
"
,
"
Ꝫ
"
:
"
ET
"
,
"
Ḟ
"
:
"
F
"
,
"
Ƒ
"
:
"
F
"
,
"
Ǵ
"
:
"
G
"
,
"
Ğ
"
:
"
G
"
,
"
Ǧ
"
:
"
G
"
,
"
Ģ
"
:
"
G
"
,
"
Ĝ
"
:
"
G
"
,
"
Ġ
"
:
"
G
"
,
"
Ɠ
"
:
"
G
"
,
"
Ḡ
"
:
"
G
"
,
"
Ǥ
"
:
"
G
"
,
"
Ḫ
"
:
"
H
"
,
"
Ȟ
"
:
"
H
"
,
"
Ḩ
"
:
"
H
"
,
"
Ĥ
"
:
"
H
"
,
"
Ⱨ
"
:
"
H
"
,
"
Ḧ
"
:
"
H
"
,
"
Ḣ
"
:
"
H
"
,
"
Ḥ
"
:
"
H
"
,
"
Ħ
"
:
"
H
"
,
"
Í
"
:
"
I
"
,
"
Ĭ
"
:
"
I
"
,
"
Ǐ
"
:
"
I
"
,
"
Î
"
:
"
I
"
,
"
Ï
"
:
"
I
"
,
"
Ḯ
"
:
"
I
"
,
"
İ
"
:
"
I
"
,
"
Ị
"
:
"
I
"
,
"
Ȉ
"
:
"
I
"
,
"
Ì
"
:
"
I
"
,
"
Ỉ
"
:
"
I
"
,
"
Ȋ
"
:
"
I
"
,
"
Ī
"
:
"
I
"
,
"
Į
"
:
"
I
"
,
"
Ɨ
"
:
"
I
"
,
"
Ĩ
"
:
"
I
"
,
"
Ḭ
"
:
"
I
"
,
"
Ꝺ
"
:
"
D
"
,
"
Ꝼ
"
:
"
F
"
,
"
Ᵹ
"
:
"
G
"
,
"
Ꞃ
"
:
"
R
"
,
"
Ꞅ
"
:
"
S
"
,
"
Ꞇ
"
:
"
T
"
,
"
Ꝭ
"
:
"
IS
"
,
"
Ĵ
"
:
"
J
"
,
"
Ɉ
"
:
"
J
"
,
"
Ḱ
"
:
"
K
"
,
"
Ǩ
"
:
"
K
"
,
"
Ķ
"
:
"
K
"
,
"
Ⱪ
"
:
"
K
"
,
"
Ꝃ
"
:
"
K
"
,
"
Ḳ
"
:
"
K
"
,
"
Ƙ
"
:
"
K
"
,
"
Ḵ
"
:
"
K
"
,
"
Ꝁ
"
:
"
K
"
,
"
Ꝅ
"
:
"
K
"
,
"
Ĺ
"
:
"
L
"
,
"
Ƚ
"
:
"
L
"
,
"
Ľ
"
:
"
L
"
,
"
Ļ
"
:
"
L
"
,
"
Ḽ
"
:
"
L
"
,
"
Ḷ
"
:
"
L
"
,
"
Ḹ
"
:
"
L
"
,
"
Ⱡ
"
:
"
L
"
,
"
Ꝉ
"
:
"
L
"
,
"
Ḻ
"
:
"
L
"
,
"
Ŀ
"
:
"
L
"
,
"
Ɫ
"
:
"
L
"
,
"
Lj
"
:
"
L
"
,
"
Ł
"
:
"
L
"
,
"
LJ
"
:
"
LJ
"
,
"
Ḿ
"
:
"
M
"
,
"
Ṁ
"
:
"
M
"
,
"
Ṃ
"
:
"
M
"
,
"
Ɱ
"
:
"
M
"
,
"
Ń
"
:
"
N
"
,
"
Ň
"
:
"
N
"
,
"
Ņ
"
:
"
N
"
,
"
Ṋ
"
:
"
N
"
,
"
Ṅ
"
:
"
N
"
,
"
Ṇ
"
:
"
N
"
,
"
Ǹ
"
:
"
N
"
,
"
Ɲ
"
:
"
N
"
,
"
Ṉ
"
:
"
N
"
,
"
Ƞ
"
:
"
N
"
,
"
Nj
"
:
"
N
"
,
"
Ñ
"
:
"
N
"
,
"
NJ
"
:
"
NJ
"
,
"
Ó
"
:
"
O
"
,
"
Ŏ
"
:
"
O
"
,
"
Ǒ
"
:
"
O
"
,
"
Ô
"
:
"
O
"
,
"
Ố
"
:
"
O
"
,
"
Ộ
"
:
"
O
"
,
"
Ồ
"
:
"
O
"
,
"
Ổ
"
:
"
O
"
,
"
Ỗ
"
:
"
O
"
,
"
Ö
"
:
"
O
"
,
"
Ȫ
"
:
"
O
"
,
"
Ȯ
"
:
"
O
"
,
"
Ȱ
"
:
"
O
"
,
"
Ọ
"
:
"
O
"
,
"
Ő
"
:
"
O
"
,
"
Ȍ
"
:
"
O
"
,
"
Ò
"
:
"
O
"
,
"
Ỏ
"
:
"
O
"
,
"
Ơ
"
:
"
O
"
,
"
Ớ
"
:
"
O
"
,
"
Ợ
"
:
"
O
"
,
"
Ờ
"
:
"
O
"
,
"
Ở
"
:
"
O
"
,
"
Ỡ
"
:
"
O
"
,
"
Ȏ
"
:
"
O
"
,
"
Ꝋ
"
:
"
O
"
,
"
Ꝍ
"
:
"
O
"
,
"
Ō
"
:
"
O
"
,
"
Ṓ
"
:
"
O
"
,
"
Ṑ
"
:
"
O
"
,
"
Ɵ
"
:
"
O
"
,
"
Ǫ
"
:
"
O
"
,
"
Ǭ
"
:
"
O
"
,
"
Ø
"
:
"
O
"
,
"
Ǿ
"
:
"
O
"
,
"
Õ
"
:
"
O
"
,
"
Ṍ
"
:
"
O
"
,
"
Ṏ
"
:
"
O
"
,
"
Ȭ
"
:
"
O
"
,
"
Ƣ
"
:
"
OI
"
,
"
Ꝏ
"
:
"
OO
"
,
"
Ɛ
"
:
"
E
"
,
"
Ɔ
"
:
"
O
"
,
"
Ȣ
"
:
"
OU
"
,
"
Ṕ
"
:
"
P
"
,
"
Ṗ
"
:
"
P
"
,
"
Ꝓ
"
:
"
P
"
,
"
Ƥ
"
:
"
P
"
,
"
Ꝕ
"
:
"
P
"
,
"
Ᵽ
"
:
"
P
"
,
"
Ꝑ
"
:
"
P
"
,
"
Ꝙ
"
:
"
Q
"
,
"
Ꝗ
"
:
"
Q
"
,
"
Ŕ
"
:
"
R
"
,
"
Ř
"
:
"
R
"
,
"
Ŗ
"
:
"
R
"
,
"
Ṙ
"
:
"
R
"
,
"
Ṛ
"
:
"
R
"
,
"
Ṝ
"
:
"
R
"
,
"
Ȑ
"
:
"
R
"
,
"
Ȓ
"
:
"
R
"
,
"
Ṟ
"
:
"
R
"
,
"
Ɍ
"
:
"
R
"
,
"
Ɽ
"
:
"
R
"
,
"
Ꜿ
"
:
"
C
"
,
"
Ǝ
"
:
"
E
"
,
"
Ś
"
:
"
S
"
,
"
Ṥ
"
:
"
S
"
,
"
Š
"
:
"
S
"
,
"
Ṧ
"
:
"
S
"
,
"
Ş
"
:
"
S
"
,
"
Ŝ
"
:
"
S
"
,
"
Ș
"
:
"
S
"
,
"
Ṡ
"
:
"
S
"
,
"
Ṣ
"
:
"
S
"
,
"
Ṩ
"
:
"
S
"
,
"
ẞ
"
:
"
SS
"
,
"
Ť
"
:
"
T
"
,
"
Ţ
"
:
"
T
"
,
"
Ṱ
"
:
"
T
"
,
"
Ț
"
:
"
T
"
,
"
Ⱦ
"
:
"
T
"
,
"
Ṫ
"
:
"
T
"
,
"
Ṭ
"
:
"
T
"
,
"
Ƭ
"
:
"
T
"
,
"
Ṯ
"
:
"
T
"
,
"
Ʈ
"
:
"
T
"
,
"
Ŧ
"
:
"
T
"
,
"
Ɐ
"
:
"
A
"
,
"
Ꞁ
"
:
"
L
"
,
"
Ɯ
"
:
"
M
"
,
"
Ʌ
"
:
"
V
"
,
"
Ꜩ
"
:
"
TZ
"
,
"
Ú
"
:
"
U
"
,
"
Ŭ
"
:
"
U
"
,
"
Ǔ
"
:
"
U
"
,
"
Û
"
:
"
U
"
,
"
Ṷ
"
:
"
U
"
,
"
Ü
"
:
"
U
"
,
"
Ǘ
"
:
"
U
"
,
"
Ǚ
"
:
"
U
"
,
"
Ǜ
"
:
"
U
"
,
"
Ǖ
"
:
"
U
"
,
"
Ṳ
"
:
"
U
"
,
"
Ụ
"
:
"
U
"
,
"
Ű
"
:
"
U
"
,
"
Ȕ
"
:
"
U
"
,
"
Ù
"
:
"
U
"
,
"
Ủ
"
:
"
U
"
,
"
Ư
"
:
"
U
"
,
"
Ứ
"
:
"
U
"
,
"
Ự
"
:
"
U
"
,
"
Ừ
"
:
"
U
"
,
"
Ử
"
:
"
U
"
,
"
Ữ
"
:
"
U
"
,
"
Ȗ
"
:
"
U
"
,
"
Ū
"
:
"
U
"
,
"
Ṻ
"
:
"
U
"
,
"
Ų
"
:
"
U
"
,
"
Ů
"
:
"
U
"
,
"
Ũ
"
:
"
U
"
,
"
Ṹ
"
:
"
U
"
,
"
Ṵ
"
:
"
U
"
,
"
Ꝟ
"
:
"
V
"
,
"
Ṿ
"
:
"
V
"
,
"
Ʋ
"
:
"
V
"
,
"
Ṽ
"
:
"
V
"
,
"
Ꝡ
"
:
"
VY
"
,
"
Ẃ
"
:
"
W
"
,
"
Ŵ
"
:
"
W
"
,
"
Ẅ
"
:
"
W
"
,
"
Ẇ
"
:
"
W
"
,
"
Ẉ
"
:
"
W
"
,
"
Ẁ
"
:
"
W
"
,
"
Ⱳ
"
:
"
W
"
,
"
Ẍ
"
:
"
X
"
,
"
Ẋ
"
:
"
X
"
,
"
Ý
"
:
"
Y
"
,
"
Ŷ
"
:
"
Y
"
,
"
Ÿ
"
:
"
Y
"
,
"
Ẏ
"
:
"
Y
"
,
"
Ỵ
"
:
"
Y
"
,
"
Ỳ
"
:
"
Y
"
,
"
Ƴ
"
:
"
Y
"
,
"
Ỷ
"
:
"
Y
"
,
"
Ỿ
"
:
"
Y
"
,
"
Ȳ
"
:
"
Y
"
,
"
Ɏ
"
:
"
Y
"
,
"
Ỹ
"
:
"
Y
"
,
"
Ź
"
:
"
Z
"
,
"
Ž
"
:
"
Z
"
,
"
Ẑ
"
:
"
Z
"
,
"
Ⱬ
"
:
"
Z
"
,
"
Ż
"
:
"
Z
"
,
"
Ẓ
"
:
"
Z
"
,
"
Ȥ
"
:
"
Z
"
,
"
Ẕ
"
:
"
Z
"
,
"
Ƶ
"
:
"
Z
"
,
"
IJ
"
:
"
IJ
"
,
"
Œ
"
:
"
OE
"
,
"
ᴀ
"
:
"
A
"
,
"
ᴁ
"
:
"
AE
"
,
"
ʙ
"
:
"
B
"
,
"
ᴃ
"
:
"
B
"
,
"
ᴄ
"
:
"
C
"
,
"
ᴅ
"
:
"
D
"
,
"
ᴇ
"
:
"
E
"
,
"
ꜰ
"
:
"
F
"
,
"
ɢ
"
:
"
G
"
,
"
ʛ
"
:
"
G
"
,
"
ʜ
"
:
"
H
"
,
"
ɪ
"
:
"
I
"
,
"
ʁ
"
:
"
R
"
,
"
ᴊ
"
:
"
J
"
,
"
ᴋ
"
:
"
K
"
,
"
ʟ
"
:
"
L
"
,
"
ᴌ
"
:
"
L
"
,
"
ᴍ
"
:
"
M
"
,
"
ɴ
"
:
"
N
"
,
"
ᴏ
"
:
"
O
"
,
"
ɶ
"
:
"
OE
"
,
"
ᴐ
"
:
"
O
"
,
"
ᴕ
"
:
"
OU
"
,
"
ᴘ
"
:
"
P
"
,
"
ʀ
"
:
"
R
"
,
"
ᴎ
"
:
"
N
"
,
"
ᴙ
"
:
"
R
"
,
"
ꜱ
"
:
"
S
"
,
"
ᴛ
"
:
"
T
"
,
"
ⱻ
"
:
"
E
"
,
"
ᴚ
"
:
"
R
"
,
"
ᴜ
"
:
"
U
"
,
"
ᴠ
"
:
"
V
"
,
"
ᴡ
"
:
"
W
"
,
"
ʏ
"
:
"
Y
"
,
"
ᴢ
"
:
"
Z
"
,
"
á
"
:
"
a
"
,
"
ă
"
:
"
a
"
,
"
ắ
"
:
"
a
"
,
"
ặ
"
:
"
a
"
,
"
ằ
"
:
"
a
"
,
"
ẳ
"
:
"
a
"
,
"
ẵ
"
:
"
a
"
,
"
ǎ
"
:
"
a
"
,
"
â
"
:
"
a
"
,
"
ấ
"
:
"
a
"
,
"
ậ
"
:
"
a
"
,
"
ầ
"
:
"
a
"
,
"
ẩ
"
:
"
a
"
,
"
ẫ
"
:
"
a
"
,
"
ä
"
:
"
a
"
,
"
ǟ
"
:
"
a
"
,
"
ȧ
"
:
"
a
"
,
"
ǡ
"
:
"
a
"
,
"
ạ
"
:
"
a
"
,
"
ȁ
"
:
"
a
"
,
"
à
"
:
"
a
"
,
"
ả
"
:
"
a
"
,
"
ȃ
"
:
"
a
"
,
"
ā
"
:
"
a
"
,
"
ą
"
:
"
a
"
,
"
ᶏ
"
:
"
a
"
,
"
ẚ
"
:
"
a
"
,
"
å
"
:
"
a
"
,
"
ǻ
"
:
"
a
"
,
"
ḁ
"
:
"
a
"
,
"
ⱥ
"
:
"
a
"
,
"
ã
"
:
"
a
"
,
"
ꜳ
"
:
"
aa
"
,
"
æ
"
:
"
ae
"
,
"
ǽ
"
:
"
ae
"
,
"
ǣ
"
:
"
ae
"
,
"
ꜵ
"
:
"
ao
"
,
"
ꜷ
"
:
"
au
"
,
"
ꜹ
"
:
"
av
"
,
"
ꜻ
"
:
"
av
"
,
"
ꜽ
"
:
"
ay
"
,
"
ḃ
"
:
"
b
"
,
"
ḅ
"
:
"
b
"
,
"
ɓ
"
:
"
b
"
,
"
ḇ
"
:
"
b
"
,
"
ᵬ
"
:
"
b
"
,
"
ᶀ
"
:
"
b
"
,
"
ƀ
"
:
"
b
"
,
"
ƃ
"
:
"
b
"
,
"
ɵ
"
:
"
o
"
,
"
ć
"
:
"
c
"
,
"
č
"
:
"
c
"
,
"
ç
"
:
"
c
"
,
"
ḉ
"
:
"
c
"
,
"
ĉ
"
:
"
c
"
,
"
ɕ
"
:
"
c
"
,
"
ċ
"
:
"
c
"
,
"
ƈ
"
:
"
c
"
,
"
ȼ
"
:
"
c
"
,
"
ď
"
:
"
d
"
,
"
ḑ
"
:
"
d
"
,
"
ḓ
"
:
"
d
"
,
"
ȡ
"
:
"
d
"
,
"
ḋ
"
:
"
d
"
,
"
ḍ
"
:
"
d
"
,
"
ɗ
"
:
"
d
"
,
"
ᶑ
"
:
"
d
"
,
"
ḏ
"
:
"
d
"
,
"
ᵭ
"
:
"
d
"
,
"
ᶁ
"
:
"
d
"
,
"
đ
"
:
"
d
"
,
"
ɖ
"
:
"
d
"
,
"
ƌ
"
:
"
d
"
,
"
ı
"
:
"
i
"
,
"
ȷ
"
:
"
j
"
,
"
ɟ
"
:
"
j
"
,
"
ʄ
"
:
"
j
"
,
"
dz
"
:
"
dz
"
,
"
dž
"
:
"
dz
"
,
"
é
"
:
"
e
"
,
"
ĕ
"
:
"
e
"
,
"
ě
"
:
"
e
"
,
"
ȩ
"
:
"
e
"
,
"
ḝ
"
:
"
e
"
,
"
ê
"
:
"
e
"
,
"
ế
"
:
"
e
"
,
"
ệ
"
:
"
e
"
,
"
ề
"
:
"
e
"
,
"
ể
"
:
"
e
"
,
"
ễ
"
:
"
e
"
,
"
ḙ
"
:
"
e
"
,
"
ë
"
:
"
e
"
,
"
ė
"
:
"
e
"
,
"
ẹ
"
:
"
e
"
,
"
ȅ
"
:
"
e
"
,
"
è
"
:
"
e
"
,
"
ẻ
"
:
"
e
"
,
"
ȇ
"
:
"
e
"
,
"
ē
"
:
"
e
"
,
"
ḗ
"
:
"
e
"
,
"
ḕ
"
:
"
e
"
,
"
ⱸ
"
:
"
e
"
,
"
ę
"
:
"
e
"
,
"
ᶒ
"
:
"
e
"
,
"
ɇ
"
:
"
e
"
,
"
ẽ
"
:
"
e
"
,
"
ḛ
"
:
"
e
"
,
"
ꝫ
"
:
"
et
"
,
"
ḟ
"
:
"
f
"
,
"
ƒ
"
:
"
f
"
,
"
ᵮ
"
:
"
f
"
,
"
ᶂ
"
:
"
f
"
,
"
ǵ
"
:
"
g
"
,
"
ğ
"
:
"
g
"
,
"
ǧ
"
:
"
g
"
,
"
ģ
"
:
"
g
"
,
"
ĝ
"
:
"
g
"
,
"
ġ
"
:
"
g
"
,
"
ɠ
"
:
"
g
"
,
"
ḡ
"
:
"
g
"
,
"
ᶃ
"
:
"
g
"
,
"
ǥ
"
:
"
g
"
,
"
ḫ
"
:
"
h
"
,
"
ȟ
"
:
"
h
"
,
"
ḩ
"
:
"
h
"
,
"
ĥ
"
:
"
h
"
,
"
ⱨ
"
:
"
h
"
,
"
ḧ
"
:
"
h
"
,
"
ḣ
"
:
"
h
"
,
"
ḥ
"
:
"
h
"
,
"
ɦ
"
:
"
h
"
,
"
ẖ
"
:
"
h
"
,
"
ħ
"
:
"
h
"
,
"
ƕ
"
:
"
hv
"
,
"
í
"
:
"
i
"
,
"
ĭ
"
:
"
i
"
,
"
ǐ
"
:
"
i
"
,
"
î
"
:
"
i
"
,
"
ï
"
:
"
i
"
,
"
ḯ
"
:
"
i
"
,
"
ị
"
:
"
i
"
,
"
ȉ
"
:
"
i
"
,
"
ì
"
:
"
i
"
,
"
ỉ
"
:
"
i
"
,
"
ȋ
"
:
"
i
"
,
"
ī
"
:
"
i
"
,
"
į
"
:
"
i
"
,
"
ᶖ
"
:
"
i
"
,
"
ɨ
"
:
"
i
"
,
"
ĩ
"
:
"
i
"
,
"
ḭ
"
:
"
i
"
,
"
ꝺ
"
:
"
d
"
,
"
ꝼ
"
:
"
f
"
,
"
ᵹ
"
:
"
g
"
,
"
ꞃ
"
:
"
r
"
,
"
ꞅ
"
:
"
s
"
,
"
ꞇ
"
:
"
t
"
,
"
ꝭ
"
:
"
is
"
,
"
ǰ
"
:
"
j
"
,
"
ĵ
"
:
"
j
"
,
"
ʝ
"
:
"
j
"
,
"
ɉ
"
:
"
j
"
,
"
ḱ
"
:
"
k
"
,
"
ǩ
"
:
"
k
"
,
"
ķ
"
:
"
k
"
,
"
ⱪ
"
:
"
k
"
,
"
ꝃ
"
:
"
k
"
,
"
ḳ
"
:
"
k
"
,
"
ƙ
"
:
"
k
"
,
"
ḵ
"
:
"
k
"
,
"
ᶄ
"
:
"
k
"
,
"
ꝁ
"
:
"
k
"
,
"
ꝅ
"
:
"
k
"
,
"
ĺ
"
:
"
l
"
,
"
ƚ
"
:
"
l
"
,
"
ɬ
"
:
"
l
"
,
"
ľ
"
:
"
l
"
,
"
ļ
"
:
"
l
"
,
"
ḽ
"
:
"
l
"
,
"
ȴ
"
:
"
l
"
,
"
ḷ
"
:
"
l
"
,
"
ḹ
"
:
"
l
"
,
"
ⱡ
"
:
"
l
"
,
"
ꝉ
"
:
"
l
"
,
"
ḻ
"
:
"
l
"
,
"
ŀ
"
:
"
l
"
,
"
ɫ
"
:
"
l
"
,
"
ᶅ
"
:
"
l
"
,
"
ɭ
"
:
"
l
"
,
"
ł
"
:
"
l
"
,
"
lj
"
:
"
lj
"
,
"
ſ
"
:
"
s
"
,
"
ẜ
"
:
"
s
"
,
"
ẛ
"
:
"
s
"
,
"
ẝ
"
:
"
s
"
,
"
ḿ
"
:
"
m
"
,
"
ṁ
"
:
"
m
"
,
"
ṃ
"
:
"
m
"
,
"
ɱ
"
:
"
m
"
,
"
ᵯ
"
:
"
m
"
,
"
ᶆ
"
:
"
m
"
,
"
ń
"
:
"
n
"
,
"
ň
"
:
"
n
"
,
"
ņ
"
:
"
n
"
,
"
ṋ
"
:
"
n
"
,
"
ȵ
"
:
"
n
"
,
"
ṅ
"
:
"
n
"
,
"
ṇ
"
:
"
n
"
,
"
ǹ
"
:
"
n
"
,
"
ɲ
"
:
"
n
"
,
"
ṉ
"
:
"
n
"
,
"
ƞ
"
:
"
n
"
,
"
ᵰ
"
:
"
n
"
,
"
ᶇ
"
:
"
n
"
,
"
ɳ
"
:
"
n
"
,
"
ñ
"
:
"
n
"
,
"
nj
"
:
"
nj
"
,
"
ó
"
:
"
o
"
,
"
ŏ
"
:
"
o
"
,
"
ǒ
"
:
"
o
"
,
"
ô
"
:
"
o
"
,
"
ố
"
:
"
o
"
,
"
ộ
"
:
"
o
"
,
"
ồ
"
:
"
o
"
,
"
ổ
"
:
"
o
"
,
"
ỗ
"
:
"
o
"
,
"
ö
"
:
"
o
"
,
"
ȫ
"
:
"
o
"
,
"
ȯ
"
:
"
o
"
,
"
ȱ
"
:
"
o
"
,
"
ọ
"
:
"
o
"
,
"
ő
"
:
"
o
"
,
"
ȍ
"
:
"
o
"
,
"
ò
"
:
"
o
"
,
"
ỏ
"
:
"
o
"
,
"
ơ
"
:
"
o
"
,
"
ớ
"
:
"
o
"
,
"
ợ
"
:
"
o
"
,
"
ờ
"
:
"
o
"
,
"
ở
"
:
"
o
"
,
"
ỡ
"
:
"
o
"
,
"
ȏ
"
:
"
o
"
,
"
ꝋ
"
:
"
o
"
,
"
ꝍ
"
:
"
o
"
,
"
ⱺ
"
:
"
o
"
,
"
ō
"
:
"
o
"
,
"
ṓ
"
:
"
o
"
,
"
ṑ
"
:
"
o
"
,
"
ǫ
"
:
"
o
"
,
"
ǭ
"
:
"
o
"
,
"
ø
"
:
"
o
"
,
"
ǿ
"
:
"
o
"
,
"
õ
"
:
"
o
"
,
"
ṍ
"
:
"
o
"
,
"
ṏ
"
:
"
o
"
,
"
ȭ
"
:
"
o
"
,
"
ƣ
"
:
"
oi
"
,
"
ꝏ
"
:
"
oo
"
,
"
ɛ
"
:
"
e
"
,
"
ᶓ
"
:
"
e
"
,
"
ɔ
"
:
"
o
"
,
"
ᶗ
"
:
"
o
"
,
"
ȣ
"
:
"
ou
"
,
"
ṕ
"
:
"
p
"
,
"
ṗ
"
:
"
p
"
,
"
ꝓ
"
:
"
p
"
,
"
ƥ
"
:
"
p
"
,
"
ᵱ
"
:
"
p
"
,
"
ᶈ
"
:
"
p
"
,
"
ꝕ
"
:
"
p
"
,
"
ᵽ
"
:
"
p
"
,
"
ꝑ
"
:
"
p
"
,
"
ꝙ
"
:
"
q
"
,
"
ʠ
"
:
"
q
"
,
"
ɋ
"
:
"
q
"
,
"
ꝗ
"
:
"
q
"
,
"
ŕ
"
:
"
r
"
,
"
ř
"
:
"
r
"
,
"
ŗ
"
:
"
r
"
,
"
ṙ
"
:
"
r
"
,
"
ṛ
"
:
"
r
"
,
"
ṝ
"
:
"
r
"
,
"
ȑ
"
:
"
r
"
,
"
ɾ
"
:
"
r
"
,
"
ᵳ
"
:
"
r
"
,
"
ȓ
"
:
"
r
"
,
"
ṟ
"
:
"
r
"
,
"
ɼ
"
:
"
r
"
,
"
ᵲ
"
:
"
r
"
,
"
ᶉ
"
:
"
r
"
,
"
ɍ
"
:
"
r
"
,
"
ɽ
"
:
"
r
"
,
"
ↄ
"
:
"
c
"
,
"
ꜿ
"
:
"
c
"
,
"
ɘ
"
:
"
e
"
,
"
ɿ
"
:
"
r
"
,
"
ś
"
:
"
s
"
,
"
ṥ
"
:
"
s
"
,
"
š
"
:
"
s
"
,
"
ṧ
"
:
"
s
"
,
"
ş
"
:
"
s
"
,
"
ŝ
"
:
"
s
"
,
"
ș
"
:
"
s
"
,
"
ṡ
"
:
"
s
"
,
"
ṣ
"
:
"
s
"
,
"
ṩ
"
:
"
s
"
,
"
ʂ
"
:
"
s
"
,
"
ᵴ
"
:
"
s
"
,
"
ᶊ
"
:
"
s
"
,
"
ȿ
"
:
"
s
"
,
"
ɡ
"
:
"
g
"
,
"
ß
"
:
"
ss
"
,
"
ᴑ
"
:
"
o
"
,
"
ᴓ
"
:
"
o
"
,
"
ᴝ
"
:
"
u
"
,
"
ť
"
:
"
t
"
,
"
ţ
"
:
"
t
"
,
"
ṱ
"
:
"
t
"
,
"
ț
"
:
"
t
"
,
"
ȶ
"
:
"
t
"
,
"
ẗ
"
:
"
t
"
,
"
ⱦ
"
:
"
t
"
,
"
ṫ
"
:
"
t
"
,
"
ṭ
"
:
"
t
"
,
"
ƭ
"
:
"
t
"
,
"
ṯ
"
:
"
t
"
,
"
ᵵ
"
:
"
t
"
,
"
ƫ
"
:
"
t
"
,
"
ʈ
"
:
"
t
"
,
"
ŧ
"
:
"
t
"
,
"
ᵺ
"
:
"
th
"
,
"
ɐ
"
:
"
a
"
,
"
ᴂ
"
:
"
ae
"
,
"
ǝ
"
:
"
e
"
,
"
ᵷ
"
:
"
g
"
,
"
ɥ
"
:
"
h
"
,
"
ʮ
"
:
"
h
"
,
"
ʯ
"
:
"
h
"
,
"
ᴉ
"
:
"
i
"
,
"
ʞ
"
:
"
k
"
,
"
ꞁ
"
:
"
l
"
,
"
ɯ
"
:
"
m
"
,
"
ɰ
"
:
"
m
"
,
"
ᴔ
"
:
"
oe
"
,
"
ɹ
"
:
"
r
"
,
"
ɻ
"
:
"
r
"
,
"
ɺ
"
:
"
r
"
,
"
ⱹ
"
:
"
r
"
,
"
ʇ
"
:
"
t
"
,
"
ʌ
"
:
"
v
"
,
"
ʍ
"
:
"
w
"
,
"
ʎ
"
:
"
y
"
,
"
ꜩ
"
:
"
tz
"
,
"
ú
"
:
"
u
"
,
"
ŭ
"
:
"
u
"
,
"
ǔ
"
:
"
u
"
,
"
û
"
:
"
u
"
,
"
ṷ
"
:
"
u
"
,
"
ü
"
:
"
u
"
,
"
ǘ
"
:
"
u
"
,
"
ǚ
"
:
"
u
"
,
"
ǜ
"
:
"
u
"
,
"
ǖ
"
:
"
u
"
,
"
ṳ
"
:
"
u
"
,
"
ụ
"
:
"
u
"
,
"
ű
"
:
"
u
"
,
"
ȕ
"
:
"
u
"
,
"
ù
"
:
"
u
"
,
"
ủ
"
:
"
u
"
,
"
ư
"
:
"
u
"
,
"
ứ
"
:
"
u
"
,
"
ự
"
:
"
u
"
,
"
ừ
"
:
"
u
"
,
"
ử
"
:
"
u
"
,
"
ữ
"
:
"
u
"
,
"
ȗ
"
:
"
u
"
,
"
ū
"
:
"
u
"
,
"
ṻ
"
:
"
u
"
,
"
ų
"
:
"
u
"
,
"
ᶙ
"
:
"
u
"
,
"
ů
"
:
"
u
"
,
"
ũ
"
:
"
u
"
,
"
ṹ
"
:
"
u
"
,
"
ṵ
"
:
"
u
"
,
"
ᵫ
"
:
"
ue
"
,
"
ꝸ
"
:
"
um
"
,
"
ⱴ
"
:
"
v
"
,
"
ꝟ
"
:
"
v
"
,
"
ṿ
"
:
"
v
"
,
"
ʋ
"
:
"
v
"
,
"
ᶌ
"
:
"
v
"
,
"
ⱱ
"
:
"
v
"
,
"
ṽ
"
:
"
v
"
,
"
ꝡ
"
:
"
vy
"
,
"
ẃ
"
:
"
w
"
,
"
ŵ
"
:
"
w
"
,
"
ẅ
"
:
"
w
"
,
"
ẇ
"
:
"
w
"
,
"
ẉ
"
:
"
w
"
,
"
ẁ
"
:
"
w
"
,
"
ⱳ
"
:
"
w
"
,
"
ẘ
"
:
"
w
"
,
"
ẍ
"
:
"
x
"
,
"
ẋ
"
:
"
x
"
,
"
ᶍ
"
:
"
x
"
,
"
ý
"
:
"
y
"
,
"
ŷ
"
:
"
y
"
,
"
ÿ
"
:
"
y
"
,
"
ẏ
"
:
"
y
"
,
"
ỵ
"
:
"
y
"
,
"
ỳ
"
:
"
y
"
,
"
ƴ
"
:
"
y
"
,
"
ỷ
"
:
"
y
"
,
"
ỿ
"
:
"
y
"
,
"
ȳ
"
:
"
y
"
,
"
ẙ
"
:
"
y
"
,
"
ɏ
"
:
"
y
"
,
"
ỹ
"
:
"
y
"
,
"
ź
"
:
"
z
"
,
"
ž
"
:
"
z
"
,
"
ẑ
"
:
"
z
"
,
"
ʑ
"
:
"
z
"
,
"
ⱬ
"
:
"
z
"
,
"
ż
"
:
"
z
"
,
"
ẓ
"
:
"
z
"
,
"
ȥ
"
:
"
z
"
,
"
ẕ
"
:
"
z
"
,
"
ᵶ
"
:
"
z
"
,
"
ᶎ
"
:
"
z
"
,
"
ʐ
"
:
"
z
"
,
"
ƶ
"
:
"
z
"
,
"
ɀ
"
:
"
z
"
,
"
ff
"
:
"
ff
"
,
"
ffi
"
:
"
ffi
"
,
"
ffl
"
:
"
ffl
"
,
"
fi
"
:
"
fi
"
,
"
fl
"
:
"
fl
"
,
"
ij
"
:
"
ij
"
,
"
œ
"
:
"
oe
"
,
"
st
"
:
"
st
"
,
"
ₐ
"
:
"
a
"
,
"
ₑ
"
:
"
e
"
,
"
ᵢ
"
:
"
i
"
,
"
ⱼ
"
:
"
j
"
,
"
ₒ
"
:
"
o
"
,
"
ᵣ
"
:
"
r
"
,
"
ᵤ
"
:
"
u
"
,
"
ᵥ
"
:
"
v
"
,
"
ₓ
"
:
"
x
"
}
};
String
.
prototype
.
latinise
=
function
()
{
return
this
.
replace
(
/
[^
A-Za-z0-9
]
/g
,
function
(
x
)
{
return
Latinise
.
map
[
x
]
||
x
;
});
};
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