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
a6e480fa
Commit
a6e480fa
authored
Sep 07, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop issues
parent
b6e06124
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
spec/services/merge_requests/ff_merge_service_spec.rb
spec/services/merge_requests/ff_merge_service_spec.rb
+6
-5
spec/services/merge_requests/rebase_service_spec.rb
spec/services/merge_requests/rebase_service_spec.rb
+5
-5
No files found.
spec/services/merge_requests/ff_merge_service_spec.rb
View file @
a6e480fa
...
...
@@ -3,10 +3,12 @@ require 'spec_helper'
describe
MergeRequests
::
FfMergeService
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user2
)
{
create
(
:user
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_branch:
'flatten-dir'
,
target_branch:
'improve/awesome'
,
assignee:
user2
)
}
let
(
:merge_request
)
do
create
(
:merge_request
,
source_branch:
'flatten-dir'
,
target_branch:
'improve/awesome'
,
assignee:
user2
)
end
let
(
:project
)
{
merge_request
.
project
}
before
do
...
...
@@ -46,4 +48,3 @@ describe MergeRequests::FfMergeService do
end
end
end
spec/services/merge_requests/rebase_service_spec.rb
View file @
a6e480fa
...
...
@@ -2,9 +2,11 @@ require 'spec_helper'
describe
MergeRequests
::
RebaseService
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_branch:
'feature_conflict'
,
target_branch:
'master'
)}
let
(
:merge_request
)
do
create
(
:merge_request
,
source_branch:
'feature_conflict'
,
target_branch:
'master'
)
end
let
(
:project
)
{
merge_request
.
project
}
before
do
...
...
@@ -27,5 +29,3 @@ describe MergeRequests::RebaseService do
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