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
2a5b43c4
Commit
2a5b43c4
authored
Nov 06, 2020
by
Adrien Kohlbecker
Committed by
Stan Hu
Nov 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix relative path not found on production web server
parent
059e0397
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
changelogs/unreleased/ak-fix-loading-file.yml
changelogs/unreleased/ak-fix-loading-file.yml
+5
-0
lib/gitlab/ci/runner_instructions.rb
lib/gitlab/ci/runner_instructions.rb
+1
-1
spec/lib/gitlab/ci/runner_instructions_spec.rb
spec/lib/gitlab/ci/runner_instructions_spec.rb
+7
-0
No files found.
changelogs/unreleased/ak-fix-loading-file.yml
0 → 100644
View file @
2a5b43c4
---
title
:
Fix relative path not found on production web server
merge_request
:
47090
author
:
type
:
fixed
lib/gitlab/ci/runner_instructions.rb
View file @
2a5b43c4
...
...
@@ -106,7 +106,7 @@ module Gitlab
end
def
get_file
(
path
)
File
.
read
(
path
)
File
.
read
(
Rails
.
root
.
join
(
path
).
to_s
)
end
def
registration_token
...
...
spec/lib/gitlab/ci/runner_instructions_spec.rb
View file @
2a5b43c4
...
...
@@ -75,6 +75,13 @@ RSpec.describe Gitlab::Ci::RunnerInstructions do
with_them
do
let
(
:params
)
{
{
os:
os
,
arch:
arch
}
}
around
do
|
example
|
# puma in production does not run from Rails.root, ensure file loading does not assume this
Dir
.
chdir
(
Rails
.
root
.
join
(
'tmp'
).
to_s
)
do
example
.
run
end
end
it
'returns string containing correct params'
do
result
=
subject
.
install_script
...
...
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