summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-16 11:52:45 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-16 11:52:45 +0000
commitb6c5d52ab548a6fb38c9538281a776b80e5da81d (patch)
tree0626a39e23fc8eeff1159bf43080da0666dbe9f1
parent21fa421ca3fae67eb16b3396ea0aad222dce1f54 (diff)
parentf253f72529824198a591e06537d321917eca1d5e (diff)
downloadgitlab-ce-b6c5d52ab548a6fb38c9538281a776b80e5da81d.tar.gz
Merge branch 'cleanup-repository-initialize' into 'master'
Cleaned up Repository#initialize The "default_branch" argument is never used and the "project" argument isn't optional. See merge request !2832
-rw-r--r--app/models/project.rb2
-rw-r--r--app/models/project_wiki.rb2
-rw-r--r--app/models/repository.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index f11c6d7c6be..d18131a6762 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -342,7 +342,7 @@ class Project < ActiveRecord::Base
end
def repository
- @repository ||= Repository.new(path_with_namespace, nil, self)
+ @repository ||= Repository.new(path_with_namespace, self)
end
def commit(id = 'HEAD')
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index c847eba8d1c..c96e6f0b8ea 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -123,7 +123,7 @@ class ProjectWiki
end
def repository
- Repository.new(path_with_namespace, default_branch, @project)
+ Repository.new(path_with_namespace, @project)
end
def default_branch
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 7f0047a002e..ba275fd9803 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -15,7 +15,7 @@ class Repository
Gitlab::Popen.popen(%W(find #{repository_downloads_path} -not -path #{repository_downloads_path} -mmin +120 -delete))
end
- def initialize(path_with_namespace, default_branch = nil, project = nil)
+ def initialize(path_with_namespace, project)
@path_with_namespace = path_with_namespace
@project = project
end