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
Kazuhiko Shiozaki
gitlab-ce
Commits
802b8fce
Commit
802b8fce
authored
Nov 10, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix graph description and text
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
b1a1cadc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/projects/graphs/ci/_builds.haml
app/views/projects/graphs/ci/_builds.haml
+2
-2
features/steps/project/graph.rb
features/steps/project/graph.rb
+3
-3
No files found.
app/views/projects/graphs/ci/_builds.haml
View file @
802b8fce
...
@@ -17,13 +17,13 @@
...
@@ -17,13 +17,13 @@
.prepend-top-default
.prepend-top-default
%p
.light
%p
.light
Builds
chart
for last month
Builds for last month
(
#{
date_from_to
(
Date
.
today
-
30
.
days
,
Date
.
today
)
}
)
(
#{
date_from_to
(
Date
.
today
-
30
.
days
,
Date
.
today
)
}
)
%canvas
#monthChart
{
height:
200
}
%canvas
#monthChart
{
height:
200
}
.prepend-top-default
.prepend-top-default
%p
.light
%p
.light
Builds
chart
for last year
Builds for last year
%canvas
#yearChart
.padded
{
height:
250
}
%canvas
#yearChart
.padded
{
height:
250
}
-
[
:week
,
:month
,
:year
].
each
do
|
scope
|
-
[
:week
,
:month
,
:year
].
each
do
|
scope
|
...
...
features/steps/project/graph.rb
View file @
802b8fce
...
@@ -25,9 +25,9 @@ class Spinach::Features::ProjectGraph < Spinach::FeatureSteps
...
@@ -25,9 +25,9 @@ class Spinach::Features::ProjectGraph < Spinach::FeatureSteps
step
'page should have CI graphs'
do
step
'page should have CI graphs'
do
expect
(
page
).
to
have_content
'Overall'
expect
(
page
).
to
have_content
'Overall'
expect
(
page
).
to
have_content
'Builds
chart
for last week'
expect
(
page
).
to
have_content
'Builds for last week'
expect
(
page
).
to
have_content
'Builds
chart
for last month'
expect
(
page
).
to
have_content
'Builds for last month'
expect
(
page
).
to
have_content
'Builds
chart
for last year'
expect
(
page
).
to
have_content
'Builds for last year'
expect
(
page
).
to
have_content
'Commit duration in minutes for last 30 commits'
expect
(
page
).
to
have_content
'Commit duration in minutes for last 30 commits'
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