summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-01 15:35:12 +0000
committerRémy Coutable <remy@rymai.me>2016-07-01 15:35:12 +0000
commitc368cb605bfb586cf93cff3879212906812f327b (patch)
treea0118ec393cf299ca87f4023e48abef347e54c60
parentb37a8d8f663d625a92fe06a15a89324bd23e239f (diff)
parente7319d0a2570b229d3bbd3e64b95c8b4a2dedd69 (diff)
downloadgitlab-ce-c368cb605bfb586cf93cff3879212906812f327b.tar.gz
Merge branch 'fix/import-export-events' into 'master'
Fixing problems with events for import/export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19202 A couple of issues related to target being missing in exported `Events` (as being polymorphic and not have `ActiveRecord` relationships is a bit more tricky than normal models) plus as the export was in JSON, the import retrieves hashed fields as stringified hashes and not symbolized - so fixed that as well, which was the cause of https://gitlab.com/gitlab-org/gitlab-ce/issues/19202 Also fixed / refactored tests :simpl Import/Export Version has been bumped to 0.1.1 as theses changes to events won't work very well with old exports - forcing users to generate a new export in the new version. See merge request !4987
-rw-r--r--CHANGELOG1
-rw-r--r--app/models/issue.rb2
-rw-r--r--app/models/merge_request.rb2
-rw-r--r--app/models/milestone.rb1
-rw-r--r--app/models/note.rb1
-rw-r--r--lib/gitlab/import_export.rb2
-rw-r--r--lib/gitlab/import_export/import_export.yml15
-rw-r--r--lib/gitlab/import_export/relation_factory.rb1
-rw-r--r--spec/features/projects/import_export/test_project_export.tar.gzbin345686 -> 687442 bytes
-rw-r--r--spec/lib/gitlab/import_export/project.json6062
-rw-r--r--spec/lib/gitlab/import_export/project_tree_restorer_spec.rb6
-rw-r--r--spec/lib/gitlab/import_export/project_tree_saver_spec.rb7
12 files changed, 4070 insertions, 2030 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c71e54a9148..a019f56c0fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@ v 8.9.5 (unreleased)
- Improve the request / withdraw access button. !4860
- Fix assigning shared runners as admins. !4961
- Show "locked" label for locked runners on runners admin. !4961
+ - Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1
v 8.9.4
- Fix privilege escalation issue with OAuth external users.
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 3c5859194b4..60abd47409e 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -19,6 +19,8 @@ class Issue < ActiveRecord::Base
belongs_to :project
belongs_to :moved_to, class_name: 'Issue'
+ has_many :events, as: :target, dependent: :destroy
+
validates :project, presence: true
scope :cared, ->(user) { where(assignee_id: user) }
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 53d9aa588af..5ebc8f0c99f 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -12,6 +12,8 @@ class MergeRequest < ActiveRecord::Base
has_one :merge_request_diff, dependent: :destroy
+ has_many :events, as: :target, dependent: :destroy
+
serialize :merge_params, Hash
after_create :create_merge_request_diff, unless: :importing
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index e0c8454a998..2bd7f198030 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -17,6 +17,7 @@ class Milestone < ActiveRecord::Base
has_many :labels, -> { distinct.reorder('labels.title') }, through: :issues
has_many :merge_requests
has_many :participants, -> { distinct.reorder('users.name') }, through: :issues, source: :assignee
+ has_many :events, as: :target, dependent: :destroy
scope :active, -> { with_state(:active) }
scope :closed, -> { with_state(:closed) }
diff --git a/app/models/note.rb b/app/models/note.rb
index 8db500a5219..c2bb117eb03 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -21,6 +21,7 @@ class Note < ActiveRecord::Base
belongs_to :updated_by, class_name: "User"
has_many :todos, dependent: :destroy
+ has_many :events, as: :target, dependent: :destroy
delegate :gfm_reference, :local_reference, to: :noteable
delegate :name, to: :project, prefix: true
diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb
index 99cf85d9a3b..588647e5adb 100644
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
@@ -2,7 +2,7 @@ module Gitlab
module ImportExport
extend self
- VERSION = '0.1.0'
+ VERSION = '0.1.1'
def export_path(relative_path:)
File.join(storage_path, relative_path)
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 164ab6238c4..05f4ad527ac 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -1,24 +1,29 @@
# Model relationships to be included in the project import/export
project_tree:
- issues:
+ - :events
- notes:
- :author
+ - :author
+ - :events
- :labels
- - :milestones
+ - milestones:
+ - :events
- snippets:
- notes:
:author
- :releases
- - :events
- project_members:
- :user
- merge_requests:
- notes:
- :author
+ - :author
+ - :events
- :merge_request_diff
+ - :events
- pipelines:
- notes:
- :author
+ - :author
+ - :events
- :statuses
- :variables
- :triggers
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 92bf7e0a2fc..3fd89e08f09 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -33,6 +33,7 @@ module Gitlab
update_user_references
update_project_references
reset_ci_tokens if @relation_name == 'Ci::Trigger'
+ @relation_hash['data'].deep_symbolize_keys! if @relation_name == :events && @relation_hash['data']
generate_imported_object
end
diff --git a/spec/features/projects/import_export/test_project_export.tar.gz b/spec/features/projects/import_export/test_project_export.tar.gz
index 1fd04416d95..7bb0d26b21c 100644
--- a/spec/features/projects/import_export/test_project_export.tar.gz
+++ b/spec/features/projects/import_export/test_project_export.tar.gz
Binary files differ
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
index 403bd582ef3..0b30e8c9b04 100644
--- a/spec/lib/gitlab/import_export/project.json
+++ b/spec/lib/gitlab/import_export/project.json
@@ -1,62 +1,63 @@
{
- "name": "Gitlab Test",
- "path": "gitlab-test",
- "description": "Aut saepe in eos dolorem aliquam hic.",
+ "description": "Nisi et repellendus ut enim quo accusamus vel magnam.",
"issues_enabled": true,
"merge_requests_enabled": true,
"wiki_enabled": true,
"snippets_enabled": false,
- "visibility_level": 20,
+ "visibility_level": 10,
"archived": false,
"issues": [
{
"id": 40,
- "title": "Voluptatem modi rerum ipsum vero voluptas repudiandae veniam quibusdam.",
+ "title": "Voluptatem amet doloribus deleniti eos maxime repudiandae molestias.",
"assignee_id": 1,
- "author_id": 4,
+ "author_id": 22,
"project_id": 5,
- "created_at": "2016-03-22T15:13:28.411Z",
- "updated_at": "2016-04-12T13:08:26.029Z",
+ "created_at": "2016-06-14T15:02:08.340Z",
+ "updated_at": "2016-06-14T15:02:47.967Z",
"position": 0,
"branch_name": null,
- "description": "Aut minima non sit qui nulla rerum laborum.",
- "milestone_id": 10,
+ "description": "Aliquam enim illo et possimus.",
+ "milestone_id": 18,
"state": "opened",
"iid": 10,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 1357,
- "note": "test",
+ "id": 351,
+ "note": "Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-04-12T13:08:26.006Z",
- "updated_at": "2016-04-12T13:08:26.006Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:47.770Z",
+ "updated_at": "2016-06-14T15:02:47.770Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
- "commit_id": "",
+ "commit_id": null,
"noteable_id": 40,
"system": false,
"st_diff": null,
"updated_by_id": null,
"author": {
- "name": "Administrator"
- }
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 338,
- "note": "Fugit in aliquid voluptas dolor.",
+ "id": 352,
+ "note": "Est reprehenderit quas aut aspernatur autem recusandae voluptatem.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-03-22T15:19:59.213Z",
- "updated_at": "2016-03-22T15:19:59.213Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:47.795Z",
+ "updated_at": "2016-06-14T15:02:47.795Z",
"project_id": 5,
"attachment": {
"url": null
@@ -68,16 +69,19 @@
"st_diff": null,
"updated_by_id": null,
"author": {
- "name": "Administrator"
- }
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 337,
- "note": "Occaecati consequatur facilis doloribus omnis hic placeat nihil.",
+ "id": 353,
+ "note": "Perspiciatis suscipit voluptates in eius nihil.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:19:59.186Z",
- "updated_at": "2016-03-22T15:19:59.186Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:47.823Z",
+ "updated_at": "2016-06-14T15:02:47.823Z",
"project_id": 5,
"attachment": {
"url": null
@@ -89,16 +93,19 @@
"st_diff": null,
"updated_by_id": null,
"author": {
- "name": "Alexie Trantow"
- }
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 336,
- "note": "Nostrum et et est repudiandae non dolores voluptatem.",
+ "id": 354,
+ "note": "Aut vel voluptas corrupti nisi provident laboriosam magnam aut.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:19:59.156Z",
- "updated_at": "2016-03-22T15:19:59.156Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:47.850Z",
+ "updated_at": "2016-06-14T15:02:47.850Z",
"project_id": 5,
"attachment": {
"url": null
@@ -110,37 +117,19 @@
"st_diff": null,
"updated_by_id": null,
"author": {
- "name": "Julius Moore"
- }
- },
- {
- "id": 335,
- "note": "Nihil et aut dolorum aut sit maxime.",
- "noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:19:59.130Z",
- "updated_at": "2016-03-22T15:19:59.130Z",
- "project_id": 5,
- "attachment": {
- "url": null
+ "name": "Ottis Schuster II"
},
- "line_code": null,
- "commit_id": null,
- "noteable_id": 40,
- "system": false,
- "st_diff": null,
- "updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "events": [
+
+ ]
},
{
- "id": 334,
- "note": "Non blanditiis voluptatem sit earum accusantium distinctio voluptas officiis.",
+ "id": 355,
+ "note": "Officia dolore consequatur in saepe cum magni.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:19:59.101Z",
- "updated_at": "2016-03-22T15:19:59.101Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:47.876Z",
+ "updated_at": "2016-06-14T15:02:47.876Z",
"project_id": 5,
"attachment": {
"url": null
@@ -151,17 +140,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 333,
- "note": "Nesciunt non dolorem similique nam ipsa et.",
+ "id": 356,
+ "note": "Cum ipsum rem voluptas eaque et ea.",
"noteable_type": "Issue",
- "author_id": 22,
- "created_at": "2016-03-22T15:19:59.075Z",
- "updated_at": "2016-03-22T15:19:59.075Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:47.908Z",
+ "updated_at": "2016-06-14T15:02:47.908Z",
"project_id": 5,
"attachment": {
"url": null
@@ -172,17 +164,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 332,
- "note": "Sed aut fugit et officiis dolor.",
+ "id": 357,
+ "note": "Recusandae excepturi asperiores suscipit autem nostrum.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:19:59.047Z",
- "updated_at": "2016-03-22T15:19:59.047Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:47.937Z",
+ "updated_at": "2016-06-14T15:02:47.937Z",
"project_id": 5,
"attachment": {
"url": null
@@ -193,17 +188,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 331,
- "note": "Officiis iste eum recusandae suscipit consequatur consequatur.",
+ "id": 358,
+ "note": "Et hic est id similique et non nesciunt voluptate.",
"noteable_type": "Issue",
- "author_id": 26,
- "created_at": "2016-03-22T15:19:59.015Z",
- "updated_at": "2016-03-22T15:19:59.015Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:47.965Z",
+ "updated_at": "2016-06-14T15:02:47.965Z",
"project_id": 5,
"attachment": {
"url": null
@@ -214,39 +212,42 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
]
},
{
"id": 39,
- "title": "Sit ut adipisci sint temporibus velit quis.",
- "assignee_id": 1,
- "author_id": 12,
+ "title": "Delectus veniam ratione in eos culpa et natus molestiae earum aut.",
+ "assignee_id": 20,
+ "author_id": 22,
"project_id": 5,
- "created_at": "2016-03-22T15:13:28.278Z",
- "updated_at": "2016-03-22T15:19:59.473Z",
+ "created_at": "2016-06-14T15:02:08.233Z",
+ "updated_at": "2016-06-14T15:02:48.194Z",
"position": 0,
"branch_name": null,
- "description": "Ab sint nostrum aliquam laudantium magni recusandae qui.",
- "milestone_id": 10,
- "state": "closed",
+ "description": "Voluptate vel reprehenderit facilis omnis voluptas magnam tenetur.",
+ "milestone_id": 16,
+ "state": "opened",
"iid": 9,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 346,
- "note": "Natus rerum qui dolorem dolorum voluptas.",
+ "id": 359,
+ "note": "Quo eius velit quia et id quam.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-03-22T15:19:59.469Z",
- "updated_at": "2016-03-22T15:19:59.469Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:48.009Z",
+ "updated_at": "2016-06-14T15:02:48.009Z",
"project_id": 5,
"attachment": {
"url": null
@@ -257,17 +258,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 345,
- "note": "Voluptatibus et qui quis id sed necessitatibus quos.",
+ "id": 360,
+ "note": "Nulla commodi ratione cumque id autem.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:19:59.438Z",
- "updated_at": "2016-03-22T15:19:59.438Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:48.032Z",
+ "updated_at": "2016-06-14T15:02:48.032Z",
"project_id": 5,
"attachment": {
"url": null
@@ -278,17 +282,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 344,
- "note": "Aperiam possimus ipsam quibusdam in.",
+ "id": 361,
+ "note": "Illum non ea sed dolores corrupti.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:19:59.410Z",
- "updated_at": "2016-03-22T15:19:59.410Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:48.056Z",
+ "updated_at": "2016-06-14T15:02:48.056Z",
"project_id": 5,
"attachment": {
"url": null
@@ -299,17 +306,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 343,
- "note": "Ad vel hic molestiae tempora.",
+ "id": 362,
+ "note": "Facere dolores ipsum dolorum maiores omnis occaecati ab.",
"noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:19:59.379Z",
- "updated_at": "2016-03-22T15:19:59.379Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:48.082Z",
+ "updated_at": "2016-06-14T15:02:48.082Z",
"project_id": 5,
"attachment": {
"url": null
@@ -320,17 +330,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 342,
- "note": "Vel magnam sed quidem aut molestiae facilis alias.",
+ "id": 363,
+ "note": "Quod laudantium similique sint aut est ducimus.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:19:59.348Z",
- "updated_at": "2016-03-22T15:19:59.348Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:48.113Z",
+ "updated_at": "2016-06-14T15:02:48.113Z",
"project_id": 5,
"attachment": {
"url": null
@@ -341,17 +354,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 341,
- "note": "Veritatis dolorum aut qui quod.",
+ "id": 364,
+ "note": "Aut omnis eos esse incidunt vero reiciendis.",
"noteable_type": "Issue",
- "author_id": 22,
- "created_at": "2016-03-22T15:19:59.319Z",
- "updated_at": "2016-03-22T15:19:59.319Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:48.139Z",
+ "updated_at": "2016-06-14T15:02:48.139Z",
"project_id": 5,
"attachment": {
"url": null
@@ -362,17 +378,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 340,
- "note": "Illum at cumque dolorum et quia.",
+ "id": 365,
+ "note": "Beatae dolore et doloremque asperiores sunt.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:19:59.289Z",
- "updated_at": "2016-03-22T15:19:59.289Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:48.162Z",
+ "updated_at": "2016-06-14T15:02:48.162Z",
"project_id": 5,
"attachment": {
"url": null
@@ -383,17 +402,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 339,
- "note": "Fugiat et error molestiae cumque quos aperiam.",
+ "id": 366,
+ "note": "Doloribus ipsam ex delectus rerum libero recusandae modi repellendus.",
"noteable_type": "Issue",
- "author_id": 26,
- "created_at": "2016-03-22T15:19:59.255Z",
- "updated_at": "2016-03-22T15:19:59.255Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:48.192Z",
+ "updated_at": "2016-06-14T15:02:48.192Z",
"project_id": 5,
"attachment": {
"url": null
@@ -404,39 +426,42 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
]
},
{
"id": 38,
- "title": "Quod quo est quis vel natus nulla eos reiciendis.",
- "assignee_id": 12,
- "author_id": 3,
+ "title": "Quasi adipisci non cupiditate dolorem quo qui earum sed.",
+ "assignee_id": 1,
+ "author_id": 6,
"project_id": 5,
- "created_at": "2016-03-22T15:13:28.137Z",
- "updated_at": "2016-03-22T15:19:59.712Z",
+ "created_at": "2016-06-14T15:02:08.154Z",
+ "updated_at": "2016-06-14T15:02:48.614Z",
"position": 0,
"branch_name": null,
- "description": "Fugit dolor accusantium suscipit facere voluptate.",
- "milestone_id": 10,
- "state": "opened",
+ "description": "Ea recusandae neque autem tempora.",
+ "milestone_id": 16,
+ "state": "closed",
"iid": 8,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 354,
- "note": "Id commodi natus vel corrupti ea placeat cum nihil.",
+ "id": 367,
+ "note": "Accusantium fugiat et eaque quisquam esse corporis.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-03-22T15:19:59.708Z",
- "updated_at": "2016-03-22T15:19:59.708Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:48.235Z",
+ "updated_at": "2016-06-14T15:02:48.235Z",
"project_id": 5,
"attachment": {
"url": null
@@ -447,17 +472,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 353,
- "note": "Quia hic sed ratione eos voluptate dolor occaecati dolorem.",
+ "id": 368,
+ "note": "Ea labore eum nam qui laboriosam.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:19:59.680Z",
- "updated_at": "2016-03-22T15:19:59.680Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:48.261Z",
+ "updated_at": "2016-06-14T15:02:48.261Z",
"project_id": 5,
"attachment": {
"url": null
@@ -468,17 +496,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 352,
- "note": "Commodi sint voluptatem est aut.",
+ "id": 369,
+ "note": "Accusantium quis sed molestiae et.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:19:59.650Z",
- "updated_at": "2016-03-22T15:19:59.650Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:48.294Z",
+ "updated_at": "2016-06-14T15:02:48.294Z",
"project_id": 5,
"attachment": {
"url": null
@@ -489,17 +520,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 351,
- "note": "Et quibusdam voluptatibus dolores aut quam architecto optio.",
+ "id": 370,
+ "note": "Corporis numquam a voluptatem pariatur asperiores dolorem delectus autem.",
"noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:19:59.622Z",
- "updated_at": "2016-03-22T15:19:59.622Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:48.523Z",
+ "updated_at": "2016-06-14T15:02:48.523Z",
"project_id": 5,
"attachment": {
"url": null
@@ -510,17 +544,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 350,
- "note": "Fugit natus explicabo sed pariatur et quasi autem.",
+ "id": 371,
+ "note": "Ea accusantium maxime voluptas rerum.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:19:59.590Z",
- "updated_at": "2016-03-22T15:19:59.590Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:48.546Z",
+ "updated_at": "2016-06-14T15:02:48.546Z",
"project_id": 5,
"attachment": {
"url": null
@@ -531,17 +568,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 349,
- "note": "Corporis commodi eos quia optio sunt corrupti.",
+ "id": 372,
+ "note": "Pariatur iusto et et excepturi similique ipsam eum.",
"noteable_type": "Issue",
- "author_id": 22,
- "created_at": "2016-03-22T15:19:59.562Z",
- "updated_at": "2016-03-22T15:19:59.562Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:48.569Z",
+ "updated_at": "2016-06-14T15:02:48.569Z",
"project_id": 5,
"attachment": {
"url": null
@@ -552,17 +592,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 348,
- "note": "Occaecati nostrum hic dolor tenetur aliquid maxime animi.",
+ "id": 373,
+ "note": "Aliquam et culpa officia iste eius.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:19:59.536Z",
- "updated_at": "2016-03-22T15:19:59.536Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:48.591Z",
+ "updated_at": "2016-06-14T15:02:48.591Z",
"project_id": 5,
"attachment": {
"url": null
@@ -573,17 +616,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 347,
- "note": "Inventore ullam sed repellendus laudantium itaque et quia.",
+ "id": 374,
+ "note": "Ab id velit id unde laborum.",
"noteable_type": "Issue",
- "author_id": 26,
- "created_at": "2016-03-22T15:19:59.506Z",
- "updated_at": "2016-03-22T15:19:59.506Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:48.613Z",
+ "updated_at": "2016-06-14T15:02:48.613Z",
"project_id": 5,
"attachment": {
"url": null
@@ -594,39 +640,42 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
]
},
{
"id": 37,
- "title": "Animi suscipit quia ut hic asperiores perferendis nisi ut.",
- "assignee_id": 22,
- "author_id": 10,
+ "title": "Cupiditate quo aut ducimus minima molestiae vero numquam possimus.",
+ "assignee_id": 15,
+ "author_id": 20,
"project_id": 5,
- "created_at": "2016-03-22T15:13:27.994Z",
- "updated_at": "2016-03-22T15:19:59.972Z",
+ "created_at": "2016-06-14T15:02:08.051Z",
+ "updated_at": "2016-06-14T15:02:48.854Z",
"position": 0,
"branch_name": null,
- "description": "Non quibusdam in maxime earum eveniet itaque culpa.",
- "milestone_id": 11,
- "state": "closed",
+ "description": "Maiores architecto quos in dolorem.",
+ "milestone_id": 17,
+ "state": "opened",
"iid": 7,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 362,
- "note": "Quia qui quis molestiae in praesentium.",
+ "id": 375,
+ "note": "Quasi fugit qui sed eligendi aut quia.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-03-22T15:19:59.966Z",
- "updated_at": "2016-03-22T15:19:59.966Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:48.647Z",
+ "updated_at": "2016-06-14T15:02:48.647Z",
"project_id": 5,
"attachment": {
"url": null
@@ -637,17 +686,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 361,
- "note": "Maxime sed eius qui consequatur beatae.",
+ "id": 376,
+ "note": "Esse nesciunt voluptatem ex vero est consequatur.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:19:59.924Z",
- "updated_at": "2016-03-22T15:19:59.924Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:48.674Z",
+ "updated_at": "2016-06-14T15:02:48.674Z",
"project_id": 5,
"attachment": {
"url": null
@@ -658,17 +710,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 360,
- "note": "Voluptatum quasi corrupti eveniet sed ut quis quibusdam.",
+ "id": 377,
+ "note": "Similique qui quas non aut et velit sequi in.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:19:59.897Z",
- "updated_at": "2016-03-22T15:19:59.897Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:48.696Z",
+ "updated_at": "2016-06-14T15:02:48.696Z",
"project_id": 5,
"attachment": {
"url": null
@@ -679,17 +734,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 359,
- "note": "Molestias quia eius ipsum non.",
+ "id": 378,
+ "note": "Eveniet ut cupiditate repellendus numquam in esse eius.",
"noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:19:59.866Z",
- "updated_at": "2016-03-22T15:19:59.866Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:48.720Z",
+ "updated_at": "2016-06-14T15:02:48.720Z",
"project_id": 5,
"attachment": {
"url": null
@@ -700,17 +758,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 358,
- "note": "Aut non est accusantium aliquam.",
+ "id": 379,
+ "note": "Velit est dolorem adipisci rerum sed iure.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:19:59.834Z",
- "updated_at": "2016-03-22T15:19:59.834Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:48.755Z",
+ "updated_at": "2016-06-14T15:02:48.755Z",
"project_id": 5,
"attachment": {
"url": null
@@ -721,17 +782,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 357,
- "note": "Aspernatur voluptas id voluptas vel cum ipsam.",
+ "id": 380,
+ "note": "Voluptatem ullam ab ut illo ut quo.",
"noteable_type": "Issue",
- "author_id": 22,
- "created_at": "2016-03-22T15:19:59.805Z",
- "updated_at": "2016-03-22T15:19:59.805Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:48.793Z",
+ "updated_at": "2016-06-14T15:02:48.793Z",
"project_id": 5,
"attachment": {
"url": null
@@ -742,17 +806,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 356,
- "note": "Harum dignissimos provident tempora sit numquam est qui.",
+ "id": 381,
+ "note": "Voluptatem impedit beatae quasi ipsa earum consectetur.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:19:59.773Z",
- "updated_at": "2016-03-22T15:19:59.773Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:48.823Z",
+ "updated_at": "2016-06-14T15:02:48.823Z",
"project_id": 5,
"attachment": {
"url": null
@@ -763,17 +830,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 355,
- "note": "Sint dignissimos molestiae recusandae delectus.",
+ "id": 382,
+ "note": "Nihil officiis eaque incidunt sunt voluptatum excepturi.",
"noteable_type": "Issue",
- "author_id": 26,
- "created_at": "2016-03-22T15:19:59.746Z",
- "updated_at": "2016-03-22T15:19:59.746Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:48.852Z",
+ "updated_at": "2016-06-14T15:02:48.852Z",
"project_id": 5,
"attachment": {
"url": null
@@ -784,39 +854,42 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
]
},
{
"id": 36,
- "title": "Quia dolores commodi eligendi ut nemo totam.",
- "assignee_id": 3,
- "author_id": 4,
+ "title": "Necessitatibus dolor est enim quia rem suscipit quidem voluptas ullam.",
+ "assignee_id": 20,
+ "author_id": 16,
"project_id": 5,
- "created_at": "2016-03-22T15:13:27.814Z",
- "updated_at": "2016-03-22T15:20:00.371Z",
+ "created_at": "2016-06-14T15:02:07.958Z",
+ "updated_at": "2016-06-14T15:02:49.044Z",
"position": 0,
"branch_name": null,
- "description": "Molestiae veniam laudantium autem et natus.",
- "milestone_id": 11,
+ "description": "Ut aut ut et tenetur velit aut id modi.",
+ "milestone_id": 16,
"state": "opened",
"iid": 6,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 370,
- "note": "Occaecati temporibus tempore harum vero incidunt veniam iste.",
+ "id": 383,
+ "note": "Excepturi deleniti sunt rerum nesciunt vero fugiat possimus.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:00.365Z",
- "updated_at": "2016-03-22T15:20:00.365Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:48.885Z",
+ "updated_at": "2016-06-14T15:02:48.885Z",
"project_id": 5,
"attachment": {
"url": null
@@ -827,17 +900,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 369,
- "note": "Modi architecto officiis quia iste voluptas libero nihil quo.",
+ "id": 384,
+ "note": "Et est nemo sed nam sed.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:00.331Z",
- "updated_at": "2016-03-22T15:20:00.331Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:48.910Z",
+ "updated_at": "2016-06-14T15:02:48.910Z",
"project_id": 5,
"attachment": {
"url": null
@@ -848,17 +924,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 368,
- "note": "Eaque est tenetur ex est molestiae nobis.",
+ "id": 385,
+ "note": "Animi mollitia nulla facere amet aut quaerat.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:00.296Z",
- "updated_at": "2016-03-22T15:20:00.296Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:48.934Z",
+ "updated_at": "2016-06-14T15:02:48.934Z",
"project_id": 5,
"attachment": {
"url": null
@@ -869,17 +948,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 367,
- "note": "Odit enim ut a quo qui.",
+ "id": 386,
+ "note": "Excepturi id voluptas ut odio officiis omnis.",
"noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:00.261Z",
- "updated_at": "2016-03-22T15:20:00.261Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:48.955Z",
+ "updated_at": "2016-06-14T15:02:48.955Z",
"project_id": 5,
"attachment": {
"url": null
@@ -890,17 +972,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 366,
- "note": "Omnis unde cum officiis est.",
+ "id": 387,
+ "note": "Molestiae labore officiis magni et eligendi quasi maxime.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:00.223Z",
- "updated_at": "2016-03-22T15:20:00.223Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:48.978Z",
+ "updated_at": "2016-06-14T15:02:48.978Z",
"project_id": 5,
"attachment": {
"url": null
@@ -911,17 +996,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 365,
- "note": "Ab consequuntur aliquam illo voluptatum.",
+ "id": 388,
+ "note": "Officia tenetur praesentium rem nam non.",
"noteable_type": "Issue",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:00.178Z",
- "updated_at": "2016-03-22T15:20:00.178Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:49.001Z",
+ "updated_at": "2016-06-14T15:02:49.001Z",
"project_id": 5,
"attachment": {
"url": null
@@ -932,17 +1020,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 364,
- "note": "Molestiae dolorem est eos dolores aut.",
+ "id": 389,
+ "note": "Et et et molestiae reprehenderit.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:00.127Z",
- "updated_at": "2016-03-22T15:20:00.127Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:49.022Z",
+ "updated_at": "2016-06-14T15:02:49.022Z",
"project_id": 5,
"attachment": {
"url": null
@@ -953,17 +1044,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 363,
- "note": "Nemo velit nam quod veniam.",
+ "id": 390,
+ "note": "Aperiam in consequatur est sunt cum quia.",
"noteable_type": "Issue",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:00.083Z",
- "updated_at": "2016-03-22T15:20:00.083Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:49.043Z",
+ "updated_at": "2016-06-14T15:02:49.043Z",
"project_id": 5,
"attachment": {
"url": null
@@ -974,39 +1068,42 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
]
},
{
"id": 35,
- "title": "Rerum tenetur harum molestiae quam aut praesentium quaerat doloremque.",
- "assignee_id": 4,
- "author_id": 1,
+ "title": "Repellat praesentium deserunt maxime incidunt harum porro qui.",
+ "assignee_id": 6,
+ "author_id": 20,
"project_id": 5,
- "created_at": "2016-03-22T15:13:27.660Z",
- "updated_at": "2016-03-22T15:20:00.665Z",
+ "created_at": "2016-06-14T15:02:07.832Z",
+ "updated_at": "2016-06-14T15:02:49.226Z",
"position": 0,
"branch_name": null,
- "description": "Omnis et voluptatibus expedita qui et explicabo rem ut.",
- "milestone_id": 11,
- "state": "opened",
+ "description": "Dicta nisi nihil non ipsa velit.",
+ "milestone_id": 20,
+ "state": "closed",
"iid": 5,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 378,
- "note": "Molestiae atque exercitationem culpa harum nemo.",
+ "id": 391,
+ "note": "Qui magnam et assumenda quod id dicta necessitatibus.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:00.660Z",
- "updated_at": "2016-03-22T15:20:00.660Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:49.075Z",
+ "updated_at": "2016-06-14T15:02:49.075Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1017,17 +1114,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 377,
- "note": "Porro sed nobis neque amet velit velit.",
+ "id": 392,
+ "note": "Consectetur deserunt possimus dolor est odio.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:00.625Z",
- "updated_at": "2016-03-22T15:20:00.625Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:49.095Z",
+ "updated_at": "2016-06-14T15:02:49.095Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1038,17 +1138,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 376,
- "note": "Dicta officiis doloremque voluptatum qui omnis.",
+ "id": 393,
+ "note": "Labore nisi quo cumque voluptas consequatur aut qui.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:00.589Z",
- "updated_at": "2016-03-22T15:20:00.589Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:49.117Z",
+ "updated_at": "2016-06-14T15:02:49.117Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1059,17 +1162,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 375,
- "note": "Incidunt rerum omnis cum laudantium aut impedit.",
+ "id": 394,
+ "note": "Et totam facilis voluptas et enim.",
"noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:00.553Z",
- "updated_at": "2016-03-22T15:20:00.553Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:49.138Z",
+ "updated_at": "2016-06-14T15:02:49.138Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1080,17 +1186,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 374,
- "note": "Et suscipit omnis dolorum officia vero.",
+ "id": 395,
+ "note": "Ratione sint pariatur sed omnis eligendi quo libero exercitationem.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:00.517Z",
- "updated_at": "2016-03-22T15:20:00.517Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:49.160Z",
+ "updated_at": "2016-06-14T15:02:49.160Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1101,17 +1210,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 373,
- "note": "Doloremque adipisci et cumque inventore beatae consectetur.",
+ "id": 396,
+ "note": "Iure hic autem id voluptatem.",
"noteable_type": "Issue",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:00.485Z",
- "updated_at": "2016-03-22T15:20:00.485Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:49.182Z",
+ "updated_at": "2016-06-14T15:02:49.182Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1122,17 +1234,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 372,
- "note": "Dolores sapiente ea dolorum et quae adipisci id.",
+ "id": 397,
+ "note": "Excepturi eum laboriosam delectus repellendus odio nisi et voluptatem.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:00.455Z",
- "updated_at": "2016-03-22T15:20:00.455Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:49.205Z",
+ "updated_at": "2016-06-14T15:02:49.205Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1143,17 +1258,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 371,
- "note": "Accusantium repellat tenetur natus dicta ullam saepe facere.",
+ "id": 398,
+ "note": "Ut quis ex soluta consequatur et blanditiis.",
"noteable_type": "Issue",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:00.420Z",
- "updated_at": "2016-03-22T15:20:00.420Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:49.225Z",
+ "updated_at": "2016-06-14T15:02:49.225Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1164,39 +1282,42 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
]
},
{
"id": 34,
- "title": "Enim occaecati aut sed quia mollitia eligendi atque dolores voluptatem.",
- "assignee_id": 24,
+ "title": "Ullam expedita deserunt libero consequatur quia dolor harum perferendis facere quidem.",
+ "assignee_id": 20,
"author_id": 1,
"project_id": 5,
- "created_at": "2016-03-22T15:13:27.506Z",
- "updated_at": "2016-03-22T15:20:00.961Z",
+ "created_at": "2016-06-14T15:02:07.717Z",
+ "updated_at": "2016-06-14T15:02:49.416Z",
"position": 0,
"branch_name": null,
- "description": "Voluptatem totam magnam fugit assumenda consequatur illo qui.",
- "milestone_id": 10,
- "state": "opened",
+ "description": "Ut et explicabo vel voluptatem consequuntur ut sed.",
+ "milestone_id": 19,
+ "state": "closed",
"iid": 4,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 379,
- "note": "Praesentium odio quia fugit consequuntur repudiandae ducimus.",
+ "id": 399,
+ "note": "Dolor iste tempora tenetur non vitae maiores voluptatibus.",
"noteable_type": "Issue",
"author_id": 26,
- "created_at": "2016-03-22T15:20:00.717Z",
- "updated_at": "2016-03-22T15:20:00.717Z",
+ "created_at": "2016-06-14T15:02:49.256Z",
+ "updated_at": "2016-06-14T15:02:49.256Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1207,17 +1328,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
+ "author": {
"name": "User 4"
- }
+ },
+ "events": [
+
+ ]
},
{
- "id": 380,
- "note": "Dolores aut dolorem quia soluta incidunt commodi quia.",
+ "id": 400,
+ "note": "Aut sit quidem qui adipisci maxime excepturi iusto.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:00.754Z",
- "updated_at": "2016-03-22T15:20:00.754Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:49.284Z",
+ "updated_at": "2016-06-14T15:02:49.284Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1228,17 +1352,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 381,
- "note": "Enim et velit iure ad.",
+ "id": 401,
+ "note": "Et a necessitatibus autem quidem animi sunt voluptatum rerum.",
"noteable_type": "Issue",
"author_id": 22,
- "created_at": "2016-03-22T15:20:00.787Z",
- "updated_at": "2016-03-22T15:20:00.787Z",
+ "created_at": "2016-06-14T15:02:49.305Z",
+ "updated_at": "2016-06-14T15:02:49.305Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1249,17 +1376,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
+ "author": {
"name": "User 0"
- }
+ },
+ "events": [
+
+ ]
},
{
- "id": 382,
- "note": "Impedit nobis quis laudantium ad assumenda.",
+ "id": 402,
+ "note": "Esse laboriosam quo voluptatem quis molestiae.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:00.822Z",
- "updated_at": "2016-03-22T15:20:00.822Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:49.328Z",
+ "updated_at": "2016-06-14T15:02:49.328Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1270,17 +1400,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 383,
- "note": "Facere sed numquam quos quas.",
+ "id": 403,
+ "note": "Nemo magnam distinctio est ut voluptate ea.",
"noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:00.855Z",
- "updated_at": "2016-03-22T15:20:00.855Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:49.350Z",
+ "updated_at": "2016-06-14T15:02:49.350Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1291,17 +1424,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 384,
- "note": "Ex voluptatem sit provident error.",
+ "id": 404,
+ "note": "Omnis sed rerum neque rerum quae quam nulla officiis.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:00.889Z",
- "updated_at": "2016-03-22T15:20:00.889Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:49.372Z",
+ "updated_at": "2016-06-14T15:02:49.372Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1312,17 +1448,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 385,
- "note": "Soluta laboriosam recusandae est cupiditate.",
+ "id": 405,
+ "note": "Quo soluta dolorem vitae ad consequatur qui aut dicta.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:00.925Z",
- "updated_at": "2016-03-22T15:20:00.925Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:49.394Z",
+ "updated_at": "2016-06-14T15:02:49.394Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1333,17 +1472,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 386,
- "note": "Similique dolorem rerum iusto animi perferendis aut inventore.",
+ "id": 406,
+ "note": "Magni minus est aut aut totam ut.",
"noteable_type": "Issue",
"author_id": 1,
- "created_at": "2016-03-22T15:20:00.957Z",
- "updated_at": "2016-03-22T15:20:00.957Z",
+ "created_at": "2016-06-14T15:02:49.414Z",
+ "updated_at": "2016-06-14T15:02:49.414Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1354,39 +1496,42 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
+ "author": {
"name": "Administrator"
- }
+ },
+ "events": [
+
+ ]
}
]
},
{
"id": 33,
- "title": "Rem fugiat fugit occaecati quibusdam enim consectetur numquam.",
- "assignee_id": 22,
- "author_id": 22,
+ "title": "Numquam accusamus eos iste exercitationem magni non inventore.",
+ "assignee_id": 15,
+ "author_id": 26,
"project_id": 5,
- "created_at": "2016-03-22T15:13:27.364Z",
- "updated_at": "2016-03-22T15:20:01.227Z",
+ "created_at": "2016-06-14T15:02:07.611Z",
+ "updated_at": "2016-06-14T15:02:49.661Z",
"position": 0,
"branch_name": null,
- "description": "Provident nulla architecto neque beatae fuga alias repudiandae.",
- "milestone_id": 10,
+ "description": "Non asperiores velit accusantium voluptate.",
+ "milestone_id": 18,
"state": "closed",
"iid": 3,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 394,
- "note": "Suscipit numquam voluptatibus ipsam libero dolorum dolore totam.",
+ "id": 407,
+ "note": "Quod ea et possimus architecto.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:01.223Z",
- "updated_at": "2016-03-22T15:20:01.223Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:49.450Z",
+ "updated_at": "2016-06-14T15:02:49.450Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1397,17 +1542,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 393,
- "note": "Et et sed sit sint.",
+ "id": 408,
+ "note": "Reiciendis est et unde perferendis dicta ut praesentium quasi.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:01.194Z",
- "updated_at": "2016-03-22T15:20:01.194Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:49.503Z",
+ "updated_at": "2016-06-14T15:02:49.503Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1418,17 +1566,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 392,
- "note": "Corrupti perferendis voluptas et iure omnis officia.",
+ "id": 409,
+ "note": "Magni quia odio blanditiis pariatur voluptas.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:01.160Z",
- "updated_at": "2016-03-22T15:20:01.160Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:49.527Z",
+ "updated_at": "2016-06-14T15:02:49.527Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1439,17 +1590,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 391,
- "note": "Autem quo fugit in iste nesciunt tempora.",
+ "id": 410,
+ "note": "Enim quam ut et et et.",
"noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:01.131Z",
- "updated_at": "2016-03-22T15:20:01.131Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:49.551Z",
+ "updated_at": "2016-06-14T15:02:49.551Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1460,17 +1614,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 390,
- "note": "Magni porro ut soluta quis et eveniet maiores.",
+ "id": 411,
+ "note": "Fugit voluptatem ratione maxime expedita.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:01.101Z",
- "updated_at": "2016-03-22T15:20:01.101Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:49.578Z",
+ "updated_at": "2016-06-14T15:02:49.578Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1481,17 +1638,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 389,
- "note": "Sed consequuntur debitis nisi veniam exercitationem recusandae a quisquam.",
+ "id": 412,
+ "note": "Voluptatem enim aut ipsa et et ducimus.",
"noteable_type": "Issue",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:01.070Z",
- "updated_at": "2016-03-22T15:20:01.070Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:49.604Z",
+ "updated_at": "2016-06-14T15:02:49.604Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1502,17 +1662,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 388,
- "note": "Aut impedit qui consectetur dicta temporibus.",
+ "id": 413,
+ "note": "Quia repellat fugiat consectetur quidem.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:01.042Z",
- "updated_at": "2016-03-22T15:20:01.042Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:49.631Z",
+ "updated_at": "2016-06-14T15:02:49.631Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1523,17 +1686,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 387,
- "note": "Officia repudiandae ut culpa ipsa reiciendis.",
+ "id": 414,
+ "note": "Corporis ipsum et ea necessitatibus quod assumenda repudiandae quam.",
"noteable_type": "Issue",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:01.005Z",
- "updated_at": "2016-03-22T15:20:01.005Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:49.659Z",
+ "updated_at": "2016-06-14T15:02:49.659Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1544,39 +1710,42 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
]
},
{
"id": 32,
- "title": "Velit nihil est alias blanditiis eius earum autem hic.",
+ "title": "Necessitatibus magnam qui at velit consequatur perspiciatis.",
"assignee_id": 22,
- "author_id": 26,
+ "author_id": 15,
"project_id": 5,
- "created_at": "2016-03-22T15:13:27.225Z",
- "updated_at": "2016-03-22T15:20:01.495Z",
+ "created_at": "2016-06-14T15:02:07.431Z",
+ "updated_at": "2016-06-14T15:02:49.884Z",
"position": 0,
"branch_name": null,
- "description": "Id voluptas ut sint aut laborum nobis commodi.",
- "milestone_id": 11,
- "state": "opened",
+ "description": "Molestiae corporis magnam et fugit aliquid nulla quia.",
+ "milestone_id": 17,
+ "state": "closed",
"iid": 2,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 402,
- "note": "Magni ut eligendi sit sint recusandae voluptas tempore necessitatibus.",
+ "id": 415,
+ "note": "Nemo consequatur sed blanditiis qui id iure dolores.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:01.489Z",
- "updated_at": "2016-03-22T15:20:01.489Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:49.694Z",
+ "updated_at": "2016-06-14T15:02:49.694Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1587,17 +1756,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 401,
- "note": "Est repellat commodi incidunt tempore earum optio unde sint.",
+ "id": 416,
+ "note": "Voluptas ab accusantium dicta in.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:01.455Z",
- "updated_at": "2016-03-22T15:20:01.455Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:49.718Z",
+ "updated_at": "2016-06-14T15:02:49.718Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1608,17 +1780,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 400,
- "note": "Vero unde debitis tempore est laboriosam ut esse.",
+ "id": 417,
+ "note": "Esse odit qui a et eum ducimus.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:01.421Z",
- "updated_at": "2016-03-22T15:20:01.421Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:49.741Z",
+ "updated_at": "2016-06-14T15:02:49.741Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1629,17 +1804,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 399,
- "note": "Omnis qui asperiores expedita harum voluptatem eius.",
+ "id": 418,
+ "note": "Sequi dolor doloribus ratione placeat repellendus.",
"noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:01.391Z",
- "updated_at": "2016-03-22T15:20:01.391Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:49.767Z",
+ "updated_at": "2016-06-14T15:02:49.767Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1650,17 +1828,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 398,
- "note": "Dolorem doloribus delectus quo ratione esse veritatis.",
+ "id": 419,
+ "note": "Quae aspernatur rem est similique.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:01.358Z",
- "updated_at": "2016-03-22T15:20:01.358Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:49.796Z",
+ "updated_at": "2016-06-14T15:02:49.796Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1671,17 +1852,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 397,
- "note": "Quia esse et odit id est omnis dolorum quia.",
+ "id": 420,
+ "note": "Voluptate omnis et id rerum non nesciunt laudantium assumenda.",
"noteable_type": "Issue",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:01.329Z",
- "updated_at": "2016-03-22T15:20:01.329Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:49.825Z",
+ "updated_at": "2016-06-14T15:02:49.825Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1692,17 +1876,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 396,
- "note": "Exercitationem suscipit non rerum tempore sit.",
+ "id": 421,
+ "note": "Quia enim ab et eligendi.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:01.297Z",
- "updated_at": "2016-03-22T15:20:01.297Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:49.853Z",
+ "updated_at": "2016-06-14T15:02:49.853Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1713,17 +1900,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 395,
- "note": "Nihil veniam magni sit officiis.",
+ "id": 422,
+ "note": "In fugiat rerum voluptas quas officia.",
"noteable_type": "Issue",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:01.268Z",
- "updated_at": "2016-03-22T15:20:01.268Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:49.881Z",
+ "updated_at": "2016-06-14T15:02:49.881Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1734,39 +1924,42 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
]
},
{
"id": 31,
- "title": "Asperiores recusandae praesentium voluptas pariatur provident qui exercitationem quis.",
- "assignee_id": 26,
- "author_id": 24,
+ "title": "Libero nam magnam incidunt eaque placeat error et.",
+ "assignee_id": 1,
+ "author_id": 16,
"project_id": 5,
- "created_at": "2016-03-22T15:13:26.889Z",
- "updated_at": "2016-03-22T15:20:01.834Z",
+ "created_at": "2016-06-14T15:02:07.280Z",
+ "updated_at": "2016-06-14T15:02:50.134Z",
"position": 0,
"branch_name": null,
- "description": "Ex voluptates qui excepturi cupiditate.",
- "milestone_id": 11,
+ "description": "Quod ad architecto qui est sed quia.",
+ "milestone_id": 20,
"state": "closed",
"iid": 1,
"updated_by_id": null,
"confidential": false,
"deleted_at": null,
- "moved_to_id": null,
"due_date": null,
+ "moved_to_id": null,
"notes": [
{
- "id": 410,
- "note": "Sit itaque non nihil nisi qui voluptatem dolorem error.",
+ "id": 423,
+ "note": "A mollitia qui iste consequatur eaque iure omnis sunt.",
"noteable_type": "Issue",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:01.828Z",
- "updated_at": "2016-03-22T15:20:01.828Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:49.933Z",
+ "updated_at": "2016-06-14T15:02:49.933Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1777,17 +1970,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 409,
- "note": "Omnis rem nihil molestiae enim laudantium doloremque.",
+ "id": 424,
+ "note": "Eveniet est et blanditiis sequi alias.",
"noteable_type": "Issue",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:01.783Z",
- "updated_at": "2016-03-22T15:20:01.783Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:49.965Z",
+ "updated_at": "2016-06-14T15:02:49.965Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1798,17 +1994,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 408,
- "note": "Ullam harum sit et optio incidunt.",
+ "id": 425,
+ "note": "Commodi tempore voluptas doloremque est.",
"noteable_type": "Issue",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:01.746Z",
- "updated_at": "2016-03-22T15:20:01.746Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:49.996Z",
+ "updated_at": "2016-06-14T15:02:49.996Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1819,17 +2018,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 407,
- "note": "Fugit distinctio ab quo ipsam.",
+ "id": 426,
+ "note": "Quo libero impedit odio debitis rerum aspernatur.",
"noteable_type": "Issue",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:01.716Z",
- "updated_at": "2016-03-22T15:20:01.716Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:50.024Z",
+ "updated_at": "2016-06-14T15:02:50.024Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1840,17 +2042,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 406,
- "note": "Impedit iste possimus ad ea.",
+ "id": 427,
+ "note": "Dolorem voluptatem qui labore deserunt.",
"noteable_type": "Issue",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:01.676Z",
- "updated_at": "2016-03-22T15:20:01.676Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:50.049Z",
+ "updated_at": "2016-06-14T15:02:50.049Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1861,17 +2066,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 405,
- "note": "Nemo recusandae dolore distinctio quam consequuntur ut et aut.",
+ "id": 428,
+ "note": "Est blanditiis laboriosam enim ipsam.",
"noteable_type": "Issue",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:01.641Z",
- "updated_at": "2016-03-22T15:20:01.641Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:50.077Z",
+ "updated_at": "2016-06-14T15:02:50.077Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1882,17 +2090,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 404,
- "note": "Nisi repudiandae repellat nulla culpa quasi expedita quod velit.",
+ "id": 429,
+ "note": "Et in voluptatem animi dolorem eos.",
"noteable_type": "Issue",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:01.601Z",
- "updated_at": "2016-03-22T15:20:01.601Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:50.107Z",
+ "updated_at": "2016-06-14T15:02:50.107Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1903,17 +2114,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 403,
- "note": "Quibusdam odio temporibus nemo voluptatibus accusamus.",
+ "id": 430,
+ "note": "Unde culpa voluptate qui sint quos.",
"noteable_type": "Issue",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:01.552Z",
- "updated_at": "2016-03-22T15:20:01.552Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:50.132Z",
+ "updated_at": "2016-06-14T15:02:50.132Z",
"project_id": 5,
"attachment": {
"url": null
@@ -1924,470 +2138,338 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
]
}
],
"labels": [
- {
- "id": 12,
- "title": "test",
- "color": "#428bca",
- "project_id": 5,
- "created_at": "2016-05-10T10:53:14.214Z",
- "updated_at": "2016-05-10T10:53:14.214Z",
- "template": false,
- "description": "test label"
- }
+
],
"milestones": [
{
- "id": 11,
- "title": "v2.0",
+ "id": 20,
+ "title": "v4.0",
"project_id": 5,
- "description": "Sapiente facilis architecto reprehenderit aut sed enim.",
+ "description": "Totam quam laborum id magnam natus eaque aspernatur.",
"due_date": null,
- "created_at": "2016-03-22T15:13:21.631Z",
- "updated_at": "2016-03-22T15:13:21.631Z",
- "state": "closed",
- "iid": 2
+ "created_at": "2016-06-14T15:02:04.590Z",
+ "updated_at": "2016-06-14T15:02:04.590Z",
+ "state": "active",
+ "iid": 5,
+ "events": [
+ {
+ "id": 240,
+ "target_type": "Milestone",
+ "target_id": 20,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:04.593Z",
+ "updated_at": "2016-06-14T15:02:04.593Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 60,
+ "target_type": "Milestone",
+ "target_id": 20,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:04.593Z",
+ "updated_at": "2016-06-14T15:02:04.593Z",
+ "action": 1,
+ "author_id": 20
+ }
+ ]
},
{
- "id": 10,
- "title": "v1.0",
+ "id": 19,
+ "title": "v3.0",
"project_id": 5,
- "description": "Est sed eos minima veniam culpa aut non.",
+ "description": "Rerum at autem exercitationem ea voluptates harum quam placeat.",
"due_date": null,
- "created_at": "2016-03-22T15:13:21.622Z",
- "updated_at": "2016-03-22T15:13:21.622Z",
- "state": "closed",
- "iid": 1
- }
- ],
- "snippets": [
-
- ],
- "releases": [
-
- ],
- "events": [
- {
- "id": 301,
- "target_type": "Note",
- "target_id": 1357,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-04-12T13:08:30.886Z",
- "updated_at": "2016-04-12T13:08:30.886Z",
- "action": 6,
- "author_id": 1
- },
- {
- "id": 227,
- "target_type": "MergeRequest",
- "target_id": 85,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:19:44.957Z",
- "updated_at": "2016-03-22T15:19:44.957Z",
- "action": 1,
- "author_id": 1
- },
- {
- "id": 226,
- "target_type": "MergeRequest",
- "target_id": 84,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:19:44.600Z",
- "updated_at": "2016-03-22T15:19:44.600Z",
- "action": 1,
- "author_id": 1
- },
- {
- "id": 157,
- "target_type": "MergeRequest",
- "target_id": 15,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:45.936Z",
- "updated_at": "2016-03-22T15:13:45.936Z",
- "action": 1,
- "author_id": 3
- },
- {
- "id": 156,
- "target_type": "MergeRequest",
- "target_id": 14,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:45.500Z",
- "updated_at": "2016-03-22T15:13:45.500Z",
- "action": 1,
- "author_id": 10
- },
- {
- "id": 155,
- "target_type": "MergeRequest",
- "target_id": 13,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:45.242Z",
- "updated_at": "2016-03-22T15:13:45.242Z",
- "action": 1,
- "author_id": 1
- },
- {
- "id": 154,
- "target_type": "MergeRequest",
- "target_id": 12,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:44.940Z",
- "updated_at": "2016-03-22T15:13:44.940Z",
- "action": 1,
- "author_id": 24
- },
- {
- "id": 153,
- "target_type": "MergeRequest",
- "target_id": 11,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:44.568Z",
- "updated_at": "2016-03-22T15:13:44.568Z",
- "action": 1,
- "author_id": 26
- },
- {
- "id": 152,
- "target_type": "MergeRequest",
- "target_id": 10,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:44.225Z",
- "updated_at": "2016-03-22T15:13:44.225Z",
- "action": 1,
- "author_id": 22
- },
- {
- "id": 151,
- "target_type": "MergeRequest",
- "target_id": 9,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:43.868Z",
- "updated_at": "2016-03-22T15:13:43.868Z",
- "action": 1,
- "author_id": 24
- },
- {
- "id": 102,
- "target_type": "Issue",
- "target_id": 40,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:28.474Z",
- "updated_at": "2016-03-22T15:13:28.474Z",
- "action": 1,
- "author_id": 4
- },
- {
- "id": 101,
- "target_type": "Issue",
- "target_id": 39,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:28.328Z",
- "updated_at": "2016-03-22T15:13:28.328Z",
- "action": 1,
- "author_id": 12
- },
- {
- "id": 100,
- "target_type": "Issue",
- "target_id": 38,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:28.204Z",
- "updated_at": "2016-03-22T15:13:28.204Z",
- "action": 1,
- "author_id": 3
- },
- {
- "id": 99,
- "target_type": "Issue",
- "target_id": 37,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:28.055Z",
- "updated_at": "2016-03-22T15:13:28.055Z",
- "action": 1,
- "author_id": 10
- },
- {
- "id": 98,
- "target_type": "Issue",
- "target_id": 36,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:27.913Z",
- "updated_at": "2016-03-22T15:13:27.913Z",
- "action": 1,
- "author_id": 4
- },
- {
- "id": 97,
- "target_type": "Issue",
- "target_id": 35,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:27.731Z",
- "updated_at": "2016-03-22T15:13:27.731Z",
- "action": 1,
- "author_id": 1
- },
- {
- "id": 96,
- "target_type": "Issue",
- "target_id": 34,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:27.564Z",
- "updated_at": "2016-03-22T15:13:27.564Z",
- "action": 1,
- "author_id": 1
- },
- {
- "id": 95,
- "target_type": "Issue",
- "target_id": 33,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:27.429Z",
- "updated_at": "2016-03-22T15:13:27.429Z",
- "action": 1,
- "author_id": 22
- },
- {
- "id": 94,
- "target_type": "Issue",
- "target_id": 32,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:27.287Z",
- "updated_at": "2016-03-22T15:13:27.287Z",
- "action": 1,
- "author_id": 26
- },
- {
- "id": 93,
- "target_type": "Issue",
- "target_id": 31,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:26.997Z",
- "updated_at": "2016-03-22T15:13:26.997Z",
- "action": 1,
- "author_id": 24
- },
- {
- "id": 51,
- "target_type": "Milestone",
- "target_id": 11,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:21.634Z",
- "updated_at": "2016-03-22T15:13:21.634Z",
- "action": 1,
- "author_id": 26
- },
- {
- "id": 50,
- "target_type": "Milestone",
- "target_id": 10,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:21.625Z",
- "updated_at": "2016-03-22T15:13:21.625Z",
- "action": 1,
- "author_id": 22
- },
- {
- "id": 24,
- "target_type": null,
- "target_id": null,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:20.750Z",
- "updated_at": "2016-03-22T15:13:20.750Z",
- "action": 8,
- "author_id": 12
- },
- {
- "id": 23,
- "target_type": null,
- "target_id": null,
- "title": null,
- "data": null,
- "project_id": 5,
- "created_at": "2016-03-22T15:13:20.711Z",
- "updated_at": "2016-03-22T15:13:20.711Z",
- "action": 8,
- "author_id": 22
+ "created_at": "2016-06-14T15:02:04.583Z",
+ "updated_at": "2016-06-14T15:02:04.583Z",
+ "state": "active",
+ "iid": 4,
+ "events": [
+ {
+ "id": 241,
+ "target_type": "Milestone",
+ "target_id": 19,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:04.585Z",
+ "updated_at": "2016-06-14T15:02:04.585Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 59,
+ "target_type": "Milestone",
+ "target_id": 19,
+ "title": null,
+ "data": {
+ "object_kind": "push",
+ "before": "0000000000000000000000000000000000000000",
+ "after": "de990aa15829d0ab182ad5a55b4c527846c0d39c",
+ "ref": "refs/heads/removable-group-owner",
+ "checkout_sha": "de990aa15829d0ab182ad5a55b4c527846c0d39c",
+ "message": null,
+ "user_id": 273486,
+ "user_name": "James Lopez",
+ "user_email": "james@jameslopez.es",
+ "project_id": 562317,
+ "repository": {
+ "name": "GitLab Community Edition",
+ "url": "git@gitlab.com:james11/gitlab-ce.git",
+ "description": "Version Control on your Server. See http://gitlab.org/gitlab-ce/ and the README for more information",
+ "homepage": "https://gitlab.com/james11/gitlab-ce",
+ "git_http_url": "https://gitlab.com/james11/gitlab-ce.git",
+ "git_ssh_url": "git@gitlab.com:james11/gitlab-ce.git",
+ "visibility_level": 20
+ },
+ "commits": [
+ {
+ "id": "de990aa15829d0ab182ad5a55b4c527846c0d39c",
+ "message": "fixed last group owner issue and added test\\n",
+ "timestamp": "2015-10-29T16:10:27+00:00",
+ "url": "https://gitlab.com/james11/gitlab-ce/commit/de990aa15829d0ab182ad5a55b4c527846c0d39c",
+ "author": {
+ "name": "James Lopez",
+ "email": "james.lopez@vodafone.com"
+ }
+ }
+ ],
+ "total_commits_count": 1
+ },
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:04.585Z",
+ "updated_at": "2016-06-14T15:02:04.585Z",
+ "action": 1,
+ "author_id": 25
+ }
+ ]
},
{
- "id": 22,
- "target_type": null,
- "target_id": null,
- "title": null,
- "data": null,
+ "id": 18,
+ "title": "v2.0",
"project_id": 5,
- "created_at": "2016-03-22T15:13:20.667Z",
- "updated_at": "2016-03-22T15:13:20.667Z",
- "action": 8,
- "author_id": 26
+ "description": "Error dolorem rerum aut nulla.",
+ "due_date": null,
+ "created_at": "2016-06-14T15:02:04.576Z",
+ "updated_at": "2016-06-14T15:02:04.576Z",
+ "state": "active",
+ "iid": 3,
+ "events": [
+ {
+ "id": 242,
+ "target_type": "Milestone",
+ "target_id": 18,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:04.579Z",
+ "updated_at": "2016-06-14T15:02:04.579Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 58,
+ "target_type": "Milestone",
+ "target_id": 18,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:04.579Z",
+ "updated_at": "2016-06-14T15:02:04.579Z",
+ "action": 1,
+ "author_id": 22
+ }
+ ]
},
{
- "id": 21,
- "target_type": null,
- "target_id": null,
- "title": null,
- "data": null,
+ "id": 17,
+ "title": "v1.0",
"project_id": 5,
- "created_at": "2016-03-22T15:13:20.646Z",
- "updated_at": "2016-03-22T15:13:20.646Z",
- "action": 8,
- "author_id": 1
+ "description": "Molestiae perspiciatis voluptates doloremque commodi veniam consequatur.",
+ "due_date": null,
+ "created_at": "2016-06-14T15:02:04.569Z",
+ "updated_at": "2016-06-14T15:02:04.569Z",
+ "state": "active",
+ "iid": 2,
+ "events": [
+ {
+ "id": 243,
+ "target_type": "Milestone",
+ "target_id": 17,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:04.570Z",
+ "updated_at": "2016-06-14T15:02:04.570Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 57,
+ "target_type": "Milestone",
+ "target_id": 17,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:04.570Z",
+ "updated_at": "2016-06-14T15:02:04.570Z",
+ "action": 1,
+ "author_id": 20
+ }
+ ]
},
{
- "id": 5,
- "target_type": null,
- "target_id": null,
- "title": null,
- "data": null,
+ "id": 16,
+ "title": "v0.0",
"project_id": 5,
- "created_at": "2016-03-22T15:13:10.369Z",
- "updated_at": "2016-03-22T15:13:10.369Z",
- "action": 1,
- "author_id": 1
+ "description": "Velit numquam et sed sit.",
+ "due_date": null,
+ "created_at": "2016-06-14T15:02:04.561Z",
+ "updated_at": "2016-06-14T15:02:04.561Z",
+ "state": "closed",
+ "iid": 1,
+ "events": [
+ {
+ "id": 244,
+ "target_type": "Milestone",
+ "target_id": 16,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:04.563Z",
+ "updated_at": "2016-06-14T15:02:04.563Z",
+ "action": 1,
+ "author_id": 26
+ },
+ {
+ "id": 56,
+ "target_type": "Milestone",
+ "target_id": 16,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:04.563Z",
+ "updated_at": "2016-06-14T15:02:04.563Z",
+ "action": 1,
+ "author_id": 26
+ }
+ ]
}
],
+ "snippets": [
+
+ ],
+ "releases": [
+
+ ],
"project_members": [
{
- "id": 35,
+ "id": 36,
"access_level": 40,
"source_id": 5,
"source_type": "Project",
- "user_id": 12,
+ "user_id": 16,
"notification_level": 3,
- "created_at": "2016-03-22T15:13:20.743Z",
- "updated_at": "2016-03-22T15:13:20.743Z",
+ "created_at": "2016-06-14T15:02:03.834Z",
+ "updated_at": "2016-06-14T15:02:03.834Z",
"created_by_id": null,
"invite_email": null,
"invite_token": null,
"invite_accepted_at": null,
+ "requested_at": null,
"user": {
- "id": 12,
- "email": "maureen.bogisich@russelkessler.com",
- "username": "evans"
+ "id": 16,
+ "email": "maritza_schoen@block.ca",
+ "username": "bernard_willms"
}
},
{
- "id": 34,
- "access_level": 40,
+ "id": 35,
+ "access_level": 10,
"source_id": 5,
"source_type": "Project",
- "user_id": 22,
+ "user_id": 6,
"notification_level": 3,
- "created_at": "2016-03-22T15:13:20.708Z",
- "updated_at": "2016-03-22T15:13:20.708Z",
+ "created_at": "2016-06-14T15:02:03.811Z",
+ "updated_at": "2016-06-14T15:02:03.811Z",
"created_by_id": null,
"invite_email": null,
"invite_token": null,
"invite_accepted_at": null,
+ "requested_at": null,
"user": {
- "id": 22,
- "email": "user0@example.com",
- "username": "user0"
+ "id": 6,
+ "email": "shaina@koelpindenesik.com",
+ "username": "saul_will"
}
},
{
- "id": 33,
- "access_level": 40,
+ "id": 34,
+ "access_level": 20,
"source_id": 5,
"source_type": "Project",
- "user_id": 26,
+ "user_id": 15,
"notification_level": 3,
- "created_at": "2016-03-22T15:13:20.664Z",
- "updated_at": "2016-03-22T15:13:20.664Z",
+ "created_at": "2016-06-14T15:02:03.776Z",
+ "updated_at": "2016-06-14T15:02:03.776Z",
"created_by_id": null,
"invite_email": null,
"invite_token": null,
"invite_accepted_at": null,
+ "requested_at": null,
"user": {
- "id": 26,
- "email": "user4@example.com",
- "username": "user4"
+ "id": 15,
+ "email": "breanna_sanford@wolf.com",
+ "username": "emmet.schamberger"
}
},
{
- "id": 32,
+ "id": 33,
"access_level": 20,
"source_id": 5,
"source_type": "Project",
- "user_id": 1,
+ "user_id": 26,
"notification_level": 3,
- "created_at": "2016-03-22T15:13:20.643Z",
- "updated_at": "2016-03-22T15:13:20.643Z",
+ "created_at": "2016-06-14T15:02:03.742Z",
+ "updated_at": "2016-06-14T15:02:03.742Z",
"created_by_id": null,
"invite_email": null,
"invite_token": null,
"invite_accepted_at": null,
+ "requested_at": null,
"user": {
- "id": 1,
- "email": "nospam@bluegod.net",
- "username": "root"
+ "id": 26,
+ "email": "user4@example.com",
+ "username": "user4"
}
}
],
"merge_requests": [
{
- "id": 85,
+ "id": 27,
"target_branch": "feature",
"source_branch": "feature_conflict",
"source_project_id": 5,
"author_id": 1,
"assignee_id": null,
"title": "Cannot be automatically merged",
- "created_at": "2016-03-22T15:19:44.807Z",
- "updated_at": "2016-03-22T15:20:09.557Z",
+ "created_at": "2016-06-14T15:02:36.568Z",
+ "updated_at": "2016-06-14T15:02:56.815Z",
"milestone_id": null,
"state": "opened",
"merge_status": "unchecked",
@@ -2399,7 +2481,7 @@
"updated_by_id": null,
"merge_error": null,
"merge_params": {
-
+ "force_remove_source_branch": null
},
"merge_when_build_succeeds": false,
"merge_user_id": null,
@@ -2407,176 +2489,200 @@
"deleted_at": null,
"notes": [
{
- "id": 638,
- "note": "Ab velit ducimus totam sunt ut.",
+ "id": 671,
+ "note": "Sit voluptatibus eveniet architecto quidem.",
"noteable_type": "MergeRequest",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:09.553Z",
- "updated_at": "2016-03-22T15:20:09.553Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:56.632Z",
+ "updated_at": "2016-06-14T15:02:56.632Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 85,
+ "noteable_id": 27,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 637,
- "note": "Ipsum aliquam est in unde similique nihil illo ea.",
+ "id": 672,
+ "note": "Odio maxime ratione voluptatibus sed.",
"noteable_type": "MergeRequest",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:09.528Z",
- "updated_at": "2016-03-22T15:20:09.528Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:56.656Z",
+ "updated_at": "2016-06-14T15:02:56.656Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 85,
+ "noteable_id": 27,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 636,
- "note": "Soluta inventore adipisci et consequatur expedita aliquid earum modi.",
+ "id": 673,
+ "note": "Et deserunt et omnis nihil excepturi accusantium.",
"noteable_type": "MergeRequest",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:09.496Z",
- "updated_at": "2016-03-22T15:20:09.496Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:56.679Z",
+ "updated_at": "2016-06-14T15:02:56.679Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 85,
+ "noteable_id": 27,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 635,
- "note": "Corporis incidunt tempore est deleniti.",
+ "id": 674,
+ "note": "Saepe asperiores exercitationem non dignissimos laborum reiciendis et ipsum.",
"noteable_type": "MergeRequest",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:09.469Z",
- "updated_at": "2016-03-22T15:20:09.469Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:56.700Z",
+ "updated_at": "2016-06-14T15:02:56.700Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 85,
+ "noteable_id": 27,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 634,
- "note": "Hic dolores voluptatibus qui necessitatibus.",
+ "id": 675,
+ "note": "Numquam est at dolor quo et sed eligendi similique.",
"noteable_type": "MergeRequest",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:09.440Z",
- "updated_at": "2016-03-22T15:20:09.440Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:56.720Z",
+ "updated_at": "2016-06-14T15:02:56.720Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 85,
+ "noteable_id": 27,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 633,
- "note": "Rerum architecto placeat doloribus voluptates consequuntur quo.",
+ "id": 676,
+ "note": "Et perferendis aliquam sunt nisi labore delectus.",
"noteable_type": "MergeRequest",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:09.412Z",
- "updated_at": "2016-03-22T15:20:09.412Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:56.742Z",
+ "updated_at": "2016-06-14T15:02:56.742Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 85,
+ "noteable_id": 27,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 632,
- "note": "Vel earum aut ut occaecati aut ut rerum qui.",
+ "id": 677,
+ "note": "Aut ex rerum et in.",
"noteable_type": "MergeRequest",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:09.389Z",
- "updated_at": "2016-03-22T15:20:09.389Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:56.791Z",
+ "updated_at": "2016-06-14T15:02:56.791Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 85,
+ "noteable_id": 27,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 631,
- "note": "Est voluptatibus dolores animi numquam.",
+ "id": 678,
+ "note": "Dolor laborum earum ut exercitationem.",
"noteable_type": "MergeRequest",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:09.361Z",
- "updated_at": "2016-03-22T15:20:09.361Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:56.814Z",
+ "updated_at": "2016-06-14T15:02:56.814Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 85,
+ "noteable_id": 27,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
],
"merge_request_diff": {
- "id": 85,
+ "id": 27,
"state": "collected",
"st_commits": [
{
@@ -2759,23 +2865,49 @@
"too_large": false
}
],
- "merge_request_id": 85,
- "created_at": "2016-03-22T15:19:44.810Z",
- "updated_at": "2016-03-22T15:19:44.901Z",
+ "merge_request_id": 27,
+ "created_at": "2016-06-14T15:02:36.572Z",
+ "updated_at": "2016-06-14T15:02:36.658Z",
"base_commit_sha": "ae73cb07c9eeaf35924a10f713b364d32b2dd34f",
"real_size": "9"
- }
+ },
+ "events": [
+ {
+ "id": 221,
+ "target_type": "MergeRequest",
+ "target_id": 27,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:36.703Z",
+ "updated_at": "2016-06-14T15:02:36.703Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 187,
+ "target_type": "MergeRequest",
+ "target_id": 27,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:36.703Z",
+ "updated_at": "2016-06-14T15:02:36.703Z",
+ "action": 1,
+ "author_id": 1
+ }
+ ]
},
{
- "id": 84,
+ "id": 26,
"target_branch": "master",
"source_branch": "feature",
"source_project_id": 5,
"author_id": 1,
"assignee_id": null,
"title": "Can be automatically merged",
- "created_at": "2016-03-22T15:19:44.482Z",
- "updated_at": "2016-03-22T15:20:09.773Z",
+ "created_at": "2016-06-14T15:02:36.418Z",
+ "updated_at": "2016-06-14T15:02:57.013Z",
"milestone_id": null,
"state": "opened",
"merge_status": "unchecked",
@@ -2787,7 +2919,7 @@
"updated_by_id": null,
"merge_error": null,
"merge_params": {
-
+ "force_remove_source_branch": null
},
"merge_when_build_succeeds": false,
"merge_user_id": null,
@@ -2795,176 +2927,200 @@
"deleted_at": null,
"notes": [
{
- "id": 646,
- "note": "Temporibus debitis veniam est ut sit nihil.",
+ "id": 679,
+ "note": "Qui rerum totam nisi est.",
"noteable_type": "MergeRequest",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:09.770Z",
- "updated_at": "2016-03-22T15:20:09.770Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:56.848Z",
+ "updated_at": "2016-06-14T15:02:56.848Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 84,
+ "noteable_id": 26,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 645,
- "note": "Ut assumenda dignissimos quibusdam veritatis sequi dolores.",
+ "id": 680,
+ "note": "Pariatur magni corrupti consequatur debitis minima error beatae voluptatem.",
"noteable_type": "MergeRequest",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:09.740Z",
- "updated_at": "2016-03-22T15:20:09.740Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:56.871Z",
+ "updated_at": "2016-06-14T15:02:56.871Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 84,
+ "noteable_id": 26,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 644,
- "note": "Velit quae quidem cupiditate laudantium nihil ut eveniet.",
+ "id": 681,
+ "note": "Qui quis ut modi eos rerum ratione.",
"noteable_type": "MergeRequest",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:09.717Z",
- "updated_at": "2016-03-22T15:20:09.717Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:56.895Z",
+ "updated_at": "2016-06-14T15:02:56.895Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 84,
+ "noteable_id": 26,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 643,
- "note": "Repellat quas porro sed mollitia laborum ut fugiat.",
+ "id": 682,
+ "note": "Illum quidem expedita mollitia fugit.",
"noteable_type": "MergeRequest",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:09.690Z",
- "updated_at": "2016-03-22T15:20:09.690Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:56.918Z",
+ "updated_at": "2016-06-14T15:02:56.918Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 84,
+ "noteable_id": 26,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 642,
- "note": "Qui aut debitis perspiciatis et voluptatem.",
+ "id": 683,
+ "note": "Consectetur voluptate sit sint possimus veritatis quod.",
"noteable_type": "MergeRequest",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:09.665Z",
- "updated_at": "2016-03-22T15:20:09.665Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:56.942Z",
+ "updated_at": "2016-06-14T15:02:56.942Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 84,
+ "noteable_id": 26,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 641,
- "note": "Quia id quia velit et.",
+ "id": 684,
+ "note": "Natus libero quibusdam rem assumenda deleniti accusamus sed earum.",
"noteable_type": "MergeRequest",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:09.639Z",
- "updated_at": "2016-03-22T15:20:09.639Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:56.966Z",
+ "updated_at": "2016-06-14T15:02:56.966Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 84,
+ "noteable_id": 26,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 640,
- "note": "Corporis commodi doloremque itaque non animi.",
+ "id": 685,
+ "note": "Tenetur autem nihil rerum odit.",
"noteable_type": "MergeRequest",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:09.617Z",
- "updated_at": "2016-03-22T15:20:09.617Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:56.989Z",
+ "updated_at": "2016-06-14T15:02:56.989Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 84,
+ "noteable_id": 26,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 639,
- "note": "Possimus dignissimos voluptatum in tenetur.",
+ "id": 686,
+ "note": "Quia maiores et odio sed.",
"noteable_type": "MergeRequest",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:09.589Z",
- "updated_at": "2016-03-22T15:20:09.589Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:57.012Z",
+ "updated_at": "2016-06-14T15:02:57.012Z",
"project_id": 5,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
- "noteable_id": 84,
+ "noteable_id": 26,
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
],
"merge_request_diff": {
- "id": 84,
+ "id": 26,
"state": "collected",
"st_commits": [
{
@@ -2994,35 +3150,61 @@
"too_large": false
}
],
- "merge_request_id": 84,
- "created_at": "2016-03-22T15:19:44.485Z",
- "updated_at": "2016-03-22T15:19:44.577Z",
+ "merge_request_id": 26,
+ "created_at": "2016-06-14T15:02:36.421Z",
+ "updated_at": "2016-06-14T15:02:36.474Z",
"base_commit_sha": "ae73cb07c9eeaf35924a10f713b364d32b2dd34f",
"real_size": "1"
- }
+ },
+ "events": [
+ {
+ "id": 222,
+ "target_type": "MergeRequest",
+ "target_id": 26,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:36.496Z",
+ "updated_at": "2016-06-14T15:02:36.496Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 186,
+ "target_type": "MergeRequest",
+ "target_id": 26,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:36.496Z",
+ "updated_at": "2016-06-14T15:02:36.496Z",
+ "action": 1,
+ "author_id": 1
+ }
+ ]
},
{
"id": 15,
- "target_branch": "markdown",
- "source_branch": "master",
+ "target_branch": "test-7",
+ "source_branch": "test-1",
"source_project_id": 5,
- "author_id": 3,
- "assignee_id": 3,
- "title": "Nulla explicabo iure voluptas perferendis autem autem unde nemo totam optio.",
- "created_at": "2016-03-22T15:13:45.689Z",
- "updated_at": "2016-03-22T15:20:30.476Z",
- "milestone_id": 10,
+ "author_id": 22,
+ "assignee_id": 16,
+ "title": "Qui accusantium et inventore facilis doloribus occaecati officiis.",
+ "created_at": "2016-06-14T15:02:25.168Z",
+ "updated_at": "2016-06-14T15:02:59.521Z",
+ "milestone_id": 17,
"state": "opened",
"merge_status": "unchecked",
"target_project_id": 5,
"iid": 7,
- "description": "Doloribus dignissimos impedit qui et provident exercitationem. Veniam quis magni qui fugiat. Et quia voluptate et vel consequatur pariatur ea est.",
+ "description": "Et commodi deserunt aspernatur vero rerum. Ut non dolorum alias in odit est libero. Voluptatibus eos in et vitae repudiandae facilis ex mollitia.",
"position": 0,
"locked_at": null,
"updated_by_id": null,
"merge_error": null,
"merge_params": {
-
+ "force_remove_source_branch": null
},
"merge_when_build_succeeds": false,
"merge_user_id": null,
@@ -3030,12 +3212,12 @@
"deleted_at": null,
"notes": [
{
- "id": 1231,
- "note": "Rerum optio quibusdam provident possimus quis cum.",
+ "id": 777,
+ "note": "Pariatur voluptas placeat aspernatur culpa suscipit soluta.",
"noteable_type": "MergeRequest",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:30.472Z",
- "updated_at": "2016-03-22T15:20:30.472Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:59.348Z",
+ "updated_at": "2016-06-14T15:02:59.348Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3046,17 +3228,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1230,
- "note": "Quasi odit repudiandae ut officiis ut nihil illo.",
+ "id": 778,
+ "note": "Alias et iure mollitia suscipit molestiae voluptatum nostrum asperiores.",
"noteable_type": "MergeRequest",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:30.444Z",
- "updated_at": "2016-03-22T15:20:30.444Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:59.372Z",
+ "updated_at": "2016-06-14T15:02:59.372Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3067,17 +3252,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1229,
- "note": "Aut vero dolores facere sed.",
+ "id": 779,
+ "note": "Laudantium qui eum qui sunt.",
"noteable_type": "MergeRequest",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:30.412Z",
- "updated_at": "2016-03-22T15:20:30.412Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:59.395Z",
+ "updated_at": "2016-06-14T15:02:59.395Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3088,17 +3276,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1228,
- "note": "Autem voluptatem et blanditiis accusantium deserunt et et.",
+ "id": 780,
+ "note": "Quas rem est iusto ut delectus fugiat recusandae mollitia.",
"noteable_type": "MergeRequest",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:30.383Z",
- "updated_at": "2016-03-22T15:20:30.383Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:59.418Z",
+ "updated_at": "2016-06-14T15:02:59.418Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3109,17 +3300,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1227,
- "note": "Voluptatem aliquam voluptatem molestiae est.",
+ "id": 781,
+ "note": "Repellendus ab et qui nesciunt.",
"noteable_type": "MergeRequest",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:30.352Z",
- "updated_at": "2016-03-22T15:20:30.352Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:59.444Z",
+ "updated_at": "2016-06-14T15:02:59.444Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3130,17 +3324,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1226,
- "note": "Ea aut cupiditate est consequatur animi error qui et.",
+ "id": 782,
+ "note": "Non possimus voluptatum odio qui ut.",
"noteable_type": "MergeRequest",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:30.319Z",
- "updated_at": "2016-03-22T15:20:30.319Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:59.469Z",
+ "updated_at": "2016-06-14T15:02:59.469Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3151,17 +3348,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1225,
- "note": "Voluptates est voluptas et nostrum modi beatae inventore et.",
+ "id": 783,
+ "note": "Dolores repellendus eum ducimus quam ab dolorem quia.",
"noteable_type": "MergeRequest",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:30.289Z",
- "updated_at": "2016-03-22T15:20:30.289Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:59.494Z",
+ "updated_at": "2016-06-14T15:02:59.494Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3172,17 +3372,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1224,
- "note": "Quia est rerum adipisci cupiditate.",
+ "id": 784,
+ "note": "Facilis dolorem aut corrupti id ratione occaecati.",
"noteable_type": "MergeRequest",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:30.260Z",
- "updated_at": "2016-03-22T15:20:30.260Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:59.520Z",
+ "updated_at": "2016-06-14T15:02:59.520Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3193,9 +3396,12 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
],
"merge_request_diff": {
@@ -3203,6 +3409,304 @@
"state": "collected",
"st_commits": [
{
+ "id": "94b8d581c48d894b86661718582fecbc5e3ed2eb",
+ "message": "fixes #10\n",
+ "parent_ids": [
+ "be93687618e4b132087f430a4d8fc3a609c9b77c"
+ ],
+ "authored_date": "2016-01-19T13:22:56.000+01:00",
+ "author_name": "James Lopez",
+ "author_email": "james@jameslopez.es",
+ "committed_date": "2016-01-19T13:22:56.000+01:00",
+ "committer_name": "James Lopez",
+ "committer_email": "james@jameslopez.es"
+ }
+ ],
+ "st_diffs": [
+ {
+ "diff": "--- /dev/null\n+++ b/test\n",
+ "new_path": "test",
+ "old_path": "test",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ }
+ ],
+ "merge_request_id": 15,
+ "created_at": "2016-06-14T15:02:25.171Z",
+ "updated_at": "2016-06-14T15:02:25.230Z",
+ "base_commit_sha": "be93687618e4b132087f430a4d8fc3a609c9b77c",
+ "real_size": "1"
+ },
+ "events": [
+ {
+ "id": 223,
+ "target_type": "MergeRequest",
+ "target_id": 15,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:25.262Z",
+ "updated_at": "2016-06-14T15:02:25.262Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 175,
+ "target_type": "MergeRequest",
+ "target_id": 15,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:25.262Z",
+ "updated_at": "2016-06-14T15:02:25.262Z",
+ "action": 1,
+ "author_id": 22
+ }
+ ]
+ },
+ {
+ "id": 14,
+ "target_branch": "fix",
+ "source_branch": "test-3",
+ "source_project_id": 5,
+ "author_id": 20,
+ "assignee_id": 20,
+ "title": "In voluptas aut sequi voluptatem ullam vel corporis illum consequatur.",
+ "created_at": "2016-06-14T15:02:24.760Z",
+ "updated_at": "2016-06-14T15:02:59.749Z",
+ "milestone_id": 20,
+ "state": "opened",
+ "merge_status": "unchecked",
+ "target_project_id": 5,
+ "iid": 6,
+ "description": "Dicta magnam non voluptates nam dignissimos nostrum deserunt. Dolorum et suscipit iure quae doloremque. Necessitatibus saepe aut labore sed.",
+ "position": 0,
+ "locked_at": null,
+ "updated_by_id": null,
+ "merge_error": null,
+ "merge_params": {
+ "force_remove_source_branch": null
+ },
+ "merge_when_build_succeeds": false,
+ "merge_user_id": null,
+ "merge_commit_sha": null,
+ "deleted_at": null,
+ "notes": [
+ {
+ "id": 785,
+ "note": "Atque cupiditate necessitatibus deserunt minus natus odit.",
+ "noteable_type": "MergeRequest",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:59.559Z",
+ "updated_at": "2016-06-14T15:02:59.559Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "noteable_id": 14,
+ "system": false,
+ "st_diff": null,
+ "updated_by_id": null,
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
+ },
+ {
+ "id": 786,
+ "note": "Non dolorem provident mollitia nesciunt optio ex eveniet.",
+ "noteable_type": "MergeRequest",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:59.587Z",
+ "updated_at": "2016-06-14T15:02:59.587Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "noteable_id": 14,
+ "system": false,
+ "st_diff": null,
+ "updated_by_id": null,
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
+ },
+ {
+ "id": 787,
+ "note": "Similique officia nemo quasi commodi accusantium quae qui.",
+ "noteable_type": "MergeRequest",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:59.621Z",
+ "updated_at": "2016-06-14T15:02:59.621Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "noteable_id": 14,
+ "system": false,
+ "st_diff": null,
+ "updated_by_id": null,
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
+ },
+ {
+ "id": 788,
+ "note": "Et est et alias ad dolor qui.",
+ "noteable_type": "MergeRequest",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:59.650Z",
+ "updated_at": "2016-06-14T15:02:59.650Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "noteable_id": 14,
+ "system": false,
+ "st_diff": null,
+ "updated_by_id": null,
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
+ },
+ {
+ "id": 789,
+ "note": "Numquam temporibus ratione voluptatibus aliquid.",
+ "noteable_type": "MergeRequest",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:59.675Z",
+ "updated_at": "2016-06-14T15:02:59.675Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "noteable_id": 14,
+ "system": false,
+ "st_diff": null,
+ "updated_by_id": null,
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
+ },
+ {
+ "id": 790,
+ "note": "Ut ex aliquam consectetur perferendis est hic aut quia.",
+ "noteable_type": "MergeRequest",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:59.703Z",
+ "updated_at": "2016-06-14T15:02:59.703Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "noteable_id": 14,
+ "system": false,
+ "st_diff": null,
+ "updated_by_id": null,
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
+ },
+ {
+ "id": 791,
+ "note": "Esse eos quam quaerat aut ut asperiores officiis.",
+ "noteable_type": "MergeRequest",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:59.726Z",
+ "updated_at": "2016-06-14T15:02:59.726Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "noteable_id": 14,
+ "system": false,
+ "st_diff": null,
+ "updated_by_id": null,
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
+ },
+ {
+ "id": 792,
+ "note": "Sint facilis accusantium iure blanditiis.",
+ "noteable_type": "MergeRequest",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:59.748Z",
+ "updated_at": "2016-06-14T15:02:59.748Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "noteable_id": 14,
+ "system": false,
+ "st_diff": null,
+ "updated_by_id": null,
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
+ }
+ ],
+ "merge_request_diff": {
+ "id": 14,
+ "state": "collected",
+ "st_commits": [
+ {
+ "id": "ddd4ff416a931589c695eb4f5b23f844426f6928",
+ "message": "fixes #10\n",
+ "parent_ids": [
+ "be93687618e4b132087f430a4d8fc3a609c9b77c"
+ ],
+ "authored_date": "2016-01-19T14:14:43.000+01:00",
+ "author_name": "James Lopez",
+ "author_email": "james@jameslopez.es",
+ "committed_date": "2016-01-19T14:14:43.000+01:00",
+ "committer_name": "James Lopez",
+ "committer_email": "james@jameslopez.es"
+ },
+ {
"id": "be93687618e4b132087f430a4d8fc3a609c9b77c",
"message": "Merge branch 'master' into 'master'\r\n\r\nLFS object pointer.\r\n\r\n\r\n\r\nSee merge request !6",
"parent_ids": [
@@ -3388,10 +3892,108 @@
"committed_date": "2015-01-10T21:28:18.000+01:00",
"committer_name": "marmis85",
"committer_email": "marmis85@gmail.com"
+ },
+ {
+ "id": "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
+ "message": "Add submodule from gitlab.com\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "570e7b2abdd848b95f2f578043fc23bd6f6fd24d"
+ ],
+ "authored_date": "2014-02-27T10:01:38.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T10:01:38.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
+ },
+ {
+ "id": "570e7b2abdd848b95f2f578043fc23bd6f6fd24d",
+ "message": "Change some files\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"
+ ],
+ "authored_date": "2014-02-27T09:57:31.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T09:57:31.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
+ },
+ {
+ "id": "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9",
+ "message": "More submodules\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "d14d6c0abdd253381df51a723d58691b2ee1ab08"
+ ],
+ "authored_date": "2014-02-27T09:54:21.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T09:54:21.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
+ },
+ {
+ "id": "d14d6c0abdd253381df51a723d58691b2ee1ab08",
+ "message": "Remove ds_store files\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "c1acaa58bbcbc3eafe538cb8274ba387047b69f8"
+ ],
+ "authored_date": "2014-02-27T09:49:50.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T09:49:50.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
+ },
+ {
+ "id": "c1acaa58bbcbc3eafe538cb8274ba387047b69f8",
+ "message": "Ignore DS files\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "ae73cb07c9eeaf35924a10f713b364d32b2dd34f"
+ ],
+ "authored_date": "2014-02-27T09:48:32.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T09:48:32.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
}
],
"st_diffs": [
{
+ "diff": "Binary files a/.DS_Store and /dev/null differ\n",
+ "new_path": ".DS_Store",
+ "old_path": ".DS_Store",
+ "a_mode": "100644",
+ "b_mode": "0",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": true,
+ "too_large": false
+ },
+ {
+ "diff": "--- a/.gitignore\n+++ b/.gitignore\n@@ -17,3 +17,4 @@ rerun.txt\n pickle-email-*.html\n .project\n config/initializers/secret_token.rb\n+.DS_Store\n",
+ "new_path": ".gitignore",
+ "old_path": ".gitignore",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- a/.gitmodules\n+++ b/.gitmodules\n@@ -1,3 +1,9 @@\n [submodule \"six\"]\n \tpath = six\n \turl = git://github.com/randx/six.git\n+[submodule \"gitlab-shell\"]\n+\tpath = gitlab-shell\n+\turl = https://github.com/gitlabhq/gitlab-shell.git\n+[submodule \"gitlab-grack\"]\n+\tpath = gitlab-grack\n+\turl = https://gitlab.com/gitlab-org/gitlab-grack.git\n",
+ "new_path": ".gitmodules",
+ "old_path": ".gitmodules",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
"diff": "--- a/CHANGELOG\n+++ b/CHANGELOG\n@@ -1,4 +1,6 @@\n-v 6.7.0\n+v6.8.0\n+\n+v6.7.0\n - Add support for Gemnasium as a Project Service (Olivier Gonzalez)\n - Add edit file button to MergeRequest diff\n - Public groups (Jason Hollingsworth)\n",
"new_path": "CHANGELOG",
"old_path": "CHANGELOG",
@@ -3414,6 +4016,17 @@
"too_large": false
},
{
+ "diff": "Binary files a/files/.DS_Store and /dev/null differ\n",
+ "new_path": "files/.DS_Store",
+ "old_path": "files/.DS_Store",
+ "a_mode": "100644",
+ "b_mode": "0",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": true,
+ "too_large": false
+ },
+ {
"diff": "--- /dev/null\n+++ b/files/images/wm.svg\n@@ -0,0 +1,78 @@\n+\u003c?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?\u003e\n+\u003csvg width=\"1300px\" height=\"680px\" viewBox=\"0 0 1300 680\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:sketch=\"http://www.bohemiancoding.com/sketch/ns\"\u003e\n+ \u003c!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch --\u003e\n+ \u003ctitle\u003ewm\u003c/title\u003e\n+ \u003cdesc\u003eCreated with Sketch.\u003c/desc\u003e\n+ \u003cdefs\u003e\n+ \u003cpath id=\"path-1\" d=\"M-69.8,1023.54607 L1675.19996,1023.54607 L1675.19996,0 L-69.8,0 L-69.8,1023.54607 L-69.8,1023.54607 Z\"\u003e\u003c/path\u003e\n+ \u003c/defs\u003e\n+ \u003cg id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" sketch:type=\"MSPage\"\u003e\n+ \u003cpath d=\"M1300,680 L0,680 L0,0 L1300,0 L1300,680 L1300,680 Z\" id=\"bg\" fill=\"#30353E\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cg id=\"gitlab_logo\" sketch:type=\"MSLayerGroup\" transform=\"translate(-262.000000, -172.000000)\"\u003e\n+ \u003cg id=\"g10\" transform=\"translate(872.500000, 512.354581) scale(1, -1) translate(-872.500000, -512.354581) translate(0.000000, 0.290751)\"\u003e\n+ \u003cg id=\"g12\" transform=\"translate(1218.022652, 440.744871)\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\n+ \u003cpath d=\"M-50.0233338,141.900706 L-69.07059,141.900706 L-69.0100967,0.155858152 L8.04444805,0.155858152 L8.04444805,17.6840847 L-49.9628405,17.6840847 L-50.0233338,141.900706 L-50.0233338,141.900706 Z\" id=\"path14\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g16\"\u003e\n+ \u003cg id=\"g18-Clipped\"\u003e\n+ \u003cmask id=\"mask-2\" sketch:name=\"path22\" fill=\"white\"\u003e\n+ \u003cuse xlink:href=\"#path-1\"\u003e\u003c/use\u003e\n+ \u003c/mask\u003e\n+ \u003cg id=\"path22\"\u003e\u003c/g\u003e\n+ \u003cg id=\"g18\" mask=\"url(#mask-2)\"\u003e\n+ \u003cg transform=\"translate(382.736659, 312.879425)\"\u003e\n+ \u003cg id=\"g24\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(852.718192, 124.992771)\"\u003e\n+ \u003cpath d=\"M63.9833317,27.9148929 C59.2218085,22.9379001 51.2134221,17.9597442 40.3909323,17.9597442 C25.8888194,17.9597442 20.0453962,25.1013043 20.0453962,34.4074318 C20.0453962,48.4730484 29.7848226,55.1819277 50.5642821,55.1819277 C54.4602853,55.1819277 60.7364685,54.7492469 63.9833317,54.1002256 L63.9833317,27.9148929 L63.9833317,27.9148929 Z M44.2869356,113.827628 C28.9053426,113.827628 14.7975996,108.376082 3.78897657,99.301416 L10.5211864,87.6422957 C18.3131929,92.1866076 27.8374026,96.7320827 41.4728323,96.7320827 C57.0568452,96.7320827 63.9833317,88.7239978 63.9833317,75.3074024 L63.9833317,68.3821827 C60.9528485,69.0312039 54.6766653,69.4650479 50.7806621,69.4650479 C17.4476729,69.4650479 0.565379986,57.7791759 0.565379986,33.3245665 C0.565379986,11.4683685 13.9844297,0.43151772 34.3299658,0.43151772 C48.0351955,0.43151772 61.1692285,6.70771614 65.7143717,16.8780421 L69.1776149,3.02876588 L82.5978279,3.02876588 L82.5978279,75.5237428 C82.5978279,98.462806 72.6408582,113.827628 44.2869356,113.827628 L44.2869356,113.827628 Z\" id=\"path26\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g28\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(959.546624, 124.857151)\"\u003e\n+ \u003cpath d=\"M37.2266657,17.4468081 C30.0837992,17.4468081 23.8064527,18.3121698 19.0449295,20.4767371 L19.0449295,79.2306079 L19.0449295,86.0464943 C25.538656,91.457331 33.5470425,95.3526217 43.7203922,95.3526217 C62.1173451,95.3526217 69.2602116,82.3687072 69.2602116,61.3767077 C69.2602116,31.5135879 57.7885819,17.4468081 37.2266657,17.4468081 M45.2315622,113.963713 C28.208506,113.963713 19.0449295,102.384849 19.0449295,102.384849 L19.0449295,120.67143 L18.9844362,144.908535 L10.3967097,144.908535 L0.371103324,144.908535 L0.431596656,6.62629771 C9.73826309,2.73100702 22.5081728,0.567602823 36.3611458,0.567602823 C71.8579349,0.567602823 88.9566078,23.2891625 88.9566078,62.4584098 C88.9566078,93.4043948 73.1527248,113.963713 45.2315622,113.963713\" id=\"path30\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g32\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(509.576747, 125.294950)\"\u003e\n+ \u003cpath d=\"M68.636665,129.10638 C85.5189579,129.10638 96.3414476,123.480366 103.484314,117.853189 L111.669527,132.029302 C100.513161,141.811145 85.5073245,147.06845 69.5021849,147.06845 C29.0274926,147.06845 0.673569983,122.3975 0.673569983,72.6252464 C0.673569983,20.4709215 31.2622559,0.12910638 66.2553217,0.12910638 C83.7879179,0.12910638 98.7227909,4.24073748 108.462217,8.35236859 L108.063194,64.0763105 L108.063194,70.6502677 L108.063194,81.6057001 L56.1168719,81.6057001 L56.1168719,64.0763105 L89.2323178,64.0763105 L89.6313411,21.7701271 C85.3025779,19.6055598 77.7269514,17.8748364 67.554765,17.8748364 C39.4172223,17.8748364 20.5863462,35.5717154 20.5863462,72.8415868 C20.5863462,110.711628 40.0663623,129.10638 68.636665,129.10638\" id=\"path34\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g36\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(692.388992, 124.376085)\"\u003e\n+ \u003cpath d=\"M19.7766662,145.390067 L1.16216997,145.390067 L1.2226633,121.585642 L1.2226633,111.846834 L1.2226633,106.170806 L1.2226633,96.2656714 L1.2226633,39.5681976 L1.2226633,39.3518572 C1.2226633,16.4127939 11.1796331,1.04797161 39.5335557,1.04797161 C43.4504989,1.04797161 47.2836822,1.40388649 51.0051854,2.07965952 L51.0051854,18.7925385 C48.3109055,18.3796307 45.4351455,18.1446804 42.3476589,18.1446804 C26.763646,18.1446804 19.8371595,26.1516022 19.8371595,39.5681976 L19.8371595,96.2656714 L51.0051854,96.2656714 L51.0051854,111.846834 L19.8371595,111.846834 L19.7766662,145.390067 L19.7766662,145.390067 Z\" id=\"path38\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cpath d=\"M646.318899,128.021188 L664.933395,128.021188 L664.933395,236.223966 L646.318899,236.223966 L646.318899,128.021188 L646.318899,128.021188 Z\" id=\"path40\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cpath d=\"M646.318899,251.154944 L664.933395,251.154944 L664.933395,269.766036 L646.318899,269.766036 L646.318899,251.154944 L646.318899,251.154944 Z\" id=\"path42\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cg id=\"g44\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(0.464170, 0.676006)\"\u003e\n+ \u003cpath d=\"M429.269989,169.815599 L405.225053,243.802859 L357.571431,390.440955 C355.120288,397.984955 344.444378,397.984955 341.992071,390.440955 L294.337286,243.802859 L136.094873,243.802859 L88.4389245,390.440955 C85.9877812,397.984955 75.3118715,397.984955 72.8595648,390.440955 L25.2059427,243.802859 L1.16216997,169.815599 C-1.03187664,163.067173 1.37156997,155.674379 7.11261982,151.503429 L215.215498,0.336141836 L423.319539,151.503429 C429.060589,155.674379 431.462873,163.067173 429.269989,169.815599\" id=\"path46\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g48\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(135.410135, 1.012147)\"\u003e\n+ \u003cpath d=\"M80.269998,0 L80.269998,0 L159.391786,243.466717 L1.14820997,243.466717 L80.269998,0 L80.269998,0 Z\" id=\"path50\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g52\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012147)\"\u003e\n+ \u003cg id=\"path54\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g56\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(24.893471, 1.012613)\"\u003e\n+ \u003cpath d=\"M190.786662,0 L111.664874,243.465554 L0.777106647,243.465554 L190.786662,0 L190.786662,0 Z\" id=\"path58\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g60\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012613)\"\u003e\n+ \u003cg id=\"path62\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g64\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(0.077245, 0.223203)\"\u003e\n+ \u003cpath d=\"M25.5933327,244.255313 L25.5933327,244.255313 L1.54839663,170.268052 C-0.644486651,163.519627 1.75779662,156.126833 7.50000981,151.957046 L215.602888,0.789758846 L25.5933327,244.255313 L25.5933327,244.255313 Z\" id=\"path66\" fill=\"#FCA326\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g68\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012147)\"\u003e\n+ \u003cg id=\"path70\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g72\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(25.670578, 244.478283)\"\u003e\n+ \u003cpath d=\"M0,0 L110.887767,0 L63.2329818,146.638096 C60.7806751,154.183259 50.1047654,154.183259 47.6536221,146.638096 L0,0 L0,0 Z\" id=\"path74\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g76\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012613)\"\u003e\n+ \u003cpath d=\"M0,0 L79.121788,243.465554 L190.009555,243.465554 L0,0 L0,0 Z\" id=\"path78\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g80\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(214.902910, 0.223203)\"\u003e\n+ \u003cpath d=\"M190.786662,244.255313 L190.786662,244.255313 L214.831598,170.268052 C217.024481,163.519627 214.622198,156.126833 208.879985,151.957046 L0.777106647,0.789758846 L190.786662,244.255313 L190.786662,244.255313 Z\" id=\"path82\" fill=\"#FCA326\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g84\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(294.009575, 244.478283)\"\u003e\n+ \u003cpath d=\"M111.679997,0 L0.79222998,0 L48.4470155,146.638096 C50.8993221,154.183259 61.5752318,154.183259 64.0263751,146.638096 L111.679997,0 L111.679997,0 Z\" id=\"path86\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+\u003c/svg\u003e\n\\ No newline at end of file\n",
"new_path": "files/images/wm.svg",
"old_path": "files/images/wm.svg",
@@ -3436,6 +4049,28 @@
"too_large": false
},
{
+ "diff": "--- a/files/ruby/popen.rb\n+++ b/files/ruby/popen.rb\n@@ -6,12 +6,18 @@ module Popen\n \n def popen(cmd, path=nil)\n unless cmd.is_a?(Array)\n- raise \"System commands must be given as an array of strings\"\n+ raise RuntimeError, \"System commands must be given as an array of strings\"\n end\n \n path ||= Dir.pwd\n- vars = { \"PWD\" =\u003e path }\n- options = { chdir: path }\n+\n+ vars = {\n+ \"PWD\" =\u003e path\n+ }\n+\n+ options = {\n+ chdir: path\n+ }\n \n unless File.directory?(path)\n FileUtils.mkdir_p(path)\n@@ -19,6 +25,7 @@ module Popen\n \n @cmd_output = \"\"\n @cmd_status = 0\n+\n Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|\n @cmd_output \u003c\u003c stdout.read\n @cmd_output \u003c\u003c stderr.read\n",
+ "new_path": "files/ruby/popen.rb",
+ "old_path": "files/ruby/popen.rb",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- a/files/ruby/regex.rb\n+++ b/files/ruby/regex.rb\n@@ -19,14 +19,12 @@ module Gitlab\n end\n \n def archive_formats_regex\n- #|zip|tar| tar.gz | tar.bz2 |\n- /(zip|tar|tar\\.gz|tgz|gz|tar\\.bz2|tbz|tbz2|tb2|bz2)/\n+ /(zip|tar|7z|tar\\.gz|tgz|gz|tar\\.bz2|tbz|tbz2|tb2|bz2)/\n end\n \n def git_reference_regex\n # Valid git ref regex, see:\n # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html\n-\n %r{\n (?!\n (?# doesn't begins with)\n",
+ "new_path": "files/ruby/regex.rb",
+ "old_path": "files/ruby/regex.rb",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
"diff": "--- /dev/null\n+++ b/files/whitespace\n@@ -0,0 +1 @@\n+test \n",
"new_path": "files/whitespace",
"old_path": "files/whitespace",
@@ -3456,231 +4091,29 @@
"renamed_file": false,
"deleted_file": false,
"too_large": false
- }
- ],
- "merge_request_id": 15,
- "created_at": "2016-03-22T15:13:45.692Z",
- "updated_at": "2016-03-22T15:13:45.808Z",
- "base_commit_sha": "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
- "real_size": "6"
- }
- },
- {
- "id": 14,
- "target_branch": "test-1",
- "source_branch": "test-10",
- "source_project_id": 5,
- "author_id": 10,
- "assignee_id": 1,
- "title": "Tempore aliquid sit amet odit qui cum iusto voluptatibus asperiores.",
- "created_at": "2016-03-22T15:13:45.442Z",
- "updated_at": "2016-03-22T15:20:30.735Z",
- "milestone_id": 10,
- "state": "opened",
- "merge_status": "unchecked",
- "target_project_id": 5,
- "iid": 6,
- "description": "Quis et et autem saepe ut. Eum corporis tempore cum dolore. Molestiae pariatur voluptatem officia perferendis aut veniam.",
- "position": 0,
- "locked_at": null,
- "updated_by_id": null,
- "merge_error": null,
- "merge_params": {
-
- },
- "merge_when_build_succeeds": false,
- "merge_user_id": null,
- "merge_commit_sha": null,
- "deleted_at": null,
- "notes": [
- {
- "id": 1239,
- "note": "Aspernatur suscipit veritatis aliquid rerum.",
- "noteable_type": "MergeRequest",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:30.731Z",
- "updated_at": "2016-03-22T15:20:30.731Z",
- "project_id": 5,
- "attachment": {
- "url": null
- },
- "line_code": null,
- "commit_id": null,
- "noteable_id": 14,
- "system": false,
- "st_diff": null,
- "updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
- },
- {
- "id": 1238,
- "note": "Rerum deleniti omnis porro commodi.",
- "noteable_type": "MergeRequest",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:30.701Z",
- "updated_at": "2016-03-22T15:20:30.701Z",
- "project_id": 5,
- "attachment": {
- "url": null
- },
- "line_code": null,
- "commit_id": null,
- "noteable_id": 14,
- "system": false,
- "st_diff": null,
- "updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
- },
- {
- "id": 1237,
- "note": "Eaque ut magnam rerum non dolores esse.",
- "noteable_type": "MergeRequest",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:30.667Z",
- "updated_at": "2016-03-22T15:20:30.667Z",
- "project_id": 5,
- "attachment": {
- "url": null
- },
- "line_code": null,
- "commit_id": null,
- "noteable_id": 14,
- "system": false,
- "st_diff": null,
- "updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
- },
- {
- "id": 1236,
- "note": "Fugit et aut similique illum ut natus maiores et.",
- "noteable_type": "MergeRequest",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:30.637Z",
- "updated_at": "2016-03-22T15:20:30.637Z",
- "project_id": 5,
- "attachment": {
- "url": null
- },
- "line_code": null,
- "commit_id": null,
- "noteable_id": 14,
- "system": false,
- "st_diff": null,
- "updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
- },
- {
- "id": 1235,
- "note": "Qui qui temporibus eos aliquam.",
- "noteable_type": "MergeRequest",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:30.608Z",
- "updated_at": "2016-03-22T15:20:30.608Z",
- "project_id": 5,
- "attachment": {
- "url": null
- },
- "line_code": null,
- "commit_id": null,
- "noteable_id": 14,
- "system": false,
- "st_diff": null,
- "updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
- },
- {
- "id": 1234,
- "note": "Voluptates hic dolorum aut inventore.",
- "noteable_type": "MergeRequest",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:30.575Z",
- "updated_at": "2016-03-22T15:20:30.575Z",
- "project_id": 5,
- "attachment": {
- "url": null
},
- "line_code": null,
- "commit_id": null,
- "noteable_id": 14,
- "system": false,
- "st_diff": null,
- "updated_by_id": null,
- "author": {
- "name": "User 0"
- }
- },
- {
- "id": 1233,
- "note": "Dolorum iure at dolor dolores numquam iusto.",
- "noteable_type": "MergeRequest",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:30.548Z",
- "updated_at": "2016-03-22T15:20:30.548Z",
- "project_id": 5,
- "attachment": {
- "url": null
- },
- "line_code": null,
- "commit_id": null,
- "noteable_id": 14,
- "system": false,
- "st_diff": null,
- "updated_by_id": null,
- "author": {
- "name": "User 2"
- }
- },
- {
- "id": 1232,
- "note": "Nihil est eum aspernatur amet minus et corporis consectetur.",
- "noteable_type": "MergeRequest",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:30.517Z",
- "updated_at": "2016-03-22T15:20:30.517Z",
- "project_id": 5,
- "attachment": {
- "url": null
+ {
+ "diff": "--- /dev/null\n+++ b/gitlab-grack\n@@ -0,0 +1 @@\n+Subproject commit 645f6c4c82fd3f5e06f67134450a570b795e55a6\n",
+ "new_path": "gitlab-grack",
+ "old_path": "gitlab-grack",
+ "a_mode": "0",
+ "b_mode": "160000",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
},
- "line_code": null,
- "commit_id": null,
- "noteable_id": 14,
- "system": false,
- "st_diff": null,
- "updated_by_id": null,
- "author": {
- "name": "User 4"
- }
- }
- ],
- "merge_request_diff": {
- "id": 14,
- "state": "collected",
- "st_commits": [
{
- "id": "bce96ecee98f51fa5d91021e6c42859a35a701ad",
- "message": "fixes #10\n",
- "parent_ids": [
- "be93687618e4b132087f430a4d8fc3a609c9b77c"
- ],
- "authored_date": "2016-01-19T15:40:05.000+01:00",
- "author_name": "Test Lopez",
- "author_email": "Test@Testlopez.es",
- "committed_date": "2016-01-19T15:40:05.000+01:00",
- "committer_name": "Test Lopez",
- "committer_email": "Test@Testlopez.es"
- }
- ],
- "st_diffs": [
+ "diff": "--- /dev/null\n+++ b/gitlab-shell\n@@ -0,0 +1 @@\n+Subproject commit 79bceae69cb5750d6567b223597999bfa91cb3b9\n",
+ "new_path": "gitlab-shell",
+ "old_path": "gitlab-shell",
+ "a_mode": "0",
+ "b_mode": "160000",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
{
"diff": "--- /dev/null\n+++ b/test\n",
"new_path": "test",
@@ -3694,34 +4127,60 @@
}
],
"merge_request_id": 14,
- "created_at": "2016-03-22T15:13:45.444Z",
- "updated_at": "2016-03-22T15:13:45.486Z",
- "base_commit_sha": "be93687618e4b132087f430a4d8fc3a609c9b77c",
- "real_size": "1"
- }
+ "created_at": "2016-06-14T15:02:24.770Z",
+ "updated_at": "2016-06-14T15:02:25.007Z",
+ "base_commit_sha": "ae73cb07c9eeaf35924a10f713b364d32b2dd34f",
+ "real_size": "15"
+ },
+ "events": [
+ {
+ "id": 224,
+ "target_type": "MergeRequest",
+ "target_id": 14,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:25.113Z",
+ "updated_at": "2016-06-14T15:02:25.113Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 174,
+ "target_type": "MergeRequest",
+ "target_id": 14,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:25.113Z",
+ "updated_at": "2016-06-14T15:02:25.113Z",
+ "action": 1,
+ "author_id": 20
+ }
+ ]
},
{
"id": 13,
- "target_branch": "test-11",
- "source_branch": "test-12",
+ "target_branch": "improve/awesome",
+ "source_branch": "test-8",
"source_project_id": 5,
- "author_id": 1,
- "assignee_id": 26,
- "title": "Voluptas minus sunt voluptatum quis quia ut velit distinctio itaque.",
- "created_at": "2016-03-22T15:13:45.164Z",
- "updated_at": "2016-03-22T15:20:30.994Z",
- "milestone_id": 11,
+ "author_id": 16,
+ "assignee_id": 25,
+ "title": "Voluptates consequatur eius nemo amet libero animi illum delectus tempore.",
+ "created_at": "2016-06-14T15:02:24.415Z",
+ "updated_at": "2016-06-14T15:02:59.958Z",
+ "milestone_id": 17,
"state": "opened",
"merge_status": "unchecked",
"target_project_id": 5,
"iid": 5,
- "description": "Ea ut modi consectetur et minus beatae. Et sunt ducimus praesentium libero officia maiores voluptas cumque. Rerum in aut corporis et ullam omnis.",
+ "description": "Est eaque quasi qui qui. Similique voluptatem impedit iusto ratione reprehenderit. Itaque est illum ut nulla aut.",
"position": 0,
"locked_at": null,
"updated_by_id": null,
"merge_error": null,
"merge_params": {
-
+ "force_remove_source_branch": null
},
"merge_when_build_succeeds": false,
"merge_user_id": null,
@@ -3729,12 +4188,12 @@
"deleted_at": null,
"notes": [
{
- "id": 1247,
- "note": "Non error magnam placeat cupiditate eum.",
+ "id": 793,
+ "note": "In illum maxime aperiam nulla est aspernatur.",
"noteable_type": "MergeRequest",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:30.989Z",
- "updated_at": "2016-03-22T15:20:30.989Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:02:59.782Z",
+ "updated_at": "2016-06-14T15:02:59.782Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3745,17 +4204,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1246,
- "note": "Eos optio et architecto eligendi ea est nihil.",
+ "id": 794,
+ "note": "Enim quia perferendis cum distinctio tenetur optio voluptas veniam.",
"noteable_type": "MergeRequest",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:30.957Z",
- "updated_at": "2016-03-22T15:20:30.957Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:02:59.807Z",
+ "updated_at": "2016-06-14T15:02:59.807Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3766,17 +4228,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1245,
- "note": "Reprehenderit in atque dolor et repudiandae a est.",
+ "id": 795,
+ "note": "Dolor ad quia quis pariatur ducimus.",
"noteable_type": "MergeRequest",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:30.928Z",
- "updated_at": "2016-03-22T15:20:30.928Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:02:59.831Z",
+ "updated_at": "2016-06-14T15:02:59.831Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3787,17 +4252,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1244,
- "note": "Numquam fugit doloremque iure odio et.",
+ "id": 796,
+ "note": "Et a odio voluptate aut.",
"noteable_type": "MergeRequest",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:30.902Z",
- "updated_at": "2016-03-22T15:20:30.902Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:02:59.854Z",
+ "updated_at": "2016-06-14T15:02:59.854Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3808,17 +4276,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1243,
- "note": "Doloribus laboriosam id harum voluptatum vitae ut quam.",
+ "id": 797,
+ "note": "Quis nihil temporibus voluptatum modi minima a ut.",
"noteable_type": "MergeRequest",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:30.863Z",
- "updated_at": "2016-03-22T15:20:30.863Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:02:59.879Z",
+ "updated_at": "2016-06-14T15:02:59.879Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3829,17 +4300,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1242,
- "note": "Harum et ut ipsum dolore ea.",
+ "id": 798,
+ "note": "Ut alias consequatur in nostrum.",
"noteable_type": "MergeRequest",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:30.832Z",
- "updated_at": "2016-03-22T15:20:30.832Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:02:59.904Z",
+ "updated_at": "2016-06-14T15:02:59.904Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3850,17 +4324,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1241,
- "note": "Corporis sed soluta ut est modi natus ab.",
+ "id": 799,
+ "note": "Voluptatibus aperiam assumenda et neque sint libero.",
"noteable_type": "MergeRequest",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:30.802Z",
- "updated_at": "2016-03-22T15:20:30.802Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:02:59.926Z",
+ "updated_at": "2016-06-14T15:02:59.926Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3871,17 +4348,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1240,
- "note": "Corrupti totam tenetur officiis ratione dolores est qui vel.",
+ "id": 800,
+ "note": "Veritatis voluptatem dolor dolores magni quo ut ipsa fuga.",
"noteable_type": "MergeRequest",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:30.771Z",
- "updated_at": "2016-03-22T15:20:30.771Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:02:59.956Z",
+ "updated_at": "2016-06-14T15:02:59.956Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3892,9 +4372,12 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
],
"merge_request_diff": {
@@ -3902,21 +4385,274 @@
"state": "collected",
"st_commits": [
{
- "id": "a4e5dfebf42e34596526acb8611bc7ed80e4eb3f",
+ "id": "0bfedc29d30280c7e8564e19f654584b459e5868",
"message": "fixes #10\n",
"parent_ids": [
"be93687618e4b132087f430a4d8fc3a609c9b77c"
],
- "authored_date": "2016-01-19T15:44:02.000+01:00",
- "author_name": "Test Lopez",
- "author_email": "Test@Testlopez.es",
- "committed_date": "2016-01-19T15:44:02.000+01:00",
- "committer_name": "Test Lopez",
- "committer_email": "Test@Testlopez.es"
+ "authored_date": "2016-01-19T15:25:23.000+01:00",
+ "author_name": "James Lopez",
+ "author_email": "james@jameslopez.es",
+ "committed_date": "2016-01-19T15:25:23.000+01:00",
+ "committer_name": "James Lopez",
+ "committer_email": "james@jameslopez.es"
+ },
+ {
+ "id": "be93687618e4b132087f430a4d8fc3a609c9b77c",
+ "message": "Merge branch 'master' into 'master'\r\n\r\nLFS object pointer.\r\n\r\n\r\n\r\nSee merge request !6",
+ "parent_ids": [
+ "5f923865dde3436854e9ceb9cdb7815618d4e849",
+ "048721d90c449b244b7b4c53a9186b04330174ec"
+ ],
+ "authored_date": "2015-12-07T12:52:12.000+01:00",
+ "author_name": "Marin Jankovski",
+ "author_email": "marin@gitlab.com",
+ "committed_date": "2015-12-07T12:52:12.000+01:00",
+ "committer_name": "Marin Jankovski",
+ "committer_email": "marin@gitlab.com"
+ },
+ {
+ "id": "048721d90c449b244b7b4c53a9186b04330174ec",
+ "message": "LFS object pointer.\n",
+ "parent_ids": [
+ "5f923865dde3436854e9ceb9cdb7815618d4e849"
+ ],
+ "authored_date": "2015-12-07T11:54:28.000+01:00",
+ "author_name": "Marin Jankovski",
+ "author_email": "maxlazio@gmail.com",
+ "committed_date": "2015-12-07T11:54:28.000+01:00",
+ "committer_name": "Marin Jankovski",
+ "committer_email": "maxlazio@gmail.com"
+ },
+ {
+ "id": "5f923865dde3436854e9ceb9cdb7815618d4e849",
+ "message": "GitLab currently doesn't support patches that involve a merge commit: add a commit here\n",
+ "parent_ids": [
+ "d2d430676773caa88cdaf7c55944073b2fd5561a"
+ ],
+ "authored_date": "2015-11-13T16:27:12.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T16:27:12.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "d2d430676773caa88cdaf7c55944073b2fd5561a",
+ "message": "Merge branch 'add-svg' into 'master'\r\n\r\nAdd GitLab SVG\r\n\r\nAdded to test preview of sanitized SVG images\r\n\r\nSee merge request !5",
+ "parent_ids": [
+ "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+ "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73"
+ ],
+ "authored_date": "2015-11-13T08:50:17.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T08:50:17.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73",
+ "message": "Add GitLab SVG\n",
+ "parent_ids": [
+ "59e29889be61e6e0e5e223bfa9ac2721d31605b8"
+ ],
+ "authored_date": "2015-11-13T08:39:43.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T08:39:43.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+ "message": "Merge branch 'whitespace' into 'master'\r\n\r\nadd whitespace test file\r\n\r\nSorry, I did a mistake.\r\nGit ignore empty files.\r\nSo I add a new whitespace test file.\r\n\r\nSee merge request !4",
+ "parent_ids": [
+ "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+ "66eceea0db202bb39c4e445e8ca28689645366c5"
+ ],
+ "authored_date": "2015-11-13T07:21:40.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T07:21:40.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "66eceea0db202bb39c4e445e8ca28689645366c5",
+ "message": "add spaces in whitespace file\n",
+ "parent_ids": [
+ "08f22f255f082689c0d7d39d19205085311542bc"
+ ],
+ "authored_date": "2015-11-13T06:01:27.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T06:01:27.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "08f22f255f082689c0d7d39d19205085311542bc",
+ "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+ "parent_ids": [
+ "c642fe9b8b9f28f9225d7ea953fe14e74748d53b"
+ ],
+ "authored_date": "2015-11-13T06:00:16.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T06:00:16.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+ "message": "Merge branch 'whitespace' into 'master'\r\n\r\nadd spaces\r\n\r\nTo test this pull request.(https://github.com/gitlabhq/gitlabhq/pull/9757)\r\nJust add whitespaces.\r\n\r\nSee merge request !3",
+ "parent_ids": [
+ "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+ "c642fe9b8b9f28f9225d7ea953fe14e74748d53b"
+ ],
+ "authored_date": "2015-11-13T05:23:14.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T05:23:14.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "c642fe9b8b9f28f9225d7ea953fe14e74748d53b",
+ "message": "add whitespace in empty\n",
+ "parent_ids": [
+ "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0"
+ ],
+ "authored_date": "2015-11-13T05:08:45.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T05:08:45.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0",
+ "message": "add empty file\n",
+ "parent_ids": [
+ "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd"
+ ],
+ "authored_date": "2015-11-13T05:08:04.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T05:08:04.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+ "message": "Add ISO-8859 test file\n",
+ "parent_ids": [
+ "e56497bb5f03a90a51293fc6d516788730953899"
+ ],
+ "authored_date": "2015-08-25T17:53:12.000+02:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@packetzoom.com",
+ "committed_date": "2015-08-25T17:53:12.000+02:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@packetzoom.com"
+ },
+ {
+ "id": "e56497bb5f03a90a51293fc6d516788730953899",
+ "message": "Merge branch 'tree_helper_spec' into 'master'\n\nAdd directory structure for tree_helper spec\n\nThis directory structure is needed for a testing the method flatten_tree(tree) in the TreeHelper module\n\nSee [merge request #275](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/275#note_732774)\n\nSee merge request !2\n",
+ "parent_ids": [
+ "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
+ "4cd80ccab63c82b4bad16faa5193fbd2aa06df40"
+ ],
+ "authored_date": "2015-01-10T22:23:29.000+01:00",
+ "author_name": "Sytse Sijbrandij",
+ "author_email": "sytse@gitlab.com",
+ "committed_date": "2015-01-10T22:23:29.000+01:00",
+ "committer_name": "Sytse Sijbrandij",
+ "committer_email": "sytse@gitlab.com"
+ },
+ {
+ "id": "4cd80ccab63c82b4bad16faa5193fbd2aa06df40",
+ "message": "add directory structure for tree_helper spec\n",
+ "parent_ids": [
+ "5937ac0a7beb003549fc5fd26fc247adbce4a52e"
+ ],
+ "authored_date": "2015-01-10T21:28:18.000+01:00",
+ "author_name": "marmis85",
+ "author_email": "marmis85@gmail.com",
+ "committed_date": "2015-01-10T21:28:18.000+01:00",
+ "committer_name": "marmis85",
+ "committer_email": "marmis85@gmail.com"
}
],
"st_diffs": [
{
+ "diff": "--- a/CHANGELOG\n+++ b/CHANGELOG\n@@ -1,4 +1,6 @@\n-v 6.7.0\n+v6.8.0\n+\n+v6.7.0\n - Add support for Gemnasium as a Project Service (Olivier Gonzalez)\n - Add edit file button to MergeRequest diff\n - Public groups (Jason Hollingsworth)\n",
+ "new_path": "CHANGELOG",
+ "old_path": "CHANGELOG",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/encoding/iso8859.txt\n@@ -0,0 +1 @@\n+Äü\n",
+ "new_path": "encoding/iso8859.txt",
+ "old_path": "encoding/iso8859.txt",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/files/images/wm.svg\n@@ -0,0 +1,78 @@\n+\u003c?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?\u003e\n+\u003csvg width=\"1300px\" height=\"680px\" viewBox=\"0 0 1300 680\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:sketch=\"http://www.bohemiancoding.com/sketch/ns\"\u003e\n+ \u003c!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch --\u003e\n+ \u003ctitle\u003ewm\u003c/title\u003e\n+ \u003cdesc\u003eCreated with Sketch.\u003c/desc\u003e\n+ \u003cdefs\u003e\n+ \u003cpath id=\"path-1\" d=\"M-69.8,1023.54607 L1675.19996,1023.54607 L1675.19996,0 L-69.8,0 L-69.8,1023.54607 L-69.8,1023.54607 Z\"\u003e\u003c/path\u003e\n+ \u003c/defs\u003e\n+ \u003cg id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" sketch:type=\"MSPage\"\u003e\n+ \u003cpath d=\"M1300,680 L0,680 L0,0 L1300,0 L1300,680 L1300,680 Z\" id=\"bg\" fill=\"#30353E\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cg id=\"gitlab_logo\" sketch:type=\"MSLayerGroup\" transform=\"translate(-262.000000, -172.000000)\"\u003e\n+ \u003cg id=\"g10\" transform=\"translate(872.500000, 512.354581) scale(1, -1) translate(-872.500000, -512.354581) translate(0.000000, 0.290751)\"\u003e\n+ \u003cg id=\"g12\" transform=\"translate(1218.022652, 440.744871)\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\n+ \u003cpath d=\"M-50.0233338,141.900706 L-69.07059,141.900706 L-69.0100967,0.155858152 L8.04444805,0.155858152 L8.04444805,17.6840847 L-49.9628405,17.6840847 L-50.0233338,141.900706 L-50.0233338,141.900706 Z\" id=\"path14\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g16\"\u003e\n+ \u003cg id=\"g18-Clipped\"\u003e\n+ \u003cmask id=\"mask-2\" sketch:name=\"path22\" fill=\"white\"\u003e\n+ \u003cuse xlink:href=\"#path-1\"\u003e\u003c/use\u003e\n+ \u003c/mask\u003e\n+ \u003cg id=\"path22\"\u003e\u003c/g\u003e\n+ \u003cg id=\"g18\" mask=\"url(#mask-2)\"\u003e\n+ \u003cg transform=\"translate(382.736659, 312.879425)\"\u003e\n+ \u003cg id=\"g24\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(852.718192, 124.992771)\"\u003e\n+ \u003cpath d=\"M63.9833317,27.9148929 C59.2218085,22.9379001 51.2134221,17.9597442 40.3909323,17.9597442 C25.8888194,17.9597442 20.0453962,25.1013043 20.0453962,34.4074318 C20.0453962,48.4730484 29.7848226,55.1819277 50.5642821,55.1819277 C54.4602853,55.1819277 60.7364685,54.7492469 63.9833317,54.1002256 L63.9833317,27.9148929 L63.9833317,27.9148929 Z M44.2869356,113.827628 C28.9053426,113.827628 14.7975996,108.376082 3.78897657,99.301416 L10.5211864,87.6422957 C18.3131929,92.1866076 27.8374026,96.7320827 41.4728323,96.7320827 C57.0568452,96.7320827 63.9833317,88.7239978 63.9833317,75.3074024 L63.9833317,68.3821827 C60.9528485,69.0312039 54.6766653,69.4650479 50.7806621,69.4650479 C17.4476729,69.4650479 0.565379986,57.7791759 0.565379986,33.3245665 C0.565379986,11.4683685 13.9844297,0.43151772 34.3299658,0.43151772 C48.0351955,0.43151772 61.1692285,6.70771614 65.7143717,16.8780421 L69.1776149,3.02876588 L82.5978279,3.02876588 L82.5978279,75.5237428 C82.5978279,98.462806 72.6408582,113.827628 44.2869356,113.827628 L44.2869356,113.827628 Z\" id=\"path26\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g28\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(959.546624, 124.857151)\"\u003e\n+ \u003cpath d=\"M37.2266657,17.4468081 C30.0837992,17.4468081 23.8064527,18.3121698 19.0449295,20.4767371 L19.0449295,79.2306079 L19.0449295,86.0464943 C25.538656,91.457331 33.5470425,95.3526217 43.7203922,95.3526217 C62.1173451,95.3526217 69.2602116,82.3687072 69.2602116,61.3767077 C69.2602116,31.5135879 57.7885819,17.4468081 37.2266657,17.4468081 M45.2315622,113.963713 C28.208506,113.963713 19.0449295,102.384849 19.0449295,102.384849 L19.0449295,120.67143 L18.9844362,144.908535 L10.3967097,144.908535 L0.371103324,144.908535 L0.431596656,6.62629771 C9.73826309,2.73100702 22.5081728,0.567602823 36.3611458,0.567602823 C71.8579349,0.567602823 88.9566078,23.2891625 88.9566078,62.4584098 C88.9566078,93.4043948 73.1527248,113.963713 45.2315622,113.963713\" id=\"path30\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g32\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(509.576747, 125.294950)\"\u003e\n+ \u003cpath d=\"M68.636665,129.10638 C85.5189579,129.10638 96.3414476,123.480366 103.484314,117.853189 L111.669527,132.029302 C100.513161,141.811145 85.5073245,147.06845 69.5021849,147.06845 C29.0274926,147.06845 0.673569983,122.3975 0.673569983,72.6252464 C0.673569983,20.4709215 31.2622559,0.12910638 66.2553217,0.12910638 C83.7879179,0.12910638 98.7227909,4.24073748 108.462217,8.35236859 L108.063194,64.0763105 L108.063194,70.6502677 L108.063194,81.6057001 L56.1168719,81.6057001 L56.1168719,64.0763105 L89.2323178,64.0763105 L89.6313411,21.7701271 C85.3025779,19.6055598 77.7269514,17.8748364 67.554765,17.8748364 C39.4172223,17.8748364 20.5863462,35.5717154 20.5863462,72.8415868 C20.5863462,110.711628 40.0663623,129.10638 68.636665,129.10638\" id=\"path34\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g36\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(692.388992, 124.376085)\"\u003e\n+ \u003cpath d=\"M19.7766662,145.390067 L1.16216997,145.390067 L1.2226633,121.585642 L1.2226633,111.846834 L1.2226633,106.170806 L1.2226633,96.2656714 L1.2226633,39.5681976 L1.2226633,39.3518572 C1.2226633,16.4127939 11.1796331,1.04797161 39.5335557,1.04797161 C43.4504989,1.04797161 47.2836822,1.40388649 51.0051854,2.07965952 L51.0051854,18.7925385 C48.3109055,18.3796307 45.4351455,18.1446804 42.3476589,18.1446804 C26.763646,18.1446804 19.8371595,26.1516022 19.8371595,39.5681976 L19.8371595,96.2656714 L51.0051854,96.2656714 L51.0051854,111.846834 L19.8371595,111.846834 L19.7766662,145.390067 L19.7766662,145.390067 Z\" id=\"path38\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cpath d=\"M646.318899,128.021188 L664.933395,128.021188 L664.933395,236.223966 L646.318899,236.223966 L646.318899,128.021188 L646.318899,128.021188 Z\" id=\"path40\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cpath d=\"M646.318899,251.154944 L664.933395,251.154944 L664.933395,269.766036 L646.318899,269.766036 L646.318899,251.154944 L646.318899,251.154944 Z\" id=\"path42\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cg id=\"g44\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(0.464170, 0.676006)\"\u003e\n+ \u003cpath d=\"M429.269989,169.815599 L405.225053,243.802859 L357.571431,390.440955 C355.120288,397.984955 344.444378,397.984955 341.992071,390.440955 L294.337286,243.802859 L136.094873,243.802859 L88.4389245,390.440955 C85.9877812,397.984955 75.3118715,397.984955 72.8595648,390.440955 L25.2059427,243.802859 L1.16216997,169.815599 C-1.03187664,163.067173 1.37156997,155.674379 7.11261982,151.503429 L215.215498,0.336141836 L423.319539,151.503429 C429.060589,155.674379 431.462873,163.067173 429.269989,169.815599\" id=\"path46\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g48\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(135.410135, 1.012147)\"\u003e\n+ \u003cpath d=\"M80.269998,0 L80.269998,0 L159.391786,243.466717 L1.14820997,243.466717 L80.269998,0 L80.269998,0 Z\" id=\"path50\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g52\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012147)\"\u003e\n+ \u003cg id=\"path54\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g56\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(24.893471, 1.012613)\"\u003e\n+ \u003cpath d=\"M190.786662,0 L111.664874,243.465554 L0.777106647,243.465554 L190.786662,0 L190.786662,0 Z\" id=\"path58\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g60\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012613)\"\u003e\n+ \u003cg id=\"path62\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g64\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(0.077245, 0.223203)\"\u003e\n+ \u003cpath d=\"M25.5933327,244.255313 L25.5933327,244.255313 L1.54839663,170.268052 C-0.644486651,163.519627 1.75779662,156.126833 7.50000981,151.957046 L215.602888,0.789758846 L25.5933327,244.255313 L25.5933327,244.255313 Z\" id=\"path66\" fill=\"#FCA326\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g68\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012147)\"\u003e\n+ \u003cg id=\"path70\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g72\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(25.670578, 244.478283)\"\u003e\n+ \u003cpath d=\"M0,0 L110.887767,0 L63.2329818,146.638096 C60.7806751,154.183259 50.1047654,154.183259 47.6536221,146.638096 L0,0 L0,0 Z\" id=\"path74\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g76\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012613)\"\u003e\n+ \u003cpath d=\"M0,0 L79.121788,243.465554 L190.009555,243.465554 L0,0 L0,0 Z\" id=\"path78\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g80\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(214.902910, 0.223203)\"\u003e\n+ \u003cpath d=\"M190.786662,244.255313 L190.786662,244.255313 L214.831598,170.268052 C217.024481,163.519627 214.622198,156.126833 208.879985,151.957046 L0.777106647,0.789758846 L190.786662,244.255313 L190.786662,244.255313 Z\" id=\"path82\" fill=\"#FCA326\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g84\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(294.009575, 244.478283)\"\u003e\n+ \u003cpath d=\"M111.679997,0 L0.79222998,0 L48.4470155,146.638096 C50.8993221,154.183259 61.5752318,154.183259 64.0263751,146.638096 L111.679997,0 L111.679997,0 Z\" id=\"path86\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+\u003c/svg\u003e\n\\ No newline at end of file\n",
+ "new_path": "files/images/wm.svg",
+ "old_path": "files/images/wm.svg",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/files/lfs/lfs_object.iso\n@@ -0,0 +1,4 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897\n+size 1575078\n+\n",
+ "new_path": "files/lfs/lfs_object.iso",
+ "old_path": "files/lfs/lfs_object.iso",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/files/whitespace\n@@ -0,0 +1 @@\n+test \n",
+ "new_path": "files/whitespace",
+ "old_path": "files/whitespace",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/foo/bar/.gitkeep\n",
+ "new_path": "foo/bar/.gitkeep",
+ "old_path": "foo/bar/.gitkeep",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
"diff": "--- /dev/null\n+++ b/test\n",
"new_path": "test",
"old_path": "test",
@@ -3929,34 +4665,60 @@
}
],
"merge_request_id": 13,
- "created_at": "2016-03-22T15:13:45.167Z",
- "updated_at": "2016-03-22T15:13:45.216Z",
- "base_commit_sha": "be93687618e4b132087f430a4d8fc3a609c9b77c",
- "real_size": "1"
- }
+ "created_at": "2016-06-14T15:02:24.420Z",
+ "updated_at": "2016-06-14T15:02:24.561Z",
+ "base_commit_sha": "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
+ "real_size": "7"
+ },
+ "events": [
+ {
+ "id": 225,
+ "target_type": "MergeRequest",
+ "target_id": 13,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:24.636Z",
+ "updated_at": "2016-06-14T15:02:24.636Z",
+ "action": 1,
+ "author_id": 16
+ },
+ {
+ "id": 173,
+ "target_type": "MergeRequest",
+ "target_id": 13,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:24.636Z",
+ "updated_at": "2016-06-14T15:02:24.636Z",
+ "action": 1,
+ "author_id": 16
+ }
+ ]
},
{
"id": 12,
- "target_branch": "test-15",
+ "target_branch": "flatten-dirs",
"source_branch": "test-2",
"source_project_id": 5,
- "author_id": 24,
- "assignee_id": 12,
- "title": "In assumenda nam quaerat qui eos sit facilis enim quia quis.",
- "created_at": "2016-03-22T15:13:44.837Z",
- "updated_at": "2016-03-22T15:20:31.258Z",
- "milestone_id": 10,
+ "author_id": 1,
+ "assignee_id": 22,
+ "title": "In a rerum harum nihil accusamus aut quia nobis non.",
+ "created_at": "2016-06-14T15:02:24.000Z",
+ "updated_at": "2016-06-14T15:03:00.225Z",
+ "milestone_id": 19,
"state": "opened",
"merge_status": "unchecked",
"target_project_id": 5,
"iid": 4,
- "description": "Soluta excepturi quis iste vero delectus rerum. Consequatur possimus aliquam necessitatibus deleniti rerum est impedit. Eius rem et consequatur assumenda est commodi.",
+ "description": "Nam magnam odit velit rerum. Sapiente dolore sunt saepe debitis. Culpa maiores ut ad dolores dolorem et.",
"position": 0,
"locked_at": null,
"updated_by_id": null,
"merge_error": null,
"merge_params": {
-
+ "force_remove_source_branch": null
},
"merge_when_build_succeeds": false,
"merge_user_id": null,
@@ -3964,12 +4726,12 @@
"deleted_at": null,
"notes": [
{
- "id": 1255,
- "note": "Quibusdam rem aut similique ipsum recusandae ut accusamus.",
+ "id": 801,
+ "note": "Nihil dicta molestias expedita atque.",
"noteable_type": "MergeRequest",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:31.253Z",
- "updated_at": "2016-03-22T15:20:31.253Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:03:00.001Z",
+ "updated_at": "2016-06-14T15:03:00.001Z",
"project_id": 5,
"attachment": {
"url": null
@@ -3980,17 +4742,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1254,
- "note": "Cumque sed omnis ipsa et magnam dolorem et.",
+ "id": 802,
+ "note": "Illum culpa voluptas enim accusantium deserunt.",
"noteable_type": "MergeRequest",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:31.224Z",
- "updated_at": "2016-03-22T15:20:31.224Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:03:00.034Z",
+ "updated_at": "2016-06-14T15:03:00.034Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4001,17 +4766,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1253,
- "note": "Molestiae beatae id consequatur nam minus quia.",
+ "id": 803,
+ "note": "Dicta esse aliquam laboriosam unde alias.",
"noteable_type": "MergeRequest",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:31.195Z",
- "updated_at": "2016-03-22T15:20:31.195Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:03:00.065Z",
+ "updated_at": "2016-06-14T15:03:00.065Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4022,17 +4790,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1252,
- "note": "Voluptatem dolorem dignissimos itaque tempora quas ut.",
+ "id": 804,
+ "note": "Dicta autem et sed molestiae ut quae.",
"noteable_type": "MergeRequest",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:31.166Z",
- "updated_at": "2016-03-22T15:20:31.166Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:03:00.097Z",
+ "updated_at": "2016-06-14T15:03:00.097Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4043,17 +4814,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1251,
- "note": "Debitis qui quibusdam voluptas repellat veritatis dicta rerum id.",
+ "id": 805,
+ "note": "Ut ut temporibus voluptas dolore quia velit.",
"noteable_type": "MergeRequest",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:31.137Z",
- "updated_at": "2016-03-22T15:20:31.137Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:03:00.129Z",
+ "updated_at": "2016-06-14T15:03:00.129Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4064,17 +4838,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1250,
- "note": "Suscipit optio ad voluptatem dignissimos temporibus amet molestias ut.",
+ "id": 806,
+ "note": "Dolores similique sint pariatur error id quia fugit aut.",
"noteable_type": "MergeRequest",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:31.107Z",
- "updated_at": "2016-03-22T15:20:31.107Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:03:00.162Z",
+ "updated_at": "2016-06-14T15:03:00.162Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4085,17 +4862,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1249,
- "note": "Nemo aut vitae et ducimus autem ex dolores.",
+ "id": 807,
+ "note": "Quisquam provident nihil aperiam voluptatem.",
"noteable_type": "MergeRequest",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:31.073Z",
- "updated_at": "2016-03-22T15:20:31.073Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:03:00.193Z",
+ "updated_at": "2016-06-14T15:03:00.193Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4106,17 +4886,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1248,
- "note": "Repellendus eaque ex molestiae laudantium placeat quidem vitae recusandae.",
+ "id": 808,
+ "note": "Similique quo vero expedita deserunt ipsam earum.",
"noteable_type": "MergeRequest",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:31.038Z",
- "updated_at": "2016-03-22T15:20:31.038Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:03:00.224Z",
+ "updated_at": "2016-06-14T15:03:00.224Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4127,9 +4910,12 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
],
"merge_request_diff": {
@@ -4143,15 +4929,230 @@
"be93687618e4b132087f430a4d8fc3a609c9b77c"
],
"authored_date": "2016-01-19T14:08:21.000+01:00",
- "author_name": "Test Lopez",
- "author_email": "Test@Testlopez.es",
+ "author_name": "James Lopez",
+ "author_email": "james@jameslopez.es",
"committed_date": "2016-01-19T14:08:21.000+01:00",
- "committer_name": "Test Lopez",
- "committer_email": "Test@Testlopez.es"
+ "committer_name": "James Lopez",
+ "committer_email": "james@jameslopez.es"
+ },
+ {
+ "id": "be93687618e4b132087f430a4d8fc3a609c9b77c",
+ "message": "Merge branch 'master' into 'master'\r\n\r\nLFS object pointer.\r\n\r\n\r\n\r\nSee merge request !6",
+ "parent_ids": [
+ "5f923865dde3436854e9ceb9cdb7815618d4e849",
+ "048721d90c449b244b7b4c53a9186b04330174ec"
+ ],
+ "authored_date": "2015-12-07T12:52:12.000+01:00",
+ "author_name": "Marin Jankovski",
+ "author_email": "marin@gitlab.com",
+ "committed_date": "2015-12-07T12:52:12.000+01:00",
+ "committer_name": "Marin Jankovski",
+ "committer_email": "marin@gitlab.com"
+ },
+ {
+ "id": "048721d90c449b244b7b4c53a9186b04330174ec",
+ "message": "LFS object pointer.\n",
+ "parent_ids": [
+ "5f923865dde3436854e9ceb9cdb7815618d4e849"
+ ],
+ "authored_date": "2015-12-07T11:54:28.000+01:00",
+ "author_name": "Marin Jankovski",
+ "author_email": "maxlazio@gmail.com",
+ "committed_date": "2015-12-07T11:54:28.000+01:00",
+ "committer_name": "Marin Jankovski",
+ "committer_email": "maxlazio@gmail.com"
+ },
+ {
+ "id": "5f923865dde3436854e9ceb9cdb7815618d4e849",
+ "message": "GitLab currently doesn't support patches that involve a merge commit: add a commit here\n",
+ "parent_ids": [
+ "d2d430676773caa88cdaf7c55944073b2fd5561a"
+ ],
+ "authored_date": "2015-11-13T16:27:12.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T16:27:12.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "d2d430676773caa88cdaf7c55944073b2fd5561a",
+ "message": "Merge branch 'add-svg' into 'master'\r\n\r\nAdd GitLab SVG\r\n\r\nAdded to test preview of sanitized SVG images\r\n\r\nSee merge request !5",
+ "parent_ids": [
+ "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+ "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73"
+ ],
+ "authored_date": "2015-11-13T08:50:17.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T08:50:17.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73",
+ "message": "Add GitLab SVG\n",
+ "parent_ids": [
+ "59e29889be61e6e0e5e223bfa9ac2721d31605b8"
+ ],
+ "authored_date": "2015-11-13T08:39:43.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T08:39:43.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+ "message": "Merge branch 'whitespace' into 'master'\r\n\r\nadd whitespace test file\r\n\r\nSorry, I did a mistake.\r\nGit ignore empty files.\r\nSo I add a new whitespace test file.\r\n\r\nSee merge request !4",
+ "parent_ids": [
+ "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+ "66eceea0db202bb39c4e445e8ca28689645366c5"
+ ],
+ "authored_date": "2015-11-13T07:21:40.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T07:21:40.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "66eceea0db202bb39c4e445e8ca28689645366c5",
+ "message": "add spaces in whitespace file\n",
+ "parent_ids": [
+ "08f22f255f082689c0d7d39d19205085311542bc"
+ ],
+ "authored_date": "2015-11-13T06:01:27.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T06:01:27.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "08f22f255f082689c0d7d39d19205085311542bc",
+ "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+ "parent_ids": [
+ "c642fe9b8b9f28f9225d7ea953fe14e74748d53b"
+ ],
+ "authored_date": "2015-11-13T06:00:16.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T06:00:16.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+ "message": "Merge branch 'whitespace' into 'master'\r\n\r\nadd spaces\r\n\r\nTo test this pull request.(https://github.com/gitlabhq/gitlabhq/pull/9757)\r\nJust add whitespaces.\r\n\r\nSee merge request !3",
+ "parent_ids": [
+ "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+ "c642fe9b8b9f28f9225d7ea953fe14e74748d53b"
+ ],
+ "authored_date": "2015-11-13T05:23:14.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T05:23:14.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "c642fe9b8b9f28f9225d7ea953fe14e74748d53b",
+ "message": "add whitespace in empty\n",
+ "parent_ids": [
+ "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0"
+ ],
+ "authored_date": "2015-11-13T05:08:45.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T05:08:45.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0",
+ "message": "add empty file\n",
+ "parent_ids": [
+ "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd"
+ ],
+ "authored_date": "2015-11-13T05:08:04.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T05:08:04.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+ "message": "Add ISO-8859 test file\n",
+ "parent_ids": [
+ "e56497bb5f03a90a51293fc6d516788730953899"
+ ],
+ "authored_date": "2015-08-25T17:53:12.000+02:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@packetzoom.com",
+ "committed_date": "2015-08-25T17:53:12.000+02:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@packetzoom.com"
}
],
"st_diffs": [
{
+ "diff": "--- a/CHANGELOG\n+++ b/CHANGELOG\n@@ -1,4 +1,6 @@\n-v 6.7.0\n+v6.8.0\n+\n+v6.7.0\n - Add support for Gemnasium as a Project Service (Olivier Gonzalez)\n - Add edit file button to MergeRequest diff\n - Public groups (Jason Hollingsworth)\n",
+ "new_path": "CHANGELOG",
+ "old_path": "CHANGELOG",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/encoding/iso8859.txt\n@@ -0,0 +1 @@\n+Äü\n",
+ "new_path": "encoding/iso8859.txt",
+ "old_path": "encoding/iso8859.txt",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/files/images/wm.svg\n@@ -0,0 +1,78 @@\n+\u003c?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?\u003e\n+\u003csvg width=\"1300px\" height=\"680px\" viewBox=\"0 0 1300 680\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:sketch=\"http://www.bohemiancoding.com/sketch/ns\"\u003e\n+ \u003c!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch --\u003e\n+ \u003ctitle\u003ewm\u003c/title\u003e\n+ \u003cdesc\u003eCreated with Sketch.\u003c/desc\u003e\n+ \u003cdefs\u003e\n+ \u003cpath id=\"path-1\" d=\"M-69.8,1023.54607 L1675.19996,1023.54607 L1675.19996,0 L-69.8,0 L-69.8,1023.54607 L-69.8,1023.54607 Z\"\u003e\u003c/path\u003e\n+ \u003c/defs\u003e\n+ \u003cg id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" sketch:type=\"MSPage\"\u003e\n+ \u003cpath d=\"M1300,680 L0,680 L0,0 L1300,0 L1300,680 L1300,680 Z\" id=\"bg\" fill=\"#30353E\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cg id=\"gitlab_logo\" sketch:type=\"MSLayerGroup\" transform=\"translate(-262.000000, -172.000000)\"\u003e\n+ \u003cg id=\"g10\" transform=\"translate(872.500000, 512.354581) scale(1, -1) translate(-872.500000, -512.354581) translate(0.000000, 0.290751)\"\u003e\n+ \u003cg id=\"g12\" transform=\"translate(1218.022652, 440.744871)\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\n+ \u003cpath d=\"M-50.0233338,141.900706 L-69.07059,141.900706 L-69.0100967,0.155858152 L8.04444805,0.155858152 L8.04444805,17.6840847 L-49.9628405,17.6840847 L-50.0233338,141.900706 L-50.0233338,141.900706 Z\" id=\"path14\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g16\"\u003e\n+ \u003cg id=\"g18-Clipped\"\u003e\n+ \u003cmask id=\"mask-2\" sketch:name=\"path22\" fill=\"white\"\u003e\n+ \u003cuse xlink:href=\"#path-1\"\u003e\u003c/use\u003e\n+ \u003c/mask\u003e\n+ \u003cg id=\"path22\"\u003e\u003c/g\u003e\n+ \u003cg id=\"g18\" mask=\"url(#mask-2)\"\u003e\n+ \u003cg transform=\"translate(382.736659, 312.879425)\"\u003e\n+ \u003cg id=\"g24\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(852.718192, 124.992771)\"\u003e\n+ \u003cpath d=\"M63.9833317,27.9148929 C59.2218085,22.9379001 51.2134221,17.9597442 40.3909323,17.9597442 C25.8888194,17.9597442 20.0453962,25.1013043 20.0453962,34.4074318 C20.0453962,48.4730484 29.7848226,55.1819277 50.5642821,55.1819277 C54.4602853,55.1819277 60.7364685,54.7492469 63.9833317,54.1002256 L63.9833317,27.9148929 L63.9833317,27.9148929 Z M44.2869356,113.827628 C28.9053426,113.827628 14.7975996,108.376082 3.78897657,99.301416 L10.5211864,87.6422957 C18.3131929,92.1866076 27.8374026,96.7320827 41.4728323,96.7320827 C57.0568452,96.7320827 63.9833317,88.7239978 63.9833317,75.3074024 L63.9833317,68.3821827 C60.9528485,69.0312039 54.6766653,69.4650479 50.7806621,69.4650479 C17.4476729,69.4650479 0.565379986,57.7791759 0.565379986,33.3245665 C0.565379986,11.4683685 13.9844297,0.43151772 34.3299658,0.43151772 C48.0351955,0.43151772 61.1692285,6.70771614 65.7143717,16.8780421 L69.1776149,3.02876588 L82.5978279,3.02876588 L82.5978279,75.5237428 C82.5978279,98.462806 72.6408582,113.827628 44.2869356,113.827628 L44.2869356,113.827628 Z\" id=\"path26\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g28\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(959.546624, 124.857151)\"\u003e\n+ \u003cpath d=\"M37.2266657,17.4468081 C30.0837992,17.4468081 23.8064527,18.3121698 19.0449295,20.4767371 L19.0449295,79.2306079 L19.0449295,86.0464943 C25.538656,91.457331 33.5470425,95.3526217 43.7203922,95.3526217 C62.1173451,95.3526217 69.2602116,82.3687072 69.2602116,61.3767077 C69.2602116,31.5135879 57.7885819,17.4468081 37.2266657,17.4468081 M45.2315622,113.963713 C28.208506,113.963713 19.0449295,102.384849 19.0449295,102.384849 L19.0449295,120.67143 L18.9844362,144.908535 L10.3967097,144.908535 L0.371103324,144.908535 L0.431596656,6.62629771 C9.73826309,2.73100702 22.5081728,0.567602823 36.3611458,0.567602823 C71.8579349,0.567602823 88.9566078,23.2891625 88.9566078,62.4584098 C88.9566078,93.4043948 73.1527248,113.963713 45.2315622,113.963713\" id=\"path30\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g32\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(509.576747, 125.294950)\"\u003e\n+ \u003cpath d=\"M68.636665,129.10638 C85.5189579,129.10638 96.3414476,123.480366 103.484314,117.853189 L111.669527,132.029302 C100.513161,141.811145 85.5073245,147.06845 69.5021849,147.06845 C29.0274926,147.06845 0.673569983,122.3975 0.673569983,72.6252464 C0.673569983,20.4709215 31.2622559,0.12910638 66.2553217,0.12910638 C83.7879179,0.12910638 98.7227909,4.24073748 108.462217,8.35236859 L108.063194,64.0763105 L108.063194,70.6502677 L108.063194,81.6057001 L56.1168719,81.6057001 L56.1168719,64.0763105 L89.2323178,64.0763105 L89.6313411,21.7701271 C85.3025779,19.6055598 77.7269514,17.8748364 67.554765,17.8748364 C39.4172223,17.8748364 20.5863462,35.5717154 20.5863462,72.8415868 C20.5863462,110.711628 40.0663623,129.10638 68.636665,129.10638\" id=\"path34\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g36\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(692.388992, 124.376085)\"\u003e\n+ \u003cpath d=\"M19.7766662,145.390067 L1.16216997,145.390067 L1.2226633,121.585642 L1.2226633,111.846834 L1.2226633,106.170806 L1.2226633,96.2656714 L1.2226633,39.5681976 L1.2226633,39.3518572 C1.2226633,16.4127939 11.1796331,1.04797161 39.5335557,1.04797161 C43.4504989,1.04797161 47.2836822,1.40388649 51.0051854,2.07965952 L51.0051854,18.7925385 C48.3109055,18.3796307 45.4351455,18.1446804 42.3476589,18.1446804 C26.763646,18.1446804 19.8371595,26.1516022 19.8371595,39.5681976 L19.8371595,96.2656714 L51.0051854,96.2656714 L51.0051854,111.846834 L19.8371595,111.846834 L19.7766662,145.390067 L19.7766662,145.390067 Z\" id=\"path38\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cpath d=\"M646.318899,128.021188 L664.933395,128.021188 L664.933395,236.223966 L646.318899,236.223966 L646.318899,128.021188 L646.318899,128.021188 Z\" id=\"path40\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cpath d=\"M646.318899,251.154944 L664.933395,251.154944 L664.933395,269.766036 L646.318899,269.766036 L646.318899,251.154944 L646.318899,251.154944 Z\" id=\"path42\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cg id=\"g44\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(0.464170, 0.676006)\"\u003e\n+ \u003cpath d=\"M429.269989,169.815599 L405.225053,243.802859 L357.571431,390.440955 C355.120288,397.984955 344.444378,397.984955 341.992071,390.440955 L294.337286,243.802859 L136.094873,243.802859 L88.4389245,390.440955 C85.9877812,397.984955 75.3118715,397.984955 72.8595648,390.440955 L25.2059427,243.802859 L1.16216997,169.815599 C-1.03187664,163.067173 1.37156997,155.674379 7.11261982,151.503429 L215.215498,0.336141836 L423.319539,151.503429 C429.060589,155.674379 431.462873,163.067173 429.269989,169.815599\" id=\"path46\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g48\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(135.410135, 1.012147)\"\u003e\n+ \u003cpath d=\"M80.269998,0 L80.269998,0 L159.391786,243.466717 L1.14820997,243.466717 L80.269998,0 L80.269998,0 Z\" id=\"path50\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g52\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012147)\"\u003e\n+ \u003cg id=\"path54\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g56\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(24.893471, 1.012613)\"\u003e\n+ \u003cpath d=\"M190.786662,0 L111.664874,243.465554 L0.777106647,243.465554 L190.786662,0 L190.786662,0 Z\" id=\"path58\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g60\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012613)\"\u003e\n+ \u003cg id=\"path62\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g64\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(0.077245, 0.223203)\"\u003e\n+ \u003cpath d=\"M25.5933327,244.255313 L25.5933327,244.255313 L1.54839663,170.268052 C-0.644486651,163.519627 1.75779662,156.126833 7.50000981,151.957046 L215.602888,0.789758846 L25.5933327,244.255313 L25.5933327,244.255313 Z\" id=\"path66\" fill=\"#FCA326\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g68\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012147)\"\u003e\n+ \u003cg id=\"path70\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g72\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(25.670578, 244.478283)\"\u003e\n+ \u003cpath d=\"M0,0 L110.887767,0 L63.2329818,146.638096 C60.7806751,154.183259 50.1047654,154.183259 47.6536221,146.638096 L0,0 L0,0 Z\" id=\"path74\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g76\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012613)\"\u003e\n+ \u003cpath d=\"M0,0 L79.121788,243.465554 L190.009555,243.465554 L0,0 L0,0 Z\" id=\"path78\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g80\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(214.902910, 0.223203)\"\u003e\n+ \u003cpath d=\"M190.786662,244.255313 L190.786662,244.255313 L214.831598,170.268052 C217.024481,163.519627 214.622198,156.126833 208.879985,151.957046 L0.777106647,0.789758846 L190.786662,244.255313 L190.786662,244.255313 Z\" id=\"path82\" fill=\"#FCA326\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g84\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(294.009575, 244.478283)\"\u003e\n+ \u003cpath d=\"M111.679997,0 L0.79222998,0 L48.4470155,146.638096 C50.8993221,154.183259 61.5752318,154.183259 64.0263751,146.638096 L111.679997,0 L111.679997,0 Z\" id=\"path86\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+\u003c/svg\u003e\n\\ No newline at end of file\n",
+ "new_path": "files/images/wm.svg",
+ "old_path": "files/images/wm.svg",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/files/lfs/lfs_object.iso\n@@ -0,0 +1,4 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897\n+size 1575078\n+\n",
+ "new_path": "files/lfs/lfs_object.iso",
+ "old_path": "files/lfs/lfs_object.iso",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/files/whitespace\n@@ -0,0 +1 @@\n+test \n",
+ "new_path": "files/whitespace",
+ "old_path": "files/whitespace",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
"diff": "--- /dev/null\n+++ b/test\n",
"new_path": "test",
"old_path": "test",
@@ -4164,34 +5165,60 @@
}
],
"merge_request_id": 12,
- "created_at": "2016-03-22T15:13:44.840Z",
- "updated_at": "2016-03-22T15:13:44.908Z",
- "base_commit_sha": "be93687618e4b132087f430a4d8fc3a609c9b77c",
- "real_size": "1"
- }
+ "created_at": "2016-06-14T15:02:24.006Z",
+ "updated_at": "2016-06-14T15:02:24.169Z",
+ "base_commit_sha": "e56497bb5f03a90a51293fc6d516788730953899",
+ "real_size": "6"
+ },
+ "events": [
+ {
+ "id": 226,
+ "target_type": "MergeRequest",
+ "target_id": 12,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:24.253Z",
+ "updated_at": "2016-06-14T15:02:24.253Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 172,
+ "target_type": "MergeRequest",
+ "target_id": 12,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:24.253Z",
+ "updated_at": "2016-06-14T15:02:24.253Z",
+ "action": 1,
+ "author_id": 1
+ }
+ ]
},
{
"id": 11,
- "target_branch": "test-3",
- "source_branch": "test-5",
+ "target_branch": "test-15",
+ "source_branch": "'test'",
"source_project_id": 5,
- "author_id": 26,
- "assignee_id": 12,
- "title": "Magni aut reprehenderit ut accusantium est eum.",
- "created_at": "2016-03-22T15:13:44.494Z",
- "updated_at": "2016-03-22T15:20:31.886Z",
- "milestone_id": 10,
+ "author_id": 16,
+ "assignee_id": 16,
+ "title": "Corporis provident similique perspiciatis dolores eos animi.",
+ "created_at": "2016-06-14T15:02:23.767Z",
+ "updated_at": "2016-06-14T15:03:00.475Z",
+ "milestone_id": 18,
"state": "opened",
"merge_status": "unchecked",
"target_project_id": 5,
"iid": 3,
- "description": "Et hic maxime harum ullam. Nulla velit pariatur libero recusandae. Dolor est earum laboriosam harum quo.",
+ "description": "Libero nesciunt mollitia quis odit eos vero quasi. Iure voluptatem ut sint pariatur voluptates ut aut. Laborum possimus unde illum ipsum eum.",
"position": 0,
"locked_at": null,
"updated_by_id": null,
"merge_error": null,
"merge_params": {
-
+ "force_remove_source_branch": null
},
"merge_when_build_succeeds": false,
"merge_user_id": null,
@@ -4199,12 +5226,12 @@
"deleted_at": null,
"notes": [
{
- "id": 1263,
- "note": "Beatae incidunt exercitationem voluptates recusandae fuga quia enim.",
+ "id": 809,
+ "note": "Omnis ratione laboriosam dolores qui.",
"noteable_type": "MergeRequest",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:31.883Z",
- "updated_at": "2016-03-22T15:20:31.883Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:03:00.260Z",
+ "updated_at": "2016-06-14T15:03:00.260Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4215,17 +5242,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1262,
- "note": "Illum sunt id consequuntur fugit et quo ullam eum.",
+ "id": 810,
+ "note": "Voluptas voluptates pariatur dolores maxime est voluptas.",
"noteable_type": "MergeRequest",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:31.860Z",
- "updated_at": "2016-03-22T15:20:31.860Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:03:00.290Z",
+ "updated_at": "2016-06-14T15:03:00.290Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4236,17 +5266,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1261,
- "note": "Alias reiciendis autem ipsa sequi autem nemo odio.",
+ "id": 811,
+ "note": "Sit perspiciatis facilis ipsum consequatur.",
"noteable_type": "MergeRequest",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:31.456Z",
- "updated_at": "2016-03-22T15:20:31.456Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:03:00.323Z",
+ "updated_at": "2016-06-14T15:03:00.323Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4257,17 +5290,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1260,
- "note": "Maxime nisi odit eos nulla vel ex accusamus velit.",
+ "id": 812,
+ "note": "Ut neque aliquam nam et est.",
"noteable_type": "MergeRequest",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:31.426Z",
- "updated_at": "2016-03-22T15:20:31.426Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:03:00.349Z",
+ "updated_at": "2016-06-14T15:03:00.349Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4278,17 +5314,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1259,
- "note": "Excepturi et qui sapiente ut ducimus sunt nesciunt.",
+ "id": 813,
+ "note": "Et debitis rerum minima sit aut dolorem.",
"noteable_type": "MergeRequest",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:31.397Z",
- "updated_at": "2016-03-22T15:20:31.397Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:03:00.374Z",
+ "updated_at": "2016-06-14T15:03:00.374Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4299,17 +5338,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1258,
- "note": "Quis rerum dolores et dolorem modi neque ullam doloribus.",
+ "id": 814,
+ "note": "Ea nisi earum fugit iste aperiam consequatur.",
"noteable_type": "MergeRequest",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:31.364Z",
- "updated_at": "2016-03-22T15:20:31.364Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:03:00.397Z",
+ "updated_at": "2016-06-14T15:03:00.397Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4320,17 +5362,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1257,
- "note": "Voluptatum et mollitia neque aut.",
+ "id": 815,
+ "note": "Amet ratione consequatur laudantium rerum voluptas est nobis.",
"noteable_type": "MergeRequest",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:31.328Z",
- "updated_at": "2016-03-22T15:20:31.328Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:03:00.450Z",
+ "updated_at": "2016-06-14T15:03:00.450Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4341,17 +5386,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1256,
- "note": "Rerum laudantium dolor natus doloribus voluptas aliquid a.",
+ "id": 816,
+ "note": "Ab ducimus cumque quia dolorem vitae sint beatae rerum.",
"noteable_type": "MergeRequest",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:31.298Z",
- "updated_at": "2016-03-22T15:20:31.298Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:03:00.474Z",
+ "updated_at": "2016-06-14T15:03:00.474Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4362,71 +5410,76 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
],
"merge_request_diff": {
"id": 11,
- "state": "collected",
- "st_commits": [
- {
- "id": "f998ac87ac9244f15e9c15109a6f4e62a54b779d",
- "message": "fixes #10\n",
- "parent_ids": [
- "be93687618e4b132087f430a4d8fc3a609c9b77c"
- ],
- "authored_date": "2016-01-19T14:43:23.000+01:00",
- "author_name": "Test Lopez",
- "author_email": "Test@Testlopez.es",
- "committed_date": "2016-01-19T14:43:23.000+01:00",
- "committer_name": "Test Lopez",
- "committer_email": "Test@Testlopez.es"
- }
- ],
+ "state": "empty",
+ "st_commits": null,
"st_diffs": [
- {
- "diff": "--- /dev/null\n+++ b/test\n",
- "new_path": "test",
- "old_path": "test",
- "a_mode": "0",
- "b_mode": "100644",
- "new_file": true,
- "renamed_file": false,
- "deleted_file": false,
- "too_large": false
- }
+
],
"merge_request_id": 11,
- "created_at": "2016-03-22T15:13:44.497Z",
- "updated_at": "2016-03-22T15:13:44.547Z",
- "base_commit_sha": "be93687618e4b132087f430a4d8fc3a609c9b77c",
- "real_size": "1"
- }
+ "created_at": "2016-06-14T15:02:23.772Z",
+ "updated_at": "2016-06-14T15:02:23.833Z",
+ "base_commit_sha": "e56497bb5f03a90a51293fc6d516788730953899",
+ "real_size": null
+ },
+ "events": [
+ {
+ "id": 227,
+ "target_type": "MergeRequest",
+ "target_id": 11,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:23.865Z",
+ "updated_at": "2016-06-14T15:02:23.865Z",
+ "action": 1,
+ "author_id": 16
+ },
+ {
+ "id": 171,
+ "target_type": "MergeRequest",
+ "target_id": 11,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:23.865Z",
+ "updated_at": "2016-06-14T15:02:23.865Z",
+ "action": 1,
+ "author_id": 16
+ }
+ ]
},
{
"id": 10,
- "target_branch": "test-6",
- "source_branch": "test-7",
+ "target_branch": "feature",
+ "source_branch": "test-5",
"source_project_id": 5,
- "author_id": 22,
- "assignee_id": 4,
- "title": "Rerum commodi corporis quis qui fugit sed ut.",
- "created_at": "2016-03-22T15:13:44.103Z",
- "updated_at": "2016-03-22T15:20:32.096Z",
- "milestone_id": 11,
+ "author_id": 20,
+ "assignee_id": 25,
+ "title": "Eligendi reprehenderit doloribus quia et sit id.",
+ "created_at": "2016-06-14T15:02:23.014Z",
+ "updated_at": "2016-06-14T15:03:00.685Z",
+ "milestone_id": 20,
"state": "opened",
"merge_status": "unchecked",
"target_project_id": 5,
"iid": 2,
- "description": "Laudantium vel dignissimos aspernatur quis aut. Dolores et doloremque ipsa quia voluptate modi labore. Ipsa provident repellat error et nihil.",
+ "description": "Ut dolor quia aliquid dolore et nisi. Est minus suscipit enim quaerat sapiente consequatur rerum. Eveniet provident consequatur dolor accusantium reiciendis.",
"position": 0,
"locked_at": null,
"updated_by_id": null,
"merge_error": null,
"merge_params": {
-
+ "force_remove_source_branch": null
},
"merge_when_build_succeeds": false,
"merge_user_id": null,
@@ -4434,12 +5487,12 @@
"deleted_at": null,
"notes": [
{
- "id": 1271,
- "note": "Quod ut ut quisquam et ut dolorem dolor.",
+ "id": 817,
+ "note": "Recusandae et voluptas enim qui et.",
"noteable_type": "MergeRequest",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:32.093Z",
- "updated_at": "2016-03-22T15:20:32.093Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:03:00.510Z",
+ "updated_at": "2016-06-14T15:03:00.510Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4450,17 +5503,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1270,
- "note": "Sed deserunt et explicabo rem repellat voluptatem.",
+ "id": 818,
+ "note": "Asperiores dolorem rerum ipsum totam.",
"noteable_type": "MergeRequest",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:32.070Z",
- "updated_at": "2016-03-22T15:20:32.070Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:03:00.538Z",
+ "updated_at": "2016-06-14T15:03:00.538Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4471,17 +5527,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1269,
- "note": "Veritatis architecto omnis consequatur et optio.",
+ "id": 819,
+ "note": "Qui quam et iure quasi provident cumque itaque sequi.",
"noteable_type": "MergeRequest",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:32.046Z",
- "updated_at": "2016-03-22T15:20:32.046Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:03:00.562Z",
+ "updated_at": "2016-06-14T15:03:00.562Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4492,17 +5551,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1268,
- "note": "Omnis suscipit odio molestiae debitis quia autem magni.",
+ "id": 820,
+ "note": "Sint accusantium aliquid iste qui iusto minus vel.",
"noteable_type": "MergeRequest",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:32.019Z",
- "updated_at": "2016-03-22T15:20:32.019Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:03:00.585Z",
+ "updated_at": "2016-06-14T15:03:00.585Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4513,17 +5575,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1267,
- "note": "Molestias est sunt est tempora consequatur cupiditate magnam.",
+ "id": 821,
+ "note": "Dolor corrupti dolorem blanditiis voluptas.",
"noteable_type": "MergeRequest",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:31.993Z",
- "updated_at": "2016-03-22T15:20:31.993Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:03:00.610Z",
+ "updated_at": "2016-06-14T15:03:00.610Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4534,17 +5599,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1266,
- "note": "Ratione blanditiis eveniet voluptatem nostrum rerum excepturi in molestiae.",
+ "id": 822,
+ "note": "Est perferendis assumenda aliquam aliquid sit ipsum ullam aut.",
"noteable_type": "MergeRequest",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:31.969Z",
- "updated_at": "2016-03-22T15:20:31.969Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:03:00.635Z",
+ "updated_at": "2016-06-14T15:03:00.635Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4555,17 +5623,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1265,
- "note": "Illo voluptatibus vel odio ea.",
+ "id": 823,
+ "note": "Hic neque reiciendis quaerat maiores.",
"noteable_type": "MergeRequest",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:31.944Z",
- "updated_at": "2016-03-22T15:20:31.944Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:03:00.659Z",
+ "updated_at": "2016-06-14T15:03:00.659Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4576,17 +5647,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1264,
- "note": "Earum veritatis quis facere itaque iure.",
+ "id": 824,
+ "note": "Sequi architecto doloribus ut vel autem.",
"noteable_type": "MergeRequest",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:31.919Z",
- "updated_at": "2016-03-22T15:20:31.919Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:03:00.683Z",
+ "updated_at": "2016-06-14T15:03:00.683Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4597,9 +5671,12 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
],
"merge_request_diff": {
@@ -4607,21 +5684,427 @@
"state": "collected",
"st_commits": [
{
- "id": "b42bb86cea49bdcef943e521584b7f417d8ddd3d",
+ "id": "f998ac87ac9244f15e9c15109a6f4e62a54b779d",
"message": "fixes #10\n",
"parent_ids": [
"be93687618e4b132087f430a4d8fc3a609c9b77c"
],
- "authored_date": "2016-01-19T15:03:09.000+01:00",
- "author_name": "Test Lopez",
- "author_email": "Test@Testlopez.es",
- "committed_date": "2016-01-19T15:03:09.000+01:00",
- "committer_name": "Test Lopez",
- "committer_email": "Test@Testlopez.es"
+ "authored_date": "2016-01-19T14:43:23.000+01:00",
+ "author_name": "James Lopez",
+ "author_email": "james@jameslopez.es",
+ "committed_date": "2016-01-19T14:43:23.000+01:00",
+ "committer_name": "James Lopez",
+ "committer_email": "james@jameslopez.es"
+ },
+ {
+ "id": "be93687618e4b132087f430a4d8fc3a609c9b77c",
+ "message": "Merge branch 'master' into 'master'\r\n\r\nLFS object pointer.\r\n\r\n\r\n\r\nSee merge request !6",
+ "parent_ids": [
+ "5f923865dde3436854e9ceb9cdb7815618d4e849",
+ "048721d90c449b244b7b4c53a9186b04330174ec"
+ ],
+ "authored_date": "2015-12-07T12:52:12.000+01:00",
+ "author_name": "Marin Jankovski",
+ "author_email": "marin@gitlab.com",
+ "committed_date": "2015-12-07T12:52:12.000+01:00",
+ "committer_name": "Marin Jankovski",
+ "committer_email": "marin@gitlab.com"
+ },
+ {
+ "id": "048721d90c449b244b7b4c53a9186b04330174ec",
+ "message": "LFS object pointer.\n",
+ "parent_ids": [
+ "5f923865dde3436854e9ceb9cdb7815618d4e849"
+ ],
+ "authored_date": "2015-12-07T11:54:28.000+01:00",
+ "author_name": "Marin Jankovski",
+ "author_email": "maxlazio@gmail.com",
+ "committed_date": "2015-12-07T11:54:28.000+01:00",
+ "committer_name": "Marin Jankovski",
+ "committer_email": "maxlazio@gmail.com"
+ },
+ {
+ "id": "5f923865dde3436854e9ceb9cdb7815618d4e849",
+ "message": "GitLab currently doesn't support patches that involve a merge commit: add a commit here\n",
+ "parent_ids": [
+ "d2d430676773caa88cdaf7c55944073b2fd5561a"
+ ],
+ "authored_date": "2015-11-13T16:27:12.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T16:27:12.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "d2d430676773caa88cdaf7c55944073b2fd5561a",
+ "message": "Merge branch 'add-svg' into 'master'\r\n\r\nAdd GitLab SVG\r\n\r\nAdded to test preview of sanitized SVG images\r\n\r\nSee merge request !5",
+ "parent_ids": [
+ "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+ "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73"
+ ],
+ "authored_date": "2015-11-13T08:50:17.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T08:50:17.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73",
+ "message": "Add GitLab SVG\n",
+ "parent_ids": [
+ "59e29889be61e6e0e5e223bfa9ac2721d31605b8"
+ ],
+ "authored_date": "2015-11-13T08:39:43.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T08:39:43.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+ "message": "Merge branch 'whitespace' into 'master'\r\n\r\nadd whitespace test file\r\n\r\nSorry, I did a mistake.\r\nGit ignore empty files.\r\nSo I add a new whitespace test file.\r\n\r\nSee merge request !4",
+ "parent_ids": [
+ "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+ "66eceea0db202bb39c4e445e8ca28689645366c5"
+ ],
+ "authored_date": "2015-11-13T07:21:40.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T07:21:40.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "66eceea0db202bb39c4e445e8ca28689645366c5",
+ "message": "add spaces in whitespace file\n",
+ "parent_ids": [
+ "08f22f255f082689c0d7d39d19205085311542bc"
+ ],
+ "authored_date": "2015-11-13T06:01:27.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T06:01:27.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "08f22f255f082689c0d7d39d19205085311542bc",
+ "message": "remove emtpy file.(beacase git ignore empty file)\nadd whitespace test file.\n",
+ "parent_ids": [
+ "c642fe9b8b9f28f9225d7ea953fe14e74748d53b"
+ ],
+ "authored_date": "2015-11-13T06:00:16.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T06:00:16.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+ "message": "Merge branch 'whitespace' into 'master'\r\n\r\nadd spaces\r\n\r\nTo test this pull request.(https://github.com/gitlabhq/gitlabhq/pull/9757)\r\nJust add whitespaces.\r\n\r\nSee merge request !3",
+ "parent_ids": [
+ "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+ "c642fe9b8b9f28f9225d7ea953fe14e74748d53b"
+ ],
+ "authored_date": "2015-11-13T05:23:14.000+01:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@gmail.com",
+ "committed_date": "2015-11-13T05:23:14.000+01:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@gmail.com"
+ },
+ {
+ "id": "c642fe9b8b9f28f9225d7ea953fe14e74748d53b",
+ "message": "add whitespace in empty\n",
+ "parent_ids": [
+ "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0"
+ ],
+ "authored_date": "2015-11-13T05:08:45.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T05:08:45.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0",
+ "message": "add empty file\n",
+ "parent_ids": [
+ "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd"
+ ],
+ "authored_date": "2015-11-13T05:08:04.000+01:00",
+ "author_name": "윤민식",
+ "author_email": "minsik.yoon@samsung.com",
+ "committed_date": "2015-11-13T05:08:04.000+01:00",
+ "committer_name": "윤민식",
+ "committer_email": "minsik.yoon@samsung.com"
+ },
+ {
+ "id": "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+ "message": "Add ISO-8859 test file\n",
+ "parent_ids": [
+ "e56497bb5f03a90a51293fc6d516788730953899"
+ ],
+ "authored_date": "2015-08-25T17:53:12.000+02:00",
+ "author_name": "Stan Hu",
+ "author_email": "stanhu@packetzoom.com",
+ "committed_date": "2015-08-25T17:53:12.000+02:00",
+ "committer_name": "Stan Hu",
+ "committer_email": "stanhu@packetzoom.com"
+ },
+ {
+ "id": "e56497bb5f03a90a51293fc6d516788730953899",
+ "message": "Merge branch 'tree_helper_spec' into 'master'\n\nAdd directory structure for tree_helper spec\n\nThis directory structure is needed for a testing the method flatten_tree(tree) in the TreeHelper module\n\nSee [merge request #275](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/275#note_732774)\n\nSee merge request !2\n",
+ "parent_ids": [
+ "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
+ "4cd80ccab63c82b4bad16faa5193fbd2aa06df40"
+ ],
+ "authored_date": "2015-01-10T22:23:29.000+01:00",
+ "author_name": "Sytse Sijbrandij",
+ "author_email": "sytse@gitlab.com",
+ "committed_date": "2015-01-10T22:23:29.000+01:00",
+ "committer_name": "Sytse Sijbrandij",
+ "committer_email": "sytse@gitlab.com"
+ },
+ {
+ "id": "4cd80ccab63c82b4bad16faa5193fbd2aa06df40",
+ "message": "add directory structure for tree_helper spec\n",
+ "parent_ids": [
+ "5937ac0a7beb003549fc5fd26fc247adbce4a52e"
+ ],
+ "authored_date": "2015-01-10T21:28:18.000+01:00",
+ "author_name": "marmis85",
+ "author_email": "marmis85@gmail.com",
+ "committed_date": "2015-01-10T21:28:18.000+01:00",
+ "committer_name": "marmis85",
+ "committer_email": "marmis85@gmail.com"
+ },
+ {
+ "id": "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
+ "message": "Add submodule from gitlab.com\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "570e7b2abdd848b95f2f578043fc23bd6f6fd24d"
+ ],
+ "authored_date": "2014-02-27T10:01:38.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T10:01:38.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
+ },
+ {
+ "id": "570e7b2abdd848b95f2f578043fc23bd6f6fd24d",
+ "message": "Change some files\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9"
+ ],
+ "authored_date": "2014-02-27T09:57:31.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T09:57:31.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
+ },
+ {
+ "id": "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9",
+ "message": "More submodules\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "d14d6c0abdd253381df51a723d58691b2ee1ab08"
+ ],
+ "authored_date": "2014-02-27T09:54:21.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T09:54:21.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
+ },
+ {
+ "id": "d14d6c0abdd253381df51a723d58691b2ee1ab08",
+ "message": "Remove ds_store files\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "c1acaa58bbcbc3eafe538cb8274ba387047b69f8"
+ ],
+ "authored_date": "2014-02-27T09:49:50.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T09:49:50.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
+ },
+ {
+ "id": "c1acaa58bbcbc3eafe538cb8274ba387047b69f8",
+ "message": "Ignore DS files\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
+ "parent_ids": [
+ "ae73cb07c9eeaf35924a10f713b364d32b2dd34f"
+ ],
+ "authored_date": "2014-02-27T09:48:32.000+01:00",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "committed_date": "2014-02-27T09:48:32.000+01:00",
+ "committer_name": "Dmitriy Zaporozhets",
+ "committer_email": "dmitriy.zaporozhets@gmail.com"
}
],
"st_diffs": [
{
+ "diff": "Binary files a/.DS_Store and /dev/null differ\n",
+ "new_path": ".DS_Store",
+ "old_path": ".DS_Store",
+ "a_mode": "100644",
+ "b_mode": "0",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": true,
+ "too_large": false
+ },
+ {
+ "diff": "--- a/.gitignore\n+++ b/.gitignore\n@@ -17,3 +17,4 @@ rerun.txt\n pickle-email-*.html\n .project\n config/initializers/secret_token.rb\n+.DS_Store\n",
+ "new_path": ".gitignore",
+ "old_path": ".gitignore",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- a/.gitmodules\n+++ b/.gitmodules\n@@ -1,3 +1,9 @@\n [submodule \"six\"]\n \tpath = six\n \turl = git://github.com/randx/six.git\n+[submodule \"gitlab-shell\"]\n+\tpath = gitlab-shell\n+\turl = https://github.com/gitlabhq/gitlab-shell.git\n+[submodule \"gitlab-grack\"]\n+\tpath = gitlab-grack\n+\turl = https://gitlab.com/gitlab-org/gitlab-grack.git\n",
+ "new_path": ".gitmodules",
+ "old_path": ".gitmodules",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- a/CHANGELOG\n+++ b/CHANGELOG\n@@ -1,4 +1,6 @@\n-v 6.7.0\n+v6.8.0\n+\n+v6.7.0\n - Add support for Gemnasium as a Project Service (Olivier Gonzalez)\n - Add edit file button to MergeRequest diff\n - Public groups (Jason Hollingsworth)\n",
+ "new_path": "CHANGELOG",
+ "old_path": "CHANGELOG",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/encoding/iso8859.txt\n@@ -0,0 +1 @@\n+Äü\n",
+ "new_path": "encoding/iso8859.txt",
+ "old_path": "encoding/iso8859.txt",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "Binary files a/files/.DS_Store and /dev/null differ\n",
+ "new_path": "files/.DS_Store",
+ "old_path": "files/.DS_Store",
+ "a_mode": "100644",
+ "b_mode": "0",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": true,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/files/images/wm.svg\n@@ -0,0 +1,78 @@\n+\u003c?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?\u003e\n+\u003csvg width=\"1300px\" height=\"680px\" viewBox=\"0 0 1300 680\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:sketch=\"http://www.bohemiancoding.com/sketch/ns\"\u003e\n+ \u003c!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch --\u003e\n+ \u003ctitle\u003ewm\u003c/title\u003e\n+ \u003cdesc\u003eCreated with Sketch.\u003c/desc\u003e\n+ \u003cdefs\u003e\n+ \u003cpath id=\"path-1\" d=\"M-69.8,1023.54607 L1675.19996,1023.54607 L1675.19996,0 L-69.8,0 L-69.8,1023.54607 L-69.8,1023.54607 Z\"\u003e\u003c/path\u003e\n+ \u003c/defs\u003e\n+ \u003cg id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" sketch:type=\"MSPage\"\u003e\n+ \u003cpath d=\"M1300,680 L0,680 L0,0 L1300,0 L1300,680 L1300,680 Z\" id=\"bg\" fill=\"#30353E\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cg id=\"gitlab_logo\" sketch:type=\"MSLayerGroup\" transform=\"translate(-262.000000, -172.000000)\"\u003e\n+ \u003cg id=\"g10\" transform=\"translate(872.500000, 512.354581) scale(1, -1) translate(-872.500000, -512.354581) translate(0.000000, 0.290751)\"\u003e\n+ \u003cg id=\"g12\" transform=\"translate(1218.022652, 440.744871)\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\n+ \u003cpath d=\"M-50.0233338,141.900706 L-69.07059,141.900706 L-69.0100967,0.155858152 L8.04444805,0.155858152 L8.04444805,17.6840847 L-49.9628405,17.6840847 L-50.0233338,141.900706 L-50.0233338,141.900706 Z\" id=\"path14\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g16\"\u003e\n+ \u003cg id=\"g18-Clipped\"\u003e\n+ \u003cmask id=\"mask-2\" sketch:name=\"path22\" fill=\"white\"\u003e\n+ \u003cuse xlink:href=\"#path-1\"\u003e\u003c/use\u003e\n+ \u003c/mask\u003e\n+ \u003cg id=\"path22\"\u003e\u003c/g\u003e\n+ \u003cg id=\"g18\" mask=\"url(#mask-2)\"\u003e\n+ \u003cg transform=\"translate(382.736659, 312.879425)\"\u003e\n+ \u003cg id=\"g24\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(852.718192, 124.992771)\"\u003e\n+ \u003cpath d=\"M63.9833317,27.9148929 C59.2218085,22.9379001 51.2134221,17.9597442 40.3909323,17.9597442 C25.8888194,17.9597442 20.0453962,25.1013043 20.0453962,34.4074318 C20.0453962,48.4730484 29.7848226,55.1819277 50.5642821,55.1819277 C54.4602853,55.1819277 60.7364685,54.7492469 63.9833317,54.1002256 L63.9833317,27.9148929 L63.9833317,27.9148929 Z M44.2869356,113.827628 C28.9053426,113.827628 14.7975996,108.376082 3.78897657,99.301416 L10.5211864,87.6422957 C18.3131929,92.1866076 27.8374026,96.7320827 41.4728323,96.7320827 C57.0568452,96.7320827 63.9833317,88.7239978 63.9833317,75.3074024 L63.9833317,68.3821827 C60.9528485,69.0312039 54.6766653,69.4650479 50.7806621,69.4650479 C17.4476729,69.4650479 0.565379986,57.7791759 0.565379986,33.3245665 C0.565379986,11.4683685 13.9844297,0.43151772 34.3299658,0.43151772 C48.0351955,0.43151772 61.1692285,6.70771614 65.7143717,16.8780421 L69.1776149,3.02876588 L82.5978279,3.02876588 L82.5978279,75.5237428 C82.5978279,98.462806 72.6408582,113.827628 44.2869356,113.827628 L44.2869356,113.827628 Z\" id=\"path26\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g28\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(959.546624, 124.857151)\"\u003e\n+ \u003cpath d=\"M37.2266657,17.4468081 C30.0837992,17.4468081 23.8064527,18.3121698 19.0449295,20.4767371 L19.0449295,79.2306079 L19.0449295,86.0464943 C25.538656,91.457331 33.5470425,95.3526217 43.7203922,95.3526217 C62.1173451,95.3526217 69.2602116,82.3687072 69.2602116,61.3767077 C69.2602116,31.5135879 57.7885819,17.4468081 37.2266657,17.4468081 M45.2315622,113.963713 C28.208506,113.963713 19.0449295,102.384849 19.0449295,102.384849 L19.0449295,120.67143 L18.9844362,144.908535 L10.3967097,144.908535 L0.371103324,144.908535 L0.431596656,6.62629771 C9.73826309,2.73100702 22.5081728,0.567602823 36.3611458,0.567602823 C71.8579349,0.567602823 88.9566078,23.2891625 88.9566078,62.4584098 C88.9566078,93.4043948 73.1527248,113.963713 45.2315622,113.963713\" id=\"path30\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g32\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(509.576747, 125.294950)\"\u003e\n+ \u003cpath d=\"M68.636665,129.10638 C85.5189579,129.10638 96.3414476,123.480366 103.484314,117.853189 L111.669527,132.029302 C100.513161,141.811145 85.5073245,147.06845 69.5021849,147.06845 C29.0274926,147.06845 0.673569983,122.3975 0.673569983,72.6252464 C0.673569983,20.4709215 31.2622559,0.12910638 66.2553217,0.12910638 C83.7879179,0.12910638 98.7227909,4.24073748 108.462217,8.35236859 L108.063194,64.0763105 L108.063194,70.6502677 L108.063194,81.6057001 L56.1168719,81.6057001 L56.1168719,64.0763105 L89.2323178,64.0763105 L89.6313411,21.7701271 C85.3025779,19.6055598 77.7269514,17.8748364 67.554765,17.8748364 C39.4172223,17.8748364 20.5863462,35.5717154 20.5863462,72.8415868 C20.5863462,110.711628 40.0663623,129.10638 68.636665,129.10638\" id=\"path34\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g36\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(692.388992, 124.376085)\"\u003e\n+ \u003cpath d=\"M19.7766662,145.390067 L1.16216997,145.390067 L1.2226633,121.585642 L1.2226633,111.846834 L1.2226633,106.170806 L1.2226633,96.2656714 L1.2226633,39.5681976 L1.2226633,39.3518572 C1.2226633,16.4127939 11.1796331,1.04797161 39.5335557,1.04797161 C43.4504989,1.04797161 47.2836822,1.40388649 51.0051854,2.07965952 L51.0051854,18.7925385 C48.3109055,18.3796307 45.4351455,18.1446804 42.3476589,18.1446804 C26.763646,18.1446804 19.8371595,26.1516022 19.8371595,39.5681976 L19.8371595,96.2656714 L51.0051854,96.2656714 L51.0051854,111.846834 L19.8371595,111.846834 L19.7766662,145.390067 L19.7766662,145.390067 Z\" id=\"path38\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cpath d=\"M646.318899,128.021188 L664.933395,128.021188 L664.933395,236.223966 L646.318899,236.223966 L646.318899,128.021188 L646.318899,128.021188 Z\" id=\"path40\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cpath d=\"M646.318899,251.154944 L664.933395,251.154944 L664.933395,269.766036 L646.318899,269.766036 L646.318899,251.154944 L646.318899,251.154944 Z\" id=\"path42\" fill=\"#8C929D\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003cg id=\"g44\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(0.464170, 0.676006)\"\u003e\n+ \u003cpath d=\"M429.269989,169.815599 L405.225053,243.802859 L357.571431,390.440955 C355.120288,397.984955 344.444378,397.984955 341.992071,390.440955 L294.337286,243.802859 L136.094873,243.802859 L88.4389245,390.440955 C85.9877812,397.984955 75.3118715,397.984955 72.8595648,390.440955 L25.2059427,243.802859 L1.16216997,169.815599 C-1.03187664,163.067173 1.37156997,155.674379 7.11261982,151.503429 L215.215498,0.336141836 L423.319539,151.503429 C429.060589,155.674379 431.462873,163.067173 429.269989,169.815599\" id=\"path46\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g48\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(135.410135, 1.012147)\"\u003e\n+ \u003cpath d=\"M80.269998,0 L80.269998,0 L159.391786,243.466717 L1.14820997,243.466717 L80.269998,0 L80.269998,0 Z\" id=\"path50\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g52\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012147)\"\u003e\n+ \u003cg id=\"path54\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g56\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(24.893471, 1.012613)\"\u003e\n+ \u003cpath d=\"M190.786662,0 L111.664874,243.465554 L0.777106647,243.465554 L190.786662,0 L190.786662,0 Z\" id=\"path58\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g60\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012613)\"\u003e\n+ \u003cg id=\"path62\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g64\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(0.077245, 0.223203)\"\u003e\n+ \u003cpath d=\"M25.5933327,244.255313 L25.5933327,244.255313 L1.54839663,170.268052 C-0.644486651,163.519627 1.75779662,156.126833 7.50000981,151.957046 L215.602888,0.789758846 L25.5933327,244.255313 L25.5933327,244.255313 Z\" id=\"path66\" fill=\"#FCA326\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g68\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012147)\"\u003e\n+ \u003cg id=\"path70\"\u003e\u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g72\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(25.670578, 244.478283)\"\u003e\n+ \u003cpath d=\"M0,0 L110.887767,0 L63.2329818,146.638096 C60.7806751,154.183259 50.1047654,154.183259 47.6536221,146.638096 L0,0 L0,0 Z\" id=\"path74\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g76\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(215.680133, 1.012613)\"\u003e\n+ \u003cpath d=\"M0,0 L79.121788,243.465554 L190.009555,243.465554 L0,0 L0,0 Z\" id=\"path78\" fill=\"#FC6D26\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g80\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(214.902910, 0.223203)\"\u003e\n+ \u003cpath d=\"M190.786662,244.255313 L190.786662,244.255313 L214.831598,170.268052 C217.024481,163.519627 214.622198,156.126833 208.879985,151.957046 L0.777106647,0.789758846 L190.786662,244.255313 L190.786662,244.255313 Z\" id=\"path82\" fill=\"#FCA326\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003cg id=\"g84\" stroke-width=\"1\" fill=\"none\" sketch:type=\"MSLayerGroup\" transform=\"translate(294.009575, 244.478283)\"\u003e\n+ \u003cpath d=\"M111.679997,0 L0.79222998,0 L48.4470155,146.638096 C50.8993221,154.183259 61.5752318,154.183259 64.0263751,146.638096 L111.679997,0 L111.679997,0 Z\" id=\"path86\" fill=\"#E24329\" sketch:type=\"MSShapeGroup\"\u003e\u003c/path\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+ \u003c/g\u003e\n+\u003c/svg\u003e\n\\ No newline at end of file\n",
+ "new_path": "files/images/wm.svg",
+ "old_path": "files/images/wm.svg",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/files/lfs/lfs_object.iso\n@@ -0,0 +1,4 @@\n+version https://git-lfs.github.com/spec/v1\n+oid sha256:91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897\n+size 1575078\n+\n",
+ "new_path": "files/lfs/lfs_object.iso",
+ "old_path": "files/lfs/lfs_object.iso",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- a/files/ruby/popen.rb\n+++ b/files/ruby/popen.rb\n@@ -6,12 +6,18 @@ module Popen\n \n def popen(cmd, path=nil)\n unless cmd.is_a?(Array)\n- raise \"System commands must be given as an array of strings\"\n+ raise RuntimeError, \"System commands must be given as an array of strings\"\n end\n \n path ||= Dir.pwd\n- vars = { \"PWD\" =\u003e path }\n- options = { chdir: path }\n+\n+ vars = {\n+ \"PWD\" =\u003e path\n+ }\n+\n+ options = {\n+ chdir: path\n+ }\n \n unless File.directory?(path)\n FileUtils.mkdir_p(path)\n@@ -19,6 +25,7 @@ module Popen\n \n @cmd_output = \"\"\n @cmd_status = 0\n+\n Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr|\n @cmd_output \u003c\u003c stdout.read\n @cmd_output \u003c\u003c stderr.read\n",
+ "new_path": "files/ruby/popen.rb",
+ "old_path": "files/ruby/popen.rb",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- a/files/ruby/regex.rb\n+++ b/files/ruby/regex.rb\n@@ -19,14 +19,12 @@ module Gitlab\n end\n \n def archive_formats_regex\n- #|zip|tar| tar.gz | tar.bz2 |\n- /(zip|tar|tar\\.gz|tgz|gz|tar\\.bz2|tbz|tbz2|tb2|bz2)/\n+ /(zip|tar|7z|tar\\.gz|tgz|gz|tar\\.bz2|tbz|tbz2|tb2|bz2)/\n end\n \n def git_reference_regex\n # Valid git ref regex, see:\n # https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html\n-\n %r{\n (?!\n (?# doesn't begins with)\n",
+ "new_path": "files/ruby/regex.rb",
+ "old_path": "files/ruby/regex.rb",
+ "a_mode": "100644",
+ "b_mode": "100644",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/files/whitespace\n@@ -0,0 +1 @@\n+test \n",
+ "new_path": "files/whitespace",
+ "old_path": "files/whitespace",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/foo/bar/.gitkeep\n",
+ "new_path": "foo/bar/.gitkeep",
+ "old_path": "foo/bar/.gitkeep",
+ "a_mode": "0",
+ "b_mode": "100644",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/gitlab-grack\n@@ -0,0 +1 @@\n+Subproject commit 645f6c4c82fd3f5e06f67134450a570b795e55a6\n",
+ "new_path": "gitlab-grack",
+ "old_path": "gitlab-grack",
+ "a_mode": "0",
+ "b_mode": "160000",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
+ "diff": "--- /dev/null\n+++ b/gitlab-shell\n@@ -0,0 +1 @@\n+Subproject commit 79bceae69cb5750d6567b223597999bfa91cb3b9\n",
+ "new_path": "gitlab-shell",
+ "old_path": "gitlab-shell",
+ "a_mode": "0",
+ "b_mode": "160000",
+ "new_file": true,
+ "renamed_file": false,
+ "deleted_file": false,
+ "too_large": false
+ },
+ {
"diff": "--- /dev/null\n+++ b/test\n",
"new_path": "test",
"old_path": "test",
@@ -4634,34 +6117,60 @@
}
],
"merge_request_id": 10,
- "created_at": "2016-03-22T15:13:44.107Z",
- "updated_at": "2016-03-22T15:13:44.190Z",
- "base_commit_sha": "be93687618e4b132087f430a4d8fc3a609c9b77c",
- "real_size": "1"
- }
+ "created_at": "2016-06-14T15:02:23.019Z",
+ "updated_at": "2016-06-14T15:02:23.493Z",
+ "base_commit_sha": "ae73cb07c9eeaf35924a10f713b364d32b2dd34f",
+ "real_size": "15"
+ },
+ "events": [
+ {
+ "id": 228,
+ "target_type": "MergeRequest",
+ "target_id": 10,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:23.660Z",
+ "updated_at": "2016-06-14T15:02:23.660Z",
+ "action": 1,
+ "author_id": 1
+ },
+ {
+ "id": 170,
+ "target_type": "MergeRequest",
+ "target_id": 10,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:23.660Z",
+ "updated_at": "2016-06-14T15:02:23.660Z",
+ "action": 1,
+ "author_id": 20
+ }
+ ]
},
{
"id": 9,
- "target_branch": "test-8",
- "source_branch": "test-9",
+ "target_branch": "test-6",
+ "source_branch": "test-12",
"source_project_id": 5,
- "author_id": 24,
- "assignee_id": 3,
- "title": "Saepe et neque ut vero nobis et voluptatum facere qui minima.",
- "created_at": "2016-03-22T15:13:43.792Z",
- "updated_at": "2016-03-22T15:20:32.309Z",
- "milestone_id": 10,
+ "author_id": 16,
+ "assignee_id": 6,
+ "title": "Et ipsam voluptas velit sequi illum ut.",
+ "created_at": "2016-06-14T15:02:22.825Z",
+ "updated_at": "2016-06-14T15:03:00.904Z",
+ "milestone_id": 16,
"state": "opened",
"merge_status": "unchecked",
"target_project_id": 5,
"iid": 1,
- "description": "Autem enim aliquam labore qui voluptas ut voluptatem. Et corrupti sit fuga dolores alias iusto voluptatem. Excepturi ut saepe accusamus neque distinctio.",
+ "description": "Eveniet nihil ratione veniam similique qui aut sapiente tempora. Sed praesentium iusto dignissimos possimus id repudiandae quo nihil. Qui doloremque autem et iure fugit.",
"position": 0,
"locked_at": null,
"updated_by_id": null,
"merge_error": null,
"merge_params": {
-
+ "force_remove_source_branch": null
},
"merge_when_build_succeeds": false,
"merge_user_id": null,
@@ -4669,12 +6178,12 @@
"deleted_at": null,
"notes": [
{
- "id": 1279,
- "note": "A corrupti nesciunt pariatur ea.",
+ "id": 825,
+ "note": "Aliquid voluptatem consequatur voluptas ex perspiciatis.",
"noteable_type": "MergeRequest",
- "author_id": 1,
- "created_at": "2016-03-22T15:20:32.307Z",
- "updated_at": "2016-03-22T15:20:32.307Z",
+ "author_id": 26,
+ "created_at": "2016-06-14T15:03:00.722Z",
+ "updated_at": "2016-06-14T15:03:00.722Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4685,17 +6194,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Administrator"
- }
+ "author": {
+ "name": "User 4"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1278,
- "note": "Adipisci aut ut et voluptate numquam.",
+ "id": 826,
+ "note": "Itaque optio voluptatem praesentium voluptas.",
"noteable_type": "MergeRequest",
- "author_id": 3,
- "created_at": "2016-03-22T15:20:32.281Z",
- "updated_at": "2016-03-22T15:20:32.281Z",
+ "author_id": 25,
+ "created_at": "2016-06-14T15:03:00.745Z",
+ "updated_at": "2016-06-14T15:03:00.745Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4706,17 +6218,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Alexie Trantow"
- }
+ "author": {
+ "name": "User 3"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1277,
- "note": "Adipisci voluptatem quod ut placeat repellendus deleniti.",
+ "id": 827,
+ "note": "Ut est corporis fuga asperiores delectus excepturi aperiam.",
"noteable_type": "MergeRequest",
- "author_id": 4,
- "created_at": "2016-03-22T15:20:32.255Z",
- "updated_at": "2016-03-22T15:20:32.255Z",
+ "author_id": 22,
+ "created_at": "2016-06-14T15:03:00.771Z",
+ "updated_at": "2016-06-14T15:03:00.771Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4727,17 +6242,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Julius Moore"
- }
+ "author": {
+ "name": "User 0"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1276,
- "note": "Vitae et doloremque aut et aspernatur velit placeat sed.",
+ "id": 828,
+ "note": "Similique ea dolore officiis temporibus.",
"noteable_type": "MergeRequest",
- "author_id": 10,
- "created_at": "2016-03-22T15:20:32.230Z",
- "updated_at": "2016-03-22T15:20:32.230Z",
+ "author_id": 20,
+ "created_at": "2016-06-14T15:03:00.798Z",
+ "updated_at": "2016-06-14T15:03:00.798Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4748,17 +6266,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Robyn McCullough Jr."
- }
+ "author": {
+ "name": "Ottis Schuster II"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1275,
- "note": "Quos cupiditate nesciunt expedita aspernatur.",
+ "id": 829,
+ "note": "Qui laudantium qui quae quis.",
"noteable_type": "MergeRequest",
- "author_id": 12,
- "created_at": "2016-03-22T15:20:32.207Z",
- "updated_at": "2016-03-22T15:20:32.207Z",
+ "author_id": 16,
+ "created_at": "2016-06-14T15:03:00.828Z",
+ "updated_at": "2016-06-14T15:03:00.828Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4769,17 +6290,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "Vladimir McCullough"
- }
+ "author": {
+ "name": "Rhett Emmerich IV"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1274,
- "note": "Optio rem inventore dicta praesentium sit.",
+ "id": 830,
+ "note": "Et vel voluptas amet laborum qui soluta.",
"noteable_type": "MergeRequest",
- "author_id": 22,
- "created_at": "2016-03-22T15:20:32.181Z",
- "updated_at": "2016-03-22T15:20:32.181Z",
+ "author_id": 15,
+ "created_at": "2016-06-14T15:03:00.850Z",
+ "updated_at": "2016-06-14T15:03:00.850Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4790,17 +6314,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 0"
- }
+ "author": {
+ "name": "Burdette Bernier"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1273,
- "note": "Sit incidunt molestiae maxime officiis rerum necessitatibus.",
+ "id": 831,
+ "note": "Enim ad consequuntur assumenda provident voluptatem similique deleniti.",
"noteable_type": "MergeRequest",
- "author_id": 24,
- "created_at": "2016-03-22T15:20:32.159Z",
- "updated_at": "2016-03-22T15:20:32.159Z",
+ "author_id": 6,
+ "created_at": "2016-06-14T15:03:00.876Z",
+ "updated_at": "2016-06-14T15:03:00.876Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4811,17 +6338,20 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 2"
- }
+ "author": {
+ "name": "Ari Wintheiser"
+ },
+ "events": [
+
+ ]
},
{
- "id": 1272,
- "note": "Autem ut non itaque molestiae nisi quia officiis doloribus.",
+ "id": 832,
+ "note": "Officiis sequi commodi pariatur totam fugiat voluptas corporis dignissimos.",
"noteable_type": "MergeRequest",
- "author_id": 26,
- "created_at": "2016-03-22T15:20:32.129Z",
- "updated_at": "2016-03-22T15:20:32.129Z",
+ "author_id": 1,
+ "created_at": "2016-06-14T15:03:00.902Z",
+ "updated_at": "2016-06-14T15:03:00.902Z",
"project_id": 5,
"attachment": {
"url": null
@@ -4832,9 +6362,12 @@
"system": false,
"st_diff": null,
"updated_by_id": null,
- "author": {
- "name": "User 4"
- }
+ "author": {
+ "name": "Administrator"
+ },
+ "events": [
+
+ ]
}
],
"merge_request_diff": {
@@ -4842,17 +6375,17 @@
"state": "collected",
"st_commits": [
{
- "id": "e239ba8c97b80b2874579a4d625ea9628f4c8ff5",
+ "id": "a4e5dfebf42e34596526acb8611bc7ed80e4eb3f",
"message": "fixes #10\n",
"parent_ids": [
"be93687618e4b132087f430a4d8fc3a609c9b77c"
],
- "authored_date": "2016-01-19T15:38:06.000+01:00",
- "author_name": "Test Lopez",
- "author_email": "Test@Testlopez.es",
- "committed_date": "2016-01-19T15:38:06.000+01:00",
- "committer_name": "Test Lopez",
- "committer_email": "Test@Testlopez.es"
+ "authored_date": "2016-01-19T15:44:02.000+01:00",
+ "author_name": "James Lopez",
+ "author_email": "james@jameslopez.es",
+ "committed_date": "2016-01-19T15:44:02.000+01:00",
+ "committer_name": "James Lopez",
+ "committer_email": "james@jameslopez.es"
}
],
"st_diffs": [
@@ -4869,11 +6402,37 @@
}
],
"merge_request_id": 9,
- "created_at": "2016-03-22T15:13:43.794Z",
- "updated_at": "2016-03-22T15:13:43.848Z",
+ "created_at": "2016-06-14T15:02:22.829Z",
+ "updated_at": "2016-06-14T15:02:22.900Z",
"base_commit_sha": "be93687618e4b132087f430a4d8fc3a609c9b77c",
"real_size": "1"
- }
+ },
+ "events": [
+ {
+ "id": 229,
+ "target_type": "MergeRequest",
+ "target_id": 9,
+ "title": null,
+ "data": null,
+ "project_id": 36,
+ "created_at": "2016-06-14T15:02:22.927Z",
+ "updated_at": "2016-06-14T15:02:22.927Z",
+ "action": 1,
+ "author_id": 16
+ },
+ {
+ "id": 169,
+ "target_type": "MergeRequest",
+ "target_id": 9,
+ "title": null,
+ "data": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:22.927Z",
+ "updated_at": "2016-06-14T15:02:22.927Z",
+ "action": 1,
+ "author_id": 16
+ }
+ ]
}
],
"pipelines": [
@@ -5360,5 +6919,464 @@
}
]
}
+ ],
+ "variables": [
+
+ ],
+ "triggers": [
+
+ ],
+ "deploy_keys": [
+
+ ],
+ "services": [
+ {
+ "id": 164,
+ "title": null,
+ "project_id": 5,
+ "created_at": "2016-06-14T15:02:07.372Z",
+ "updated_at": "2016-06-14T15:02:07.372Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "issue_tracker",
+ "default": true,
+ "wiki_page_events": true
+ },
+ {
+ "id": 100,
+ "title": "JetBrains TeamCity CI",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.315Z",
+ "updated_at": "2016-06-14T15:01:51.315Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "ci",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 99,
+ "title": "Slack",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.303Z",
+ "updated_at": "2016-06-14T15:01:51.303Z",
+ "active": false,
+ "properties": {
+ "notify_only_broken_builds": true
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 98,
+ "title": "Redmine",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.289Z",
+ "updated_at": "2016-06-14T15:01:51.289Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "issue_tracker",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 97,
+ "title": "Pushover",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.277Z",
+ "updated_at": "2016-06-14T15:01:51.277Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 96,
+ "title": "PivotalTracker",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.267Z",
+ "updated_at": "2016-06-14T15:01:51.267Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 95,
+ "title": "JIRA",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.255Z",
+ "updated_at": "2016-06-14T15:01:51.255Z",
+ "active": false,
+ "properties": {
+ "api_url": "",
+ "jira_issue_transition_id": "2"
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "issue_tracker",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 94,
+ "title": "Irker (IRC gateway)",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.232Z",
+ "updated_at": "2016-06-14T15:01:51.232Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 93,
+ "title": "HipChat",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.219Z",
+ "updated_at": "2016-06-14T15:01:51.219Z",
+ "active": false,
+ "properties": {
+ "notify_only_broken_builds": true
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 92,
+ "title": "Gemnasium",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.202Z",
+ "updated_at": "2016-06-14T15:01:51.202Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 91,
+ "title": "Flowdock",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.182Z",
+ "updated_at": "2016-06-14T15:01:51.182Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 90,
+ "title": "External Wiki",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.166Z",
+ "updated_at": "2016-06-14T15:01:51.166Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 89,
+ "title": "Emails on push",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.153Z",
+ "updated_at": "2016-06-14T15:01:51.153Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 88,
+ "title": "Drone CI",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.139Z",
+ "updated_at": "2016-06-14T15:01:51.139Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "ci",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 87,
+ "title": "Custom Issue Tracker",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.125Z",
+ "updated_at": "2016-06-14T15:01:51.125Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "issue_tracker",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 86,
+ "title": "Campfire",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.113Z",
+ "updated_at": "2016-06-14T15:01:51.113Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 85,
+ "title": "Builds emails",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.090Z",
+ "updated_at": "2016-06-14T15:01:51.090Z",
+ "active": false,
+ "properties": {
+ "notify_only_broken_builds": true
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 84,
+ "title": "Buildkite",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.080Z",
+ "updated_at": "2016-06-14T15:01:51.080Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "ci",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 83,
+ "title": "Atlassian Bamboo CI",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.067Z",
+ "updated_at": "2016-06-14T15:01:51.067Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "ci",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 82,
+ "title": "Assembla",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.047Z",
+ "updated_at": "2016-06-14T15:01:51.047Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ },
+ {
+ "id": 81,
+ "title": "Asana",
+ "project_id": 5,
+ "created_at": "2016-06-14T15:01:51.031Z",
+ "updated_at": "2016-06-14T15:01:51.031Z",
+ "active": false,
+ "properties": {
+
+ },
+ "template": false,
+ "push_events": true,
+ "issues_events": true,
+ "merge_requests_events": true,
+ "tag_push_events": true,
+ "note_events": true,
+ "build_events": true,
+ "category": "common",
+ "default": false,
+ "wiki_page_events": true
+ }
+ ],
+ "hooks": [
+
+ ],
+ "protected_branches": [
+
]
} \ No newline at end of file
diff --git a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
index 23036ab8108..e401ca99077 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -24,6 +24,12 @@ describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
expect(Ci::Pipeline.first.notes).not_to be_empty
end
+
+ it 'restores the correct event' do
+ restored_project_json
+
+ expect(Event.where.not(data: nil).first.data[:ref]).not_to be_empty
+ end
end
end
end
diff --git a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
index 8d29b2f8fd1..3b98045a2fc 100644
--- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
@@ -34,7 +34,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
end
it 'has events' do
- expect(saved_project_json['events']).not_to be_empty
+ expect(saved_project_json['milestones'].first['events']).not_to be_empty
end
it 'has milestones' do
@@ -132,7 +132,7 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
statuses: [commit_status])
create(:ci_build, pipeline: ci_pipeline, project: project)
- create(:milestone, project: project)
+ milestone = create(:milestone, project: project)
create(:note, noteable: issue, project: project)
create(:note, noteable: merge_request, project: project)
create(:note, noteable: snippet, project: project)
@@ -140,6 +140,9 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
author: user,
project: project,
commit_id: ci_pipeline.sha)
+
+ create(:event, target: milestone, project: project, action: Event::CREATED, author: user)
+
project
end