Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
50a05f64b9bb
Unverified
Commit
97a4d8ae
authored
Feb 04, 2014
by
Dmitriy Zaporozhets
Browse files
Improve code according to new gitlab_git
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
388e6d499070
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/helpers/gitlab_markdown_helper.rb
View file @
50a05f64
...
...
@@ -166,13 +166,13 @@ def build_nested_path(path, request_path)
def
file_exists?
(
path
)
return
false
if
path
.
nil?
||
path
.
empty?
return
@repository
.
blob_at
(
current_ref
,
path
).
present?
||
Tree
.
new
(
@repository
,
current_ref
,
path
).
entries
.
any?
return
@repository
.
blob_at
(
current_ref
,
path
).
present?
||
@repository
.
tree
(
:head
,
path
).
entries
.
any?
end
# Check if the path is pointing to a directory(tree) or a file(blob)
# eg. doc/api is directory and doc/README.md is file
def
local_path
(
path
)
return
"tree"
if
Tree
.
new
(
@repository
,
current_ref
,
path
).
entries
.
any?
return
"tree"
if
@repository
.
tree
(
:head
,
path
).
entries
.
any?
return
"raw"
if
@repository
.
blob_at
(
current_ref
,
path
).
image?
return
"blob"
end
...
...
app/models/repository.rb
View file @
50a05f64
...
...
@@ -163,7 +163,19 @@ def blob_at(sha, path)
def
readme
Rails
.
cache
.
fetch
(
cache_key
(
:readme
))
do
T
ree
.
new
(
self
,
self
.
root_ref
).
readme
t
ree
(
:head
).
readme
end
end
def
head_commit
commit
(
self
.
root_ref
)
end
def
tree
(
sha
=
:head
,
path
=
nil
)
if
sha
==
:head
sha
=
head_commit
.
sha
end
Tree
.
new
(
self
,
sha
,
path
)
end
end
app/models/tree.rb
View file @
50a05f64
...
...
@@ -23,4 +23,8 @@ def blobs
def
submodules
@entries
.
select
(
&
:submodule?
)
end
def
sorted_entries
trees
+
blobs
+
submodules
end
end
lib/api/entities.rb
View file @
50a05f64
...
...
@@ -79,7 +79,16 @@ class GroupMember < UserBasic
end
class
RepoObject
<
Grape
::
Entity
expose
:name
,
:commit
expose
:name
expose
:commit
do
|
repo_obj
,
options
|
if
repo_obj
.
respond_to?
(
:commit
)
repo_obj
.
commit
elsif
options
[
:project
]
options
[
:project
].
repository
.
commit
(
repo_obj
.
target
)
end
end
expose
:protected
do
|
repo
,
options
|
if
options
[
:project
]
options
[
:project
].
protected_branch?
repo
.
name
...
...
@@ -87,6 +96,16 @@ class RepoObject < Grape::Entity
end
end
class
RepoTreeObject
<
Grape
::
Entity
expose
:id
,
:name
,
:type
expose
:mode
do
|
obj
,
options
|
filemode
=
obj
.
mode
.
to_s
(
8
)
filemode
=
"0"
+
filemode
if
filemode
.
length
<
6
filemode
end
end
class
RepoCommit
<
Grape
::
Entity
expose
:id
,
:short_id
,
:title
,
:author_name
,
:author_email
,
:created_at
end
...
...
lib/api/repositories.rb
View file @
50a05f64
...
...
@@ -82,7 +82,7 @@ def handle_project_member_errors(errors)
# Example Request:
# GET /projects/:id/repository/tags
get
":id/repository/tags"
do
present
user_project
.
repo
.
tags
.
sort_by
(
&
:name
).
reverse
,
with:
Entities
::
RepoObject
present
user_project
.
repo
.
tags
.
sort_by
(
&
:name
).
reverse
,
with:
Entities
::
RepoObject
,
project:
user_project
end
# Get a project repository commits
...
...
@@ -141,15 +141,9 @@ def handle_project_member_errors(errors)
path
=
params
[
:path
]
||
nil
commit
=
user_project
.
repository
.
commit
(
ref
)
tree
=
Tree
.
new
(
user_project
.
repository
,
commit
.
id
,
path
)
tree
=
user_project
.
repository
.
tree
(
commit
.
id
,
path
)
trees
=
[]
%w(trees blobs submodules)
.
each
do
|
type
|
trees
+=
tree
.
send
(
type
).
map
{
|
t
|
{
name:
t
.
name
,
type:
type
.
singularize
,
mode:
t
.
mode
,
id:
t
.
id
}
}
end
trees
present
tree
.
sorted_entries
,
with:
Entities
::
RepoTreeObject
end
# Get a raw file contents
...
...
@@ -233,4 +227,3 @@ def handle_project_member_errors(errors)
end
end
end
lib/extracts_path.rb
View file @
50a05f64
...
...
@@ -117,7 +117,7 @@ def assign_ref_vars
end
def
tree
@tree
||=
T
re
e
.
new
(
@repo
,
@commit
.
id
,
@path
)
@tree
||=
@
re
po
.
tree
(
@commit
.
id
,
@path
)
end
private
...
...
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