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
6074896c
Commit
6074896c
authored
Feb 18, 2013
by
Andrew8xx8
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spinach tests fixed
parent
69698aac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
app/views/milestones/_milestone.html.haml
app/views/milestones/_milestone.html.haml
+1
-1
features/steps/project/project_issues.rb
features/steps/project/project_issues.rb
+2
-3
features/steps/project/project_merge_requests.rb
features/steps/project/project_merge_requests.rb
+4
-5
No files found.
app/views/milestones/_milestone.html.haml
View file @
6074896c
%li
{
class:
"milestone milestone-#{milestone.closed? ? 'closed' : 'open'}"
,
id:
dom_id
(
milestone
)
}
.pull-right
-
if
can?
(
current_user
,
:admin_milestone
,
milestone
.
project
)
and
milestone
.
opened
?
-
if
can?
(
current_user
,
:admin_milestone
,
milestone
.
project
)
and
milestone
.
active
?
=
link_to
edit_project_milestone_path
(
milestone
.
project
,
milestone
),
class:
"btn btn-small edit-milestone-link grouped"
do
%i
.icon-edit
Edit
...
...
features/steps/project/project_issues.rb
View file @
6074896c
...
...
@@ -122,10 +122,9 @@ class ProjectIssues < Spinach::FeatureSteps
And
'project "Shop" have "Release 0.3" closed issue'
do
project
=
Project
.
find_by_name
(
"Shop"
)
create
(
:issue
,
create
(
:
closed_
issue
,
:title
=>
"Release 0.3"
,
:project
=>
project
,
:author
=>
project
.
users
.
first
,
:closed
=>
true
)
:author
=>
project
.
users
.
first
)
end
end
features/steps/project/project_merge_requests.rb
View file @
6074896c
...
...
@@ -26,7 +26,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
Then
'I should see closed merge request "Bug NS-04"'
do
mr
=
MergeRequest
.
find_by_title
(
"Bug NS-04"
)
mr
.
closed
.
should
be_true
mr
.
closed
?
.
should
be_true
page
.
should
have_content
"Closed by"
end
...
...
@@ -64,7 +64,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
And
'project "Shop" have "Bug NS-04" open merge request'
do
project
=
Project
.
find_by_name
(
"Shop"
)
create
(
:merge_request
,
create
(
:
closed_
merge_request
,
title:
"Bug NS-04"
,
project:
project
,
author:
project
.
users
.
first
)
...
...
@@ -80,11 +80,10 @@ class ProjectMergeRequests < Spinach::FeatureSteps
And
'project "Shop" have "Feature NS-03" closed merge request'
do
project
=
Project
.
find_by_name
(
"Shop"
)
create
(
:merge_request
,
create
(
:
closed_
merge_request
,
title:
"Feature NS-03"
,
project:
project
,
author:
project
.
users
.
first
,
closed:
true
)
author:
project
.
users
.
first
)
end
And
'I switch to the diff tab'
do
...
...
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