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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
11e1c013
Commit
11e1c013
authored
Jun 12, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'detect_omnibus' into 'master'
Detect omnibus-gitlab in `rake gitlab:check`
parents
630be84a
90bfe286
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
0 deletions
+15
-0
CHANGELOG
CHANGELOG
+1
-0
lib/tasks/gitlab/check.rake
lib/tasks/gitlab/check.rake
+14
-0
No files found.
CHANGELOG
View file @
11e1c013
...
@@ -31,6 +31,7 @@ v 7.0.0
...
@@ -31,6 +31,7 @@ v 7.0.0
- Add notice about huge push over http to unicorn config
- Add notice about huge push over http to unicorn config
- File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
- File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
- Overall performance improvements
- Overall performance improvements
- Skip init script check on omnibus-gitlab
v 6.9.2
v 6.9.2
- Revert the commit that broke the LDAP user filter
- Revert the commit that broke the LDAP user filter
...
...
lib/tasks/gitlab/check.rake
View file @
11e1c013
...
@@ -123,6 +123,11 @@ namespace :gitlab do
...
@@ -123,6 +123,11 @@ namespace :gitlab do
def
check_init_script_exists
def
check_init_script_exists
print
"Init script exists? ... "
print
"Init script exists? ... "
if
omnibus_gitlab?
puts
'skipped (omnibus-gitlab has no init script)'
.
magenta
return
end
script_path
=
"/etc/init.d/gitlab"
script_path
=
"/etc/init.d/gitlab"
if
File
.
exists?
(
script_path
)
if
File
.
exists?
(
script_path
)
...
@@ -142,6 +147,11 @@ namespace :gitlab do
...
@@ -142,6 +147,11 @@ namespace :gitlab do
def
check_init_script_up_to_date
def
check_init_script_up_to_date
print
"Init script up-to-date? ... "
print
"Init script up-to-date? ... "
if
omnibus_gitlab?
puts
'skipped (omnibus-gitlab has no init script)'
.
magenta
return
end
recipe_path
=
Rails
.
root
.
join
(
"lib/support/init.d/"
,
"gitlab"
)
recipe_path
=
Rails
.
root
.
join
(
"lib/support/init.d/"
,
"gitlab"
)
script_path
=
"/etc/init.d/gitlab"
script_path
=
"/etc/init.d/gitlab"
...
@@ -823,4 +833,8 @@ namespace :gitlab do
...
@@ -823,4 +833,8 @@ namespace :gitlab do
fix_and_rerun
fix_and_rerun
end
end
end
end
def
omnibus_gitlab?
Dir
.
pwd
==
'/opt/gitlab/embedded/service/gitlab-rails'
end
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