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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
dff4050f
Commit
dff4050f
authored
Mar 21, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed some rubocop warnings
parent
bd8a7767
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
5 deletions
+6
-5
app/models/project_import_data.rb
app/models/project_import_data.rb
+1
-1
lib/gitlab/import_url.rb
lib/gitlab/import_url.rb
+1
-1
spec/factories/project_import_data.rb
spec/factories/project_import_data.rb
+1
-1
spec/lib/gitlab/github_import/project_creator_spec.rb
spec/lib/gitlab/github_import/project_creator_spec.rb
+1
-1
spec/lib/gitlab/github_import/wiki_formatter_spec.rb
spec/lib/gitlab/github_import/wiki_formatter_spec.rb
+2
-1
No files found.
app/models/project_import_data.rb
View file @
dff4050f
...
...
@@ -12,7 +12,7 @@ require 'file_size_validator'
class
ProjectImportData
<
ActiveRecord
::
Base
belongs_to
:project
attr_encrypted
:credentials
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
,
marshal:
true
,
encode:
true
,
:mode
=>
:per_attribute_iv_and_salt
attr_encrypted
:credentials
,
key:
Gitlab
::
Application
.
secrets
.
db_key_base
,
marshal:
true
,
encode:
true
,
mode:
:per_attribute_iv_and_salt
serialize
:data
,
JSON
...
...
lib/gitlab/import_url.rb
View file @
dff4050f
...
...
@@ -34,4 +34,4 @@ module Gitlab
safe_url
end
end
end
\ No newline at end of file
end
spec/factories/project_import_data.rb
View file @
dff4050f
...
...
@@ -2,4 +2,4 @@ FactoryGirl.define do
factory
:project_import_data
,
class:
ProjectImportData
do
data
"test"
end
end
\ No newline at end of file
end
spec/lib/gitlab/github_import/project_creator_spec.rb
View file @
dff4050f
...
...
@@ -28,7 +28,7 @@ describe Gitlab::GithubImport::ProjectCreator, lib: true do
expect
(
project
.
import_url
).
to
eq
(
"https://asdffg@gitlab.com/asd/vim.git"
)
expect
(
project
.
safe_import_url
).
to
eq
(
"https://*****@gitlab.com/asd/vim.git"
)
expect
(
project
.
import_data
.
credentials
).
to
eq
(
:user
=>
"asdffg"
,
:password
=>
nil
)
expect
(
project
.
import_data
.
credentials
).
to
eq
(
user:
"asdffg"
,
password:
nil
)
expect
(
project
.
visibility_level
).
to
eq
(
Gitlab
::
VisibilityLevel
::
PRIVATE
)
end
end
spec/lib/gitlab/github_import/wiki_formatter_spec.rb
View file @
dff4050f
...
...
@@ -2,7 +2,8 @@ require 'spec_helper'
describe
Gitlab
::
GithubImport
::
WikiFormatter
,
lib:
true
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/sample.gitlabhq.git'
)
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