Skip to content

Commit 02124ed

Browse files
committed
Merge branch 'remove-redis-cli' into 'master'
Remove unused redis bin configuration. Closes #114 See merge request gitlab-org/gitlab-shell!177
2 parents 5a9245e + 516bf4a commit 02124ed

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
v5.10.3
2+
- Remove unused redis bin configuration
3+
14
v5.10.2
25
- Print redirection message when pushing into renamed project
36

config.yml.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ auth_file: "/home/git/.ssh/authorized_keys"
3737

3838
# Redis settings used for pushing commit notices to gitlab
3939
redis:
40-
bin: /usr/bin/redis-cli
4140
# host: 127.0.0.1
4241
# port: 6379
4342
# pass: redispass # Allows you to specify the password for Redis

spec/fixtures/gitlab_config_redis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
redis:
2-
bin: /usr/bin/redis-cli
32
host: 127.0.1.1
43
port: 6378
54
pass: secure

spec/gitlab_config_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
config.instance_variable_set(:@config, YAML.load(config_file))
1111
end
1212

13-
it { config.redis['bin'].should eq('/usr/bin/redis-cli') }
1413
it { config.redis['host'].should eq('127.0.1.1') }
1514
it { config.redis['port'].should eq(6378) }
1615
it { config.redis['database'].should eq(1) }

0 commit comments

Comments
 (0)