diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-01-12 14:50:25 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-01-14 12:09:31 -0200 |
| commit | 89e8b82b638e440bc487c4135cdfa4402fdffde5 (patch) | |
| tree | c71859880913c8968514512124c13fcfb9de283f | |
| parent | ca87bb652a1a8390cdc686059f670b89b274dce2 (diff) | |
| download | gitlab-ce-89e8b82b638e440bc487c4135cdfa4402fdffde5.tar.gz | |
Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter
| -rw-r--r-- | lib/gitlab/github_import/wiki_formatter.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/github_import/wiki_formatter_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/github_import/wiki_formatter.rb b/lib/gitlab/github_import/wiki_formatter.rb index 6dd2b917c4a..6c592ff469c 100644 --- a/lib/gitlab/github_import/wiki_formatter.rb +++ b/lib/gitlab/github_import/wiki_formatter.rb @@ -12,7 +12,7 @@ module Gitlab end def import_url - project.import_url.sub(".git", ".wiki.git") + project.import_url.sub(/\.git\z/, ".wiki.git") end end end diff --git a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb index a4ef7b60ae1..aed2aa39e3a 100644 --- a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb +++ b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Gitlab::GithubImport::WikiFormatter, lib: true do let(:project) do 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 subject(:wiki) { described_class.new(project)} @@ -16,7 +16,7 @@ describe Gitlab::GithubImport::WikiFormatter, lib: true do describe '#import_url' 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 |