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
Tatuya Kamada
gitlab-ce
Commits
ced56641
Commit
ced56641
authored
Mar 21, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactored code based on feedback
parent
6dfb5d7c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
app/models/project.rb
app/models/project.rb
+8
-2
lib/gitlab/import_url.rb
lib/gitlab/import_url.rb
+3
-3
No files found.
app/models/project.rb
View file @
ced56641
...
@@ -406,8 +406,7 @@ class Project < ActiveRecord::Base
...
@@ -406,8 +406,7 @@ class Project < ActiveRecord::Base
def
import_url
=
(
value
)
def
import_url
=
(
value
)
import_url
=
Gitlab
::
ImportUrl
.
new
(
value
)
import_url
=
Gitlab
::
ImportUrl
.
new
(
value
)
# deletes any existing import_data
create_or_update_import_data
(
import_url
.
credentials
)
create_import_data
(
credentials:
import_url
.
credentials
)
super
(
import_url
.
sanitized_url
)
super
(
import_url
.
sanitized_url
)
end
end
...
@@ -420,6 +419,13 @@ class Project < ActiveRecord::Base
...
@@ -420,6 +419,13 @@ class Project < ActiveRecord::Base
end
end
end
end
def
create_or_update_import_data
(
credentials
)
project_import_data
=
import_data
||
ProjectImportData
.
new
project_import_data
.
credentials
=
credentials
project_import_data
.
project_id
=
id
project_import_data
.
save
end
def
import?
def
import?
external_import?
||
forked?
external_import?
||
forked?
end
end
...
...
lib/gitlab/import_url.rb
View file @
ced56641
...
@@ -20,10 +20,10 @@ module Gitlab
...
@@ -20,10 +20,10 @@ module Gitlab
private
private
def
generate_full_url
def
generate_full_url
return
@url
unless
@
credentials
return
@url
unless
credentials
@full_url
=
@url
.
dup
@full_url
=
@url
.
dup
@full_url
.
user
=
@
credentials
[
:user
]
@full_url
.
user
=
credentials
[
:user
]
@full_url
.
password
=
@
credentials
[
:password
]
@full_url
.
password
=
credentials
[
:password
]
@full_url
@full_url
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