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
4f4edc7b
Commit
4f4edc7b
authored
May 31, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
0baed81e
d972a60a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
qa/qa/fixtures/auto_devops_rack/Dockerfile
qa/qa/fixtures/auto_devops_rack/Dockerfile
+9
-0
qa/qa/runtime/api/client.rb
qa/qa/runtime/api/client.rb
+3
-6
No files found.
qa/qa/fixtures/auto_devops_rack/Dockerfile
0 → 100644
View file @
4f4edc7b
FROM
ruby:2.6.3-alpine
ADD
./ /app/
WORKDIR
/app
ENV
RACK_ENV production
ENV
PORT 5000
EXPOSE
5000
RUN
bundle
install
CMD
["bundle","exec", "rackup", "-p", "5000"]
qa/qa/runtime/api/client.rb
View file @
4f4edc7b
...
...
@@ -25,15 +25,12 @@ module QA
private
def
create_personal_access_token
if
@is_new_session
Runtime
::
Browser
.
visit
(
@address
,
Page
::
Main
::
Login
)
{
do_create_personal_access_token
}
else
do_create_personal_access_token
end
Runtime
::
Browser
.
visit
(
@address
,
Page
::
Main
::
Login
)
if
@is_new_session
do_create_personal_access_token
end
def
do_create_personal_access_token
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
Resource
::
PersonalAccessToken
.
fabricate!
.
access_token
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