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
Boxiang Sun
gitlab-ce
Commits
829830ae
Commit
829830ae
authored
Feb 09, 2016
by
Zeger-Jan van de Weg
Committed by
Zeger-Jan van de Weg
Feb 22, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix loading data when no author_id is passed
parent
df27b3a1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/controllers/autocomplete_controller.rb
app/controllers/autocomplete_controller.rb
+1
-1
app/services/merge_requests/base_service.rb
app/services/merge_requests/base_service.rb
+2
-2
No files found.
app/controllers/autocomplete_controller.rb
View file @
829830ae
...
@@ -15,7 +15,7 @@ class AutocompleteController < ApplicationController
...
@@ -15,7 +15,7 @@ class AutocompleteController < ApplicationController
@users
=
[
*
@users
,
current_user
]
@users
=
[
*
@users
,
current_user
]
end
end
if
params
[
:author_id
]
unless
params
[
:author_id
]
==
"false"
@users
=
[
User
.
find
(
params
[
:author_id
]),
*
@users
]
@users
=
[
User
.
find
(
params
[
:author_id
]),
*
@users
]
end
end
...
...
app/services/merge_requests/base_service.rb
View file @
829830ae
...
@@ -23,8 +23,8 @@ module MergeRequests
...
@@ -23,8 +23,8 @@ module MergeRequests
private
private
def
filter_params
(
issu
e
able
=
nil
)
def
filter_params
(
issuable
=
nil
)
super
(
:merge_request
,
issu
e
able
)
super
(
:merge_request
,
issuable
)
end
end
end
end
end
end
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