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
8fe3fa13
Commit
8fe3fa13
authored
Jul 21, 2017
by
Gabriel Mazetto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More path_with_namespace -> full_path renames (EE)
parent
35a81d13
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
12 additions
and
12 deletions
+12
-12
app/helpers/ee/gitlab_routing_helper.rb
app/helpers/ee/gitlab_routing_helper.rb
+1
-1
app/services/geo/event_store.rb
app/services/geo/event_store.rb
+1
-1
app/services/geo/repository_renamed_event_store.rb
app/services/geo/repository_renamed_event_store.rb
+1
-1
app/services/geo/repository_sync_service.rb
app/services/geo/repository_sync_service.rb
+1
-1
app/services/geo/wiki_sync_service.rb
app/services/geo/wiki_sync_service.rb
+1
-1
lib/gitlab/geo/project_log_helpers.rb
lib/gitlab/geo/project_log_helpers.rb
+1
-1
spec/models/concerns/elastic/project_spec.rb
spec/models/concerns/elastic/project_spec.rb
+1
-1
spec/services/geo/move_repository_service_spec.rb
spec/services/geo/move_repository_service_spec.rb
+2
-2
spec/services/geo/repository_sync_service_spec.rb
spec/services/geo/repository_sync_service_spec.rb
+2
-2
spec/services/geo/wiki_sync_service_spec.rb
spec/services/geo/wiki_sync_service_spec.rb
+1
-1
No files found.
app/helpers/ee/gitlab_routing_helper.rb
View file @
8fe3fa13
...
...
@@ -8,7 +8,7 @@ module EE
end
def
geo_primary_ssh_url_to_repo
(
project
)
"
#{
::
Gitlab
::
Geo
.
primary_node
.
clone_url_prefix
}#{
project
.
path_with_namespace
}
.git"
"
#{
::
Gitlab
::
Geo
.
primary_node
.
clone_url_prefix
}#{
project
.
full_path
}
.git"
end
def
geo_primary_http_url_to_repo
(
project
)
...
...
app/services/geo/event_store.rb
View file @
8fe3fa13
...
...
@@ -49,7 +49,7 @@ module Geo
message:
message
,
error:
error
,
project_id:
project
.
id
,
project_path:
project
.
path_with_namespace
)
project_path:
project
.
full_path
)
end
end
end
app/services/geo/repository_renamed_event_store.rb
View file @
8fe3fa13
...
...
@@ -27,7 +27,7 @@ module Geo
end
def
new_wiki_path_with_namespace
project
.
wiki
.
path_with_namespace
project
.
wiki
.
full_path
end
end
end
app/services/geo/repository_sync_service.rb
View file @
8fe3fa13
...
...
@@ -33,7 +33,7 @@ module Geo
end
def
ssh_url_to_repo
"
#{
primary_ssh_path_prefix
}#{
project
.
path_with_namespace
}
.git"
"
#{
primary_ssh_path_prefix
}#{
project
.
full_path
}
.git"
end
end
end
app/services/geo/wiki_sync_service.rb
View file @
8fe3fa13
...
...
@@ -26,7 +26,7 @@ module Geo
end
def
ssh_url_to_wiki
"
#{
primary_ssh_path_prefix
}#{
project
.
path_with_namespace
}
.wiki.git"
"
#{
primary_ssh_path_prefix
}#{
project
.
full_path
}
.wiki.git"
end
end
end
lib/gitlab/geo/project_log_helpers.rb
View file @
8fe3fa13
...
...
@@ -18,7 +18,7 @@ module Gitlab
{
class:
self
.
class
.
name
,
project_id:
project
.
id
,
project_path:
project
.
path_with_namespace
,
project_path:
project
.
full_path
,
message:
message
}
end
...
...
spec/models/concerns/elastic/project_spec.rb
View file @
8fe3fa13
...
...
@@ -72,7 +72,7 @@ describe Project, elastic: true do
)
expected_hash
[
'name_with_namespace'
]
=
project
.
name_with_namespace
expected_hash
[
'path_with_namespace'
]
=
project
.
path_with_namespace
expected_hash
[
'path_with_namespace'
]
=
project
.
full_path
expect
(
project
.
as_indexed_json
).
to
eq
(
expected_hash
)
end
...
...
spec/services/geo/move_repository_service_spec.rb
View file @
8fe3fa13
...
...
@@ -2,9 +2,9 @@ require 'spec_helper'
describe
Geo
::
MoveRepositoryService
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:new_path
)
{
project
.
path_with_namespace
+
'+renamed'
}
let
(
:new_path
)
{
project
.
full_path
+
'+renamed'
}
let
(
:full_new_path
)
{
File
.
join
(
project
.
repository_storage_path
,
new_path
)
}
subject
{
described_class
.
new
(
project
.
id
,
project
.
name
,
project
.
path_with_namespace
,
new_path
)
}
subject
{
described_class
.
new
(
project
.
id
,
project
.
name
,
project
.
full_path
,
new_path
)
}
describe
'#execute'
do
it
'renames the path'
do
...
...
spec/services/geo/repository_sync_service_spec.rb
View file @
8fe3fa13
...
...
@@ -11,7 +11,7 @@ RSpec.describe Geo::RepositorySyncService do
describe
'#execute'
do
let
(
:project
)
{
create
(
:project_empty_repo
)
}
let
(
:repository
)
{
project
.
repository
}
let
(
:url_to_repo
)
{
"
#{
primary
.
clone_url_prefix
}#{
project
.
path_with_namespace
}
.git"
}
let
(
:url_to_repo
)
{
"
#{
primary
.
clone_url_prefix
}#{
project
.
full_path
}
.git"
}
before
do
allow
(
Gitlab
::
ExclusiveLease
).
to
receive
(
:new
)
...
...
@@ -94,7 +94,7 @@ RSpec.describe Geo::RepositorySyncService do
context
'when repository sync fail'
do
let
(
:registry
)
{
Geo
::
ProjectRegistry
.
find_by
(
project_id:
project
.
id
)
}
let
(
:url_to_repo
)
{
"
#{
primary
.
clone_url_prefix
}#{
project
.
path_with_namespace
}
.git"
}
let
(
:url_to_repo
)
{
"
#{
primary
.
clone_url_prefix
}#{
project
.
full_path
}
.git"
}
before
do
allow
(
repository
).
to
receive
(
:fetch_geo_mirror
).
with
(
url_to_repo
)
{
raise
Gitlab
::
Shell
::
Error
}
...
...
spec/services/geo/wiki_sync_service_spec.rb
View file @
8fe3fa13
...
...
@@ -11,7 +11,7 @@ RSpec.describe Geo::WikiSyncService do
describe
'#execute'
do
let
(
:project
)
{
create
(
:project_empty_repo
)
}
let
(
:repository
)
{
project
.
wiki
.
repository
}
let
(
:url_to_repo
)
{
"
#{
primary
.
clone_url_prefix
}#{
project
.
path_with_namespace
}
.wiki.git"
}
let
(
:url_to_repo
)
{
"
#{
primary
.
clone_url_prefix
}#{
project
.
full_path
}
.wiki.git"
}
before
do
allow
(
Gitlab
::
ExclusiveLease
).
to
receive
(
:new
)
...
...
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