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
iv
gitlab-ce
Commits
5f595be4
Commit
5f595be4
authored
Mar 20, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new gems methods.
parent
817f5ff6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
6 deletions
+3
-6
app/views/layouts/_init_auto_complete.html.haml
app/views/layouts/_init_auto_complete.html.haml
+1
-1
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+1
-1
config/initializers/gemoji.rb
config/initializers/gemoji.rb
+0
-3
lib/gitlab/markdown.rb
lib/gitlab/markdown.rb
+1
-1
No files found.
app/views/layouts/_init_auto_complete.html.haml
View file @
5f595be4
:javascript
:javascript
GitLab
.
GfmAutoComplete
.
dataSource
=
"
#{
autocomplete_sources_project_path
(
@project
)
}
"
GitLab
.
GfmAutoComplete
.
dataSource
=
"
#{
autocomplete_sources_project_path
(
@project
)
}
"
GitLab
.
GfmAutoComplete
.
Emoji
.
assetBase
=
"
#{
Gitlab
.
config
.
gitlab
.
relative_url_root
+
'/assets/emoji'
}
"
GitLab
.
GfmAutoComplete
.
Emoji
.
assetBase
=
"
#{
Gitlab
.
config
.
gitlab
.
relative_url_root
+
Emoji
.
asset_path
}
"
GitLab
.
GfmAutoComplete
.
setup
();
GitLab
.
GfmAutoComplete
.
setup
();
app/views/projects/notes/_note.html.haml
View file @
5f595be4
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
%i
.icon-thumbs-up
%i
.icon-thumbs-up
\+1
\+1
-
if
note
.
downvote?
-
if
note
.
downvote?
%span
.vote.downvote.label.label-
erro
r
%span
.vote.downvote.label.label-
dange
r
%i
.icon-thumbs-down
%i
.icon-thumbs-down
\-1
\-1
...
...
config/initializers/gemoji.rb
deleted
100644 → 0
View file @
817f5ff6
# Workaround for https://github.com/github/gemoji/pull/18
require
'gemoji'
Gitlab
::
Application
.
config
.
assets
.
paths
<<
Emoji
.
images_path
lib/gitlab/markdown.rb
View file @
5f595be4
...
@@ -152,7 +152,7 @@ module Gitlab
...
@@ -152,7 +152,7 @@ module Gitlab
#
#
# Returns boolean
# Returns boolean
def
valid_emoji?
(
emoji
)
def
valid_emoji?
(
emoji
)
Emoji
.
names
.
include?
emoji
Emoji
.
find_by_name
emoji
end
end
# Private: Dispatches to a dedicated processing method based on reference
# Private: Dispatches to a dedicated processing method based on reference
...
...
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