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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
7bb378b3
Commit
7bb378b3
authored
Feb 22, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create EmojisController
parent
b80df087
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+1
-1
app/controllers/autocomplete_controller.rb
app/controllers/autocomplete_controller.rb
+0
-4
app/controllers/emojis_controller.rb
app/controllers/emojis_controller.rb
+5
-0
app/views/emojis/index.html.haml
app/views/emojis/index.html.haml
+0
-0
config/routes.rb
config/routes.rb
+2
-1
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
7bb378b3
...
@@ -19,7 +19,7 @@ class @AwardsHandler
...
@@ -19,7 +19,7 @@ class @AwardsHandler
$
(
".emoji-menu"
).
show
()
$
(
".emoji-menu"
).
show
()
$
(
"#emoji_search"
).
focus
()
$
(
"#emoji_search"
).
focus
()
else
else
$
.
get
"/emoji
_menu
"
,
(
response
)
->
$
.
get
"/emoji
s
"
,
(
response
)
->
$
(
".add-award"
).
after
response
$
(
".add-award"
).
after
response
$
(
".emoji-menu"
).
show
()
$
(
".emoji-menu"
).
show
()
$
(
"#emoji_search"
).
focus
()
$
(
"#emoji_search"
).
focus
()
...
...
app/controllers/autocomplete_controller.rb
View file @
7bb378b3
...
@@ -24,10 +24,6 @@ class AutocompleteController < ApplicationController
...
@@ -24,10 +24,6 @@ class AutocompleteController < ApplicationController
render
json:
@user
,
only:
[
:name
,
:username
,
:id
],
methods:
[
:avatar_url
]
render
json:
@user
,
only:
[
:name
,
:username
,
:id
],
methods:
[
:avatar_url
]
end
end
def
emoji_menu
render
'shared/emoji_menu'
,
layout:
false
end
private
private
def
find_users
def
find_users
...
...
app/controllers/emojis_controller.rb
0 → 100644
View file @
7bb378b3
class
EmojisController
<
ApplicationController
def
index
render
:index
,
layout:
false
end
end
app/views/
shared/emoji_menu
.html.haml
→
app/views/
emojis/index
.html.haml
View file @
7bb378b3
File moved
config/routes.rb
View file @
7bb378b3
...
@@ -42,8 +42,9 @@ Rails.application.routes.draw do
...
@@ -42,8 +42,9 @@ Rails.application.routes.draw do
# Autocomplete
# Autocomplete
get
'/autocomplete/users'
=>
'autocomplete#users'
get
'/autocomplete/users'
=>
'autocomplete#users'
get
'/autocomplete/users/:id'
=>
'autocomplete#user'
get
'/autocomplete/users/:id'
=>
'autocomplete#user'
get
'/emoji_menu'
=>
'autocomplete#emoji_menu'
# Emojis
resources
:emojis
,
only: :index
# Search
# Search
get
'search'
=>
'search#show'
get
'search'
=>
'search#show'
...
...
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