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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
365b1280
Commit
365b1280
authored
Mar 08, 2018
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix new GitHub CI/CD page redirecting to import GitHub status page
Fix
https://gitlab.com/gitlab-org/gitlab-ee/issues/5194
parent
73463b08
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
app/views/import/github/new.html.haml
app/views/import/github/new.html.haml
+1
-1
ee/spec/features/projects/new_project_spec.rb
ee/spec/features/projects/new_project_spec.rb
+6
-0
No files found.
app/views/import/github/new.html.haml
View file @
365b1280
...
...
@@ -10,7 +10,7 @@
%p
=
import_github_authorize_message
=
link_to
_
(
'List your GitHub repositories'
),
status_import_github_path
,
class:
'btn btn-success'
=
link_to
_
(
'List your GitHub repositories'
),
status_import_github_path
(
ci_cd_only:
params
[
:ci_cd_only
])
,
class:
'btn btn-success'
%hr
...
...
ee/spec/features/projects/new_project_spec.rb
View file @
365b1280
...
...
@@ -139,6 +139,12 @@ feature 'New project' do
expect
(
created_project
.
project_feature
).
not_to
be_issues_enabled
end
it
'new GitHub CI/CD project page has link to status page with ?ci_cd_only=true param'
do
visit
new_import_github_path
(
ci_cd_only:
true
)
expect
(
page
).
to
have_link
(
'List your GitHub repositories'
,
href:
status_import_github_path
(
ci_cd_only:
true
))
end
it
'stays on GitHub import page after access token failure'
do
visit
new_project_path
find
(
'#ci-cd-project-tab'
).
click
...
...
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