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
90cbb73e
Commit
90cbb73e
authored
Mar 22, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix "Import projects from" button to show the correct instructions
Closes #1267
parent
29f6b01d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
3 deletions
+44
-3
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+3
-3
features/dashboard/new_project.feature
features/dashboard/new_project.feature
+13
-0
features/steps/dashboard/new_project.rb
features/steps/dashboard/new_project.rb
+27
-0
No files found.
CHANGELOG
View file @
90cbb73e
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
v 7.10.0 (unreleased)
- Fix "Import projects from" button to show the correct instructions (Stan Hu)
- Update poltergeist to version 1.6.0 to support PhantomJS 2.0 (Zeger-Jan van de Weg)
- Update poltergeist to version 1.6.0 to support PhantomJS 2.0 (Zeger-Jan van de Weg)
- Fix cross references when usernames, milestones, or project names contain underscores (Stan Hu)
- Fix cross references when usernames, milestones, or project names contain underscores (Stan Hu)
- enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger)
- enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger)
...
...
app/views/projects/new.html.haml
View file @
90cbb73e
...
@@ -112,6 +112,6 @@
...
@@ -112,6 +112,6 @@
$ ->
$ ->
$('.how_to_import_link').bind 'click', (e) ->
$('.how_to_import_link').bind 'click', (e) ->
e.preventDefault()
e.preventDefault()
import_modal = $(this).
parent().find
(".modal").show()
import_modal = $(this).
next
(".modal").show()
$('.modal-header .close').bind 'click', ->
$('.modal-header .close').bind 'click', ->
$(".modal").hide()
$(".modal").hide()
features/dashboard/new_project.feature
0 → 100644
View file @
90cbb73e
@dashboard
Feature
:
New Project
Background
:
Given
I sign in as a user
And
I own project
"Shop"
And
I visit dashboard page
@javascript
Scenario
:
I
should see New projects page
Given
I click
"New project"
link
Then
I see
"New project"
page
When
I click on
"Import project from GitHub"
Then
I see instructions on how to import from GitHub
features/steps/dashboard/new_project.rb
0 → 100644
View file @
90cbb73e
class
Spinach::Features::NewProject
<
Spinach
::
FeatureSteps
include
SharedAuthentication
include
SharedPaths
include
SharedProject
step
'I click "New project" link'
do
click_link
"New project"
end
step
'I see "New project" page'
do
page
.
should
have_content
(
"Project path"
)
end
step
'I click on "Import project from GitHub"'
do
first
(
'.how_to_import_link'
).
click
end
step
'I see instructions on how to import from GitHub'
do
github_modal
=
first
(
'.modal-body'
)
github_modal
.
should
be_visible
github_modal
.
should
have_content
"To enable importing projects from GitHub"
all
(
'.modal-body'
).
each
do
|
element
|
element
.
should_not
be_visible
unless
element
==
github_modal
end
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