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
11987a64
Commit
11987a64
authored
Feb 03, 2019
by
Sanad Liaquat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve qa/qa/page/main/login.rb
parent
51452029
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
20 deletions
+0
-20
qa/qa/page/main/login.rb
qa/qa/page/main/login.rb
+0
-20
No files found.
qa/qa/page/main/login.rb
View file @
11987a64
...
@@ -153,7 +153,6 @@ module QA
...
@@ -153,7 +153,6 @@ module QA
def
sign_in_with_github
def
sign_in_with_github
set_initial_password_if_present
set_initial_password_if_present
click_element
:github_login_button
click_element
:github_login_button
<<<<<<<
HEAD
end
end
def
sign_in_with_saml
def
sign_in_with_saml
...
@@ -163,25 +162,6 @@ module QA
...
@@ -163,25 +162,6 @@ module QA
private
private
=======
end
def
sign_in_with_saml
set_initial_password_if_present
click_element
:saml_login_button
end
private
def
sign_in_using_ldap_credentials
switch_to_ldap_tab
fill_element
:username_field
,
Runtime
::
User
.
ldap_username
fill_element
:password_field
,
Runtime
::
User
.
ldap_password
click_element
:sign_in_button
end
>>>>>>>
upstream
/
master
def
sign_in_using_gitlab_credentials
(
user
)
def
sign_in_using_gitlab_credentials
(
user
)
switch_to_sign_in_tab
if
has_sign_in_tab?
switch_to_sign_in_tab
if
has_sign_in_tab?
switch_to_standard_tab
if
has_standard_tab?
switch_to_standard_tab
if
has_standard_tab?
...
...
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