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
Jérome Perrin
gitlab-ce
Commits
012948b8
Commit
012948b8
authored
Jun 14, 2018
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move info attributes to mandatory
Closes
https://gitlab.com/gitlab-org/gitaly/issues/1082
parent
41d01281
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
15 deletions
+1
-15
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+1
-15
No files found.
lib/gitlab/git/repository.rb
View file @
012948b8
...
@@ -984,21 +984,7 @@ module Gitlab
...
@@ -984,21 +984,7 @@ module Gitlab
def
info_attributes
def
info_attributes
return
@info_attributes
if
@info_attributes
return
@info_attributes
if
@info_attributes
content
=
content
=
gitaly_repository_client
.
info_attributes
gitaly_migrate
(
:get_info_attributes
,
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
do
|
is_enabled
|
if
is_enabled
gitaly_repository_client
.
info_attributes
else
attributes_path
=
File
.
join
(
File
.
expand_path
(
path
),
'info'
,
'attributes'
)
if
File
.
exist?
(
attributes_path
)
File
.
read
(
attributes_path
)
else
""
end
end
end
@info_attributes
=
AttributesParser
.
new
(
content
)
@info_attributes
=
AttributesParser
.
new
(
content
)
end
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