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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
1b4e3e74
Commit
1b4e3e74
authored
Oct 31, 2018
by
at.ramya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removing duplicate definitions
parent
75cfba9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
27 deletions
+1
-27
qa/qa/page/merge_request/show.rb
qa/qa/page/merge_request/show.rb
+1
-27
No files found.
qa/qa/page/merge_request/show.rb
View file @
1b4e3e74
...
@@ -55,32 +55,6 @@ module QA
...
@@ -55,32 +55,6 @@ module QA
element
:labels_block
element
:labels_block
end
end
view
'app/views/projects/merge_requests/show.html.haml'
do
element
:notes_tab
element
:diffs_tab
end
view
'app/assets/javascripts/diffs/components/diff_line_gutter_content.vue'
do
element
:diff_comment
end
view
'app/assets/javascripts/notes/components/comment_form.vue'
do
element
:note_dropdown
element
:discussion_option
end
view
'app/assets/javascripts/notes/components/note_form.vue'
do
element
:reply_input
end
view
'app/assets/javascripts/notes/components/noteable_discussion.vue'
do
element
:discussion_reply
end
view
'app/assets/javascripts/diffs/components/inline_diff_table_row.vue'
do
element
:new_diff_line
end
def
fast_forward_possible?
def
fast_forward_possible?
!
has_text?
(
'Fast-forward merge is not possible'
)
!
has_text?
(
'Fast-forward merge is not possible'
)
end
end
...
@@ -186,7 +160,7 @@ module QA
...
@@ -186,7 +160,7 @@ module QA
end
end
def
reply_to_discussion
(
reply_text
)
def
reply_to_discussion
(
reply_text
)
all_elements
(
:discussion_reply
).
fir
st
.
click
all_elements
(
:discussion_reply
).
la
st
.
click
fill_element
:reply_input
,
reply_text
fill_element
:reply_input
,
reply_text
end
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