summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-18 16:13:10 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-18 16:13:10 -0800
commitb37c4d67e9039e21c1c5a802b497dee9a13be954 (patch)
treeb7b34d36ae967287419501d50f26c225e6d7addd
parent8ab4228b08c6f3bada042e7fd74ae1e2583e8191 (diff)
downloadgitlab-shell-b37c4d67e9039e21c1c5a802b497dee9a13be954.tar.gz
Safer line sub for git-annex commandv2.5.2
-rw-r--r--CHANGELOG3
-rw-r--r--VERSION2
-rw-r--r--lib/gitlab_shell.rb2
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8ba97aa..7ee1790 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.5.2
+ - Safer line sub for git-annex command
+
v2.5.1
- Expect broadcast message to return empty JSON if no message now
diff --git a/VERSION b/VERSION
index 73462a5..f225a78 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.1
+2.5.2
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index d053ffb..864b61c 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -51,7 +51,7 @@ class GitlabShell
@git_cmd = args.first
if @git_cmd == 'git-annex-shell' && @config.git_annex_enabled?
- @repo_name = escape_path(args[2].gsub("\/~\/", ''))
+ @repo_name = escape_path(args[2].sub(/\A\/~\//, ''))
# Make sure repository has git-annex enabled
init_git_annex(@repo_name)