BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
bcdcea1e
Commit
bcdcea1e
authored
May 30, 2018
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sh-move-blob-data-at-public' into 'master'
Make Repository#blob_data_at a public method See merge request gitlab-org/gitlab-ce!19259
parents
a8a02926
2346dda4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
repository.rb
app/models/repository.rb
+8
-8
No files found.
app/models/repository.rb
View file @
bcdcea1e
...
...
@@ -957,6 +957,14 @@ 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
,
...
...
@@ -979,14 +987,6 @@ class Repository
::
Commit
.
new
(
commit
,
@project
)
if
commit
end
def
blob_data_at
(
sha
,
path
)
blob
=
blob_at
(
sha
,
path
)
return
unless
blob
blob
.
load_all_data!
blob
.
data
end
def
cache
@cache
||=
Gitlab
::
RepositoryCache
.
new
(
self
)
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment