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
06954954
Commit
06954954
authored
Sep 03, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
85d1c205
f15e3efb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
db/fixtures/development/17_cycle_analytics.rb
db/fixtures/development/17_cycle_analytics.rb
+4
-2
spec/javascripts/monitoring/components/dashboard_spec.js
spec/javascripts/monitoring/components/dashboard_spec.js
+3
-1
No files found.
db/fixtures/development/17_cycle_analytics.rb
View file @
06954954
...
...
@@ -18,6 +18,7 @@ class Gitlab::Seeder::CycleAnalytics
# Milestones / Labels
Timecop
.
travel
5
.
days
.
from_now
if
index
.
even?
issue_metrics
.
first_associated_with_milestone_at
=
rand
(
6
..
12
).
hours
.
from_now
else
...
...
@@ -146,7 +147,7 @@ class Gitlab::Seeder::CycleAnalytics
commit_sha
=
issue
.
project
.
repository
.
create_file
(
@user
,
filename
,
"content"
,
message:
"Commit for
#{
issue
.
to_reference
}
"
,
branch_name:
branch_name
)
issue
.
project
.
repository
.
commit
(
commit_sha
)
Git
::
BranchPushService
.
new
(
::
Git
::
BranchPushService
.
new
(
issue
.
project
,
@user
,
oldrev:
issue
.
project
.
repository
.
commit
(
"master"
).
sha
,
...
...
@@ -182,7 +183,8 @@ class Gitlab::Seeder::CycleAnalytics
ref:
"refs/heads/
#{
merge_request
.
source_branch
}
"
)
pipeline
=
service
.
execute
(
:push
,
ignore_skip_ci:
true
,
save_on_errors:
false
)
pipeline
.
builds
.
map
(
&
:run!
)
pipeline
.
builds
.
each
(
&
:enqueue
)
# make sure all pipelines in pending state
pipeline
.
builds
.
each
(
&
:run!
)
pipeline
.
update_status
end
end
...
...
spec/javascripts/monitoring/components/dashboard_spec.js
View file @
06954954
...
...
@@ -378,7 +378,9 @@ describe('Dashboard', () => {
});
});
describe
(
'
link to chart
'
,
()
=>
{
// https://gitlab.com/gitlab-org/gitlab-ce/issues/66922
// eslint-disable-next-line jasmine/no-disabled-tests
xdescribe
(
'
link to chart
'
,
()
=>
{
let
wrapper
;
const
currentDashboard
=
'
TEST_DASHBOARD
'
;
localVue
.
use
(
GlToast
);
...
...
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