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
c2939c71
Commit
c2939c71
authored
Jun 27, 2018
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix merge requests data source key to be camelCase
parent
1f31803d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
spec/helpers/application_helper_spec.rb
spec/helpers/application_helper_spec.rb
+1
-1
No files found.
app/helpers/application_helper.rb
View file @
c2939c71
...
@@ -270,7 +270,7 @@ module ApplicationHelper
...
@@ -270,7 +270,7 @@ module ApplicationHelper
{
{
members:
members_project_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
members:
members_project_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
issues:
issues_project_autocomplete_sources_path
(
object
),
issues:
issues_project_autocomplete_sources_path
(
object
),
merge
_r
equests:
merge_requests_project_autocomplete_sources_path
(
object
),
merge
R
equests:
merge_requests_project_autocomplete_sources_path
(
object
),
labels:
labels_project_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
labels:
labels_project_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
milestones:
milestones_project_autocomplete_sources_path
(
object
),
milestones:
milestones_project_autocomplete_sources_path
(
object
),
commands:
commands_project_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
])
commands:
commands_project_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
])
...
...
spec/helpers/application_helper_spec.rb
View file @
c2939c71
...
@@ -157,7 +157,7 @@ describe ApplicationHelper do
...
@@ -157,7 +157,7 @@ describe ApplicationHelper do
let
(
:noteable_type
)
{
Issue
}
let
(
:noteable_type
)
{
Issue
}
it
'returns paths for autocomplete_sources_controller'
do
it
'returns paths for autocomplete_sources_controller'
do
sources
=
helper
.
autocomplete_data_sources
(
project
,
noteable_type
)
sources
=
helper
.
autocomplete_data_sources
(
project
,
noteable_type
)
expect
(
sources
.
keys
).
to
match_array
([
:members
,
:issues
,
:merge
_r
equests
,
:labels
,
:milestones
,
:commands
])
expect
(
sources
.
keys
).
to
match_array
([
:members
,
:issues
,
:merge
R
equests
,
:labels
,
:milestones
,
:commands
])
sources
.
keys
.
each
do
|
key
|
sources
.
keys
.
each
do
|
key
|
expect
(
sources
[
key
]).
not_to
be_nil
expect
(
sources
[
key
]).
not_to
be_nil
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