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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ada1ea2a
Commit
ada1ea2a
authored
Dec 09, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for autocomplete and fixes some specs
parent
a58cefc6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/controllers/autocomplete_controller.rb
app/controllers/autocomplete_controller.rb
+1
-1
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+1
-1
spec/helpers/merge_request_helper_spec.rb
spec/helpers/merge_request_helper_spec.rb
+1
-1
No files found.
app/controllers/autocomplete_controller.rb
View file @
ada1ea2a
...
...
@@ -8,7 +8,7 @@ class AutocompleteController < ApplicationController
@users
=
@users
.
active
@users
=
@users
.
reorder
(
:name
)
if
params
[
:push_code_to_protected_branches
]
&&
project
if
params
[
:push_code_to_protected_branches
]
.
present?
&&
project
@users
=
@users
.
to_a
.
select
{
|
user
|
user
.
can?
(
:push_code_to_protected_branches
,
project
)
}.
take
(
PER_PAGE
)
else
@users
=
@users
.
page
(
params
[
:page
]).
per
(
PER_PAGE
)
...
...
features/steps/project/merge_requests.rb
View file @
ada1ea2a
...
...
@@ -386,7 +386,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
expect
(
page
).
to
have_content
(
@user
.
name
)
end
click_button
"Submit
new
merge request"
click_button
"Submit merge request"
click_link
"Edit"
page
.
within
'ul.approver-list'
do
...
...
spec/helpers/merge_request_helper_spec.rb
View file @
ada1ea2a
...
...
@@ -37,7 +37,7 @@ describe MergeRequestsHelper do
]
end
it
{
is_expected
.
to
eq
(
'
JIRA-123, JIRA-456, and FOOBAR-7890
'
)
}
it
{
is_expected
.
to
eq
(
'
FOOBAR-7890, JIRA-123, and JIRA-456
'
)
}
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