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
341c1181
Commit
341c1181
authored
8 years ago
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor project to include some nicer EE stuff
parent
f26389a0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
8 deletions
+3
-8
app/models/project.rb
app/models/project.rb
+3
-8
No files found.
app/models/project.rb
View file @
341c1181
...
...
@@ -204,7 +204,7 @@ class Project < ActiveRecord::Base
state
:finished
state
:failed
after_transition
any
=>
:finished
,
do: :
clear_import_data
after_transition
any
=>
:finished
,
do: :
reset_cache_and_import_attrs
end
class
<<
self
...
...
@@ -360,7 +360,7 @@ class Project < ActiveRecord::Base
end
end
def
clear_import_data
def
reset_cache_and_import_attrs
update
(
import_error:
nil
)
ProjectCacheWorker
.
perform_async
(
self
.
id
)
...
...
@@ -426,12 +426,7 @@ class Project < ActiveRecord::Base
end
def
safe_import_url
result
=
URI
.
parse
(
self
.
import_url
)
result
.
password
=
'*****'
unless
result
.
password
.
nil?
result
.
user
=
'*****'
unless
result
.
user
.
nil?
||
result
.
user
==
"git"
#tokens or other data may be saved as user
result
.
to_s
rescue
self
.
import_url
Gitlab
::
UrlSanitizer
.
new
(
import_url
).
masked_url
end
def
check_limit
...
...
This diff is collapsed.
Click to expand it.
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