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
fe3b2e64
Commit
fe3b2e64
authored
Sep 06, 2017
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop violation
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1b860a4e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
spec/ee/spec/models/ee/merge_request_spec.rb
spec/ee/spec/models/ee/merge_request_spec.rb
+6
-2
No files found.
spec/ee/spec/models/ee/merge_request_spec.rb
View file @
fe3b2e64
...
...
@@ -39,7 +39,9 @@ describe MergeRequest do
describe
'#rebase_in_progress?'
do
# Create merge request and project before we stub file calls
before
{
subject
}
before
do
subject
end
it
'returns true when there is a current rebase directory'
do
allow
(
File
).
to
receive
(
:exist?
).
and_return
(
true
)
...
...
@@ -73,7 +75,9 @@ describe MergeRequest do
describe
'#squash_in_progress?'
do
# Create merge request and project before we stub file calls
before
{
subject
}
before
do
subject
end
it
'returns true when there is a current squash directory'
do
allow
(
File
).
to
receive
(
:exist?
).
and_return
(
true
)
...
...
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