summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-12-13 10:31:56 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-12-13 10:31:56 +0000
commit02124edb5d032eb25cde7662f9b0962fa167b3c4 (patch)
tree602c35cc03cba5c3d7accca148c694c54fc5e79b
parent5a9245e02088f5de70d1d217557dea344e047ada (diff)
parent516bf4a94d68e8238d9740badfaa76006f7abd07 (diff)
downloadgitlab-shell-02124edb5d032eb25cde7662f9b0962fa167b3c4.tar.gz
Merge branch 'remove-redis-cli' into 'master'
Remove unused redis bin configuration. Closes #114 See merge request gitlab-org/gitlab-shell!177
-rw-r--r--CHANGELOG3
-rw-r--r--config.yml.example1
-rw-r--r--spec/fixtures/gitlab_config_redis.yml1
-rw-r--r--spec/gitlab_config_spec.rb1
4 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index eeb302d..e59b560 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v5.10.3
+ - Remove unused redis bin configuration
+
v5.10.2
- Print redirection message when pushing into renamed project
diff --git a/config.yml.example b/config.yml.example
index d5b7261..f631261 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -37,7 +37,6 @@ auth_file: "/home/git/.ssh/authorized_keys"
# Redis settings used for pushing commit notices to gitlab
redis:
- bin: /usr/bin/redis-cli
# host: 127.0.0.1
# port: 6379
# pass: redispass # Allows you to specify the password for Redis
diff --git a/spec/fixtures/gitlab_config_redis.yml b/spec/fixtures/gitlab_config_redis.yml
index e07e5df..cfe4166 100644
--- a/spec/fixtures/gitlab_config_redis.yml
+++ b/spec/fixtures/gitlab_config_redis.yml
@@ -1,5 +1,4 @@
redis:
- bin: /usr/bin/redis-cli
host: 127.0.1.1
port: 6378
pass: secure
diff --git a/spec/gitlab_config_spec.rb b/spec/gitlab_config_spec.rb
index b92da65..e33e606 100644
--- a/spec/gitlab_config_spec.rb
+++ b/spec/gitlab_config_spec.rb
@@ -10,7 +10,6 @@ describe GitlabConfig do
config.instance_variable_set(:@config, YAML.load(config_file))
end
- it { config.redis['bin'].should eq('/usr/bin/redis-cli') }
it { config.redis['host'].should eq('127.0.1.1') }
it { config.redis['port'].should eq(6378) }
it { config.redis['database'].should eq(1) }