Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
73609873
Commit
73609873
authored
5 years ago
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
31463981
f18f3ed9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/graphql/types/tree/blob_type.rb
app/graphql/types/tree/blob_type.rb
+1
-1
lib/gitlab/graphql/loaders/batch_lfs_oid_loader.rb
lib/gitlab/graphql/loaders/batch_lfs_oid_loader.rb
+1
-1
spec/lib/gitlab/graphql/loaders/batch_lfs_oid_loader_spec.rb
spec/lib/gitlab/graphql/loaders/batch_lfs_oid_loader_spec.rb
+1
-1
No files found.
app/graphql/types/tree/blob_type.rb
View file @
73609873
...
...
@@ -10,7 +10,7 @@ module Types
field
:web_url
,
GraphQL
::
STRING_TYPE
,
null:
true
field
:lfs_oid
,
GraphQL
::
STRING_TYPE
,
null:
true
,
resolve:
->
(
blob
,
args
,
ctx
)
do
Gitlab
::
Graphql
::
Loaders
::
Batch
Commit
Loader
.
new
(
blob
.
repository
,
blob
.
id
).
find
Gitlab
::
Graphql
::
Loaders
::
Batch
LfsOid
Loader
.
new
(
blob
.
repository
,
blob
.
id
).
find
end
end
end
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/graphql/loaders/batch_
commit
_loader.rb
→
lib/gitlab/graphql/loaders/batch_
lfs_oid
_loader.rb
View file @
73609873
...
...
@@ -3,7 +3,7 @@
module
Gitlab
module
Graphql
module
Loaders
class
Batch
Commit
Loader
class
Batch
LfsOid
Loader
def
initialize
(
repository
,
blob_id
)
@repository
,
@blob_id
=
repository
,
blob_id
end
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/graphql/loaders/batch_
commit
_loader_spec.rb
→
spec/lib/gitlab/graphql/loaders/batch_
lfs_oid
_loader_spec.rb
View file @
73609873
require
'spec_helper'
describe
Gitlab
::
Graphql
::
Loaders
::
Batch
Commit
Loader
do
describe
Gitlab
::
Graphql
::
Loaders
::
Batch
LfsOid
Loader
do
include
GraphqlHelpers
set
(
:project
)
{
create
(
:project
,
:repository
)
}
...
...
This diff is collapsed.
Click to expand it.
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