Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-09-13 11:11:48 +0300
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-09-13 11:11:48 +0300
commit71f3d48544cc0857c8d470b182f7e809de6a4642 (patch)
treedbd87cb2ab7746c29c296c242ea19ec96fbef0d2 /app/models/repository.rb
parentf45985a27727c98c8c5c4a879fe4fea974a06cc1 (diff)
parente358ae16b45602666e959ada5a193c1cb4addb0f (diff)
Merge branch '42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master'
Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre" Closes #42861 See merge request gitlab-org/gitlab-ce!21603
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 99b2e5a6686..ad65881ff43 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -996,14 +996,6 @@ class Repository
remote_branch: merge_request.target_branch)
end
- def blob_data_at(sha, path)
- blob = blob_at(sha, path)
- return unless blob
-
- blob.load_all_data!
- blob.data
- end
-
def squash(user, merge_request)
raw.squash(user, merge_request.id, branch: merge_request.target_branch,
start_sha: merge_request.diff_start_sha,
@@ -1012,6 +1004,14 @@ class Repository
message: merge_request.title)
end
+ def blob_data_at(sha, path)
+ blob = blob_at(sha, path)
+ return unless blob
+
+ blob.load_all_data!
+ blob.data
+ end
+
private
# TODO Generice finder, later split this on finders by Ref or Oid