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
Boxiang Sun
gitlab-ce
Commits
8ae57909
Commit
8ae57909
authored
Mar 01, 2018
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport BE changes from CI/CD projects ee!4567
See
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4567
parent
c9660b45
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+6
-2
No files found.
app/controllers/projects_controller.rb
View file @
8ae57909
...
@@ -41,7 +41,7 @@ class ProjectsController < Projects::ApplicationController
...
@@ -41,7 +41,7 @@ class ProjectsController < Projects::ApplicationController
cookies
[
:issue_board_welcome_hidden
]
=
{
path:
project_path
(
@project
),
value:
nil
,
expires:
Time
.
at
(
0
)
}
cookies
[
:issue_board_welcome_hidden
]
=
{
path:
project_path
(
@project
),
value:
nil
,
expires:
Time
.
at
(
0
)
}
redirect_to
(
redirect_to
(
project_path
(
@project
),
project_path
(
@project
,
custom_import_params
),
notice:
_
(
"Project '%{project_name}' was successfully created."
)
%
{
project_name:
@project
.
name
}
notice:
_
(
"Project '%{project_name}' was successfully created."
)
%
{
project_name:
@project
.
name
}
)
)
else
else
...
@@ -103,7 +103,7 @@ class ProjectsController < Projects::ApplicationController
...
@@ -103,7 +103,7 @@ class ProjectsController < Projects::ApplicationController
def
show
def
show
if
@project
.
import_in_progress?
if
@project
.
import_in_progress?
redirect_to
project_import_path
(
@project
)
redirect_to
project_import_path
(
@project
,
custom_import_params
)
return
return
end
end
...
@@ -359,6 +359,10 @@ class ProjectsController < Projects::ApplicationController
...
@@ -359,6 +359,10 @@ class ProjectsController < Projects::ApplicationController
]
]
end
end
def
custom_import_params
{}
end
def
repo_exists?
def
repo_exists?
project
.
repository_exists?
&&
!
project
.
empty_repo?
project
.
repository_exists?
&&
!
project
.
empty_repo?
...
...
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