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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
20f4815e
Commit
20f4815e
authored
Mar 19, 2019
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch..."
This reverts merge request !26183
parent
afeb2dd9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
36 deletions
+3
-36
app/models/repository.rb
app/models/repository.rb
+2
-9
lib/gitlab/file_detector.rb
lib/gitlab/file_detector.rb
+0
-1
spec/lib/gitlab/file_detector_spec.rb
spec/lib/gitlab/file_detector_spec.rb
+0
-4
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+1
-22
No files found.
app/models/repository.rb
View file @
20f4815e
...
...
@@ -39,8 +39,7 @@ class Repository
changelog license_blob license_key gitignore
gitlab_ci_yml branch_names tag_names branch_count
tag_count avatar exists? root_ref has_visible_content?
issue_template_names merge_request_template_names xcode_project?
insights_config)
.
freeze
issue_template_names merge_request_template_names xcode_project?)
.
freeze
# Methods that use cache_method but only memoize the value
MEMOIZED_CACHED_METHODS
=
%i(license)
.
freeze
...
...
@@ -58,8 +57,7 @@ class Repository
avatar: :avatar
,
issue_template: :issue_template_names
,
merge_request_template: :merge_request_template_names
,
xcode_config: :xcode_project?
,
insights_config: :insights_config
xcode_config: :xcode_project?
}.
freeze
def
initialize
(
full_path
,
project
,
disk_path:
nil
,
is_wiki:
false
)
...
...
@@ -665,11 +663,6 @@ class Repository
end
cache_method
:xcode_project?
def
insights_config
file_on_head
(
:insights_config
)
end
cache_method
:insights_config
def
head_commit
@head_commit
||=
commit
(
self
.
root_ref
)
end
...
...
lib/gitlab/file_detector.rb
View file @
20f4815e
...
...
@@ -22,7 +22,6 @@ module Gitlab
gitignore:
'.gitignore'
,
gitlab_ci:
'.gitlab-ci.yml'
,
route_map:
'.gitlab/route-map.yml'
,
insights_config:
'.gitlab/insights.yml'
,
# Dependency files
cartfile:
%r{
\A
Cartfile[^/]*
\z
}
,
...
...
spec/lib/gitlab/file_detector_spec.rb
View file @
20f4815e
...
...
@@ -77,10 +77,6 @@ describe Gitlab::FileDetector do
expect
(
described_class
.
type_of
(
'.gitlab/merge_request_templates/foo.md'
)).
to
eq
(
:merge_request_template
)
end
it
'returns the type of an Insights config file'
do
expect
(
described_class
.
type_of
(
'.gitlab/insights.yml'
)).
to
eq
(
:insights_config
)
end
it
'returns nil for an unknown file'
do
expect
(
described_class
.
type_of
(
'foo.txt'
)).
to
be_nil
end
...
...
spec/models/repository_spec.rb
View file @
20f4815e
...
...
@@ -1616,8 +1616,7 @@ describe Repository do
:has_visible_content?
,
:issue_template_names
,
:merge_request_template_names
,
:xcode_project?
,
:insights_config
:xcode_project?
])
repository
.
after_change_head
...
...
@@ -1883,26 +1882,6 @@ describe Repository do
end
end
describe
"#insights_config"
,
:use_clean_rails_memory_store_caching
do
it
'returns a valid Insights config file'
do
files
=
[
TestBlob
.
new
(
'file'
),
TestBlob
.
new
(
'.gitlab/insights.yml'
)]
expect
(
repository
.
tree
).
to
receive
(
:blobs
).
and_return
(
files
)
expect
(
repository
.
insights_config
.
path
).
to
eq
(
'.gitlab/insights.yml'
)
end
it
'returns nil if does not exist'
do
expect
(
repository
.
tree
).
to
receive
(
:blobs
).
and_return
([])
expect
(
repository
.
insights_config
).
to
be_nil
end
it
'returns nil for an empty repository'
do
allow
(
repository
).
to
receive
(
:root_ref
).
and_raise
(
Gitlab
::
Git
::
Repository
::
NoRepository
)
expect
(
repository
.
insights_config
).
to
be_nil
end
end
describe
"#keep_around"
do
it
"does not fail if we attempt to reference bad commit"
do
expect
(
repository
.
kept_around?
(
'abc1234'
)).
to
be_falsey
...
...
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