diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-01 20:24:13 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-01 20:24:13 +0000 |
| commit | f8cf4981b84362a87a06ec7fe5094f373e56a04a (patch) | |
| tree | fae18b313f7efbc83682f2f5bdadf4e18ce04f86 /spec | |
| parent | c3cfebcf1cad21434bd90d4d3bb33824c4644eb5 (diff) | |
| parent | d12d210fd6a6cd7fe9f397703fc752c562b68b92 (diff) | |
| download | gitlab-shell-f8cf4981b84362a87a06ec7fe5094f373e56a04a.tar.gz | |
Merge branch 'keys-chmod' into 'master'
Manage authorized_keys permissions continuously
We can lazily create authorized_keys and set its permissions. This
adds negligible overhead and it allows us to remove a setup step from
GitLab both on source and in omnibus-gitlab.
See merge request !78
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/gitlab_keys_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/gitlab_keys_spec.rb b/spec/gitlab_keys_spec.rb index ed2fd58..5afa467 100644 --- a/spec/gitlab_keys_spec.rb +++ b/spec/gitlab_keys_spec.rb @@ -80,7 +80,7 @@ describe GitlabKeys do context "without file writing" do before do - gitlab_keys.should_receive(:open).and_yield(mock(:file, puts: nil)) + gitlab_keys.should_receive(:open).and_yield(mock(:file, puts: nil, chmod: nil)) end it "should log an add-key event" do |