diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-20 13:45:15 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-20 13:45:15 +0300 |
| commit | 823aba63e444afa2f45477819770fec3cb5f0159 (patch) | |
| tree | 935ad2aa301fe21dd0bab1de8b9c0b013ae50573 | |
| parent | f673321afc0f6b53c1c80e3fe6e183a07e2e4742 (diff) | |
| parent | 7e74d0547255a9cf60f00b9d9133aa8b2c546507 (diff) | |
| download | gitlab-shell-823aba63e444afa2f45477819770fec3cb5f0159.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlab-shellv2.1.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | lib/gitlab_access.rb | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -6,3 +6,5 @@ authorized_keys.lock coverage/ .gitlab_shell_secret .bundle +tags +.bundle/ diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb index 63c074b..80c050c 100644 --- a/lib/gitlab_access.rb +++ b/lib/gitlab_access.rb @@ -10,7 +10,8 @@ class GitlabAccess def initialize(repo_path, actor, changes) @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) @changes = changes.lines end |