diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-01 16:23:58 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-01 16:23:58 +0200 |
commit | d24c40ec219d76e01e2fab5f6ebf431adae91bdd (patch) | |
tree | cb2960f806149209e64bdb2c3d3421ec03bb75c4 /app/models/repository.rb | |
parent | f31d2aa44d37683a0ff88c71f558f5faf87ebda2 (diff) | |
download | gitlab-ce-d24c40ec219d76e01e2fab5f6ebf431adae91bdd.tar.gz |
Merge branches inside one repository using rugged instead of satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index cab3e896159..97d2aa1c89e 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -414,8 +414,6 @@ class Repository Gitlab::Git::Blob.remove(raw_repository, options) end - private - def user_to_comitter(user) { email: user.email, @@ -424,6 +422,8 @@ class Repository } end + private + def cache @cache ||= RepositoryCache.new(path_with_namespace) end |