Commit 823aba63 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlab-shell

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	.gitignore
parents f673321a 7e74d054
...@@ -6,3 +6,5 @@ authorized_keys.lock ...@@ -6,3 +6,5 @@ authorized_keys.lock
coverage/ coverage/
.gitlab_shell_secret .gitlab_shell_secret
.bundle .bundle
tags
.bundle/
...@@ -10,7 +10,8 @@ class GitlabAccess ...@@ -10,7 +10,8 @@ class GitlabAccess
def initialize(repo_path, actor, changes) def initialize(repo_path, actor, changes)
@config = GitlabConfig.new @config = GitlabConfig.new
@repo_path, @actor = repo_path.strip, actor @repo_path = repo_path.strip
@actor = actor
@repo_name = extract_repo_name(@repo_path.dup, config.repos_path.to_s) @repo_name = extract_repo_name(@repo_path.dup, config.repos_path.to_s)
@changes = changes.lines @changes = changes.lines
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment