BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
16063496
Commit
16063496
authored
Jun 09, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dm-mail-room-check-without-omnibus' into 'master'
Don't check if MailRoom is running on Omnibus Closes #19607 See merge request !12056
parents
e4038cb5
f1e4376f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
dm-mail-room-check-without-omnibus.yml
changelogs/unreleased/dm-mail-room-check-without-omnibus.yml
+4
-0
check.rake
lib/tasks/gitlab/check.rake
+4
-5
No files found.
changelogs/unreleased/dm-mail-room-check-without-omnibus.yml
0 → 100644
View file @
16063496
---
title
:
Don't check if MailRoom is running on Omnibus
merge_request
:
author
:
lib/tasks/gitlab/check.rake
View file @
16063496
...
...
@@ -336,12 +336,9 @@ namespace :gitlab do
########################
def
check_initd_configured_correctly
print
"Init.d configured correctly? ... "
return
if
omnibus_gitlab?
if
omnibus_gitlab?
puts
'skipped (omnibus-gitlab has no init script)'
.
color
(
:magenta
)
return
end
print
"Init.d configured correctly? ... "
path
=
"/etc/default/gitlab"
...
...
@@ -379,6 +376,8 @@ namespace :gitlab do
end
def
check_mail_room_running
return
if
omnibus_gitlab?
print
"MailRoom running? ... "
path
=
"/etc/default/gitlab"
...
...
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