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
Kazuhiko Shiozaki
gitlab-ce
Commits
89e8b82b
Commit
89e8b82b
authored
Jan 12, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter
parent
ca87bb65
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/github_import/wiki_formatter.rb
lib/gitlab/github_import/wiki_formatter.rb
+1
-1
spec/lib/gitlab/github_import/wiki_formatter_spec.rb
spec/lib/gitlab/github_import/wiki_formatter_spec.rb
+2
-2
No files found.
lib/gitlab/github_import/wiki_formatter.rb
View file @
89e8b82b
...
@@ -12,7 +12,7 @@ module Gitlab
...
@@ -12,7 +12,7 @@ module Gitlab
end
end
def
import_url
def
import_url
project
.
import_url
.
sub
(
".git"
,
".wiki.git"
)
project
.
import_url
.
sub
(
/\.git\z/
,
".wiki.git"
)
end
end
end
end
end
end
...
...
spec/lib/gitlab/github_import/wiki_formatter_spec.rb
View file @
89e8b82b
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
Gitlab
::
GithubImport
::
WikiFormatter
,
lib:
true
do
describe
Gitlab
::
GithubImport
::
WikiFormatter
,
lib:
true
do
let
(
:project
)
do
let
(
:project
)
do
create
(
:project
,
namespace:
create
(
:namespace
,
path:
'gitlabhq'
),
create
(
:project
,
namespace:
create
(
:namespace
,
path:
'gitlabhq'
),
import_url:
'https://xxx@github.com/gitlabhq/gitlabhq.git'
)
import_url:
'https://xxx@github.com/gitlabhq/
sample.
gitlabhq.git'
)
end
end
subject
(
:wiki
)
{
described_class
.
new
(
project
)}
subject
(
:wiki
)
{
described_class
.
new
(
project
)}
...
@@ -16,7 +16,7 @@ describe Gitlab::GithubImport::WikiFormatter, lib: true do
...
@@ -16,7 +16,7 @@ describe Gitlab::GithubImport::WikiFormatter, lib: true do
describe
'#import_url'
do
describe
'#import_url'
do
it
'returns URL of the wiki repository'
do
it
'returns URL of the wiki repository'
do
expect
(
wiki
.
import_url
).
to
eq
'https://xxx@github.com/gitlabhq/gitlabhq.wiki.git'
expect
(
wiki
.
import_url
).
to
eq
'https://xxx@github.com/gitlabhq/
sample.
gitlabhq.wiki.git'
end
end
end
end
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