diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 13:03:48 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 13:03:48 -0600 |
| commit | cecea7529fb37893af6bf514a53e239a3be1eea6 (patch) | |
| tree | 2781b7d777b9cf6fb76ba238b2fdce0e01a08618 /spec/javascripts/vue_mr_widget/mock_data.js | |
| parent | 691cf4409145d80c09e43a10fd252d88075dc3e6 (diff) | |
| parent | 1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff) | |
| download | gitlab-ce-cecea7529fb37893af6bf514a53e239a3be1eea6.tar.gz | |
Merge branch 'master' into fix-no-template
Diffstat (limited to 'spec/javascripts/vue_mr_widget/mock_data.js')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/mock_data.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/javascripts/vue_mr_widget/mock_data.js b/spec/javascripts/vue_mr_widget/mock_data.js index 1ad7c2d8efa..ca29c9fee32 100644 --- a/spec/javascripts/vue_mr_widget/mock_data.js +++ b/spec/javascripts/vue_mr_widget/mock_data.js @@ -33,8 +33,8 @@ export default { "source_project_id": 19, "target_branch": "master", "target_project_id": 19, - "merge_event": { - "author": { + "metrics": { + "merged_by": { "name": "Administrator", "username": "root", "id": 1, @@ -42,9 +42,10 @@ export default { "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon", "web_url": "http://localhost:3000/root" }, - "updated_at": "2017-04-07T15:39:25.696Z" + "merged_at": "2017-04-07T15:39:25.696Z", + "closed_by": null, + "closed_at": null }, - "closed_event": null, "author": { "name": "Administrator", "username": "root", |