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
122f02bc
Commit
122f02bc
authored
Oct 23, 2015
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the contents of the satellites dir
parent
0bb50ea0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
4 deletions
+25
-4
config/gitlab.yml.example
config/gitlab.yml.example
+4
-2
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+3
-1
db/migrate/20151023144219_remove_satellites.rb
db/migrate/20151023144219_remove_satellites.rb
+17
-0
db/schema.rb
db/schema.rb
+1
-1
No files found.
config/gitlab.yml.example
View file @
122f02bc
...
...
@@ -318,10 +318,12 @@ production: &base
# ==========================
# GitLab Satellites
#
# Note for maintainers: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in
# db/migrate/20151023144219_remove_satellites.rb
satellites:
# Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
path: /home/git/gitlab-satellites/
timeout: 30
## Backup settings
backup:
...
...
config/initializers/1_settings.rb
View file @
122f02bc
...
...
@@ -242,9 +242,11 @@ Settings.git['max_size'] ||= 20971520 # 20.megabytes
Settings
.
git
[
'bin_path'
]
||=
'/usr/bin/git'
Settings
.
git
[
'timeout'
]
||=
10
# Important: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in
# db/migrate/20151023144219_remove_satellites.rb
Settings
[
'satellites'
]
||=
Settingslogic
.
new
({})
Settings
.
satellites
[
'path'
]
=
File
.
expand_path
(
Settings
.
satellites
[
'path'
]
||
"tmp/repo_satellites/"
,
Rails
.
root
)
Settings
.
satellites
[
'timeout'
]
||=
30
#
# Extra customization
...
...
db/migrate/20151023144219_remove_satellites.rb
0 → 100644
View file @
122f02bc
require
'fileutils'
class
RemoveSatellites
<
ActiveRecord
::
Migration
def
up
satellites
=
Gitlab
.
config
[
'satellites'
]
return
if
satellites
.
nil?
satellites_path
=
satellites
[
'path'
]
return
if
satellites_path
.
nil?
FileUtils
.
rm_rf
(
satellites_path
)
end
def
down
# Do nothing
end
end
db/schema.rb
View file @
122f02bc
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
201510231
12551
)
do
ActiveRecord
::
Schema
.
define
(
version:
201510231
44219
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
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