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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
f9a11630
Commit
f9a11630
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test/fix_home_dir'
parents
2c7e0874
37d62938
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG
CHANGELOG
+1
-0
lib/tasks/gitlab/shell.rake
lib/tasks/gitlab/shell.rake
+1
-1
No files found.
CHANGELOG
View file @
f9a11630
v 7.3.0
- Always set the 'origin' remote in satellite actions
- Write authorized_keys in tmp/ during tests
v 7.2.0
- Explore page
...
...
This diff is collapsed.
Click to expand it.
lib/tasks/gitlab/shell.rake
View file @
f9a11630
...
...
@@ -8,7 +8,7 @@ namespace :gitlab do
args
.
with_defaults
(
tag:
'v'
+
default_version
,
repo:
"https://gitlab.com/gitlab-org/gitlab-shell.git"
)
user
=
Settings
.
gitlab
.
user
home_dir
=
Settings
.
gitlab
.
user_home
home_dir
=
Rails
.
env
.
test?
?
Rails
.
root
.
join
(
'tmp/tests'
)
:
Settings
.
gitlab
.
user_home
gitlab_url
=
Settings
.
gitlab
.
url
# gitlab-shell requires a / at the end of the url
gitlab_url
+=
"/"
unless
gitlab_url
.
match
(
/\/$/
)
...
...
This diff is collapsed.
Click to expand it.
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