Add latest changes from gitlab-org/gitlab@master

spec/fixtures/lib/gitlab/import_export/project.json

@@ -6161,7 +6161,7 @@
     {
       "id": 36,
       "project_id": 5,
-      "ref": "master",
+      "ref": null,
       "sha": "sha-notes",
       "before_sha": null,
       "push_data": null,
@@ -6289,19 +6289,21 @@
     {
       "id": 37,
       "project_id": 5,
-      "ref": null,
+      "ref": "master",
       "sha": "048721d90c449b244b7b4c53a9186b04330174ec",
       "before_sha": null,
       "push_data": null,
       "created_at": "2016-03-22T15:20:35.757Z",
       "updated_at": "2016-03-22T15:20:35.757Z",
-      "tag": null,
+      "tag": false,
       "yaml_errors": null,
       "committed_at": null,
       "status": "failed",
       "started_at": null,
       "finished_at": null,
       "duration": null,
+      "source": "merge_request_event",
+      "merge_request_id": 27,
       "stages": [
         {
           "id": 21,
@@ -6372,7 +6374,32 @@
             }
           ]
         }
-      ]
+      ],
+      "merge_request": {
+        "id": 27,
+        "target_branch": "feature",
+        "source_branch": "feature_conflict",
+        "source_project_id": 999,
+        "author_id": 1,
+        "assignee_id": null,
+        "title": "MR1",
+        "created_at": "2016-06-14T15:02:36.568Z",
+        "updated_at": "2016-06-14T15:02:56.815Z",
+        "state": "opened",
+        "merge_status": "unchecked",
+        "target_project_id": 5,
+        "iid": 9,
+        "description": null,
+        "position": 0,
+        "updated_by_id": null,
+        "merge_error": null,
+        "diff_head_sha": "HEAD",
+        "source_branch_sha": "ABCD",
+        "target_branch_sha": "DCBA",
+        "merge_params": {
+          "force_remove_source_branch": null
+        }
+      }
     },
     {
       "id": 38,

spec/lib/gitlab/import_export/model_configuration_spec.rb

@@ -12,9 +12,9 @@ describe 'Import/Export model configuration' do
     # Remove duplicated or add missing models
     # - project is not part of the tree, so it has to be added manually.
-    # - milestone, labels have both singular and plural versions in the tree, so remove the duplicates.
+    # - milestone, labels, merge_request have both singular and plural versions in the tree, so remove the duplicates.
     # - User, Author... Models we do not care about for checking models
-    names.flatten.uniq - %w(milestones labels user author) + ['project']
+    names.flatten.uniq - %w(milestones labels user author merge_request) + ['project']
   end
   let(:all_models_yml) { 'spec/lib/gitlab/import_export/all_models.yml' }
   let(:all_models_hash) { YAML.load_file(all_models_yml) }

spec/serializers/analytics_build_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AnalyticsBuildEntity do

spec/serializers/analytics_build_serializer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AnalyticsBuildSerializer do

spec/serializers/analytics_issue_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AnalyticsIssueEntity do

spec/serializers/analytics_issue_serializer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AnalyticsIssueSerializer do

spec/serializers/analytics_merge_request_serializer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AnalyticsMergeRequestSerializer do

spec/serializers/analytics_stage_serializer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AnalyticsStageSerializer do

spec/serializers/analytics_summary_serializer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe AnalyticsSummarySerializer do

spec/serializers/blob_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BlobEntity do

spec/serializers/build_action_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BuildActionEntity do

spec/serializers/build_artifact_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BuildArtifactEntity do

spec/serializers/build_details_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BuildDetailsEntity do

spec/serializers/build_serializer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe BuildSerializer do

spec/serializers/cluster_application_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe ClusterApplicationEntity do

spec/serializers/cluster_basic_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe ClusterBasicEntity do

spec/serializers/cluster_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe ClusterEntity do

spec/serializers/cluster_serializer_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe ClusterSerializer do

spec/serializers/commit_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe CommitEntity do

spec/serializers/container_repository_entity_spec.rb

+# frozen_string_literal: true
+
 require 'spec_helper'
 describe ContainerRepositoryEntity do