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
Boxiang Sun
gitlab-ce
Commits
e1925f6d
Commit
e1925f6d
authored
Jan 19, 2018
by
Kim "BKC" Carlbäcker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move rugged-call from Project#write_repository_config to Git::Repository#write_config
parent
43538018
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/models/project.rb
app/models/project.rb
+1
-1
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+4
-0
No files found.
app/models/project.rb
View file @
e1925f6d
...
@@ -1437,7 +1437,7 @@ class Project < ActiveRecord::Base
...
@@ -1437,7 +1437,7 @@ class Project < ActiveRecord::Base
# We'd need to keep track of project full path otherwise directory tree
# We'd need to keep track of project full path otherwise directory tree
# created with hashed storage enabled cannot be usefully imported using
# created with hashed storage enabled cannot be usefully imported using
# the import rake task.
# the import rake task.
repository
.
r
ugged
.
config
[
'gitlab.fullpath'
]
=
gl_full_path
repository
.
r
aw_repository
.
write_config
(
full_path:
gl_full_path
)
rescue
Gitlab
::
Git
::
Repository
::
NoRepository
=>
e
rescue
Gitlab
::
Git
::
Repository
::
NoRepository
=>
e
Rails
.
logger
.
error
(
"Error writing to .git/config for project
#{
full_path
}
(
#{
id
}
):
#{
e
.
message
}
."
)
Rails
.
logger
.
error
(
"Error writing to .git/config for project
#{
full_path
}
(
#{
id
}
):
#{
e
.
message
}
."
)
nil
nil
...
...
lib/gitlab/git/repository.rb
View file @
e1925f6d
...
@@ -1317,6 +1317,10 @@ module Gitlab
...
@@ -1317,6 +1317,10 @@ module Gitlab
end
end
# rubocop:enable Metrics/ParameterLists
# rubocop:enable Metrics/ParameterLists
def
write_config
(
full_path:
nil
)
rugged
.
config
[
'gitlab.fullpath'
]
=
full_path
end
def
gitaly_repository
def
gitaly_repository
Gitlab
::
GitalyClient
::
Util
.
repository
(
@storage
,
@relative_path
,
@gl_repository
)
Gitlab
::
GitalyClient
::
Util
.
repository
(
@storage
,
@relative_path
,
@gl_repository
)
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