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
Boxiang Sun
gitlab-ce
Commits
ce41b5c7
Commit
ce41b5c7
authored
Aug 04, 2016
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small refactor and a few documentation fixes
parent
45b392b2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
doc/administration/high_availability/redis.md
doc/administration/high_availability/redis.md
+2
-2
lib/gitlab/mail_room.rb
lib/gitlab/mail_room.rb
+2
-2
lib/gitlab/redis.rb
lib/gitlab/redis.rb
+1
-1
spec/config/mail_room_spec.rb
spec/config/mail_room_spec.rb
+2
-2
No files found.
doc/administration/high_availability/redis.md
View file @
ce41b5c7
...
...
@@ -59,9 +59,9 @@ Redis.
## Experimental Redis Sentinel support
> [Introduced][ce-1877] in GitLab 8.1
0
.
> [Introduced][ce-1877] in GitLab 8.1
1
.
Since GitLab 8.1
0
, you can configure a list of Redis Sentinel servers that
Since GitLab 8.1
1
, you can configure a list of Redis Sentinel servers that
will monitor a group of Redis servers to provide you with a standard failover
support.
...
...
lib/gitlab/mail_room.rb
View file @
ce41b5c7
...
...
@@ -13,8 +13,8 @@ module Gitlab
@config
||=
fetch_config
end
def
re
load
_config!
@config
=
fetch_config
def
re
set
_config!
@config
=
nil
end
private
...
...
lib/gitlab/redis.rb
View file @
ce41b5c7
...
...
@@ -37,7 +37,7 @@ module Gitlab
end
end
def
initialize
(
rails_env
=
nil
)
def
initialize
(
rails_env
=
nil
)
@rails_env
=
rails_env
||
::
Rails
.
env
end
...
...
spec/config/mail_room_spec.rb
View file @
ce41b5c7
...
...
@@ -7,7 +7,7 @@ describe 'mail_room.yml' do
context
'when incoming email is disabled'
do
before
do
ENV
[
'MAIL_ROOM_GITLAB_CONFIG_FILE'
]
=
Rails
.
root
.
join
(
'spec/fixtures/mail_room_disabled.yml'
).
to_s
Gitlab
::
MailRoom
.
re
load
_config!
Gitlab
::
MailRoom
.
re
set
_config!
end
after
do
...
...
@@ -22,7 +22,7 @@ describe 'mail_room.yml' do
context
'when incoming email is enabled'
do
before
do
ENV
[
'MAIL_ROOM_GITLAB_CONFIG_FILE'
]
=
Rails
.
root
.
join
(
'spec/fixtures/mail_room_enabled.yml'
).
to_s
Gitlab
::
MailRoom
.
re
load
_config!
Gitlab
::
MailRoom
.
re
set
_config!
end
after
do
...
...
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