summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-30 14:36:15 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-04-30 14:36:15 +0300
commit83432988253d662c5e95a2a7173c8192f1598e98 (patch)
tree99c98c5fc60374849ef5a60e15e81e27f0482f3e
parent5eac1f8fbce6a424d8a770b24c6a7974cd205a46 (diff)
downloadgitlab-shell-1.4.0.tar.gz
Fix tests and version up to 1.4.0v1.4.0
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
-rw-r--r--spec/gitlab_keys_spec.rb2
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3305cb9..b0414b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v1.4.0
+ - Regex used in rm-key command was too lax
+
v1.3.0
- Fork-project command
- Custom redis configuration
diff --git a/VERSION b/VERSION
index f0bb29e..88c5fb8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.0
+1.4.0
diff --git a/spec/gitlab_keys_spec.rb b/spec/gitlab_keys_spec.rb
index 0caaf9b..f04d506 100644
--- a/spec/gitlab_keys_spec.rb
+++ b/spec/gitlab_keys_spec.rb
@@ -24,7 +24,7 @@ describe GitlabKeys do
let(:gitlab_keys) { build_gitlab_keys('rm-key', 'key-741', 'ssh-rsa AAAAB3NzaDAxx2E') }
it "should receive valid cmd" do
- valid_cmd = "sed -i '/shell key-741/d' #{GitlabConfig.new.auth_file}"
+ valid_cmd = "sed -i '/shell key-741\"/d' #{GitlabConfig.new.auth_file}"
gitlab_keys.should_receive(:system).with(valid_cmd)
gitlab_keys.send :rm_key
end