summaryrefslogtreecommitdiff
path: root/app/models/repository.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb25
1 files changed, 11 insertions, 14 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 3e52841e802..d2d92a064a4 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -35,9 +35,6 @@ class Repository
avatar: :avatar
}
- ROUTE_MAP_PATH = '.gitlab/route-map.yml'
- GITLAB_CI_YML_PATH = '.gitlab-ci.yml'
-
# Wraps around the given method and caches its output in Redis and an instance
# variable.
#
@@ -1165,6 +1162,14 @@ class Repository
end
end
+ def route_map_for(sha)
+ blob_data_at(sha, '.gitlab/route-map.yml')
+ end
+
+ def gitlab_ci_yml_for(sha)
+ blob_data_at(sha, '.gitlab-ci.yml')
+ end
+
protected
def tree_entry_at(branch_name, path)
@@ -1189,24 +1194,16 @@ class Repository
end
end
- def route_map_for(sha)
- blob = blob_at(sha, ROUTE_MAP_PATH)
- return unless blob
-
- blob.load_all_data!(self)
- blob.data
- end
+ private
- def gitlab_ci_yml_for(sha)
- blob = blob_at(sha, GITLAB_CI_YML_PATH)
+ def blob_data_at(sha, path)
+ blob = blob_at(sha, path)
return unless blob
blob.load_all_data!(self)
blob.data
end
- private
-
def git_action(index, action)
path = normalize_path(action[:file_path])