diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-12 16:20:39 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-12 16:20:39 +0000 |
| commit | 4f3f3beebad2d3c1a1ee6b657d40d7c93d5bc1b6 (patch) | |
| tree | 6f96e52365f963b2b894e2f3ec1baa8665e9027a | |
| parent | 00e30138af0ebec24255d08c5166cfd1faa28f6d (diff) | |
| parent | 61307fd850e1c52d4761d3a193e3abaedc4f55f8 (diff) | |
| download | gitlab-shell-4f3f3beebad2d3c1a1ee6b657d40d7c93d5bc1b6.tar.gz | |
Merge branch 'defaults' into 'master'
Redis defaults
See merge request !42
| -rw-r--r-- | lib/gitlab_config.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab_projects.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb index ccd17ed..c97743b 100644 --- a/lib/gitlab_config.rb +++ b/lib/gitlab_config.rb @@ -55,6 +55,8 @@ class GitlabConfig %W(env -i redis-cli) else redis['database'] ||= 0 + redis['host'] ||= '127.0.0.1' + redis['port'] ||= '6379' if redis.has_key?("socket") %W(#{redis['bin']} -s #{redis['socket']} -n #{redis['database']}) else diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb index 85eb167..d6922c6 100644 --- a/lib/gitlab_projects.rb +++ b/lib/gitlab_projects.rb @@ -105,7 +105,7 @@ class GitlabProjects end def remove_origin_in_repo - cmd = %W(git --git-dir=#{full_path} remote remove origin) + cmd = %W(git --git-dir=#{full_path} remote rm origin) pid = Process.spawn(*cmd) Process.wait(pid) end |