BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
9870c055
Commit
9870c055
authored
Feb 22, 2018
by
Felipe Artur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small review changes
parent
73e50395
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
show.rb
qa/qa/page/merge_request/show.rb
+1
-1
rebase_spec.rb
qa/qa/specs/features/merge_request/rebase_spec.rb
+1
-1
No files found.
qa/qa/page/merge_request/show.rb
View file @
9870c055
...
...
@@ -24,7 +24,7 @@ module QA
end
def
fast_forward_possible?
!
page
.
has_text?
(
"Fast-forward merge is not possible"
)
!
has_text?
(
"Fast-forward merge is not possible"
)
end
def
has_merge_button?
...
...
qa/qa/specs/features/merge_request/rebase_spec.rb
View file @
9870c055
...
...
@@ -5,7 +5,7 @@ module QA
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
project
=
Factory
::
Resource
::
Project
.
fabricate!
do
|
project
|
project
.
name
=
"
no
-fast-forward"
project
.
name
=
"
only
-fast-forward"
end
Page
::
Menu
::
Side
.
act
{
go_to_settings
}
...
...
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