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
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+1
-1
qa/qa/specs/features/merge_request/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
...
@@ -24,7 +24,7 @@ module QA
end
end
def
fast_forward_possible?
def
fast_forward_possible?
!
page
.
has_text?
(
"Fast-forward merge is not possible"
)
!
has_text?
(
"Fast-forward merge is not possible"
)
end
end
def
has_merge_button?
def
has_merge_button?
...
...
qa/qa/specs/features/merge_request/rebase_spec.rb
View file @
9870c055
...
@@ -5,7 +5,7 @@ module QA
...
@@ -5,7 +5,7 @@ module QA
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
project
=
Factory
::
Resource
::
Project
.
fabricate!
do
|
project
|
project
=
Factory
::
Resource
::
Project
.
fabricate!
do
|
project
|
project
.
name
=
"
no
-fast-forward"
project
.
name
=
"
only
-fast-forward"
end
end
Page
::
Menu
::
Side
.
act
{
go_to_settings
}
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