Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-ee-to-ce-backport

137 files changed, 8096 insertions, 1026 deletions

diff --git a/spec/lib/api/helpers/pagination_spec.rb b/spec/lib/api/helpers/pagination_spec.rb
index 59deca7757b..a547988d631 100644
--- a/spec/lib/api/helpers/pagination_spec.rb
+++ b/spec/lib/api/helpers/pagination_spec.rb
@@ -92,6 +92,27 @@ describe API::Helpers::Pagination do
           subject.paginate(resource)
         end
       end
+
+      context 'if order' do
+        it 'is not present it adds default order(:id) if no order is present' do
+          resource.order_values = []
+
+          paginated_relation = subject.paginate(resource)
+
+          expect(resource.order_values).to be_empty
+          expect(paginated_relation.order_values).to be_present
+          expect(paginated_relation.order_values.first).to be_ascending
+          expect(paginated_relation.order_values.first.expr.name).to eq :id
+        end
+
+        it 'is present it does not add anything' do
+          paginated_relation = subject.paginate(resource.order(created_at: :desc))
+
+          expect(paginated_relation.order_values).to be_present
+          expect(paginated_relation.order_values.first).to be_descending
+          expect(paginated_relation.order_values.first.expr.name).to eq :created_at
+        end
+      end
     end
 
     context 'when resource empty' do
diff --git a/spec/lib/api/helpers_spec.rb b/spec/lib/api/helpers_spec.rb
new file mode 100644
index 00000000000..3c4deba4712
--- /dev/null
+++ b/spec/lib/api/helpers_spec.rb
@@ -0,0 +1,109 @@
+require 'spec_helper'
+
+describe API::Helpers do
+  subject { Class.new.include(described_class).new }
+
+  describe '#find_namespace' do
+    let(:namespace) { create(:namespace) }
+
+    shared_examples 'namespace finder' do
+      context 'when namespace exists' do
+        it 'returns requested namespace' do
+          expect(subject.find_namespace(existing_id)).to eq(namespace)
+        end
+      end
+
+      context "when namespace doesn't exists" do
+        it 'returns nil' do
+          expect(subject.find_namespace(non_existing_id)).to be_nil
+        end
+      end
+    end
+
+    context 'when ID is used as an argument' do
+      let(:existing_id) { namespace.id }
+      let(:non_existing_id) { 9999 }
+
+      it_behaves_like 'namespace finder'
+    end
+
+    context 'when PATH is used as an argument' do
+      let(:existing_id) { namespace.path }
+      let(:non_existing_id) { 'non-existing-path' }
+
+      it_behaves_like 'namespace finder'
+    end
+  end
+
+  shared_examples 'user namespace finder' do
+    let(:user1) { create(:user) }
+
+    before do
+      allow(subject).to receive(:current_user).and_return(user1)
+      allow(subject).to receive(:header).and_return(nil)
+      allow(subject).to receive(:not_found!).and_raise('404 Namespace not found')
+    end
+
+    context 'when namespace is group' do
+      let(:namespace) { create(:group) }
+
+      context 'when user has access to group' do
+        before do
+          namespace.add_guest(user1)
+          namespace.save!
+        end
+
+        it 'returns requested namespace' do
+          expect(namespace_finder).to eq(namespace)
+        end
+      end
+
+      context "when user doesn't have access to group" do
+        it 'raises not found error' do
+          expect { namespace_finder }.to raise_error(RuntimeError, '404 Namespace not found')
+        end
+      end
+    end
+
+    context "when namespace is user's personal namespace" do
+      let(:namespace) { create(:namespace) }
+
+      context 'when user owns the namespace' do
+        before do
+          namespace.owner = user1
+          namespace.save!
+        end
+
+        it 'returns requested namespace' do
+          expect(namespace_finder).to eq(namespace)
+        end
+      end
+
+      context "when user doesn't own the namespace" do
+        it 'raises not found error' do
+          expect { namespace_finder }.to raise_error(RuntimeError, '404 Namespace not found')
+        end
+      end
+    end
+  end
+
+  describe '#find_namespace!' do
+    let(:namespace_finder) do
+      subject.find_namespace!(namespace.id)
+    end
+
+    it_behaves_like 'user namespace finder'
+  end
+
+  describe '#user_namespace' do
+    let(:namespace_finder) do
+      subject.user_namespace
+    end
+
+    before do
+      allow(subject).to receive(:params).and_return({ id: namespace.id })
+    end
+
+    it_behaves_like 'user namespace finder'
+  end
+end
diff --git a/spec/lib/gitlab/backup/manager_spec.rb b/spec/lib/backup/manager_spec.rb
index b68301a066a..b68301a066a 100644
--- a/spec/lib/gitlab/backup/manager_spec.rb
+++ b/spec/lib/backup/manager_spec.rb
diff --git a/spec/lib/backup/repository_spec.rb b/spec/lib/backup/repository_spec.rb
new file mode 100644
index 00000000000..6ee3d531d6e
--- /dev/null
+++ b/spec/lib/backup/repository_spec.rb
@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe Backup::Repository do
+  let(:progress) { StringIO.new }
+  let!(:project) { create(:project) }
+
+  before do
+    allow(progress).to receive(:puts)
+    allow(progress).to receive(:print)
+
+    allow_any_instance_of(String).to receive(:color) do |string, _color|
+      string
+    end
+
+    allow_any_instance_of(described_class).to receive(:progress).and_return(progress)
+  end
+
+  describe '#dump' do
+    describe 'repo failure' do
+      before do
+        allow(Gitlab::Popen).to receive(:popen).and_return(['normal output', 0])
+      end
+
+      it 'does not raise error' do
+        expect { described_class.new.dump }.not_to raise_error
+      end
+    end
+  end
+
+  describe '#restore' do
+    describe 'command failure' do
+      before do
+        allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
+      end
+
+      it 'shows the appropriate error' do
+        described_class.new.restore
+
+        expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} - error")
+      end
+    end
+  end
+
+  describe '#empty_repo?' do
+    context 'for a wiki' do
+      let(:wiki) { create(:project_wiki) }
+
+      it 'invalidates the emptiness cache' do
+        expect(wiki.repository).to receive(:expire_emptiness_caches).once
+
+        wiki.empty?
+      end
+
+      context 'wiki repo has content' do
+        let!(:wiki_page) { create(:wiki_page, wiki: wiki) }
+
+        it 'returns true, regardless of bad cache value' do
+          expect(described_class.new.send(:empty_repo?, wiki)).to be(false)
+        end
+      end
+
+      context 'wiki repo does not have content' do
+        it 'returns true, regardless of bad cache value' do
+          expect(described_class.new.send(:empty_repo?, wiki)).to be_truthy
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/banzai/cross_project_reference_spec.rb b/spec/lib/banzai/cross_project_reference_spec.rb
index d70749536b8..68ca960caab 100644
--- a/spec/lib/banzai/cross_project_reference_spec.rb
+++ b/spec/lib/banzai/cross_project_reference_spec.rb
@@ -3,20 +3,20 @@ require 'spec_helper'
 describe Banzai::CrossProjectReference do
   include described_class
 
-  describe '#project_from_ref' do
+  describe '#parent_from_ref' do
     context 'when no project was referenced' do
       it 'returns the project from context' do
         project = double
 
         allow(self).to receive(:context).and_return({ project: project })
 
-        expect(project_from_ref(nil)).to eq project
+        expect(parent_from_ref(nil)).to eq project
       end
     end
 
     context 'when referenced project does not exist' do
       it 'returns nil' do
-        expect(project_from_ref('invalid/reference')).to be_nil
+        expect(parent_from_ref('invalid/reference')).to be_nil
       end
     end
 
@@ -27,7 +27,7 @@ describe Banzai::CrossProjectReference do
         expect(Project).to receive(:find_by_full_path)
           .with('cross/reference').and_return(project2)
 
-        expect(project_from_ref('cross/reference')).to eq project2
+        expect(parent_from_ref('cross/reference')).to eq project2
       end
     end
   end
diff --git a/spec/lib/banzai/filter/abstract_reference_filter_spec.rb b/spec/lib/banzai/filter/abstract_reference_filter_spec.rb
index 7c0ba9ee67f..1e82d18d056 100644
--- a/spec/lib/banzai/filter/abstract_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/abstract_reference_filter_spec.rb
@@ -3,67 +3,67 @@ require 'spec_helper'
 describe Banzai::Filter::AbstractReferenceFilter do
   let(:project) { create(:project) }
 
-  describe '#references_per_project' do
-    it 'returns a Hash containing references grouped per project paths' do
+  describe '#references_per_parent' do
+    it 'returns a Hash containing references grouped per parent paths' do
       doc = Nokogiri::HTML.fragment("#1 #{project.full_path}#2")
       filter = described_class.new(doc, project: project)
 
       expect(filter).to receive(:object_class).exactly(4).times.and_return(Issue)
       expect(filter).to receive(:object_sym).twice.and_return(:issue)
 
-      refs = filter.references_per_project
+      refs = filter.references_per_parent
 
       expect(refs).to be_an_instance_of(Hash)
       expect(refs[project.full_path]).to eq(Set.new(%w[1 2]))
     end
   end
 
-  describe '#projects_per_reference' do
-    it 'returns a Hash containing projects grouped per project paths' do
+  describe '#parent_per_reference' do
+    it 'returns a Hash containing projects grouped per parent paths' do
       doc = Nokogiri::HTML.fragment('')
       filter = described_class.new(doc, project: project)
 
-      expect(filter).to receive(:references_per_project)
+      expect(filter).to receive(:references_per_parent)
         .and_return({ project.full_path => Set.new(%w[1]) })
 
-      expect(filter.projects_per_reference)
+      expect(filter.parent_per_reference)
         .to eq({ project.full_path => project })
     end
   end
 
-  describe '#find_projects_for_paths' do
+  describe '#find_for_paths' do
     let(:doc) { Nokogiri::HTML.fragment('') }
     let(:filter) { described_class.new(doc, project: project) }
 
     context 'with RequestStore disabled' do
       it 'returns a list of Projects for a list of paths' do
-        expect(filter.find_projects_for_paths([project.full_path]))
+        expect(filter.find_for_paths([project.full_path]))
           .to eq([project])
       end
 
       it "return an empty array for paths that don't exist" do
-        expect(filter.find_projects_for_paths(['nonexistent/project']))
+        expect(filter.find_for_paths(['nonexistent/project']))
           .to eq([])
       end
     end
 
     context 'with RequestStore enabled', :request_store do
       it 'returns a list of Projects for a list of paths' do
-        expect(filter.find_projects_for_paths([project.full_path]))
+        expect(filter.find_for_paths([project.full_path]))
           .to eq([project])
       end
 
       context "when no project with that path exists" do
         it "returns no value" do
-          expect(filter.find_projects_for_paths(['nonexistent/project']))
+          expect(filter.find_for_paths(['nonexistent/project']))
             .to eq([])
         end
 
         it "adds the ref to the project refs cache" do
           project_refs_cache = {}
-          allow(filter).to receive(:project_refs_cache).and_return(project_refs_cache)
+          allow(filter).to receive(:refs_cache).and_return(project_refs_cache)
 
-          filter.find_projects_for_paths(['nonexistent/project'])
+          filter.find_for_paths(['nonexistent/project'])
 
           expect(project_refs_cache).to eq({ 'nonexistent/project' => nil })
         end
@@ -71,11 +71,11 @@ describe Banzai::Filter::AbstractReferenceFilter do
         context 'when the project refs cache includes nil values' do
           before do
             # adds { 'nonexistent/project' => nil } to cache
-            filter.project_from_ref_cached('nonexistent/project')
+            filter.from_ref_cached('nonexistent/project')
           end
 
           it "return an empty array for paths that don't exist" do
-            expect(filter.find_projects_for_paths(['nonexistent/project']))
+            expect(filter.find_for_paths(['nonexistent/project']))
               .to eq([])
           end
         end
@@ -83,12 +83,12 @@ describe Banzai::Filter::AbstractReferenceFilter do
     end
   end
 
-  describe '#current_project_path' do
-    it 'returns the path of the current project' do
+  describe '#current_parent_path' do
+    it 'returns the path of the current parent' do
       doc = Nokogiri::HTML.fragment('')
       filter = described_class.new(doc, project: project)
 
-      expect(filter.current_project_path).to eq(project.full_path)
+      expect(filter.current_parent_path).to eq(project.full_path)
     end
   end
 end
diff --git a/spec/lib/banzai/filter/commit_reference_filter_spec.rb b/spec/lib/banzai/filter/commit_reference_filter_spec.rb
index 702fcac0c6f..080a5f57da9 100644
--- a/spec/lib/banzai/filter/commit_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/commit_reference_filter_spec.rb
@@ -92,6 +92,18 @@ describe Banzai::Filter::CommitReferenceFilter do
       expect(link).not_to match %r(https?://)
       expect(link).to eq urls.project_commit_url(project, reference, only_path: true)
     end
+
+    context "in merge request context" do
+      let(:noteable) { create(:merge_request, target_project: project, source_project: project) }
+      let(:commit) { noteable.commits.first }
+
+      it 'handles merge request contextual commit references' do
+        url = urls.diffs_project_merge_request_url(project, noteable, commit_id: commit.id)
+        doc = reference_filter("See #{reference}", noteable: noteable)
+
+        expect(doc.css('a').first[:href]).to eq(url)
+      end
+    end
   end
 
   context 'cross-project / cross-namespace complete reference' do
diff --git a/spec/lib/banzai/filter/issue_reference_filter_spec.rb b/spec/lib/banzai/filter/issue_reference_filter_spec.rb
index 3c98b18f99b..3a5f52ea23f 100644
--- a/spec/lib/banzai/filter/issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/issue_reference_filter_spec.rb
@@ -157,6 +157,12 @@ describe Banzai::Filter::IssueReferenceFilter do
       expect(doc.text).to eq("Fixed (#{project2.full_path}##{issue.iid}.)")
     end
 
+    it 'includes default classes' do
+      doc = reference_filter("Fixed (#{reference}.)")
+
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue has-tooltip'
+    end
+
     it 'ignores invalid issue IDs on the referenced project' do
       exp = act = "Fixed #{invalidate_reference(reference)}"
 
@@ -201,6 +207,12 @@ describe Banzai::Filter::IssueReferenceFilter do
       expect(doc.text).to eq("Fixed (#{project2.path}##{issue.iid}.)")
     end
 
+    it 'includes default classes' do
+      doc = reference_filter("Fixed (#{reference}.)")
+
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue has-tooltip'
+    end
+
     it 'ignores invalid issue IDs on the referenced project' do
       exp = act = "Fixed #{invalidate_reference(reference)}"
 
@@ -245,6 +257,12 @@ describe Banzai::Filter::IssueReferenceFilter do
       expect(doc.text).to eq("Fixed (#{project2.path}##{issue.iid}.)")
     end
 
+    it 'includes default classes' do
+      doc = reference_filter("Fixed (#{reference}.)")
+
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue has-tooltip'
+    end
+
     it 'ignores invalid issue IDs on the referenced project' do
       exp = act = "Fixed #{invalidate_reference(reference)}"
 
@@ -269,8 +287,15 @@ describe Banzai::Filter::IssueReferenceFilter do
 
     it 'links with adjacent text' do
       doc = reference_filter("Fixed (#{reference}.)")
+
       expect(doc.to_html).to match(/\(<a.+>#{Regexp.escape(issue.to_reference(project))} \(comment 123\)<\/a>\.\)/)
     end
+
+    it 'includes default classes' do
+      doc = reference_filter("Fixed (#{reference}.)")
+
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue has-tooltip'
+    end
   end
 
   context 'cross-project reference in link href' do
@@ -291,8 +316,15 @@ describe Banzai::Filter::IssueReferenceFilter do
 
     it 'links with adjacent text' do
       doc = reference_filter("Fixed (#{reference_link}.)")
+
       expect(doc.to_html).to match(/\(<a.+>Reference<\/a>\.\)/)
     end
+
+    it 'includes default classes' do
+      doc = reference_filter("Fixed (#{reference_link}.)")
+
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue has-tooltip'
+    end
   end
 
   context 'cross-project URL in link href' do
@@ -313,8 +345,15 @@ describe Banzai::Filter::IssueReferenceFilter do
 
     it 'links with adjacent text' do
       doc = reference_filter("Fixed (#{reference_link}.)")
+
       expect(doc.to_html).to match(/\(<a.+>Reference<\/a>\.\)/)
     end
+
+    it 'includes default classes' do
+      doc = reference_filter("Fixed (#{reference_link}.)")
+
+      expect(doc.css('a').first.attr('class')).to eq 'gfm gfm-issue has-tooltip'
+    end
   end
 
   context 'group context' do
@@ -343,7 +382,9 @@ describe Banzai::Filter::IssueReferenceFilter do
       reference = "#{project.full_path}##{issue.iid}"
       doc = reference_filter("See #{reference}", context)
 
-      expect(doc.css('a').first.attr('href')).to eq helper.url_for_issue(issue.iid, project)
+      link = doc.css('a').first
+      expect(link.attr('href')).to eq(helper.url_for_issue(issue.iid, project))
+      expect(link.text).to include("#{project.full_path}##{issue.iid}")
     end
 
     it 'ignores reference for shorthand cross-reference' do
@@ -358,7 +399,9 @@ describe Banzai::Filter::IssueReferenceFilter do
 
       doc = reference_filter("See #{reference}", context)
 
-      expect(doc.css('a').first.attr('href')).to eq(helper.url_for_issue(issue.iid, project) + "#note_123")
+      link = doc.css('a').first
+      expect(link.attr('href')).to eq(helper.url_for_issue(issue.iid, project) + "#note_123")
+      expect(link.text).to include("#{project.full_path}##{issue.iid}")
     end
 
     it 'links to a valid reference for cross-reference in link href' do
@@ -367,7 +410,9 @@ describe Banzai::Filter::IssueReferenceFilter do
 
       doc = reference_filter("See #{reference_link}", context)
 
-      expect(doc.css('a').first.attr('href')).to eq helper.url_for_issue(issue.iid, project) + "#note_123"
+      link = doc.css('a').first
+      expect(link.attr('href')).to eq(helper.url_for_issue(issue.iid, project) + "#note_123")
+      expect(link.text).to include('Reference')
     end
 
     it 'links to a valid reference for issue reference in the link href' do
@@ -375,23 +420,25 @@ describe Banzai::Filter::IssueReferenceFilter do
       reference_link = %{<a href="#{reference}">Reference</a>}
       doc = reference_filter("See #{reference_link}", context)
 
-      expect(doc.css('a').first.attr('href')).to eq helper.url_for_issue(issue.iid, project)
+      link = doc.css('a').first
+      expect(link.attr('href')).to eq(helper.url_for_issue(issue.iid, project))
+      expect(link.text).to include('Reference')
     end
   end
 
-  describe '#issues_per_project' do
+  describe '#records_per_parent' do
     context 'using an internal issue tracker' do
       it 'returns a Hash containing the issues per project' do
         doc = Nokogiri::HTML.fragment('')
         filter = described_class.new(doc, project: project)
 
-        expect(filter).to receive(:projects_per_reference)
+        expect(filter).to receive(:parent_per_reference)
           .and_return({ project.full_path => project })
 
-        expect(filter).to receive(:references_per_project)
+        expect(filter).to receive(:references_per_parent)
           .and_return({ project.full_path => Set.new([issue.iid]) })
 
-        expect(filter.issues_per_project)
+        expect(filter.records_per_parent)
           .to eq({ project => { issue.iid => issue } })
       end
     end
diff --git a/spec/lib/banzai/filter/mermaid_filter_spec.rb b/spec/lib/banzai/filter/mermaid_filter_spec.rb
new file mode 100644
index 00000000000..532d25e121d
--- /dev/null
+++ b/spec/lib/banzai/filter/mermaid_filter_spec.rb
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Banzai::Filter::MermaidFilter do
+  include FilterSpecHelper
+
+  it 'adds `js-render-mermaid` class to the `pre` tag' do
+    doc = filter("<pre class='code highlight js-syntax-highlight mermaid' lang='mermaid' v-pre='true'><code>graph TD;\n  A--&gt;B;\n</code></pre>")
+    result = doc.xpath('descendant-or-self::pre').first
+
+    expect(result[:class]).to include('js-render-mermaid')
+  end
+end
diff --git a/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb b/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
index 5a23e0e70cc..9f2efa05a01 100644
--- a/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
+++ b/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
@@ -31,7 +31,7 @@ describe Banzai::Filter::SyntaxHighlightFilter do
 
     it "highlights as plaintext" do
       result = filter('<pre><code lang="ruby">This is a test</code></pre>')
-      expect(result.to_html).to eq('<pre class="code highlight" lang="" v-pre="true"><code>This is a test</code></pre>')
+      expect(result.to_html).to eq('<pre class="code highlight js-syntax-highlight" lang="" v-pre="true"><code>This is a test</code></pre>')
     end
   end
 end
diff --git a/spec/lib/banzai/filter/upload_link_filter_spec.rb b/spec/lib/banzai/filter/upload_link_filter_spec.rb
index 60a88e903ef..76bc0c36ab7 100644
--- a/spec/lib/banzai/filter/upload_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/upload_link_filter_spec.rb
@@ -89,7 +89,35 @@ describe Banzai::Filter::UploadLinkFilter do
     end
   end
 
-  context 'when project context does not exist' do
+  context 'in group context' do
+    let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') }
+    let(:group) { create(:group) }
+    let(:filter_context) { { project: nil, group: group } }
+    let(:relative_path) { "groups/#{group.full_path}/-/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg" }
+
+    it 'rewrites the link correctly' do
+      doc = raw_filter(upload_link, filter_context)
+
+      expect(doc.at_css('a')['href']).to eq("#{Gitlab.config.gitlab.url}/#{relative_path}")
+    end
+
+    it 'rewrites the link correctly for subgroup' do
+      subgroup = create(:group, parent: group)
+      relative_path = "groups/#{subgroup.full_path}/-/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg"
+
+      doc = raw_filter(upload_link, { project: nil, group: subgroup })
+
+      expect(doc.at_css('a')['href']).to eq("#{Gitlab.config.gitlab.url}/#{relative_path}")
+    end
+
+    it 'does not modify absolute URL' do
+      doc = filter(link('http://example.com'), filter_context)
+
+      expect(doc.at_css('a')['href']).to eq 'http://example.com'
+    end
+  end
+
+  context 'when project or group context does not exist' do
     let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') }
 
     it 'does not raise error' do
diff --git a/spec/lib/banzai/reference_parser/issue_parser_spec.rb b/spec/lib/banzai/reference_parser/issue_parser_spec.rb
index 23dbe2b6238..4cef3bdb24b 100644
--- a/spec/lib/banzai/reference_parser/issue_parser_spec.rb
+++ b/spec/lib/banzai/reference_parser/issue_parser_spec.rb
@@ -70,12 +70,12 @@ describe Banzai::ReferenceParser::IssueParser do
     end
   end
 
-  describe '#issues_for_nodes' do
+  describe '#records_for_nodes' do
     it 'returns a Hash containing the issues for a list of nodes' do
       link['data-issue'] = issue.id.to_s
       nodes = [link]
 
-      expect(subject.issues_for_nodes(nodes)).to eq({ link => issue })
+      expect(subject.records_for_nodes(nodes)).to eq({ link => issue })
     end
   end
 end
diff --git a/spec/lib/container_registry/path_spec.rb b/spec/lib/container_registry/path_spec.rb
index 84cacdd3f0d..010deae822c 100644
--- a/spec/lib/container_registry/path_spec.rb
+++ b/spec/lib/container_registry/path_spec.rb
@@ -86,6 +86,24 @@ describe ContainerRegistry::Path do
 
       it { is_expected.to be_valid }
     end
+
+    context 'when path contains double underscore' do
+      let(:path) { 'my/repository__name' }
+
+      it { is_expected.to be_valid }
+    end
+
+    context 'when path contains invalid separator with dot' do
+      let(:path) { 'some/registry-.name' }
+
+      it { is_expected.not_to be_valid }
+    end
+
+    context 'when path contains invalid separator with underscore' do
+      let(:path) { 'some/registry._name' }
+
+      it { is_expected.not_to be_valid }
+    end
   end
 
   describe '#has_repository?' do
diff --git a/spec/lib/feature_spec.rb b/spec/lib/feature_spec.rb
index 1076c63b5f2..10020511bf8 100644
--- a/spec/lib/feature_spec.rb
+++ b/spec/lib/feature_spec.rb
@@ -13,6 +13,47 @@ describe Feature do
     end
   end
 
+  describe '.persisted_names' do
+    it 'returns the names of the persisted features' do
+      Feature::FlipperFeature.create!(key: 'foo')
+
+      expect(described_class.persisted_names).to eq(%w[foo])
+    end
+
+    it 'returns an empty Array when no features are presisted' do
+      expect(described_class.persisted_names).to be_empty
+    end
+
+    it 'caches the feature names when request store is active', :request_store do
+      Feature::FlipperFeature.create!(key: 'foo')
+
+      expect(Feature::FlipperFeature)
+        .to receive(:feature_names)
+        .once
+        .and_call_original
+
+      2.times do
+        expect(described_class.persisted_names).to eq(%w[foo])
+      end
+    end
+  end
+
+  describe '.persisted?' do
+    it 'returns true for a persisted feature' do
+      Feature::FlipperFeature.create!(key: 'foo')
+
+      feature = double(:feature, name: 'foo')
+
+      expect(described_class.persisted?(feature)).to eq(true)
+    end
+
+    it 'returns false for a feature that is not persisted' do
+      feature = double(:feature, name: 'foo')
+
+      expect(described_class.persisted?(feature)).to eq(false)
+    end
+  end
+
   describe '.all' do
     let(:features) { Set.new }
 
diff --git a/spec/lib/github/client_spec.rb b/spec/lib/github/client_spec.rb
deleted file mode 100644
index b846096fe25..00000000000
--- a/spec/lib/github/client_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe Github::Client do
-  let(:connection) { spy }
-  let(:rate_limit) { double(get: [false, 1]) }
-  let(:client) { described_class.new({}) }
-  let(:results) { double }
-  let(:response) { double }
-
-  before do
-    allow(Faraday).to receive(:new).and_return(connection)
-    allow(Github::RateLimit).to receive(:new).with(connection).and_return(rate_limit)
-  end
-
-  describe '#get' do
-    before do
-      allow(Github::Response).to receive(:new).with(results).and_return(response)
-    end
-
-    it 'uses a default per_page param' do
-      expect(connection).to receive(:get).with('/foo', per_page: 100).and_return(results)
-
-      expect(client.get('/foo')).to eq(response)
-    end
-
-    context 'with per_page given' do
-      it 'overwrites the default per_page' do
-        expect(connection).to receive(:get).with('/foo', per_page: 30).and_return(results)
-
-        expect(client.get('/foo', per_page: 30)).to eq(response)
-      end
-    end
-  end
-end
diff --git a/spec/lib/github/import/legacy_diff_note_spec.rb b/spec/lib/github/import/legacy_diff_note_spec.rb
deleted file mode 100644
index 8c50b46cacb..00000000000
--- a/spec/lib/github/import/legacy_diff_note_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Github::Import::LegacyDiffNote do
-  describe '#type' do
-    it 'returns the original note type' do
-      expect(described_class.new.type).to eq('LegacyDiffNote')
-    end
-  end
-end
diff --git a/spec/lib/github/import/note_spec.rb b/spec/lib/github/import/note_spec.rb
deleted file mode 100644
index fcdccd9e097..00000000000
--- a/spec/lib/github/import/note_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Github::Import::Note do
-  describe '#type' do
-    it 'returns the original note type' do
-      expect(described_class.new.type).to eq('Note')
-    end
-  end
-end
diff --git a/spec/lib/gitlab/auth/request_authenticator_spec.rb b/spec/lib/gitlab/auth/request_authenticator_spec.rb
new file mode 100644
index 00000000000..ffcd90b9fcb
--- /dev/null
+++ b/spec/lib/gitlab/auth/request_authenticator_spec.rb
@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe Gitlab::Auth::RequestAuthenticator do
+  let(:env) do
+    {
+      'rack.input' => '',
+      'REQUEST_METHOD' => 'GET'
+    }
+  end
+  let(:request) { ActionDispatch::Request.new(env) }
+
+  subject { described_class.new(request) }
+
+  describe '#user' do
+    let!(:sessionless_user) { build(:user) }
+    let!(:session_user) { build(:user) }
+
+    it 'returns sessionless user first' do
+      allow_any_instance_of(described_class).to receive(:find_sessionless_user).and_return(sessionless_user)
+      allow_any_instance_of(described_class).to receive(:find_user_from_warden).and_return(session_user)
+
+      expect(subject.user).to eq sessionless_user
+    end
+
+    it 'returns session user if no sessionless user found' do
+      allow_any_instance_of(described_class).to receive(:find_user_from_warden).and_return(session_user)
+
+      expect(subject.user).to eq session_user
+    end
+
+    it 'returns nil if no user found' do
+      expect(subject.user).to be_blank
+    end
+
+    it 'bubbles up exceptions' do
+      allow_any_instance_of(described_class).to receive(:find_user_from_warden).and_raise(Gitlab::Auth::UnauthorizedError)
+    end
+  end
+
+  describe '#find_sessionless_user' do
+    let!(:access_token_user) { build(:user) }
+    let!(:rss_token_user) { build(:user) }
+
+    it 'returns access_token user first' do
+      allow_any_instance_of(described_class).to receive(:find_user_from_access_token).and_return(access_token_user)
+      allow_any_instance_of(described_class).to receive(:find_user_from_rss_token).and_return(rss_token_user)
+
+      expect(subject.find_sessionless_user).to eq access_token_user
+    end
+
+    it 'returns rss_token user if no access_token user found' do
+      allow_any_instance_of(described_class).to receive(:find_user_from_rss_token).and_return(rss_token_user)
+
+      expect(subject.find_sessionless_user).to eq rss_token_user
+    end
+
+    it 'returns nil if no user found' do
+      expect(subject.find_sessionless_user).to be_blank
+    end
+
+    it 'rescue Gitlab::Auth::AuthenticationError exceptions' do
+      allow_any_instance_of(described_class).to receive(:find_user_from_access_token).and_raise(Gitlab::Auth::UnauthorizedError)
+
+      expect(subject.find_sessionless_user).to be_blank
+    end
+  end
+end
diff --git a/spec/lib/gitlab/auth/user_auth_finders_spec.rb b/spec/lib/gitlab/auth/user_auth_finders_spec.rb
new file mode 100644
index 00000000000..4637816570c
--- /dev/null
+++ b/spec/lib/gitlab/auth/user_auth_finders_spec.rb
@@ -0,0 +1,194 @@
+require 'spec_helper'
+
+describe Gitlab::Auth::UserAuthFinders do
+  include described_class
+
+  let(:user) { create(:user) }
+  let(:env) do
+    {
+      'rack.input' => ''
+    }
+  end
+  let(:request) { Rack::Request.new(env)}
+
+  def set_param(key, value)
+    request.update_param(key, value)
+  end
+
+  describe '#find_user_from_warden' do
+    context 'with CSRF token' do
+      before do
+        allow(Gitlab::RequestForgeryProtection).to receive(:verified?).and_return(true)
+      end
+
+      context 'with invalid credentials' do
+        it 'returns nil' do
+          expect(find_user_from_warden).to be_nil
+        end
+      end
+
+      context 'with valid credentials' do
+        it 'returns the user' do
+          env['warden'] = double("warden", authenticate: user)
+
+          expect(find_user_from_warden).to eq user
+        end
+      end
+    end
+
+    context 'without CSRF token' do
+      it 'returns nil' do
+        allow(Gitlab::RequestForgeryProtection).to receive(:verified?).and_return(false)
+        env['warden'] = double("warden", authenticate: user)
+
+        expect(find_user_from_warden).to be_nil
+      end
+    end
+  end
+
+  describe '#find_user_from_rss_token' do
+    context 'when the request format is atom' do
+      before do
+        env['HTTP_ACCEPT'] = 'application/atom+xml'
+      end
+
+      it 'returns user if valid rss_token' do
+        set_param(:rss_token, user.rss_token)
+
+        expect(find_user_from_rss_token).to eq user
+      end
+
+      it 'returns nil if rss_token is blank' do
+        expect(find_user_from_rss_token).to be_nil
+      end
+
+      it 'returns exception if invalid rss_token' do
+        set_param(:rss_token, 'invalid_token')
+
+        expect { find_user_from_rss_token }.to raise_error(Gitlab::Auth::UnauthorizedError)
+      end
+    end
+
+    context 'when the request format is not atom' do
+      it 'returns nil' do
+        set_param(:rss_token, user.rss_token)
+
+        expect(find_user_from_rss_token).to be_nil
+      end
+    end
+  end
+
+  describe '#find_user_from_access_token' do
+    let(:personal_access_token) { create(:personal_access_token, user: user) }
+
+    it 'returns nil if no access_token present' do
+      expect(find_personal_access_token).to be_nil
+    end
+
+    context 'when validate_access_token! returns valid' do
+      it 'returns user' do
+        env[Gitlab::Auth::UserAuthFinders::PRIVATE_TOKEN_HEADER] = personal_access_token.token
+
+        expect(find_user_from_access_token).to eq user
+      end
+
+      it 'returns exception if token has no user' do
+        env[Gitlab::Auth::UserAuthFinders::PRIVATE_TOKEN_HEADER] = personal_access_token.token
+        allow_any_instance_of(PersonalAccessToken).to receive(:user).and_return(nil)
+
+        expect { find_user_from_access_token }.to raise_error(Gitlab::Auth::UnauthorizedError)
+      end
+    end
+  end
+
+  describe '#find_personal_access_token' do
+    let(:personal_access_token) { create(:personal_access_token, user: user) }
+
+    context 'passed as header' do
+      it 'returns token if valid personal_access_token' do
+        env[Gitlab::Auth::UserAuthFinders::PRIVATE_TOKEN_HEADER] = personal_access_token.token
+
+        expect(find_personal_access_token).to eq personal_access_token
+      end
+    end
+
+    context 'passed as param' do
+      it 'returns token if valid personal_access_token' do
+        set_param(Gitlab::Auth::UserAuthFinders::PRIVATE_TOKEN_PARAM, personal_access_token.token)
+
+        expect(find_personal_access_token).to eq personal_access_token
+      end
+    end
+
+    it 'returns nil if no personal_access_token' do
+      expect(find_personal_access_token).to be_nil
+    end
+
+    it 'returns exception if invalid personal_access_token' do
+      env[Gitlab::Auth::UserAuthFinders::PRIVATE_TOKEN_HEADER] = 'invalid_token'
+
+      expect { find_personal_access_token }.to raise_error(Gitlab::Auth::UnauthorizedError)
+    end
+  end
+
+  describe '#find_oauth_access_token' do
+    let(:application) { Doorkeeper::Application.create!(name: 'MyApp', redirect_uri: 'https://app.com', owner: user) }
+    let(:token) { Doorkeeper::AccessToken.create!(application_id: application.id, resource_owner_id: user.id, scopes: 'api') }
+
+    context 'passed as header' do
+      it 'returns token if valid oauth_access_token' do
+        env['HTTP_AUTHORIZATION'] = "Bearer #{token.token}"
+
+        expect(find_oauth_access_token.token).to eq token.token
+      end
+    end
+
+    context 'passed as param' do
+      it 'returns user if valid oauth_access_token' do
+        set_param(:access_token, token.token)
+
+        expect(find_oauth_access_token.token).to eq token.token
+      end
+    end
+
+    it 'returns nil if no oauth_access_token' do
+      expect(find_oauth_access_token).to be_nil
+    end
+
+    it 'returns exception if invalid oauth_access_token' do
+      env['HTTP_AUTHORIZATION'] = "Bearer invalid_token"
+
+      expect { find_oauth_access_token }.to raise_error(Gitlab::Auth::UnauthorizedError)
+    end
+  end
+
+  describe '#validate_access_token!' do
+    let(:personal_access_token) { create(:personal_access_token, user: user) }
+
+    it 'returns nil if no access_token present' do
+      expect(validate_access_token!).to be_nil
+    end
+
+    context 'token is not valid' do
+      before do
+        allow_any_instance_of(described_class).to receive(:access_token).and_return(personal_access_token)
+      end
+
+      it 'returns Gitlab::Auth::ExpiredError if token expired' do
+        personal_access_token.expires_at = 1.day.ago
+
+        expect { validate_access_token! }.to raise_error(Gitlab::Auth::ExpiredError)
+      end
+
+      it 'returns Gitlab::Auth::RevokedError if token revoked' do
+        personal_access_token.revoke!
+
+        expect { validate_access_token! }.to raise_error(Gitlab::Auth::RevokedError)
+      end
+
+      it 'returns Gitlab::Auth::InsufficientScopeError if invalid token scope' do
+        expect { validate_access_token!(scopes: [:sudo]) }.to raise_error(Gitlab::Auth::InsufficientScopeError)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 54a853c9ce3..a6fbec295b5 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -133,6 +133,25 @@ describe Gitlab::Auth do
 
         gl_auth.find_for_git_client(user.username, token, project: nil, ip: 'ip')
       end
+
+      it 'grants deploy key write permissions' do
+        project = create(:project)
+        key = create(:deploy_key, can_push: true)
+        create(:deploy_keys_project, deploy_key: key, project: project)
+        token = Gitlab::LfsToken.new(key).token
+
+        expect(gl_auth).to receive(:rate_limit!).with('ip', success: true, login: "lfs+deploy-key-#{key.id}")
+        expect(gl_auth.find_for_git_client("lfs+deploy-key-#{key.id}", token, project: project, ip: 'ip')).to eq(Gitlab::Auth::Result.new(key, nil, :lfs_deploy_token, read_write_authentication_abilities))
+      end
+
+      it 'does not grant deploy key write permissions' do
+        project = create(:project)
+        key = create(:deploy_key, can_push: true)
+        token = Gitlab::LfsToken.new(key).token
+
+        expect(gl_auth).to receive(:rate_limit!).with('ip', success: true, login: "lfs+deploy-key-#{key.id}")
+        expect(gl_auth.find_for_git_client("lfs+deploy-key-#{key.id}", token, project: project, ip: 'ip')).to eq(Gitlab::Auth::Result.new(key, nil, :lfs_deploy_token, read_authentication_abilities))
+      end
     end
 
     context 'while using OAuth tokens as passwords' do
@@ -188,7 +207,7 @@ describe Gitlab::Auth do
       end
 
       it 'limits abilities based on scope' do
-        personal_access_token = create(:personal_access_token, scopes: ['read_user'])
+        personal_access_token = create(:personal_access_token, scopes: %w[read_user sudo])
 
         expect(gl_auth).to receive(:rate_limit!).with('ip', success: true, login: '')
         expect(gl_auth.find_for_git_client('', personal_access_token.token, project: nil, ip: 'ip')).to eq(Gitlab::Auth::Result.new(personal_access_token.user, nil, :personal_access_token, []))
@@ -232,7 +251,7 @@ describe Gitlab::Auth do
     end
 
     it 'throws an error suggesting user create a PAT when internal auth is disabled' do
-      allow_any_instance_of(ApplicationSetting).to receive(:password_authentication_enabled?) { false }
+      allow_any_instance_of(ApplicationSetting).to receive(:password_authentication_enabled_for_git?) { false }
 
       expect { gl_auth.find_for_git_client('foo', 'bar', project: nil, ip: 'ip') }.to raise_error(Gitlab::Auth::MissingPersonalAccessTokenError)
     end
@@ -305,6 +324,26 @@ describe Gitlab::Auth do
         gl_auth.find_with_user_password('ldap_user', 'password')
       end
     end
+
+    context "with password authentication disabled for Git" do
+      before do
+        stub_application_setting(password_authentication_enabled_for_git: false)
+      end
+
+      it "does not find user by valid login/password" do
+        expect(gl_auth.find_with_user_password(username, password)).to be_nil
+      end
+
+      context "with ldap enabled" do
+        before do
+          allow(Gitlab::LDAP::Config).to receive(:enabled?).and_return(true)
+        end
+
+        it "does not find non-ldap user by valid login/password" do
+          expect(gl_auth.find_with_user_password(username, password)).to be_nil
+        end
+      end
+    end
   end
 
   private
@@ -326,10 +365,15 @@ describe Gitlab::Auth do
     ]
   end
 
-  def full_authentication_abilities
+  def read_write_authentication_abilities
     read_authentication_abilities + [
       :push_code,
-      :create_container_image,
+      :create_container_image
+    ]
+  end
+
+  def full_authentication_abilities
+    read_write_authentication_abilities + [
       :admin_container_image
     ]
   end
diff --git a/spec/lib/gitlab/background_migration/create_fork_network_memberships_range_spec.rb b/spec/lib/gitlab/background_migration/create_fork_network_memberships_range_spec.rb
index 1a4ea2bac48..79d2c071446 100644
--- a/spec/lib/gitlab/background_migration/create_fork_network_memberships_range_spec.rb
+++ b/spec/lib/gitlab/background_migration/create_fork_network_memberships_range_spec.rb
@@ -93,7 +93,14 @@ describe Gitlab::BackgroundMigration::CreateForkNetworkMembershipsRange, :migrat
   end
 
   it 'knows it is finished for this range' do
-    expect(migration.missing_members?(1, 7)).to be_falsy
+    expect(migration.missing_members?(1, 8)).to be_falsy
+  end
+
+  it 'does not miss members for forks of forks for which the root was deleted' do
+    forked_project_links.create(id: 9, forked_from_project_id: base1_fork1.id, forked_to_project_id: create(:project).id)
+    base1.destroy
+
+    expect(migration.missing_members?(7, 10)).to be_falsy
   end
 
   context 'with more forks' do
diff --git a/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb b/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb
index 4d3fdbd9554..84d9e635810 100644
--- a/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb
+++ b/spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb
@@ -1,9 +1,13 @@
 require 'spec_helper'
 
-describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :truncate do
+describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :truncate, :migration, schema: 20171114162227 do
+  let(:merge_request_diffs) { table(:merge_request_diffs) }
+  let(:merge_requests) { table(:merge_requests) }
+
   describe '#perform' do
-    let(:merge_request) { create(:merge_request) }
-    let(:merge_request_diff) { merge_request.merge_request_diff }
+    let(:project) { create(:project, :repository) }
+    let(:merge_request) { merge_requests.create!(iid: 1, target_project_id: project.id, source_project_id: project.id, target_branch: 'feature', source_branch: 'master').becomes(MergeRequest) }
+    let(:merge_request_diff) { MergeRequest.find(merge_request.id).create_merge_request_diff }
     let(:updated_merge_request_diff) { MergeRequestDiff.find(merge_request_diff.id) }
 
     def diffs_to_hashes(diffs)
@@ -68,7 +72,7 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :t
       let(:stop_id) { described_class::MergeRequestDiff.maximum(:id) }
 
       before do
-        merge_request.reload_diff(true)
+        merge_request.create_merge_request_diff
 
         convert_to_yaml(start_id, merge_request_diff.commits, diffs_to_hashes(merge_request_diff.merge_request_diff_files))
         convert_to_yaml(stop_id, updated_merge_request_diff.commits, diffs_to_hashes(updated_merge_request_diff.merge_request_diff_files))
@@ -288,7 +292,7 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :t
 
     context 'when the merge request diffs are Rugged::Patch instances' do
       let(:commits) { merge_request_diff.commits.map(&:to_hash) }
-      let(:first_commit) { merge_request.project.repository.commit(merge_request_diff.head_commit_sha) }
+      let(:first_commit) { project.repository.commit(merge_request_diff.head_commit_sha) }
       let(:expected_commits) { commits }
       let(:diffs) { first_commit.rugged_diff_from_parent.patches }
       let(:expected_diffs) { [] }
@@ -298,7 +302,7 @@ describe Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits, :t
 
     context 'when the merge request diffs are Rugged::Diff::Delta instances' do
       let(:commits) { merge_request_diff.commits.map(&:to_hash) }
-      let(:first_commit) { merge_request.project.repository.commit(merge_request_diff.head_commit_sha) }
+      let(:first_commit) { project.repository.commit(merge_request_diff.head_commit_sha) }
       let(:expected_commits) { commits }
       let(:diffs) { first_commit.rugged_diff_from_parent.deltas }
       let(:expected_diffs) { [] }
diff --git a/spec/lib/gitlab/background_migration/populate_fork_networks_range_spec.rb b/spec/lib/gitlab/background_migration/populate_fork_networks_range_spec.rb
index 2c2684a6fc9..e52baf8dde7 100644
--- a/spec/lib/gitlab/background_migration/populate_fork_networks_range_spec.rb
+++ b/spec/lib/gitlab/background_migration/populate_fork_networks_range_spec.rb
@@ -3,12 +3,9 @@ require 'spec_helper'
 describe Gitlab::BackgroundMigration::PopulateForkNetworksRange, :migration, schema: 20170929131201 do
   let(:migration) { described_class.new }
   let(:base1) { create(:project) }
-  let(:base1_fork1) { create(:project) }
-  let(:base1_fork2) { create(:project) }
 
   let(:base2) { create(:project) }
   let(:base2_fork1) { create(:project) }
-  let(:base2_fork2) { create(:project) }
 
   let!(:forked_project_links) { table(:forked_project_links) }
   let!(:fork_networks) { table(:fork_networks) }
@@ -21,21 +18,24 @@ describe Gitlab::BackgroundMigration::PopulateForkNetworksRange, :migration, sch
     # A normal fork link
     forked_project_links.create(id: 1,
                                 forked_from_project_id: base1.id,
-                                forked_to_project_id: base1_fork1.id)
+                                forked_to_project_id: create(:project).id)
     forked_project_links.create(id: 2,
                                 forked_from_project_id: base1.id,
-                                forked_to_project_id: base1_fork2.id)
-
+                                forked_to_project_id: create(:project).id)
     forked_project_links.create(id: 3,
                                 forked_from_project_id: base2.id,
                                 forked_to_project_id: base2_fork1.id)
+
+    # create a fork of a fork
     forked_project_links.create(id: 4,
                                 forked_from_project_id: base2_fork1.id,
                                 forked_to_project_id: create(:project).id)
-
     forked_project_links.create(id: 5,
-                                forked_from_project_id: base2.id,
-                                forked_to_project_id: base2_fork2.id)
+                                forked_from_project_id: create(:project).id,
+                                forked_to_project_id: create(:project).id)
+
+    # Stub out the calls to the other migrations
+    allow(BackgroundMigrationWorker).to receive(:perform_in)
 
     migration.perform(1, 3)
   end
@@ -62,12 +62,15 @@ describe Gitlab::BackgroundMigration::PopulateForkNetworksRange, :migration, sch
     expect(base2_membership).not_to be_nil
   end
 
-  it 'skips links that had their source project deleted' do
-    forked_project_links.create(id: 6, forked_from_project_id: 99999, forked_to_project_id: create(:project).id)
+  it 'creates a fork network for the fork of which the source was deleted' do
+    fork = create(:project)
+    forked_project_links.create(id: 6, forked_from_project_id: 99999, forked_to_project_id: fork.id)
 
     migration.perform(5, 8)
 
     expect(fork_networks.find_by(root_project_id: 99999)).to be_nil
+    expect(fork_networks.find_by(root_project_id: fork.id)).not_to be_nil
+    expect(fork_network_members.find_by(project_id: fork.id)).not_to be_nil
   end
 
   it 'schedules a job for inserting memberships for forks-of-forks' do
@@ -80,11 +83,11 @@ describe Gitlab::BackgroundMigration::PopulateForkNetworksRange, :migration, sch
   end
 
   it 'only processes a single batch of links at a time' do
-    expect(fork_network_members.count).to eq(5)
+    expect(fork_networks.count).to eq(2)
 
     migration.perform(3, 5)
 
-    expect(fork_network_members.count).to eq(7)
+    expect(fork_networks.count).to eq(3)
   end
 
   it 'can be repeated without effect' do
diff --git a/spec/lib/gitlab/background_migration/populate_merge_requests_latest_merge_request_diff_id_spec.rb b/spec/lib/gitlab/background_migration/populate_merge_requests_latest_merge_request_diff_id_spec.rb
new file mode 100644
index 00000000000..0cb753c5853
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/populate_merge_requests_latest_merge_request_diff_id_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe Gitlab::BackgroundMigration::PopulateMergeRequestsLatestMergeRequestDiffId, :migration, schema: 20171026082505 do
+  let(:projects_table) { table(:projects) }
+  let(:merge_requests_table) { table(:merge_requests) }
+  let(:merge_request_diffs_table) { table(:merge_request_diffs) }
+
+  let(:project) { projects_table.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ce') }
+
+  def create_mr!(name, diffs: 0)
+    merge_request =
+      merge_requests_table.create!(target_project_id: project.id,
+                                   target_branch: 'master',
+                                   source_project_id: project.id,
+                                   source_branch: name,
+                                   title: name)
+
+    diffs.times do
+      merge_request_diffs_table.create!(merge_request_id: merge_request.id)
+    end
+
+    merge_request
+  end
+
+  def diffs_for(merge_request)
+    merge_request_diffs_table.where(merge_request_id: merge_request.id)
+  end
+
+  describe '#perform' do
+    it 'ignores MRs without diffs' do
+      merge_request_without_diff = create_mr!('without_diff')
+      mr_id = merge_request_without_diff.id
+
+      expect(merge_request_without_diff.latest_merge_request_diff_id).to be_nil
+
+      expect { subject.perform(mr_id, mr_id) }
+        .not_to change { merge_request_without_diff.reload.latest_merge_request_diff_id }
+    end
+
+    it 'ignores MRs that have a diff ID already set' do
+      merge_request_with_multiple_diffs = create_mr!('with_multiple_diffs', diffs: 3)
+      diff_id = diffs_for(merge_request_with_multiple_diffs).minimum(:id)
+      mr_id = merge_request_with_multiple_diffs.id
+
+      merge_request_with_multiple_diffs.update!(latest_merge_request_diff_id: diff_id)
+
+      expect { subject.perform(mr_id, mr_id) }
+        .not_to change { merge_request_with_multiple_diffs.reload.latest_merge_request_diff_id }
+    end
+
+    it 'migrates multiple MR diffs to the correct values' do
+      merge_requests = Array.new(3).map.with_index { |_, i| create_mr!(i, diffs: 3) }
+
+      subject.perform(merge_requests.first.id, merge_requests.last.id)
+
+      merge_requests.each do |merge_request|
+        expect(merge_request.reload.latest_merge_request_diff_id)
+          .to eq(diffs_for(merge_request).maximum(:id))
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
new file mode 100644
index 00000000000..b80df6956b0
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
@@ -0,0 +1,510 @@
+require 'spec_helper'
+
+describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, :sidekiq do
+  include TrackUntrackedUploadsHelpers
+
+  subject { described_class.new }
+
+  let!(:untracked_files_for_uploads) { described_class::UntrackedFile }
+  let!(:uploads) { described_class::Upload }
+
+  before do
+    DatabaseCleaner.clean
+    drop_temp_table_if_exists
+    ensure_temporary_tracking_table_exists
+    uploads.delete_all
+  end
+
+  after(:all) do
+    drop_temp_table_if_exists
+  end
+
+  context 'with untracked files and tracked files in untracked_files_for_uploads' do
+    let!(:appearance) { create_or_update_appearance(logo: uploaded_file, header_logo: uploaded_file) }
+    let!(:user1) { create(:user, :with_avatar) }
+    let!(:user2) { create(:user, :with_avatar) }
+    let!(:project1) { create(:project, :with_avatar) }
+    let!(:project2) { create(:project, :with_avatar) }
+
+    before do
+      UploadService.new(project1, uploaded_file, FileUploader).execute # Markdown upload
+      UploadService.new(project2, uploaded_file, FileUploader).execute # Markdown upload
+
+      # File records created by PrepareUntrackedUploads
+      untracked_files_for_uploads.create!(path: appearance.uploads.first.path)
+      untracked_files_for_uploads.create!(path: appearance.uploads.last.path)
+      untracked_files_for_uploads.create!(path: user1.uploads.first.path)
+      untracked_files_for_uploads.create!(path: user2.uploads.first.path)
+      untracked_files_for_uploads.create!(path: project1.uploads.first.path)
+      untracked_files_for_uploads.create!(path: project2.uploads.first.path)
+      untracked_files_for_uploads.create!(path: "#{Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR}/#{project1.full_path}/#{project1.uploads.last.path}")
+      untracked_files_for_uploads.create!(path: "#{Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR}/#{project2.full_path}/#{project2.uploads.last.path}")
+
+      # Untrack 4 files
+      user2.uploads.delete_all
+      project2.uploads.delete_all # 2 files: avatar and a Markdown upload
+      appearance.uploads.where("path like '%header_logo%'").delete_all
+    end
+
+    it 'adds untracked files to the uploads table' do
+      expect do
+        subject.perform(1, untracked_files_for_uploads.last.id)
+      end.to change { uploads.count }.from(4).to(8)
+
+      expect(user2.uploads.count).to eq(1)
+      expect(project2.uploads.count).to eq(2)
+      expect(appearance.uploads.count).to eq(2)
+    end
+
+    it 'deletes rows after processing them' do
+      expect(subject).to receive(:drop_temp_table_if_finished) # Don't drop the table so we can look at it
+
+      expect do
+        subject.perform(1, untracked_files_for_uploads.last.id)
+      end.to change { untracked_files_for_uploads.count }.from(8).to(0)
+    end
+
+    it 'does not create duplicate uploads of already tracked files' do
+      subject.perform(1, untracked_files_for_uploads.last.id)
+
+      expect(user1.uploads.count).to eq(1)
+      expect(project1.uploads.count).to eq(2)
+      expect(appearance.uploads.count).to eq(2)
+    end
+
+    it 'uses the start and end batch ids [only 1st half]' do
+      ids = untracked_files_for_uploads.all.order(:id).pluck(:id)
+      start_id = ids[0]
+      end_id = ids[3]
+
+      expect do
+        subject.perform(start_id, end_id)
+      end.to change { uploads.count }.from(4).to(6)
+
+      expect(user1.uploads.count).to eq(1)
+      expect(user2.uploads.count).to eq(1)
+      expect(appearance.uploads.count).to eq(2)
+      expect(project1.uploads.count).to eq(2)
+      expect(project2.uploads.count).to eq(0)
+
+      # Only 4 have been either confirmed or added to uploads
+      expect(untracked_files_for_uploads.count).to eq(4)
+    end
+
+    it 'uses the start and end batch ids [only 2nd half]' do
+      ids = untracked_files_for_uploads.all.order(:id).pluck(:id)
+      start_id = ids[4]
+      end_id = ids[7]
+
+      expect do
+        subject.perform(start_id, end_id)
+      end.to change { uploads.count }.from(4).to(6)
+
+      expect(user1.uploads.count).to eq(1)
+      expect(user2.uploads.count).to eq(0)
+      expect(appearance.uploads.count).to eq(1)
+      expect(project1.uploads.count).to eq(2)
+      expect(project2.uploads.count).to eq(2)
+
+      # Only 4 have been either confirmed or added to uploads
+      expect(untracked_files_for_uploads.count).to eq(4)
+    end
+
+    it 'does not drop the temporary tracking table after processing the batch, if there are still untracked rows' do
+      subject.perform(1, untracked_files_for_uploads.last.id - 1)
+
+      expect(ActiveRecord::Base.connection.table_exists?(:untracked_files_for_uploads)).to be_truthy
+    end
+
+    it 'drops the temporary tracking table after processing the batch, if there are no untracked rows left' do
+      subject.perform(1, untracked_files_for_uploads.last.id)
+
+      expect(ActiveRecord::Base.connection.table_exists?(:untracked_files_for_uploads)).to be_falsey
+    end
+
+    it 'does not block a whole batch because of one bad path' do
+      untracked_files_for_uploads.create!(path: "#{Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR}/#{project2.full_path}/._7d37bf4c747916390e596744117d5d1a")
+      expect(untracked_files_for_uploads.count).to eq(9)
+      expect(uploads.count).to eq(4)
+
+      subject.perform(1, untracked_files_for_uploads.last.id)
+
+      expect(untracked_files_for_uploads.count).to eq(1)
+      expect(uploads.count).to eq(8)
+    end
+
+    it 'an unparseable path is shown in error output' do
+      bad_path = "#{Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR}/#{project2.full_path}/._7d37bf4c747916390e596744117d5d1a"
+      untracked_files_for_uploads.create!(path: bad_path)
+
+      expect(Rails.logger).to receive(:error).with(/Error parsing path "#{bad_path}":/)
+
+      subject.perform(1, untracked_files_for_uploads.last.id)
+    end
+  end
+
+  context 'with no untracked files' do
+    it 'does not add to the uploads table (and does not raise error)' do
+      expect do
+        subject.perform(1, 1000)
+      end.not_to change { uploads.count }.from(0)
+    end
+  end
+
+  describe 'upload outcomes for each path pattern' do
+    shared_examples_for 'non_markdown_file' do
+      let!(:expected_upload_attrs) { model.uploads.first.attributes.slice('path', 'uploader', 'size', 'checksum') }
+      let!(:untracked_file) { untracked_files_for_uploads.create!(path: expected_upload_attrs['path']) }
+
+      before do
+        model.uploads.delete_all
+      end
+
+      it 'creates an Upload record' do
+        expect do
+          subject.perform(1, untracked_files_for_uploads.last.id)
+        end.to change { model.reload.uploads.count }.from(0).to(1)
+
+        expect(model.uploads.first.attributes).to include(expected_upload_attrs)
+      end
+    end
+
+    context 'for an appearance logo file path' do
+      let(:model) { create_or_update_appearance(logo: uploaded_file) }
+
+      it_behaves_like 'non_markdown_file'
+    end
+
+    context 'for an appearance header_logo file path' do
+      let(:model) { create_or_update_appearance(header_logo: uploaded_file) }
+
+      it_behaves_like 'non_markdown_file'
+    end
+
+    context 'for a pre-Markdown Note attachment file path' do
+      class Note < ActiveRecord::Base
+        has_many :uploads, as: :model, dependent: :destroy
+      end
+
+      let(:model) { create(:note, :with_attachment) }
+
+      it_behaves_like 'non_markdown_file'
+    end
+
+    context 'for a user avatar file path' do
+      let(:model) { create(:user, :with_avatar) }
+
+      it_behaves_like 'non_markdown_file'
+    end
+
+    context 'for a group avatar file path' do
+      let(:model) { create(:group, :with_avatar) }
+
+      it_behaves_like 'non_markdown_file'
+    end
+
+    context 'for a project avatar file path' do
+      let(:model) { create(:project, :with_avatar) }
+
+      it_behaves_like 'non_markdown_file'
+    end
+
+    context 'for a project Markdown attachment (notes, issues, MR descriptions) file path' do
+      let(:model) { create(:project) }
+
+      before do
+        # Upload the file
+        UploadService.new(model, uploaded_file, FileUploader).execute
+
+        # Create the untracked_files_for_uploads record
+        untracked_files_for_uploads.create!(path: "#{Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR}/#{model.full_path}/#{model.uploads.first.path}")
+
+        # Save the expected upload attributes
+        @expected_upload_attrs = model.reload.uploads.first.attributes.slice('path', 'uploader', 'size', 'checksum')
+
+        # Untrack the file
+        model.reload.uploads.delete_all
+      end
+
+      it 'creates an Upload record' do
+        expect do
+          subject.perform(1, untracked_files_for_uploads.last.id)
+        end.to change { model.reload.uploads.count }.from(0).to(1)
+
+        expect(model.uploads.first.attributes).to include(@expected_upload_attrs)
+      end
+    end
+  end
+end
+
+describe Gitlab::BackgroundMigration::PopulateUntrackedUploads::UntrackedFile do
+  include TrackUntrackedUploadsHelpers
+
+  let(:upload_class) { Gitlab::BackgroundMigration::PopulateUntrackedUploads::Upload }
+
+  before(:all) do
+    ensure_temporary_tracking_table_exists
+  end
+
+  after(:all) do
+    drop_temp_table_if_exists
+  end
+
+  describe '#upload_path' do
+    def assert_upload_path(file_path, expected_upload_path)
+      untracked_file = create_untracked_file(file_path)
+
+      expect(untracked_file.upload_path).to eq(expected_upload_path)
+    end
+
+    context 'for an appearance logo file path' do
+      it 'returns the file path relative to the CarrierWave root' do
+        assert_upload_path('/-/system/appearance/logo/1/some_logo.jpg', 'uploads/-/system/appearance/logo/1/some_logo.jpg')
+      end
+    end
+
+    context 'for an appearance header_logo file path' do
+      it 'returns the file path relative to the CarrierWave root' do
+        assert_upload_path('/-/system/appearance/header_logo/1/some_logo.jpg', 'uploads/-/system/appearance/header_logo/1/some_logo.jpg')
+      end
+    end
+
+    context 'for a pre-Markdown Note attachment file path' do
+      it 'returns the file path relative to the CarrierWave root' do
+        assert_upload_path('/-/system/note/attachment/1234/some_attachment.pdf', 'uploads/-/system/note/attachment/1234/some_attachment.pdf')
+      end
+    end
+
+    context 'for a user avatar file path' do
+      it 'returns the file path relative to the CarrierWave root' do
+        assert_upload_path('/-/system/user/avatar/1234/avatar.jpg', 'uploads/-/system/user/avatar/1234/avatar.jpg')
+      end
+    end
+
+    context 'for a group avatar file path' do
+      it 'returns the file path relative to the CarrierWave root' do
+        assert_upload_path('/-/system/group/avatar/1234/avatar.jpg', 'uploads/-/system/group/avatar/1234/avatar.jpg')
+      end
+    end
+
+    context 'for a project avatar file path' do
+      it 'returns the file path relative to the CarrierWave root' do
+        assert_upload_path('/-/system/project/avatar/1234/avatar.jpg', 'uploads/-/system/project/avatar/1234/avatar.jpg')
+      end
+    end
+
+    context 'for a project Markdown attachment (notes, issues, MR descriptions) file path' do
+      it 'returns the file path relative to the project directory in uploads' do
+        project = create(:project)
+        random_hex = SecureRandom.hex
+
+        assert_upload_path("/#{project.full_path}/#{random_hex}/Some file.jpg", "#{random_hex}/Some file.jpg")
+      end
+    end
+  end
+
+  describe '#uploader' do
+    def assert_uploader(file_path, expected_uploader)
+      untracked_file = create_untracked_file(file_path)
+
+      expect(untracked_file.uploader).to eq(expected_uploader)
+    end
+
+    context 'for an appearance logo file path' do
+      it 'returns AttachmentUploader as a string' do
+        assert_uploader('/-/system/appearance/logo/1/some_logo.jpg', 'AttachmentUploader')
+      end
+    end
+
+    context 'for an appearance header_logo file path' do
+      it 'returns AttachmentUploader as a string' do
+        assert_uploader('/-/system/appearance/header_logo/1/some_logo.jpg', 'AttachmentUploader')
+      end
+    end
+
+    context 'for a pre-Markdown Note attachment file path' do
+      it 'returns AttachmentUploader as a string' do
+        assert_uploader('/-/system/note/attachment/1234/some_attachment.pdf', 'AttachmentUploader')
+      end
+    end
+
+    context 'for a user avatar file path' do
+      it 'returns AvatarUploader as a string' do
+        assert_uploader('/-/system/user/avatar/1234/avatar.jpg', 'AvatarUploader')
+      end
+    end
+
+    context 'for a group avatar file path' do
+      it 'returns AvatarUploader as a string' do
+        assert_uploader('/-/system/group/avatar/1234/avatar.jpg', 'AvatarUploader')
+      end
+    end
+
+    context 'for a project avatar file path' do
+      it 'returns AvatarUploader as a string' do
+        assert_uploader('/-/system/project/avatar/1234/avatar.jpg', 'AvatarUploader')
+      end
+    end
+
+    context 'for a project Markdown attachment (notes, issues, MR descriptions) file path' do
+      it 'returns FileUploader as a string' do
+        project = create(:project)
+
+        assert_uploader("/#{project.full_path}/#{SecureRandom.hex}/Some file.jpg", 'FileUploader')
+      end
+    end
+  end
+
+  describe '#model_type' do
+    def assert_model_type(file_path, expected_model_type)
+      untracked_file = create_untracked_file(file_path)
+
+      expect(untracked_file.model_type).to eq(expected_model_type)
+    end
+
+    context 'for an appearance logo file path' do
+      it 'returns Appearance as a string' do
+        assert_model_type('/-/system/appearance/logo/1/some_logo.jpg', 'Appearance')
+      end
+    end
+
+    context 'for an appearance header_logo file path' do
+      it 'returns Appearance as a string' do
+        assert_model_type('/-/system/appearance/header_logo/1/some_logo.jpg', 'Appearance')
+      end
+    end
+
+    context 'for a pre-Markdown Note attachment file path' do
+      it 'returns Note as a string' do
+        assert_model_type('/-/system/note/attachment/1234/some_attachment.pdf', 'Note')
+      end
+    end
+
+    context 'for a user avatar file path' do
+      it 'returns User as a string' do
+        assert_model_type('/-/system/user/avatar/1234/avatar.jpg', 'User')
+      end
+    end
+
+    context 'for a group avatar file path' do
+      it 'returns Namespace as a string' do
+        assert_model_type('/-/system/group/avatar/1234/avatar.jpg', 'Namespace')
+      end
+    end
+
+    context 'for a project avatar file path' do
+      it 'returns Project as a string' do
+        assert_model_type('/-/system/project/avatar/1234/avatar.jpg', 'Project')
+      end
+    end
+
+    context 'for a project Markdown attachment (notes, issues, MR descriptions) file path' do
+      it 'returns Project as a string' do
+        project = create(:project)
+
+        assert_model_type("/#{project.full_path}/#{SecureRandom.hex}/Some file.jpg", 'Project')
+      end
+    end
+  end
+
+  describe '#model_id' do
+    def assert_model_id(file_path, expected_model_id)
+      untracked_file = create_untracked_file(file_path)
+
+      expect(untracked_file.model_id).to eq(expected_model_id)
+    end
+
+    context 'for an appearance logo file path' do
+      it 'returns the ID as a string' do
+        assert_model_id('/-/system/appearance/logo/1/some_logo.jpg', 1)
+      end
+    end
+
+    context 'for an appearance header_logo file path' do
+      it 'returns the ID as a string' do
+        assert_model_id('/-/system/appearance/header_logo/1/some_logo.jpg', 1)
+      end
+    end
+
+    context 'for a pre-Markdown Note attachment file path' do
+      it 'returns the ID as a string' do
+        assert_model_id('/-/system/note/attachment/1234/some_attachment.pdf', 1234)
+      end
+    end
+
+    context 'for a user avatar file path' do
+      it 'returns the ID as a string' do
+        assert_model_id('/-/system/user/avatar/1234/avatar.jpg', 1234)
+      end
+    end
+
+    context 'for a group avatar file path' do
+      it 'returns the ID as a string' do
+        assert_model_id('/-/system/group/avatar/1234/avatar.jpg', 1234)
+      end
+    end
+
+    context 'for a project avatar file path' do
+      it 'returns the ID as a string' do
+        assert_model_id('/-/system/project/avatar/1234/avatar.jpg', 1234)
+      end
+    end
+
+    context 'for a project Markdown attachment (notes, issues, MR descriptions) file path' do
+      it 'returns the ID as a string' do
+        project = create(:project)
+
+        assert_model_id("/#{project.full_path}/#{SecureRandom.hex}/Some file.jpg", project.id)
+      end
+    end
+  end
+
+  describe '#file_size' do
+    context 'for an appearance logo file path' do
+      let(:appearance) { create_or_update_appearance(logo: uploaded_file) }
+      let(:untracked_file) { described_class.create!(path: appearance.uploads.first.path) }
+
+      it 'returns the file size' do
+        expect(untracked_file.file_size).to eq(35255)
+      end
+
+      it 'returns the same thing that CarrierWave would return' do
+        expect(untracked_file.file_size).to eq(appearance.logo.size)
+      end
+    end
+
+    context 'for a project avatar file path' do
+      let(:project) { create(:project, avatar: uploaded_file) }
+      let(:untracked_file) { described_class.create!(path: project.uploads.first.path) }
+
+      it 'returns the file size' do
+        expect(untracked_file.file_size).to eq(35255)
+      end
+
+      it 'returns the same thing that CarrierWave would return' do
+        expect(untracked_file.file_size).to eq(project.avatar.size)
+      end
+    end
+
+    context 'for a project Markdown attachment (notes, issues, MR descriptions) file path' do
+      let(:project) { create(:project) }
+      let(:untracked_file) { create_untracked_file("/#{project.full_path}/#{project.uploads.first.path}") }
+
+      before do
+        UploadService.new(project, uploaded_file, FileUploader).execute
+      end
+
+      it 'returns the file size' do
+        expect(untracked_file.file_size).to eq(35255)
+      end
+
+      it 'returns the same thing that CarrierWave would return' do
+        expect(untracked_file.file_size).to eq(project.uploads.first.size)
+      end
+    end
+  end
+
+  def create_untracked_file(path_relative_to_upload_dir)
+    described_class.create!(path: "#{Gitlab::BackgroundMigration::PrepareUntrackedUploads::RELATIVE_UPLOAD_DIR}#{path_relative_to_upload_dir}")
+  end
+end
diff --git a/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb b/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb
new file mode 100644
index 00000000000..cd3f1a45270
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb
@@ -0,0 +1,242 @@
+require 'spec_helper'
+
+describe Gitlab::BackgroundMigration::PrepareUntrackedUploads, :sidekiq do
+  include TrackUntrackedUploadsHelpers
+
+  let!(:untracked_files_for_uploads) { described_class::UntrackedFile }
+
+  matcher :be_scheduled_migration do |*expected|
+    match do |migration|
+      BackgroundMigrationWorker.jobs.any? do |job|
+        job['args'] == [migration, expected]
+      end
+    end
+
+    failure_message do |migration|
+      "Migration `#{migration}` with args `#{expected.inspect}` not scheduled!"
+    end
+  end
+
+  before do
+    DatabaseCleaner.clean
+
+    drop_temp_table_if_exists
+  end
+
+  after do
+    drop_temp_table_if_exists
+  end
+
+  around do |example|
+    # Especially important so the follow-up migration does not get run
+    Sidekiq::Testing.fake! do
+      example.run
+    end
+  end
+
+  it 'ensures the untracked_files_for_uploads table exists' do
+    expect do
+      described_class.new.perform
+    end.to change { ActiveRecord::Base.connection.table_exists?(:untracked_files_for_uploads) }.from(false).to(true)
+  end
+
+  it 'has a path field long enough for really long paths' do
+    described_class.new.perform
+
+    component = 'a' * 255
+
+    long_path = [
+      'uploads',
+      component, # project.full_path
+      component  # filename
+    ].flatten.join('/')
+
+    record = untracked_files_for_uploads.create!(path: long_path)
+    expect(record.reload.path.size).to eq(519)
+  end
+
+  context "test bulk insert with ON CONFLICT DO NOTHING or IGNORE" do
+    around do |example|
+      # If this is CI, we use Postgres 9.2 so this whole context should be
+      # skipped since we're unable to use ON CONFLICT DO NOTHING or IGNORE.
+      if described_class.new.send(:can_bulk_insert_and_ignore_duplicates?)
+        example.run
+      end
+    end
+
+    context 'when files were uploaded before and after hashed storage was enabled' do
+      let!(:appearance) { create_or_update_appearance(logo: uploaded_file, header_logo: uploaded_file) }
+      let!(:user) { create(:user, :with_avatar) }
+      let!(:project1) { create(:project, :with_avatar) }
+      let(:project2) { create(:project) } # instantiate after enabling hashed_storage
+
+      before do
+        # Markdown upload before enabling hashed_storage
+        UploadService.new(project1, uploaded_file, FileUploader).execute
+
+        stub_application_setting(hashed_storage_enabled: true)
+
+        # Markdown upload after enabling hashed_storage
+        UploadService.new(project2, uploaded_file, FileUploader).execute
+      end
+
+      it 'adds unhashed files to the untracked_files_for_uploads table' do
+        described_class.new.perform
+
+        expect(untracked_files_for_uploads.count).to eq(5)
+      end
+
+      it 'adds files with paths relative to CarrierWave.root' do
+        described_class.new.perform
+        untracked_files_for_uploads.all.each do |file|
+          expect(file.path.start_with?('uploads/')).to be_truthy
+        end
+      end
+
+      it 'does not add hashed files to the untracked_files_for_uploads table' do
+        described_class.new.perform
+
+        hashed_file_path = project2.uploads.where(uploader: 'FileUploader').first.path
+        expect(untracked_files_for_uploads.where("path like '%#{hashed_file_path}%'").exists?).to be_falsey
+      end
+
+      it 'correctly schedules the follow-up background migration jobs' do
+        described_class.new.perform
+
+        expect(described_class::FOLLOW_UP_MIGRATION).to be_scheduled_migration(1, 5)
+        expect(BackgroundMigrationWorker.jobs.size).to eq(1)
+      end
+
+      # E.g. from a previous failed run of this background migration
+      context 'when there is existing data in untracked_files_for_uploads' do
+        before do
+          described_class.new.perform
+        end
+
+        it 'does not error or produce duplicates of existing data' do
+          expect do
+            described_class.new.perform
+          end.not_to change { untracked_files_for_uploads.count }.from(5)
+        end
+      end
+
+      # E.g. The installation is in use at the time of migration, and someone has
+      # just uploaded a file
+      context 'when there are files in /uploads/tmp' do
+        let(:tmp_file) { Rails.root.join(described_class::ABSOLUTE_UPLOAD_DIR, 'tmp', 'some_file.jpg') }
+
+        before do
+          FileUtils.touch(tmp_file)
+        end
+
+        after do
+          FileUtils.rm(tmp_file)
+        end
+
+        it 'does not add files from /uploads/tmp' do
+          described_class.new.perform
+
+          expect(untracked_files_for_uploads.count).to eq(5)
+        end
+      end
+    end
+  end
+
+  context 'test bulk insert without ON CONFLICT DO NOTHING or IGNORE' do
+    before do
+      # If this is CI, we use Postgres 9.2 so this stub has no effect.
+      #
+      # If this is being run on Postgres 9.5+ or MySQL, then this stub allows us
+      # to test the bulk insert functionality without ON CONFLICT DO NOTHING or
+      # IGNORE.
+      allow_any_instance_of(described_class).to receive(:postgresql_pre_9_5?).and_return(true)
+    end
+
+    context 'when files were uploaded before and after hashed storage was enabled' do
+      let!(:appearance) { create_or_update_appearance(logo: uploaded_file, header_logo: uploaded_file) }
+      let!(:user) { create(:user, :with_avatar) }
+      let!(:project1) { create(:project, :with_avatar) }
+      let(:project2) { create(:project) } # instantiate after enabling hashed_storage
+
+      before do
+        # Markdown upload before enabling hashed_storage
+        UploadService.new(project1, uploaded_file, FileUploader).execute
+
+        stub_application_setting(hashed_storage_enabled: true)
+
+        # Markdown upload after enabling hashed_storage
+        UploadService.new(project2, uploaded_file, FileUploader).execute
+      end
+
+      it 'adds unhashed files to the untracked_files_for_uploads table' do
+        described_class.new.perform
+
+        expect(untracked_files_for_uploads.count).to eq(5)
+      end
+
+      it 'adds files with paths relative to CarrierWave.root' do
+        described_class.new.perform
+        untracked_files_for_uploads.all.each do |file|
+          expect(file.path.start_with?('uploads/')).to be_truthy
+        end
+      end
+
+      it 'does not add hashed files to the untracked_files_for_uploads table' do
+        described_class.new.perform
+
+        hashed_file_path = project2.uploads.where(uploader: 'FileUploader').first.path
+        expect(untracked_files_for_uploads.where("path like '%#{hashed_file_path}%'").exists?).to be_falsey
+      end
+
+      it 'correctly schedules the follow-up background migration jobs' do
+        described_class.new.perform
+
+        expect(described_class::FOLLOW_UP_MIGRATION).to be_scheduled_migration(1, 5)
+        expect(BackgroundMigrationWorker.jobs.size).to eq(1)
+      end
+
+      # E.g. from a previous failed run of this background migration
+      context 'when there is existing data in untracked_files_for_uploads' do
+        before do
+          described_class.new.perform
+        end
+
+        it 'does not error or produce duplicates of existing data' do
+          expect do
+            described_class.new.perform
+          end.not_to change { untracked_files_for_uploads.count }.from(5)
+        end
+      end
+
+      # E.g. The installation is in use at the time of migration, and someone has
+      # just uploaded a file
+      context 'when there are files in /uploads/tmp' do
+        let(:tmp_file) { Rails.root.join(described_class::ABSOLUTE_UPLOAD_DIR, 'tmp', 'some_file.jpg') }
+
+        before do
+          FileUtils.touch(tmp_file)
+        end
+
+        after do
+          FileUtils.rm(tmp_file)
+        end
+
+        it 'does not add files from /uploads/tmp' do
+          described_class.new.perform
+
+          expect(untracked_files_for_uploads.count).to eq(5)
+        end
+      end
+    end
+  end
+
+  # Very new or lightly-used installations that are running this migration
+  # may not have an upload directory because they have no uploads.
+  context 'when no files were ever uploaded' do
+    it 'does not add to the untracked_files_for_uploads table (and does not raise error)' do
+      described_class.new.perform
+
+      expect(untracked_files_for_uploads.count).to eq(0)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/backup/repository_spec.rb b/spec/lib/gitlab/backup/repository_spec.rb
deleted file mode 100644
index 535cce12780..00000000000
--- a/spec/lib/gitlab/backup/repository_spec.rb
+++ /dev/null
@@ -1,117 +0,0 @@
-require 'spec_helper'
-
-describe Backup::Repository do
-  let(:progress) { StringIO.new }
-  let!(:project) { create(:project) }
-
-  before do
-    allow(progress).to receive(:puts)
-    allow(progress).to receive(:print)
-
-    allow_any_instance_of(String).to receive(:color) do |string, _color|
-      string
-    end
-
-    allow_any_instance_of(described_class).to receive(:progress).and_return(progress)
-  end
-
-  describe '#dump' do
-    describe 'repo failure' do
-      before do
-        allow_any_instance_of(Repository).to receive(:empty_repo?).and_raise(Rugged::OdbError)
-        allow(Gitlab::Popen).to receive(:popen).and_return(['normal output', 0])
-      end
-
-      it 'does not raise error' do
-        expect { described_class.new.dump }.not_to raise_error
-      end
-
-      it 'shows the appropriate error' do
-        described_class.new.dump
-
-        expect(progress).to have_received(:puts).with("Ignoring repository error and continuing backing up project: #{project.full_path} - Rugged::OdbError")
-      end
-    end
-
-    describe 'command failure' do
-      before do
-        allow_any_instance_of(Repository).to receive(:empty_repo?).and_return(false)
-        allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
-      end
-
-      it 'shows the appropriate error' do
-        described_class.new.dump
-
-        expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} - error")
-      end
-    end
-  end
-
-  describe '#restore' do
-    describe 'command failure' do
-      before do
-        allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
-      end
-
-      it 'shows the appropriate error' do
-        described_class.new.restore
-
-        expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} - error")
-      end
-    end
-  end
-
-  describe '#empty_repo?' do
-    context 'for a wiki' do
-      let(:wiki) { create(:project_wiki) }
-
-      context 'wiki repo has content' do
-        let!(:wiki_page) { create(:wiki_page, wiki: wiki) }
-
-        before do
-          wiki.repository.exists? # initial cache
-        end
-
-        context '`repository.exists?` is incorrectly cached as false' do
-          before do
-            repo = wiki.repository
-            repo.send(:cache).expire(:exists?)
-            repo.send(:cache).fetch(:exists?) { false }
-            repo.send(:instance_variable_set, :@exists, false)
-          end
-
-          it 'returns false, regardless of bad cache value' do
-            expect(described_class.new.send(:empty_repo?, wiki)).to be_falsey
-          end
-        end
-
-        context '`repository.exists?` is correctly cached as true' do
-          it 'returns false' do
-            expect(described_class.new.send(:empty_repo?, wiki)).to be_falsey
-          end
-        end
-      end
-
-      context 'wiki repo does not have content' do
-        context '`repository.exists?` is incorrectly cached as true' do
-          before do
-            repo = wiki.repository
-            repo.send(:cache).expire(:exists?)
-            repo.send(:cache).fetch(:exists?) { true }
-            repo.send(:instance_variable_set, :@exists, true)
-          end
-
-          it 'returns true, regardless of bad cache value' do
-            expect(described_class.new.send(:empty_repo?, wiki)).to be_truthy
-          end
-        end
-
-        context '`repository.exists?` is correctly cached as false' do
-          it 'returns true' do
-            expect(described_class.new.send(:empty_repo?, wiki)).to be_truthy
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
index a66347ead76..a6a1d9e619f 100644
--- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
@@ -54,11 +54,13 @@ describe Gitlab::BitbucketImport::Importer do
     create(
       :project,
       import_source: project_identifier,
+      import_url: "https://bitbucket.org/#{project_identifier}.git",
       import_data_attributes: { credentials: data }
     )
   end
 
   let(:importer) { described_class.new(project) }
+  let(:gitlab_shell) { double }
 
   let(:issues_statuses_sample_data) do
     {
@@ -67,6 +69,10 @@ describe Gitlab::BitbucketImport::Importer do
     }
   end
 
+  before do
+    allow(importer).to receive(:gitlab_shell) { gitlab_shell }
+  end
+
   context 'issues statuses' do
     before do
       # HACK: Bitbucket::Representation.const_get('Issue') seems to return ::Issue without this
@@ -110,15 +116,36 @@ describe Gitlab::BitbucketImport::Importer do
     end
 
     it 'maps statuses to open or closed' do
+      allow(importer).to receive(:import_wiki)
+
       importer.execute
 
       expect(project.issues.where(state: "closed").size).to eq(5)
       expect(project.issues.where(state: "opened").size).to eq(2)
     end
 
-    it 'calls import_wiki' do
-      expect(importer).to receive(:import_wiki)
-      importer.execute
+    describe 'wiki import' do
+      it 'is skipped when the wiki exists' do
+        expect(project.wiki).to receive(:repository_exists?) { true }
+        expect(importer.gitlab_shell).not_to receive(:import_repository)
+
+        importer.execute
+
+        expect(importer.errors).to be_empty
+      end
+
+      it 'imports to the project disk_path' do
+        expect(project.wiki).to receive(:repository_exists?) { false }
+        expect(importer.gitlab_shell).to receive(:import_repository).with(
+          project.repository_storage_path,
+          project.wiki.disk_path,
+          project.import_url + '/wiki'
+        )
+
+        importer.execute
+
+        expect(importer.errors).to be_empty
+      end
     end
   end
 end
diff --git a/spec/lib/gitlab/checks/change_access_spec.rb b/spec/lib/gitlab/checks/change_access_spec.rb
index 74a24a4424b..c2bca816aae 100644
--- a/spec/lib/gitlab/checks/change_access_spec.rb
+++ b/spec/lib/gitlab/checks/change_access_spec.rb
@@ -165,47 +165,16 @@ describe Gitlab::Checks::ChangeAccess do
     end
 
     context 'LFS integrity check' do
-      let(:blob_object) { project.repository.blob_at_branch('lfs', 'files/lfs/lfs_object.iso') }
+      it 'fails if any LFS blobs are missing' do
+        allow_any_instance_of(Gitlab::Checks::LfsIntegrity).to receive(:objects_missing?).and_return(true)
 
-      before do
-        allow_any_instance_of(Gitlab::Git::RevList).to receive(:new_objects) do |&lazy_block|
-          lazy_block.call([blob_object.id])
-        end
-      end
-
-      context 'with LFS not enabled' do
-        it 'skips integrity check' do
-          expect_any_instance_of(Gitlab::Git::RevList).not_to receive(:new_objects)
-
-          subject.exec
-        end
+        expect { subject.exec }.to raise_error(Gitlab::GitAccess::UnauthorizedError, /LFS objects are missing/)
       end
 
-      context 'with LFS enabled' do
-        before do
-          allow(project).to receive(:lfs_enabled?).and_return(true)
-        end
-
-        context 'deletion' do
-          let(:changes) { { oldrev: oldrev, ref: ref } }
-
-          it 'skips integrity check' do
-            expect_any_instance_of(Gitlab::Git::RevList).not_to receive(:new_objects)
+      it 'succeeds if LFS objects have already been uploaded' do
+        allow_any_instance_of(Gitlab::Checks::LfsIntegrity).to receive(:objects_missing?).and_return(false)
 
-            subject.exec
-          end
-        end
-
-        it 'fails if any LFS blobs are missing' do
-          expect { subject.exec }.to raise_error(Gitlab::GitAccess::UnauthorizedError, /LFS objects are missing/)
-        end
-
-        it 'succeeds if LFS objects have already been uploaded' do
-          lfs_object = create(:lfs_object, oid: blob_object.lfs_oid)
-          create(:lfs_objects_project, project: project, lfs_object: lfs_object)
-
-          expect { subject.exec }.not_to raise_error
-        end
+        expect { subject.exec }.not_to raise_error
       end
     end
   end
diff --git a/spec/lib/gitlab/checks/lfs_integrity_spec.rb b/spec/lib/gitlab/checks/lfs_integrity_spec.rb
new file mode 100644
index 00000000000..17756621221
--- /dev/null
+++ b/spec/lib/gitlab/checks/lfs_integrity_spec.rb
@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe Gitlab::Checks::LfsIntegrity do
+  include ProjectForksHelper
+  let(:project) { create(:project, :repository) }
+  let(:newrev) { '54fcc214b94e78d7a41a9a8fe6d87a5e59500e51' }
+
+  subject { described_class.new(project, newrev) }
+
+  describe '#objects_missing?' do
+    let(:blob_object) { project.repository.blob_at_branch('lfs', 'files/lfs/lfs_object.iso') }
+
+    before do
+      allow_any_instance_of(Gitlab::Git::RevList).to receive(:new_objects) do |&lazy_block|
+        lazy_block.call([blob_object.id])
+      end
+    end
+
+    context 'with LFS not enabled' do
+      it 'skips integrity check' do
+        expect_any_instance_of(Gitlab::Git::RevList).not_to receive(:new_objects)
+
+        subject.objects_missing?
+      end
+    end
+
+    context 'with LFS enabled' do
+      before do
+        allow(project).to receive(:lfs_enabled?).and_return(true)
+      end
+
+      context 'deletion' do
+        let(:newrev) { nil }
+
+        it 'skips integrity check' do
+          expect_any_instance_of(Gitlab::Git::RevList).not_to receive(:new_objects)
+
+          expect(subject.objects_missing?).to be_falsey
+        end
+      end
+
+      it 'is true if any LFS blobs are missing' do
+        expect(subject.objects_missing?).to be_truthy
+      end
+
+      it 'is false if LFS objects have already been uploaded' do
+        lfs_object = create(:lfs_object, oid: blob_object.lfs_oid)
+        create(:lfs_objects_project, project: project, lfs_object: lfs_object)
+
+        expect(subject.objects_missing?).to be_falsey
+      end
+    end
+
+    context 'for forked project' do
+      let(:parent_project) { create(:project, :repository) }
+      let(:project) { fork_project(parent_project, nil, repository: true) }
+
+      before do
+        allow(project).to receive(:lfs_enabled?).and_return(true)
+      end
+
+      it 'is true parent project is missing LFS objects' do
+        expect(subject.objects_missing?).to be_truthy
+      end
+
+      it 'is false parent project already conatins LFS objects for the fork' do
+        lfs_object = create(:lfs_object, oid: blob_object.lfs_oid)
+        create(:lfs_objects_project, project: parent_project, lfs_object: lfs_object)
+
+        expect(subject.objects_missing?).to be_falsey
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb b/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
index 15eb01eb472..4884d5f8ba4 100644
--- a/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
+++ b/spec/lib/gitlab/ci/build/policy/kubernetes_spec.rb
@@ -4,11 +4,24 @@ describe Gitlab::Ci::Build::Policy::Kubernetes do
   let(:pipeline) { create(:ci_pipeline, project: project) }
 
   context 'when kubernetes service is active' do
-    set(:project) { create(:kubernetes_project) }
+    shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
+      it 'is satisfied by a kubernetes pipeline' do
+        expect(described_class.new('active'))
+          .to be_satisfied_by(pipeline)
+      end
+    end
 
-    it 'is satisfied by a kubernetes pipeline' do
-      expect(described_class.new('active'))
-        .to be_satisfied_by(pipeline)
+    context 'when user configured kubernetes from Integration > Kubernetes' do
+      let(:project) { create(:kubernetes_project) }
+
+      it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
+    end
+
+    context 'when user configured kubernetes from CI/CD > Clusters' do
+      let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+      let(:project) { cluster.project }
+
+      it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
     end
   end
 
diff --git a/spec/lib/gitlab/ci/pipeline/chain/build_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/build_spec.rb
new file mode 100644
index 00000000000..0f1d72080c5
--- /dev/null
+++ b/spec/lib/gitlab/ci/pipeline/chain/build_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::Pipeline::Chain::Build do
+  set(:project) { create(:project, :repository) }
+  set(:user) { create(:user) }
+  let(:pipeline) { Ci::Pipeline.new }
+
+  let(:command) do
+    double('command', source: :push,
+                      origin_ref: 'master',
+                      checkout_sha: project.commit.id,
+                      after_sha: nil,
+                      before_sha: nil,
+                      trigger_request: nil,
+                      schedule: nil,
+                      project: project,
+                      current_user: user)
+  end
+
+  let(:step) { described_class.new(pipeline, command) }
+
+  before do
+    stub_repository_ci_yaml_file(sha: anything)
+
+    step.perform!
+  end
+
+  it 'never breaks the chain' do
+    expect(step.break?).to be false
+  end
+
+  it 'fills pipeline object with data' do
+    expect(pipeline.sha).not_to be_empty
+    expect(pipeline.sha).to eq project.commit.id
+    expect(pipeline.ref).to eq 'master'
+    expect(pipeline.user).to eq user
+    expect(pipeline.project).to eq project
+  end
+
+  it 'sets a valid config source' do
+    expect(pipeline.repository_source?).to be true
+  end
+
+  it 'returns a valid pipeline' do
+    expect(pipeline).to be_valid
+  end
+
+  it 'does not persist a pipeline' do
+    expect(pipeline).not_to be_persisted
+  end
+end
diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index d72f8553f55..98880fe9f28 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -178,15 +178,29 @@ module Gitlab
           end
 
           context 'when kubernetes is active' do
-            let(:project) { create(:kubernetes_project) }
-            let(:pipeline) { create(:ci_empty_pipeline, project: project) }
+            shared_examples 'same behavior between KubernetesService and Platform::Kubernetes' do
+              it 'returns seeds for kubernetes dependent job' do
+                seeds = subject.stage_seeds(pipeline)
 
-            it 'returns seeds for kubernetes dependent job' do
-              seeds = subject.stage_seeds(pipeline)
+                expect(seeds.size).to eq 2
+                expect(seeds.first.builds.dig(0, :name)).to eq 'spinach'
+                expect(seeds.second.builds.dig(0, :name)).to eq 'production'
+              end
+            end
 
-              expect(seeds.size).to eq 2
-              expect(seeds.first.builds.dig(0, :name)).to eq 'spinach'
-              expect(seeds.second.builds.dig(0, :name)).to eq 'production'
+            context 'when user configured kubernetes from Integration > Kubernetes' do
+              let(:project) { create(:kubernetes_project) }
+              let(:pipeline) { create(:ci_empty_pipeline, project: project) }
+
+              it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
+            end
+
+            context 'when user configured kubernetes from CI/CD > Clusters' do
+              let!(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+              let(:project) { cluster.project }
+              let(:pipeline) { create(:ci_empty_pipeline, project: project) }
+
+              it_behaves_like 'same behavior between KubernetesService and Platform::Kubernetes'
             end
           end
 
diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb
index bf981d2f6f6..92792144429 100644
--- a/spec/lib/gitlab/conflict/file_spec.rb
+++ b/spec/lib/gitlab/conflict/file_spec.rb
@@ -84,6 +84,13 @@ describe Gitlab::Conflict::File do
         expect(line.text).to eq(html_to_text(line.rich_text))
       end
     end
+
+    # This spec will break if Rouge's highlighting changes, but we need to
+    # ensure that the lines are actually highlighted.
+    it 'highlights the lines correctly' do
+      expect(conflict_file.lines.first.rich_text)
+        .to eq("<span id=\"LC1\" class=\"line\" lang=\"ruby\"><span class=\"k\">module</span> <span class=\"nn\">Gitlab</span></span>\n")
+    end
   end
 
   describe '#sections' do
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 3c8350b3aad..664ba0f7234 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -942,8 +942,8 @@ describe Gitlab::Database::MigrationHelpers do
         end
 
         it 'queues jobs in groups of buffer size 1' do
-          expect(BackgroundMigrationWorker).to receive(:perform_bulk).with([['FooJob', [id1, id2]]])
-          expect(BackgroundMigrationWorker).to receive(:perform_bulk).with([['FooJob', [id3, id3]]])
+          expect(BackgroundMigrationWorker).to receive(:bulk_perform_async).with([['FooJob', [id1, id2]]])
+          expect(BackgroundMigrationWorker).to receive(:bulk_perform_async).with([['FooJob', [id3, id3]]])
 
           model.bulk_queue_background_migration_jobs_by_range(User, 'FooJob', batch_size: 2)
         end
@@ -960,8 +960,8 @@ describe Gitlab::Database::MigrationHelpers do
         end
 
         it 'queues jobs in bulk all at once (big buffer size)' do
-          expect(BackgroundMigrationWorker).to receive(:perform_bulk).with([['FooJob', [id1, id2]],
-                                                                            ['FooJob', [id3, id3]]])
+          expect(BackgroundMigrationWorker).to receive(:bulk_perform_async).with([['FooJob', [id1, id2]],
+                                                                                  ['FooJob', [id3, id3]]])
 
           model.bulk_queue_background_migration_jobs_by_range(User, 'FooJob', batch_size: 2)
         end
diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
index 8922370b0a0..e850b5cd6a4 100644
--- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
+++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb
@@ -87,6 +87,14 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr
       subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0')
     end
 
+    it 'does not move the repositories when hashed storage is enabled' do
+      project.update!(storage_version: Project::HASHED_STORAGE_FEATURES[:repository])
+
+      expect(subject).not_to receive(:move_repository)
+
+      subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0')
+    end
+
     it 'moves uploads' do
       expect(subject).to receive(:move_uploads)
                            .with('known-parent/the-path', 'known-parent/the-path0')
@@ -94,6 +102,14 @@ describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :tr
       subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0')
     end
 
+    it 'does not move uploads when hashed storage is enabled for attachments' do
+      project.update!(storage_version: Project::HASHED_STORAGE_FEATURES[:attachments])
+
+      expect(subject).not_to receive(:move_uploads)
+
+      subject.move_project_folders(project, 'known-parent/the-path', 'known-parent/the-path0')
+    end
+
     it 'moves pages' do
       expect(subject).to receive(:move_pages)
                            .with('known-parent/the-path', 'known-parent/the-path0')
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index 7aeb85b8f5a..b2f13fae73f 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -73,6 +73,28 @@ describe Gitlab::Database do
     end
   end
 
+  describe '.replication_slots_supported?' do
+    it 'returns false when using MySQL' do
+      allow(described_class).to receive(:postgresql?).and_return(false)
+
+      expect(described_class.replication_slots_supported?).to eq(false)
+    end
+
+    it 'returns false when using PostgreSQL 9.3' do
+      allow(described_class).to receive(:postgresql?).and_return(true)
+      allow(described_class).to receive(:version).and_return('9.3.1')
+
+      expect(described_class.replication_slots_supported?).to eq(false)
+    end
+
+    it 'returns true when using PostgreSQL 9.4.0 or newer' do
+      allow(described_class).to receive(:postgresql?).and_return(true)
+      allow(described_class).to receive(:version).and_return('9.4.0')
+
+      expect(described_class.replication_slots_supported?).to eq(true)
+    end
+  end
+
   describe '.nulls_last_order' do
     context 'when using PostgreSQL' do
       before do
@@ -199,9 +221,45 @@ describe Gitlab::Database do
       described_class.bulk_insert('test', rows)
     end
 
+    it 'does not quote values of a column in the disable_quote option' do
+      [1, 2, 4, 5].each do |i|
+        expect(connection).to receive(:quote).with(i)
+      end
+
+      described_class.bulk_insert('test', rows, disable_quote: :c)
+    end
+
+    it 'does not quote values of columns in the disable_quote option' do
+      [2, 5].each do |i|
+        expect(connection).to receive(:quote).with(i)
+      end
+
+      described_class.bulk_insert('test', rows, disable_quote: [:a, :c])
+    end
+
     it 'handles non-UTF-8 data' do
       expect { described_class.bulk_insert('test', [{ a: "\255" }]) }.not_to raise_error
     end
+
+    context 'when using PostgreSQL' do
+      before do
+        allow(described_class).to receive(:mysql?).and_return(false)
+      end
+
+      it 'allows the returning of the IDs of the inserted rows' do
+        result = double(:result, values: [['10']])
+
+        expect(connection)
+          .to receive(:execute)
+          .with(/RETURNING id/)
+          .and_return(result)
+
+        ids = described_class
+          .bulk_insert('test', [{ number: 10 }], return_ids: true)
+
+        expect(ids).to eq([10])
+      end
+    end
   end
 
   describe '.create_connection_pool' do
diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb
index c91895cedc3..ff9acfd08b9 100644
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
@@ -116,12 +116,8 @@ describe Gitlab::Diff::File do
     end
 
     context 'when renamed' do
-      let(:commit) { project.commit('6907208d755b60ebeacb2e9dfea74c92c3449a1f') }
-      let(:diff_file) { commit.diffs.diff_file_with_new_path('files/js/commit.coffee') }
-
-      before do
-        allow(diff_file.new_blob).to receive(:id).and_return(diff_file.old_blob.id)
-      end
+      let(:commit) { project.commit('94bb47ca1297b7b3731ff2a36923640991e9236f') }
+      let(:diff_file) { commit.diffs.diff_file_with_new_path('CHANGELOG.md') }
 
       it 'returns false' do
         expect(diff_file.content_changed?).to be_falsey
diff --git a/spec/lib/gitlab/diff/inline_diff_spec.rb b/spec/lib/gitlab/diff/inline_diff_spec.rb
index 15451c2cf99..0a41362f606 100644
--- a/spec/lib/gitlab/diff/inline_diff_spec.rb
+++ b/spec/lib/gitlab/diff/inline_diff_spec.rb
@@ -31,6 +31,10 @@ describe Gitlab::Diff::InlineDiff do
       expect(subject[7]).to eq([17..17])
       expect(subject[8]).to be_nil
     end
+
+    it 'can handle unchanged empty lines' do
+      expect { described_class.for_lines(['- bar', '+ baz', '']) }.not_to raise_error
+    end
   end
 
   describe "#inline_diffs" do
diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb
index e5138705443..ddc4f6c5b5c 100644
--- a/spec/lib/gitlab/diff/position_tracer_spec.rb
+++ b/spec/lib/gitlab/diff/position_tracer_spec.rb
@@ -1771,9 +1771,9 @@ describe Gitlab::Diff::PositionTracer do
 
     describe "merge of target branch" do
       let(:merge_commit) do
-        update_file_again_commit
+        second_create_file_commit
 
-        merge_request = create(:merge_request, source_branch: second_create_file_commit.sha, target_branch: branch_name, source_project: project)
+        merge_request = create(:merge_request, source_branch: second_branch_name, target_branch: branch_name, source_project: project)
 
         repository.merge(current_user, merge_request.diff_head_sha, merge_request, "Merge branches")
 
diff --git a/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb b/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
new file mode 100644
index 00000000000..51ce3116880
--- /dev/null
+++ b/spec/lib/gitlab/email/handler/create_merge_request_handler_spec.rb
@@ -0,0 +1,84 @@
+require 'spec_helper'
+require_relative '../email_shared_blocks'
+
+describe Gitlab::Email::Handler::CreateMergeRequestHandler do
+  include_context :email_shared_context
+  it_behaves_like :reply_processing_shared_examples
+
+  before do
+    stub_incoming_email_setting(enabled: true, address: "incoming+%{key}@appmail.adventuretime.ooo")
+    stub_config_setting(host: 'localhost')
+  end
+
+  after do
+    TestEnv.clean_test_path
+  end
+
+  let(:email_raw) { fixture_file('emails/valid_new_merge_request.eml') }
+  let(:namespace) { create(:namespace, path: 'gitlabhq') }
+
+  let!(:project)  { create(:project, :public, :repository, namespace: namespace, path: 'gitlabhq') }
+  let!(:user) do
+    create(
+      :user,
+      email: 'jake@adventuretime.ooo',
+      incoming_email_token: 'auth_token'
+    )
+  end
+
+  context "as a non-developer" do
+    before do
+      project.add_guest(user)
+    end
+
+    it "raises UserNotAuthorizedError if the user is not a member" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::UserNotAuthorizedError)
+    end
+  end
+
+  context "as a developer" do
+    before do
+      project.add_developer(user)
+    end
+
+    context "when everything is fine" do
+      it "creates a new merge request" do
+        expect { receiver.execute }.to change { project.merge_requests.count }.by(1)
+        merge_request = project.merge_requests.last
+
+        expect(merge_request.author).to eq(user)
+        expect(merge_request.source_branch).to eq('feature')
+        expect(merge_request.title).to eq('Feature added')
+        expect(merge_request.target_branch).to eq(project.default_branch)
+      end
+    end
+
+    context "something is wrong" do
+      context "when the merge request could not be saved" do
+        before do
+          allow_any_instance_of(MergeRequest).to receive(:save).and_return(false)
+        end
+
+        it "raises an InvalidMergeRequestError" do
+          expect { receiver.execute }.to raise_error(Gitlab::Email::InvalidMergeRequestError)
+        end
+      end
+
+      context "when we can't find the incoming_email_token" do
+        let(:email_raw) { fixture_file("emails/wrong_incoming_email_token.eml") }
+
+        it "raises an UserNotFoundError" do
+          expect { receiver.execute }.to raise_error(Gitlab::Email::UserNotFoundError)
+        end
+      end
+
+      context "when the subject is blank" do
+        let(:email_raw) { fixture_file("emails/valid_new_merge_request_no_subject.eml") }
+
+        it "raises an InvalidMergeRequestError" do
+          expect { receiver.execute }.to raise_error(Gitlab::Email::InvalidMergeRequestError)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/email/handler_spec.rb b/spec/lib/gitlab/email/handler_spec.rb
new file mode 100644
index 00000000000..650b01c4df4
--- /dev/null
+++ b/spec/lib/gitlab/email/handler_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Gitlab::Email::Handler do
+  describe '.for' do
+    it 'picks issue handler if there is not merge request prefix' do
+      expect(described_class.for('email', 'project+key')).to be_an_instance_of(Gitlab::Email::Handler::CreateIssueHandler)
+    end
+
+    it 'picks merge request handler if there is merge request key' do
+      expect(described_class.for('email', 'project+merge-request+key')).to be_an_instance_of(Gitlab::Email::Handler::CreateMergeRequestHandler)
+    end
+
+    it 'returns nil if no handler is found' do
+      expect(described_class.for('email', '')).to be_nil
+    end
+  end
+end
diff --git a/spec/lib/gitlab/encoding_helper_spec.rb b/spec/lib/gitlab/encoding_helper_spec.rb
index 9151c66afb3..f6e5c55240f 100644
--- a/spec/lib/gitlab/encoding_helper_spec.rb
+++ b/spec/lib/gitlab/encoding_helper_spec.rb
@@ -9,6 +9,7 @@ describe Gitlab::EncodingHelper do
       ["nil", nil, nil],
       ["empty string", "".encode("ASCII-8BIT"), "".encode("UTF-8")],
       ["invalid utf-8 encoded string", "my bad string\xE5".force_encoding("UTF-8"), "my bad string"],
+      ["frozen non-ascii string", "é".force_encoding("ASCII-8BIT").freeze, "é".encode("UTF-8")],
       [
         'leaves ascii only string as is',
         'ascii only string',
diff --git a/spec/lib/gitlab/fake_application_settings_spec.rb b/spec/lib/gitlab/fake_application_settings_spec.rb
index 34322c2a693..af12e13d36d 100644
--- a/spec/lib/gitlab/fake_application_settings_spec.rb
+++ b/spec/lib/gitlab/fake_application_settings_spec.rb
@@ -1,25 +1,25 @@
 require 'spec_helper'
 
 describe Gitlab::FakeApplicationSettings do
-  let(:defaults) { { password_authentication_enabled: false, foobar: 'asdf', signup_enabled: true, 'test?' => 123 } }
+  let(:defaults) { { password_authentication_enabled_for_web: false, foobar: 'asdf', signup_enabled: true, 'test?' => 123 } }
 
   subject { described_class.new(defaults) }
 
   it 'wraps OpenStruct variables properly' do
-    expect(subject.password_authentication_enabled).to be_falsey
+    expect(subject.password_authentication_enabled_for_web).to be_falsey
     expect(subject.signup_enabled).to be_truthy
     expect(subject.foobar).to eq('asdf')
   end
 
   it 'defines predicate methods' do
-    expect(subject.password_authentication_enabled?).to be_falsey
+    expect(subject.password_authentication_enabled_for_web?).to be_falsey
     expect(subject.signup_enabled?).to be_truthy
   end
 
   it 'predicate method changes when value is updated' do
-    subject.password_authentication_enabled = true
+    subject.password_authentication_enabled_for_web = true
 
-    expect(subject.password_authentication_enabled?).to be_truthy
+    expect(subject.password_authentication_enabled_for_web?).to be_truthy
   end
 
   it 'does not define a predicate method' do
diff --git a/spec/lib/gitlab/git/commit_spec.rb b/spec/lib/gitlab/git/commit_spec.rb
index 9f4e3c49adc..5ed639543e0 100644
--- a/spec/lib/gitlab/git/commit_spec.rb
+++ b/spec/lib/gitlab/git/commit_spec.rb
@@ -278,6 +278,35 @@ describe Gitlab::Git::Commit, seed_helper: true do
       it { is_expected.not_to include(SeedRepo::FirstCommit::ID) }
     end
 
+    shared_examples '.shas_with_signatures' do
+      let(:signed_shas) { %w[5937ac0a7beb003549fc5fd26fc247adbce4a52e 570e7b2abdd848b95f2f578043fc23bd6f6fd24d] }
+      let(:unsigned_shas) { %w[19e2e9b4ef76b422ce1154af39a91323ccc57434 c642fe9b8b9f28f9225d7ea953fe14e74748d53b] }
+      let(:first_signed_shas) { %w[5937ac0a7beb003549fc5fd26fc247adbce4a52e c642fe9b8b9f28f9225d7ea953fe14e74748d53b] }
+
+      it 'has 2 signed shas' do
+        ret = described_class.shas_with_signatures(repository, signed_shas)
+        expect(ret).to eq(signed_shas)
+      end
+
+      it 'has 0 signed shas' do
+        ret = described_class.shas_with_signatures(repository, unsigned_shas)
+        expect(ret).to eq([])
+      end
+
+      it 'has 1 signed sha' do
+        ret = described_class.shas_with_signatures(repository, first_signed_shas)
+        expect(ret).to contain_exactly(first_signed_shas.first)
+      end
+    end
+
+    describe '.shas_with_signatures with gitaly on' do
+      it_should_behave_like '.shas_with_signatures'
+    end
+
+    describe '.shas_with_signatures with gitaly disabled', :disable_gitaly do
+      it_should_behave_like '.shas_with_signatures'
+    end
+
     describe '.find_all' do
       shared_examples 'finding all commits' do
         it 'should return a return a collection of commits' do
diff --git a/spec/lib/gitlab/git/diff_collection_spec.rb b/spec/lib/gitlab/git/diff_collection_spec.rb
index ee657101f4c..65edc750f39 100644
--- a/spec/lib/gitlab/git/diff_collection_spec.rb
+++ b/spec/lib/gitlab/git/diff_collection_spec.rb
@@ -487,6 +487,7 @@ describe Gitlab::Git::DiffCollection, seed_helper: true do
 
       loop do
         break if @count.zero?
+
         # It is critical to decrement before yielding. We may never reach the lines after 'yield'.
         @count -= 1
         yield @value
diff --git a/spec/lib/gitlab/git/remote_repository_spec.rb b/spec/lib/gitlab/git/remote_repository_spec.rb
new file mode 100644
index 00000000000..eb148cc3804
--- /dev/null
+++ b/spec/lib/gitlab/git/remote_repository_spec.rb
@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe Gitlab::Git::RemoteRepository, seed_helper: true do
+  let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') }
+  subject { described_class.new(repository) }
+
+  describe '#empty?' do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:repository, :result) do
+      Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '')       | false
+      Gitlab::Git::Repository.new('default', 'does-not-exist.git', '') | true
+    end
+
+    with_them do
+      it { expect(subject.empty?).to eq(result) }
+    end
+  end
+
+  describe '#commit_id' do
+    it 'returns an OID if the revision exists' do
+      expect(subject.commit_id('v1.0.0')).to eq('6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9')
+    end
+
+    it 'is nil when the revision does not exist' do
+      expect(subject.commit_id('does-not-exist')).to be_nil
+    end
+  end
+
+  describe '#branch_exists?' do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:branch, :result) do
+      'master'         | true
+      'does-not-exist' | false
+    end
+
+    with_them do
+      it { expect(subject.branch_exists?(branch)).to eq(result) }
+    end
+  end
+
+  describe '#same_repository?' do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:other_repository, :result) do
+      repository                                                                     | true
+      Gitlab::Git::Repository.new(repository.storage, repository.relative_path, '')  | true
+      Gitlab::Git::Repository.new('broken', TEST_REPO_PATH, '')                      | false
+      Gitlab::Git::Repository.new(repository.storage, 'wrong/relative-path.git', '') | false
+      Gitlab::Git::Repository.new('broken', 'wrong/relative-path.git', '')           | false
+    end
+
+    with_them do
+      it { expect(subject.same_repository?(other_repository)).to eq(result) }
+    end
+  end
+
+  describe '#fetch_env' do
+    let(:remote_repository) { described_class.new(repository) }
+
+    let(:gitaly_client) { double(:gitaly_client) }
+    let(:address) { 'fake-address' }
+    let(:token) { 'fake-token' }
+
+    subject { remote_repository.fetch_env }
+
+    before do
+      allow(remote_repository).to receive(:gitaly_client).and_return(gitaly_client)
+
+      expect(gitaly_client).to receive(:address).with(repository.storage).and_return(address)
+      expect(gitaly_client).to receive(:token).with(repository.storage).and_return(token)
+    end
+
+    it { expect(subject).to be_a(Hash) }
+    it { expect(subject['GITALY_ADDRESS']).to eq(address) }
+    it { expect(subject['GITALY_TOKEN']).to eq(token) }
+    it { expect(subject['GITALY_WD']).to eq(Dir.pwd) }
+
+    it 'creates a plausible GIT_SSH_COMMAND' do
+      git_ssh_command = subject['GIT_SSH_COMMAND']
+
+      expect(git_ssh_command).to start_with('/')
+      expect(git_ssh_command).to end_with('/gitaly-ssh upload-pack')
+    end
+
+    it 'creates a plausible GITALY_PAYLOAD' do
+      req = Gitaly::SSHUploadPackRequest.decode_json(subject['GITALY_PAYLOAD'])
+
+      expect(remote_repository.gitaly_repository).to eq(req.repository)
+    end
+
+    context 'when the token is blank' do
+      let(:token) { '' }
+
+      it { expect(subject.keys).not_to include('GITALY_TOKEN') }
+    end
+  end
+end
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index 96e162ac087..f19b65a5f71 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -257,7 +257,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
   end
 
   describe '#empty?' do
-    it { expect(repository.empty?).to be_falsey }
+    it { expect(repository).not_to be_empty }
   end
 
   describe '#ref_names' do
@@ -449,7 +449,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
       let(:repository) { Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '') }
 
       after do
-        FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
         ensure_seeds
       end
 
@@ -484,7 +483,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
       let(:repository) { Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '') }
 
       after do
-        FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
         ensure_seeds
       end
 
@@ -544,7 +542,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
 
     after(:all) do
-      FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
       ensure_seeds
     end
   end
@@ -570,7 +567,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
 
     after(:all) do
-      FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
       ensure_seeds
     end
   end
@@ -588,17 +584,16 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
 
     after(:all) do
-      FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
       ensure_seeds
     end
   end
 
-  describe '#fetch_mirror' do
+  describe '#fetch_as_mirror_without_shell' do
     let(:new_repository) do
       Gitlab::Git::Repository.new('default', 'my_project.git', '')
     end
 
-    subject { new_repository.fetch_mirror(repository.path) }
+    subject { new_repository.fetch_as_mirror_without_shell(repository.path) }
 
     before do
       Gitlab::Shell.new.add_repository('default', 'my_project')
@@ -634,20 +629,48 @@ describe Gitlab::Git::Repository, seed_helper: true do
   end
 
   describe '#remote_tags' do
+    let(:remote_name) { 'upstream' }
     let(:target_commit_id) { SeedRepo::Commit::ID }
+    let(:user) { create(:user) }
+    let(:tag_name) { 'v0.0.1' }
+    let(:tag_message) { 'My tag' }
+    let(:remote_repository) do
+      Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '')
+    end
 
-    subject { repository.remote_tags('upstream') }
+    subject { repository.remote_tags(remote_name) }
 
-    it 'gets the remote tags' do
-      expect(repository).to receive(:list_remote_tags).with('upstream')
-        .and_return(["#{target_commit_id}\trefs/tags/v0.0.1\n"])
+    before do
+      repository.add_remote(remote_name, remote_repository.path)
+      remote_repository.add_tag(tag_name, user: user, target: target_commit_id)
+    end
+
+    after do
+      ensure_seeds
+    end
 
+    it 'gets the remote tags' do
       expect(subject.first).to be_an_instance_of(Gitlab::Git::Tag)
-      expect(subject.first.name).to eq('v0.0.1')
+      expect(subject.first.name).to eq(tag_name)
       expect(subject.first.dereferenced_target.id).to eq(target_commit_id)
     end
   end
 
+  describe '#remote_exists?' do
+    before(:all) do
+      @repo = Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '')
+      @repo.add_remote("new_remote", SeedHelper::GITLAB_GIT_TEST_REPO_URL)
+    end
+
+    it 'returns true for an existing remote' do
+      expect(@repo.remote_exists?('new_remote')).to eq(true)
+    end
+
+    it 'returns false for a non-existing remote' do
+      expect(@repo.remote_exists?('foo')).to eq(false)
+    end
+  end
+
   describe "#log" do
     let(:commit_with_old_name) do
       Gitlab::Git::Commit.decorate(repository, @commit_with_old_name_id)
@@ -1107,7 +1130,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
       end
 
       after do
-        FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
         ensure_seeds
       end
 
@@ -1154,7 +1176,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
       end
 
       after do
-        FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
         ensure_seeds
       end
 
@@ -1189,13 +1210,32 @@ describe Gitlab::Git::Repository, seed_helper: true do
       end
     end
 
+    context 'when no root ref is available' do
+      it 'returns empty list' do
+        project = create(:project, :empty_repo)
+
+        names = project.repository.merged_branch_names(%w[feature])
+
+        expect(names).to be_empty
+      end
+    end
+
     context 'when no branch names are specified' do
-      it 'returns all merged branch names' do
+      before do
+        repository.create_branch('identical', 'master')
+      end
+
+      after do
+        ensure_seeds
+      end
+
+      it 'returns all merged branch names except for identical one' do
         names = repository.merged_branch_names
 
         expect(names).to include('merge-test')
         expect(names).to include('fix-mode')
         expect(names).not_to include('feature')
+        expect(names).not_to include('identical')
       end
     end
   end
@@ -1404,7 +1444,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
 
     after(:all) do
-      FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
       ensure_seeds
     end
 
@@ -1522,35 +1561,60 @@ describe Gitlab::Git::Repository, seed_helper: true do
   end
 
   describe '#fetch_source_branch!' do
-    let(:local_ref) { 'refs/merge-requests/1/head' }
+    shared_examples '#fetch_source_branch!' do
+      let(:local_ref) { 'refs/merge-requests/1/head' }
+      let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '') }
+      let(:source_repository) { Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '') }
 
-    context 'when the branch exists' do
-      let(:source_branch) { 'master' }
+      after do
+        ensure_seeds
+      end
 
-      it 'writes the ref' do
-        expect(repository).to receive(:write_ref).with(local_ref, /\h{40}/)
+      context 'when the branch exists' do
+        context 'when the commit does not exist locally' do
+          let(:source_branch) { 'new-branch-for-fetch-source-branch' }
+          let(:source_rugged) { source_repository.rugged }
+          let(:new_oid) { new_commit_edit_old_file(source_rugged).oid }
 
-        repository.fetch_source_branch!(repository, source_branch, local_ref)
-      end
+          before do
+            source_rugged.branches.create(source_branch, new_oid)
+          end
 
-      it 'returns true' do
-        expect(repository.fetch_source_branch!(repository, source_branch, local_ref)).to eq(true)
-      end
-    end
+          it 'writes the ref' do
+            expect(repository.fetch_source_branch!(source_repository, source_branch, local_ref)).to eq(true)
+            expect(repository.commit(local_ref).sha).to eq(new_oid)
+          end
+        end
 
-    context 'when the branch does not exist' do
-      let(:source_branch) { 'definitely-not-master' }
+        context 'when the commit exists locally' do
+          let(:source_branch) { 'master' }
+          let(:expected_oid) { SeedRepo::LastCommit::ID }
 
-      it 'does not write the ref' do
-        expect(repository).not_to receive(:write_ref)
+          it 'writes the ref' do
+            # Sanity check: the commit should already exist
+            expect(repository.commit(expected_oid)).not_to be_nil
 
-        repository.fetch_source_branch!(repository, source_branch, local_ref)
+            expect(repository.fetch_source_branch!(source_repository, source_branch, local_ref)).to eq(true)
+            expect(repository.commit(local_ref).sha).to eq(expected_oid)
+          end
+        end
       end
 
-      it 'returns false' do
-        expect(repository.fetch_source_branch!(repository, source_branch, local_ref)).to eq(false)
+      context 'when the branch does not exist' do
+        let(:source_branch) { 'definitely-not-master' }
+
+        it 'does not write the ref' do
+          expect(repository.fetch_source_branch!(source_repository, source_branch, local_ref)).to eq(false)
+          expect(repository.commit(local_ref)).to be_nil
+        end
       end
     end
+
+    it_behaves_like '#fetch_source_branch!'
+
+    context 'without gitaly', :skip_gitaly_mock do
+      it_behaves_like '#fetch_source_branch!'
+    end
   end
 
   describe '#rm_branch' do
@@ -1598,15 +1662,15 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
   end
 
-  describe '#fetch' do
+  describe '#fetch_remote_without_shell' do
     let(:git_path) { Gitlab.config.git.bin_path }
     let(:remote_name) { 'my_remote' }
 
-    subject { repository.fetch(remote_name) }
+    subject { repository.fetch_remote_without_shell(remote_name) }
 
     it 'fetches the remote and returns true if the command was successful' do
       expect(repository).to receive(:popen)
-        .with(%W(#{git_path} fetch #{remote_name}), repository.path)
+        .with(%W(#{git_path} fetch #{remote_name}), repository.path, {})
         .and_return(['', 0])
 
       expect(subject).to be(true)
@@ -1626,7 +1690,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
 
     after do
-      FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
       ensure_seeds
     end
 
@@ -1724,18 +1787,29 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
   end
 
-  describe '#fetch' do
-    let(:git_path) { Gitlab.config.git.bin_path }
-    let(:remote_name) { 'my_remote' }
+  describe '#delete_all_refs_except' do
+    let(:repository) do
+      Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '')
+    end
 
-    subject { repository.fetch(remote_name) }
+    before do
+      repository.write_ref("refs/delete/a", "0b4bc9a49b562e85de7cc9e834518ea6828729b9")
+      repository.write_ref("refs/also-delete/b", "12d65c8dd2b2676fa3ac47d955accc085a37a9c1")
+      repository.write_ref("refs/keep/c", "6473c90867124755509e100d0d35ebdc85a0b6ae")
+      repository.write_ref("refs/also-keep/d", "0b4bc9a49b562e85de7cc9e834518ea6828729b9")
+    end
 
-    it 'fetches the remote and returns true if the command was successful' do
-      expect(repository).to receive(:popen)
-        .with(%W(#{git_path} fetch #{remote_name}), repository.path)
-        .and_return(['', 0])
+    after do
+      ensure_seeds
+    end
 
-      expect(subject).to be(true)
+    it 'deletes all refs except those with the specified prefixes' do
+      repository.delete_all_refs_except(%w(refs/keep refs/also-keep refs/heads))
+      expect(repository.ref_exists?("refs/delete/a")).to be(false)
+      expect(repository.ref_exists?("refs/also-delete/b")).to be(false)
+      expect(repository.ref_exists?("refs/keep/c")).to be(true)
+      expect(repository.ref_exists?("refs/also-keep/d")).to be(true)
+      expect(repository.ref_exists?("refs/heads/master")).to be(true)
     end
   end
 
diff --git a/spec/lib/gitlab/git/storage/checker_spec.rb b/spec/lib/gitlab/git/storage/checker_spec.rb
new file mode 100644
index 00000000000..d74c3bcb04c
--- /dev/null
+++ b/spec/lib/gitlab/git/storage/checker_spec.rb
@@ -0,0 +1,132 @@
+require 'spec_helper'
+
+describe Gitlab::Git::Storage::Checker, :clean_gitlab_redis_shared_state do
+  let(:storage_name) { 'default' }
+  let(:hostname) { Gitlab::Environment.hostname }
+  let(:cache_key) { "storage_accessible:#{storage_name}:#{hostname}" }
+
+  subject(:checker) { described_class.new(storage_name) }
+
+  def value_from_redis(name)
+    Gitlab::Git::Storage.redis.with do |redis|
+      redis.hmget(cache_key, name)
+    end.first
+  end
+
+  def set_in_redis(name, value)
+    Gitlab::Git::Storage.redis.with do |redis|
+      redis.hmset(cache_key, name, value)
+    end.first
+  end
+
+  describe '.check_all' do
+    it 'calls a check for each storage' do
+      fake_checker_default = double
+      fake_checker_broken = double
+      fake_logger = fake_logger
+
+      expect(described_class).to receive(:new).with('default', fake_logger) { fake_checker_default }
+      expect(described_class).to receive(:new).with('broken', fake_logger) { fake_checker_broken }
+      expect(fake_checker_default).to receive(:check_with_lease)
+      expect(fake_checker_broken).to receive(:check_with_lease)
+
+      described_class.check_all(fake_logger)
+    end
+
+    context 'with broken storage', :broken_storage do
+      it 'returns the results' do
+        expected_result = [
+          { storage: 'default', success: true },
+          { storage: 'broken', success: false }
+        ]
+
+        expect(described_class.check_all).to eq(expected_result)
+      end
+    end
+  end
+
+  describe '#initialize' do
+    it 'assigns the settings' do
+      expect(checker.hostname).to eq(hostname)
+      expect(checker.storage).to eq('default')
+      expect(checker.storage_path).to eq(TestEnv.repos_path)
+    end
+  end
+
+  describe '#check_with_lease' do
+    it 'only allows one check at a time' do
+      expect(checker).to receive(:check).once { sleep 1 }
+
+      thread = Thread.new { checker.check_with_lease }
+      checker.check_with_lease
+      thread.join
+    end
+
+    it 'returns a result hash' do
+      expect(checker.check_with_lease).to eq(storage: 'default', success: true)
+    end
+  end
+
+  describe '#check' do
+    it 'tracks that the storage was accessible' do
+      set_in_redis(:failure_count, 10)
+      set_in_redis(:last_failure, Time.now.to_f)
+
+      checker.check
+
+      expect(value_from_redis(:failure_count).to_i).to eq(0)
+      expect(value_from_redis(:last_failure)).to be_empty
+      expect(value_from_redis(:first_failure)).to be_empty
+    end
+
+    it 'calls the check with the correct arguments' do
+      stub_application_setting(circuitbreaker_storage_timeout: 30,
+                               circuitbreaker_access_retries: 3)
+
+      expect(Gitlab::Git::Storage::ForkedStorageCheck)
+        .to receive(:storage_available?).with(TestEnv.repos_path, 30, 3)
+              .and_call_original
+
+      checker.check
+    end
+
+    it 'returns `true`' do
+      expect(checker.check).to eq(true)
+    end
+
+    it 'maintains known storage keys' do
+      Timecop.freeze do
+        # Insert an old key to expire
+        old_entry = Time.now.to_i - 3.days.to_i
+        Gitlab::Git::Storage.redis.with do |redis|
+          redis.zadd(Gitlab::Git::Storage::REDIS_KNOWN_KEYS, old_entry, 'to_be_removed')
+        end
+
+        checker.check
+
+        known_keys = Gitlab::Git::Storage.redis.with do |redis|
+          redis.zrange(Gitlab::Git::Storage::REDIS_KNOWN_KEYS, 0, -1)
+        end
+
+        expect(known_keys).to contain_exactly(cache_key)
+      end
+    end
+
+    context 'the storage is not available', :broken_storage do
+      let(:storage_name) { 'broken' }
+
+      it 'tracks that the storage was inaccessible' do
+        Timecop.freeze do
+          expect { checker.check }.to change { value_from_redis(:failure_count).to_i }.by(1)
+
+          expect(value_from_redis(:last_failure)).not_to be_empty
+          expect(value_from_redis(:first_failure)).not_to be_empty
+        end
+      end
+
+      it 'returns `false`' do
+        expect(checker.check).to eq(false)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb b/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
index 72dabca793a..210b90bfba9 100644
--- a/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
+++ b/spec/lib/gitlab/git/storage/circuit_breaker_spec.rb
@@ -1,11 +1,18 @@
 require 'spec_helper'
 
-describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state: true, broken_storage: true do
+describe Gitlab::Git::Storage::CircuitBreaker, :broken_storage do
   let(:storage_name) { 'default' }
   let(:circuit_breaker) { described_class.new(storage_name, hostname) }
   let(:hostname) { Gitlab::Environment.hostname }
   let(:cache_key) { "storage_accessible:#{storage_name}:#{hostname}" }
 
+  def set_in_redis(name, value)
+    Gitlab::Git::Storage.redis.with do |redis|
+      redis.zadd(Gitlab::Git::Storage::REDIS_KNOWN_KEYS, 0, cache_key)
+      redis.hmset(cache_key, name, value)
+    end.first
+  end
+
   before do
     # Override test-settings for the circuitbreaker with something more realistic
     # for these specs.
@@ -19,35 +26,7 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
                          )
   end
 
-  def value_from_redis(name)
-    Gitlab::Git::Storage.redis.with do |redis|
-      redis.hmget(cache_key, name)
-    end.first
-  end
-
-  def set_in_redis(name, value)
-    Gitlab::Git::Storage.redis.with do |redis|
-      redis.hmset(cache_key, name, value)
-    end.first
-  end
-
-  describe '.reset_all!' do
-    it 'clears all entries form redis' do
-      set_in_redis(:failure_count, 10)
-
-      described_class.reset_all!
-
-      key_exists = Gitlab::Git::Storage.redis.with { |redis| redis.exists(cache_key) }
-
-      expect(key_exists).to be_falsey
-    end
-
-    it 'does not break when there are no keys in redis' do
-      expect { described_class.reset_all! }.not_to raise_error
-    end
-  end
-
-  describe '.for_storage' do
+  describe '.for_storage', :request_store do
     it 'only builds a single circuitbreaker per storage' do
       expect(described_class).to receive(:new).once.and_call_original
 
@@ -70,7 +49,6 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
     it 'assigns the settings' do
       expect(circuit_breaker.hostname).to eq(hostname)
       expect(circuit_breaker.storage).to eq('default')
-      expect(circuit_breaker.storage_path).to eq(TestEnv.repos_path)
     end
   end
 
@@ -90,9 +68,9 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
       end
     end
 
-    describe '#failure_wait_time' do
+    describe '#check_interval' do
       it 'reads the value from settings' do
-        expect(circuit_breaker.failure_wait_time).to eq(1)
+        expect(circuit_breaker.check_interval).to eq(1)
       end
     end
 
@@ -113,12 +91,6 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
         expect(circuit_breaker.access_retries).to eq(4)
       end
     end
-
-    describe '#backoff_threshold' do
-      it 'reads the value from settings' do
-        expect(circuit_breaker.backoff_threshold).to eq(5)
-      end
-    end
   end
 
   describe '#perform' do
@@ -133,19 +105,6 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
       end
     end
 
-    it 'raises the correct exception when backing off' do
-      Timecop.freeze do
-        set_in_redis(:last_failure, 1.second.ago.to_f)
-        set_in_redis(:failure_count, 90)
-
-        expect { |b| circuit_breaker.perform(&b) }
-          .to raise_error do |exception|
-          expect(exception).to be_kind_of(Gitlab::Git::Storage::Failing)
-          expect(exception.retry_after).to eq(30)
-        end
-      end
-    end
-
     it 'yields the block' do
       expect { |b| circuit_breaker.perform(&b) }
         .to yield_control
@@ -169,36 +128,6 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
         .to raise_error(Rugged::OSError)
     end
 
-    it 'tracks that the storage was accessible' do
-      set_in_redis(:failure_count, 10)
-      set_in_redis(:last_failure, Time.now.to_f)
-
-      circuit_breaker.perform { '' }
-
-      expect(value_from_redis(:failure_count).to_i).to eq(0)
-      expect(value_from_redis(:last_failure)).to be_empty
-      expect(circuit_breaker.failure_count).to eq(0)
-      expect(circuit_breaker.last_failure).to be_nil
-    end
-
-    it 'only performs the accessibility check once' do
-      expect(Gitlab::Git::Storage::ForkedStorageCheck)
-        .to receive(:storage_available?).once.and_call_original
-
-      2.times { circuit_breaker.perform { '' } }
-    end
-
-    it 'calls the check with the correct arguments' do
-      stub_application_setting(circuitbreaker_storage_timeout: 30,
-                               circuitbreaker_access_retries: 3)
-
-      expect(Gitlab::Git::Storage::ForkedStorageCheck)
-        .to receive(:storage_available?).with(TestEnv.repos_path, 30, 3)
-              .and_call_original
-
-      circuit_breaker.perform { '' }
-    end
-
     context 'with the feature disabled' do
       before do
         stub_feature_flags(git_storage_circuit_breaker: false)
@@ -221,31 +150,6 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
         expect(result).to eq('hello')
       end
     end
-
-    context 'the storage is not available' do
-      let(:storage_name) { 'broken' }
-
-      it 'raises the correct exception' do
-        expect(circuit_breaker).to receive(:track_storage_inaccessible)
-
-        expect { circuit_breaker.perform { '' } }
-          .to raise_error do |exception|
-          expect(exception).to be_kind_of(Gitlab::Git::Storage::Inaccessible)
-          expect(exception.retry_after).to eq(30)
-        end
-      end
-
-      it 'tracks that the storage was inaccessible' do
-        Timecop.freeze do
-          expect { circuit_breaker.perform { '' } }.to raise_error(Gitlab::Git::Storage::Inaccessible)
-
-          expect(value_from_redis(:failure_count).to_i).to eq(1)
-          expect(value_from_redis(:last_failure)).not_to be_empty
-          expect(circuit_breaker.failure_count).to eq(1)
-          expect(circuit_breaker.last_failure).to be_within(1.second).of(Time.now)
-        end
-      end
-    end
   end
 
   describe '#circuit_broken?' do
@@ -264,32 +168,6 @@ describe Gitlab::Git::Storage::CircuitBreaker, clean_gitlab_redis_shared_state:
     end
   end
 
-  describe '#backing_off?' do
-    it 'is true when there was a recent failure' do
-      Timecop.freeze do
-        set_in_redis(:last_failure, 1.second.ago.to_f)
-        set_in_redis(:failure_count, 90)
-
-        expect(circuit_breaker.backing_off?).to be_truthy
-      end
-    end
-
-    context 'the `failure_wait_time` is set to 0' do
-      before do
-        stub_application_setting(circuitbreaker_failure_wait_time: 0)
-      end
-
-      it 'is working even when there are failures' do
-        Timecop.freeze do
-          set_in_redis(:last_failure, 0.seconds.ago.to_f)
-          set_in_redis(:failure_count, 90)
-
-          expect(circuit_breaker.backing_off?).to be_falsey
-        end
-      end
-    end
-  end
-
   describe '#last_failure' do
     it 'returns the last failure time' do
       time = Time.parse("2017-05-26 17:52:30")
diff --git a/spec/lib/gitlab/git/storage/failure_info_spec.rb b/spec/lib/gitlab/git/storage/failure_info_spec.rb
new file mode 100644
index 00000000000..bae88fdda86
--- /dev/null
+++ b/spec/lib/gitlab/git/storage/failure_info_spec.rb
@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Gitlab::Git::Storage::FailureInfo, :broken_storage do
+  let(:storage_name) { 'default' }
+  let(:hostname) { Gitlab::Environment.hostname }
+  let(:cache_key) { "storage_accessible:#{storage_name}:#{hostname}" }
+
+  def value_from_redis(name)
+    Gitlab::Git::Storage.redis.with do |redis|
+      redis.hmget(cache_key, name)
+    end.first
+  end
+
+  def set_in_redis(name, value)
+    Gitlab::Git::Storage.redis.with do |redis|
+      redis.zadd(Gitlab::Git::Storage::REDIS_KNOWN_KEYS, 0, cache_key)
+      redis.hmset(cache_key, name, value)
+    end.first
+  end
+
+  describe '.reset_all!' do
+    it 'clears all entries form redis' do
+      set_in_redis(:failure_count, 10)
+
+      described_class.reset_all!
+
+      key_exists = Gitlab::Git::Storage.redis.with { |redis| redis.exists(cache_key) }
+
+      expect(key_exists).to be_falsey
+    end
+
+    it 'does not break when there are no keys in redis' do
+      expect { described_class.reset_all! }.not_to raise_error
+    end
+  end
+
+  describe '.load' do
+    it 'loads failure information for a storage on a host' do
+      first_failure = Time.parse("2017-11-14 17:52:30")
+      last_failure = Time.parse("2017-11-14 18:54:37")
+      failure_count = 11
+
+      set_in_redis(:first_failure, first_failure.to_i)
+      set_in_redis(:last_failure, last_failure.to_i)
+      set_in_redis(:failure_count, failure_count.to_i)
+
+      info = described_class.load(cache_key)
+
+      expect(info.first_failure).to eq(first_failure)
+      expect(info.last_failure).to eq(last_failure)
+      expect(info.failure_count).to eq(failure_count)
+    end
+  end
+
+  describe '#no_failures?' do
+    it 'is true when there are no failures' do
+      info = described_class.new(nil, nil, 0)
+
+      expect(info.no_failures?).to be_truthy
+    end
+
+    it 'is false when there are failures' do
+      info = described_class.new(Time.parse("2017-11-14 17:52:30"),
+                                 Time.parse("2017-11-14 18:54:37"),
+                                 20)
+
+      expect(info.no_failures?).to be_falsy
+    end
+  end
+end
diff --git a/spec/lib/gitlab/git/storage/health_spec.rb b/spec/lib/gitlab/git/storage/health_spec.rb
index 4a14a5201d1..bb670fc5d94 100644
--- a/spec/lib/gitlab/git/storage/health_spec.rb
+++ b/spec/lib/gitlab/git/storage/health_spec.rb
@@ -1,11 +1,12 @@
 require 'spec_helper'
 
-describe Gitlab::Git::Storage::Health, clean_gitlab_redis_shared_state: true, broken_storage: true do
+describe Gitlab::Git::Storage::Health, broken_storage: true do
   let(:host1_key) { 'storage_accessible:broken:web01' }
   let(:host2_key) { 'storage_accessible:default:kiq01' }
 
   def set_in_redis(cache_key, value)
     Gitlab::Git::Storage.redis.with do |redis|
+      redis.zadd(Gitlab::Git::Storage::REDIS_KNOWN_KEYS, 0, cache_key)
       redis.hmset(cache_key, :failure_count, value)
     end.first
   end
diff --git a/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb b/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb
index 5db37f55e03..93ad20011de 100644
--- a/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb
+++ b/spec/lib/gitlab/git/storage/null_circuit_breaker_spec.rb
@@ -27,7 +27,7 @@ describe Gitlab::Git::Storage::NullCircuitBreaker do
     end
 
     describe '#failure_info' do
-      it { Timecop.freeze { expect(breaker.failure_info).to eq(Gitlab::Git::Storage::CircuitBreaker::FailureInfo.new(Time.now, breaker.failure_count_threshold)) } }
+      it { expect(breaker.failure_info.no_failures?).to be_falsy }
     end
   end
 
@@ -49,7 +49,7 @@ describe Gitlab::Git::Storage::NullCircuitBreaker do
     end
 
     describe '#failure_info' do
-      it { expect(breaker.failure_info).to eq(Gitlab::Git::Storage::CircuitBreaker::FailureInfo.new(nil, 0)) }
+      it { expect(breaker.failure_info.no_failures?).to be_truthy }
     end
   end
 
diff --git a/spec/lib/gitlab/git/user_spec.rb b/spec/lib/gitlab/git/user_spec.rb
index eb8db819045..99d850e1df9 100644
--- a/spec/lib/gitlab/git/user_spec.rb
+++ b/spec/lib/gitlab/git/user_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe Gitlab::Git::User do
-  let(:username) { 'janedo' }
-  let(:name) { 'Jane Doe' }
-  let(:email) { 'janedoe@example.com' }
+  let(:username) { 'janedoe' }
+  let(:name) { 'Jane Doé' }
+  let(:email) { 'janedoé@example.com' }
   let(:gl_id) { 'user-123' }
   let(:user) do
     described_class.new(username, name, email, gl_id)
@@ -13,7 +13,7 @@ describe Gitlab::Git::User do
 
   describe '.from_gitaly' do
     let(:gitaly_user) do
-      Gitaly::User.new(gl_username: username, name: name, email: email, gl_id: gl_id)
+      Gitaly::User.new(gl_username: username, name: name.b, email: email.b, gl_id: gl_id)
     end
 
     subject { described_class.from_gitaly(gitaly_user) }
@@ -48,8 +48,13 @@ describe Gitlab::Git::User do
     it 'creates a Gitaly::User with the correct data' do
       expect(subject).to be_a(Gitaly::User)
       expect(subject.gl_username).to eq(username)
-      expect(subject.name).to eq(name)
-      expect(subject.email).to eq(email)
+
+      expect(subject.name).to eq(name.b)
+      expect(subject.name).to be_a_binary_string
+
+      expect(subject.email).to eq(email.b)
+      expect(subject.email).to be_a_binary_string
+
       expect(subject.gl_id).to eq(gl_id)
     end
   end
diff --git a/spec/lib/gitlab/git_spec.rb b/spec/lib/gitlab/git_spec.rb
index 494dfe0e595..ce15057dd7d 100644
--- a/spec/lib/gitlab/git_spec.rb
+++ b/spec/lib/gitlab/git_spec.rb
@@ -38,4 +38,29 @@ describe Gitlab::Git do
       expect(described_class.ref_name(utf8_invalid_ref)).to eq("an_invalid_ref_å")
     end
   end
+
+  describe '.shas_eql?' do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:sha1, :sha2, :result) do
+      sha           = RepoHelpers.sample_commit.id
+      short_sha     = sha[0, Gitlab::Git::Commit::MIN_SHA_LENGTH]
+      too_short_sha = sha[0, Gitlab::Git::Commit::MIN_SHA_LENGTH - 1]
+
+      [
+        [sha, sha,           true],
+        [sha, short_sha,     true],
+        [sha, sha.reverse,   false],
+        [sha, too_short_sha, false],
+        [sha, nil,           false]
+      ]
+    end
+
+    with_them do
+      it { expect(described_class.shas_eql?(sha1, sha2)).to eq(result) }
+      it 'is commutative' do
+        expect(described_class.shas_eql?(sha2, sha1)).to eq(result)
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/gitaly_client/ref_service_spec.rb b/spec/lib/gitlab/gitaly_client/ref_service_spec.rb
index 8127b4842b7..951e146a30a 100644
--- a/spec/lib/gitlab/gitaly_client/ref_service_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/ref_service_spec.rb
@@ -104,4 +104,17 @@ describe Gitlab::GitalyClient::RefService do
       expect { client.ref_exists?('reXXXXX') }.to raise_error(ArgumentError)
     end
   end
+
+  describe '#delete_refs' do
+    let(:prefixes) { %w(refs/heads refs/keep-around) }
+
+    it 'sends a delete_refs message' do
+      expect_any_instance_of(Gitaly::RefService::Stub)
+        .to receive(:delete_refs)
+        .with(gitaly_request_with_params(except_with_prefix: prefixes), kind_of(Hash))
+        .and_return(double('delete_refs_response'))
+
+      client.delete_refs(except_with_prefixes: prefixes)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/gitaly_client/wiki_service_spec.rb b/spec/lib/gitlab/gitaly_client/wiki_service_spec.rb
new file mode 100644
index 00000000000..6ad9f5ef766
--- /dev/null
+++ b/spec/lib/gitlab/gitaly_client/wiki_service_spec.rb
@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe Gitlab::GitalyClient::WikiService do
+  let(:project) { create(:project) }
+  let(:storage_name) { project.repository_storage }
+  let(:relative_path) { project.disk_path + '.git' }
+  let(:client) { described_class.new(project.repository) }
+  let(:commit) { create(:gitaly_commit) }
+  let(:page_version) { Gitaly::WikiPageVersion.new(format: 'markdown', commit: commit) }
+  let(:page_info) { { title: 'My Page', raw_data: 'a', version: page_version } }
+
+  describe '#find_page' do
+    let(:response) do
+      [
+        Gitaly::WikiFindPageResponse.new(page: Gitaly::WikiPage.new(page_info)),
+        Gitaly::WikiFindPageResponse.new(page: Gitaly::WikiPage.new(raw_data: 'b'))
+      ]
+    end
+    let(:wiki_page) { subject.first }
+    let(:wiki_page_version) { subject.last }
+
+    subject { client.find_page(title: 'My Page', version: 'master', dir: '') }
+
+    it 'sends a wiki_find_page message' do
+      expect_any_instance_of(Gitaly::WikiService::Stub)
+        .to receive(:wiki_find_page)
+        .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
+        .and_return([].each)
+
+      subject
+    end
+
+    it 'concatenates the raw data and returns a pair of WikiPage and WikiPageVersion' do
+      expect_any_instance_of(Gitaly::WikiService::Stub)
+        .to receive(:wiki_find_page)
+        .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
+        .and_return(response.each)
+
+      expect(wiki_page.title).to eq('My Page')
+      expect(wiki_page.raw_data).to eq('ab')
+      expect(wiki_page_version.format).to eq('markdown')
+    end
+  end
+
+  describe '#get_all_pages' do
+    let(:page_2_info) { { title: 'My Page 2', raw_data: 'c', version: page_version } }
+    let(:response) do
+      [
+        Gitaly::WikiGetAllPagesResponse.new(page: Gitaly::WikiPage.new(page_info)),
+        Gitaly::WikiGetAllPagesResponse.new(page: Gitaly::WikiPage.new(raw_data: 'b')),
+        Gitaly::WikiGetAllPagesResponse.new(end_of_page: true),
+        Gitaly::WikiGetAllPagesResponse.new(page: Gitaly::WikiPage.new(page_2_info)),
+        Gitaly::WikiGetAllPagesResponse.new(page: Gitaly::WikiPage.new(raw_data: 'd')),
+        Gitaly::WikiGetAllPagesResponse.new(end_of_page: true)
+      ]
+    end
+    let(:wiki_page_1) { subject[0].first }
+    let(:wiki_page_1_version) { subject[0].last }
+    let(:wiki_page_2) { subject[1].first }
+    let(:wiki_page_2_version) { subject[1].last }
+
+    subject { client.get_all_pages }
+
+    it 'sends a wiki_get_all_pages message' do
+      expect_any_instance_of(Gitaly::WikiService::Stub)
+        .to receive(:wiki_get_all_pages)
+        .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
+        .and_return([].each)
+
+      subject
+    end
+
+    it 'concatenates the raw data and returns a pair of WikiPage and WikiPageVersion for each page' do
+      expect_any_instance_of(Gitaly::WikiService::Stub)
+        .to receive(:wiki_get_all_pages)
+        .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
+        .and_return(response.each)
+
+      expect(subject.size).to be(2)
+      expect(wiki_page_1.title).to eq('My Page')
+      expect(wiki_page_1.raw_data).to eq('ab')
+      expect(wiki_page_1_version.format).to eq('markdown')
+      expect(wiki_page_2.title).to eq('My Page 2')
+      expect(wiki_page_2.raw_data).to eq('cd')
+      expect(wiki_page_2_version.format).to eq('markdown')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb
index a1f4e65b8d4..a871ed0df0e 100644
--- a/spec/lib/gitlab/gitaly_client_spec.rb
+++ b/spec/lib/gitlab/gitaly_client_spec.rb
@@ -278,4 +278,20 @@ describe Gitlab::GitalyClient, skip_gitaly_mock: true do
       end
     end
   end
+
+  describe 'timeouts' do
+    context 'with default values' do
+      before do
+        stub_application_setting(gitaly_timeout_default: 55)
+        stub_application_setting(gitaly_timeout_medium: 30)
+        stub_application_setting(gitaly_timeout_fast: 10)
+      end
+
+      it 'returns expected values' do
+        expect(described_class.default_timeout).to be(55)
+        expect(described_class.medium_timeout).to be(30)
+        expect(described_class.fast_timeout).to be(10)
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/github_import/bulk_importing_spec.rb b/spec/lib/gitlab/github_import/bulk_importing_spec.rb
new file mode 100644
index 00000000000..91229d9c7d4
--- /dev/null
+++ b/spec/lib/gitlab/github_import/bulk_importing_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::BulkImporting do
+  let(:importer) do
+    Class.new { include(Gitlab::GithubImport::BulkImporting) }.new
+  end
+
+  describe '#build_database_rows' do
+    it 'returns an Array containing the rows to insert' do
+      object = double(:object, title: 'Foo')
+
+      expect(importer)
+        .to receive(:build)
+        .with(object)
+        .and_return({ title: 'Foo' })
+
+      expect(importer)
+        .to receive(:already_imported?)
+        .with(object)
+        .and_return(false)
+
+      enum = [[object, 1]].to_enum
+
+      expect(importer.build_database_rows(enum)).to eq([{ title: 'Foo' }])
+    end
+
+    it 'does not import objects that have already been imported' do
+      object = double(:object, title: 'Foo')
+
+      expect(importer)
+        .not_to receive(:build)
+
+      expect(importer)
+        .to receive(:already_imported?)
+        .with(object)
+        .and_return(true)
+
+      enum = [[object, 1]].to_enum
+
+      expect(importer.build_database_rows(enum)).to be_empty
+    end
+  end
+
+  describe '#bulk_insert' do
+    it 'bulk inserts rows into the database' do
+      rows = [{ title: 'Foo' }] * 10
+      model = double(:model, table_name: 'kittens')
+
+      expect(Gitlab::Database)
+        .to receive(:bulk_insert)
+        .ordered
+        .with('kittens', rows.first(5))
+
+      expect(Gitlab::Database)
+        .to receive(:bulk_insert)
+        .ordered
+        .with('kittens', rows.last(5))
+
+      importer.bulk_insert(model, rows, batch_size: 5)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/caching_spec.rb b/spec/lib/gitlab/github_import/caching_spec.rb
new file mode 100644
index 00000000000..70ecdc16da1
--- /dev/null
+++ b/spec/lib/gitlab/github_import/caching_spec.rb
@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Caching, :clean_gitlab_redis_cache do
+  describe '.read' do
+    it 'reads a value from the cache' do
+      described_class.write('foo', 'bar')
+
+      expect(described_class.read('foo')).to eq('bar')
+    end
+
+    it 'returns nil if the cache key does not exist' do
+      expect(described_class.read('foo')).to be_nil
+    end
+
+    it 'refreshes the cache key if a value is present' do
+      described_class.write('foo', 'bar')
+
+      redis = double(:redis)
+
+      expect(redis).to receive(:get).with(/foo/).and_return('bar')
+      expect(redis).to receive(:expire).with(/foo/, described_class::TIMEOUT)
+      expect(Gitlab::Redis::Cache).to receive(:with).twice.and_yield(redis)
+
+      described_class.read('foo')
+    end
+
+    it 'does not refresh the cache key if a value is empty' do
+      described_class.write('foo', nil)
+
+      redis = double(:redis)
+
+      expect(redis).to receive(:get).with(/foo/).and_return('')
+      expect(redis).not_to receive(:expire)
+      expect(Gitlab::Redis::Cache).to receive(:with).and_yield(redis)
+
+      described_class.read('foo')
+    end
+  end
+
+  describe '.read_integer' do
+    it 'returns an Integer' do
+      described_class.write('foo', '10')
+
+      expect(described_class.read_integer('foo')).to eq(10)
+    end
+
+    it 'returns nil if no value was found' do
+      expect(described_class.read_integer('foo')).to be_nil
+    end
+  end
+
+  describe '.write' do
+    it 'writes a value to the cache and returns the written value' do
+      expect(described_class.write('foo', 10)).to eq(10)
+      expect(described_class.read('foo')).to eq('10')
+    end
+  end
+
+  describe '.set_add' do
+    it 'adds a value to a set' do
+      described_class.set_add('foo', 10)
+      described_class.set_add('foo', 10)
+
+      key = described_class.cache_key_for('foo')
+      values = Gitlab::Redis::Cache.with { |r| r.smembers(key) }
+
+      expect(values).to eq(['10'])
+    end
+  end
+
+  describe '.set_includes?' do
+    it 'returns false when the key does not exist' do
+      expect(described_class.set_includes?('foo', 10)).to eq(false)
+    end
+
+    it 'returns false when the value is not present in the set' do
+      described_class.set_add('foo', 10)
+
+      expect(described_class.set_includes?('foo', 20)).to eq(false)
+    end
+
+    it 'returns true when the set includes the given value' do
+      described_class.set_add('foo', 10)
+
+      expect(described_class.set_includes?('foo', 10)).to eq(true)
+    end
+  end
+
+  describe '.write_multiple' do
+    it 'sets multiple keys' do
+      mapping = { 'foo' => 10, 'bar' => 20 }
+
+      described_class.write_multiple(mapping)
+
+      mapping.each do |key, value|
+        full_key = described_class.cache_key_for(key)
+        found = Gitlab::Redis::Cache.with { |r| r.get(full_key) }
+
+        expect(found).to eq(value.to_s)
+      end
+    end
+  end
+
+  describe '.expire' do
+    it 'sets the expiration time of a key' do
+      timeout = 1.hour.to_i
+
+      described_class.write('foo', 'bar', timeout: 2.hours.to_i)
+      described_class.expire('foo', timeout)
+
+      key = described_class.cache_key_for('foo')
+      found_ttl = Gitlab::Redis::Cache.with { |r| r.ttl(key) }
+
+      expect(found_ttl).to be <= timeout
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/client_spec.rb b/spec/lib/gitlab/github_import/client_spec.rb
index 66273255b6f..5b2642d9473 100644
--- a/spec/lib/gitlab/github_import/client_spec.rb
+++ b/spec/lib/gitlab/github_import/client_spec.rb
@@ -1,97 +1,392 @@
 require 'spec_helper'
 
 describe Gitlab::GithubImport::Client do
-  let(:token) { '123456' }
-  let(:github_provider) { Settingslogic.new('app_id' => 'asd123', 'app_secret' => 'asd123', 'name' => 'github', 'args' => { 'client_options' => {} }) }
+  describe '#parallel?' do
+    it 'returns true when the client is running in parallel mode' do
+      client = described_class.new('foo', parallel: true)
 
-  subject(:client) { described_class.new(token) }
+      expect(client).to be_parallel
+    end
+
+    it 'returns false when the client is running in sequential mode' do
+      client = described_class.new('foo', parallel: false)
 
-  before do
-    allow(Gitlab.config.omniauth).to receive(:providers).and_return([github_provider])
+      expect(client).not_to be_parallel
+    end
   end
 
-  it 'convert OAuth2 client options to symbols' do
-    client.client.options.keys.each do |key|
-      expect(key).to be_kind_of(Symbol)
+  describe '#user' do
+    it 'returns the details for the given username' do
+      client = described_class.new('foo')
+
+      expect(client.octokit).to receive(:user).with('foo')
+      expect(client).to receive(:with_rate_limit).and_yield
+
+      client.user('foo')
     end
   end
 
-  it 'does not crash (e.g. Settingslogic::MissingSetting) when verify_ssl config is not present' do
-    expect { client.api }.not_to raise_error
+  describe '#repository' do
+    it 'returns the details of a repository' do
+      client = described_class.new('foo')
+
+      expect(client.octokit).to receive(:repo).with('foo/bar')
+      expect(client).to receive(:with_rate_limit).and_yield
+
+      client.repository('foo/bar')
+    end
   end
 
-  context 'when config is missing' do
-    before do
-      allow(Gitlab.config.omniauth).to receive(:providers).and_return([])
+  describe '#labels' do
+    it 'returns the labels' do
+      client = described_class.new('foo')
+
+      expect(client)
+        .to receive(:each_object)
+        .with(:labels, 'foo/bar')
+
+      client.labels('foo/bar')
     end
+  end
 
-    it 'is still possible to get an Octokit client' do
-      expect { client.api }.not_to raise_error
+  describe '#milestones' do
+    it 'returns the milestones' do
+      client = described_class.new('foo')
+
+      expect(client)
+        .to receive(:each_object)
+        .with(:milestones, 'foo/bar')
+
+      client.milestones('foo/bar')
     end
+  end
 
-    it 'is not be possible to get an OAuth2 client' do
-      expect { client.client }.to raise_error(Projects::ImportService::Error)
+  describe '#releases' do
+    it 'returns the releases' do
+      client = described_class.new('foo')
+
+      expect(client)
+        .to receive(:each_object)
+        .with(:releases, 'foo/bar')
+
+      client.releases('foo/bar')
     end
   end
 
-  context 'allow SSL verification to be configurable on API' do
+  describe '#each_page' do
+    let(:client) { described_class.new('foo') }
+    let(:object1) { double(:object1) }
+    let(:object2) { double(:object2) }
+
     before do
-      github_provider['verify_ssl'] = false
+      allow(client)
+        .to receive(:with_rate_limit)
+        .and_yield
+
+      allow(client.octokit)
+        .to receive(:public_send)
+        .and_return([object1])
+
+      response = double(:response, data: [object2], rels: { next: nil })
+      next_page = double(:next_page, get: response)
+
+      allow(client.octokit)
+        .to receive(:last_response)
+        .and_return(double(:last_response, rels: { next: next_page }))
+    end
+
+    context 'without a block' do
+      it 'returns an Enumerator' do
+        expect(client.each_page(:foo)).to be_an_instance_of(Enumerator)
+      end
+
+      it 'the returned Enumerator returns Page objects' do
+        enum = client.each_page(:foo)
+
+        page1 = enum.next
+        page2 = enum.next
+
+        expect(page1).to be_an_instance_of(described_class::Page)
+        expect(page2).to be_an_instance_of(described_class::Page)
+
+        expect(page1.objects).to eq([object1])
+        expect(page1.number).to eq(1)
+
+        expect(page2.objects).to eq([object2])
+        expect(page2.number).to eq(2)
+      end
+    end
+
+    context 'with a block' do
+      it 'yields every retrieved page to the supplied block' do
+        pages = []
+
+        client.each_page(:foo) { |page| pages << page }
+
+        expect(pages[0]).to be_an_instance_of(described_class::Page)
+        expect(pages[1]).to be_an_instance_of(described_class::Page)
+
+        expect(pages[0].objects).to eq([object1])
+        expect(pages[0].number).to eq(1)
+
+        expect(pages[1].objects).to eq([object2])
+        expect(pages[1].number).to eq(2)
+      end
+
+      it 'starts at the given page' do
+        pages = []
+
+        client.each_page(:foo, page: 2) { |page| pages << page }
+
+        expect(pages[0].number).to eq(2)
+        expect(pages[1].number).to eq(3)
+      end
+    end
+  end
+
+  describe '#with_rate_limit' do
+    let(:client) { described_class.new('foo') }
+
+    it 'yields the supplied block when enough requests remain' do
+      expect(client).to receive(:requests_remaining?).and_return(true)
+
+      expect { |b| client.with_rate_limit(&b) }.to yield_control
+    end
+
+    it 'waits before yielding if not enough requests remain' do
+      expect(client).to receive(:requests_remaining?).and_return(false)
+      expect(client).to receive(:raise_or_wait_for_rate_limit)
+
+      expect { |b| client.with_rate_limit(&b) }.to yield_control
+    end
+
+    it 'waits and retries the operation if all requests were consumed in the supplied block' do
+      retries = 0
+
+      expect(client).to receive(:requests_remaining?).and_return(true)
+      expect(client).to receive(:raise_or_wait_for_rate_limit)
+
+      client.with_rate_limit do
+        if retries.zero?
+          retries += 1
+          raise(Octokit::TooManyRequests)
+        end
+      end
+
+      expect(retries).to eq(1)
+    end
+
+    it 'increments the request count counter' do
+      expect(client.request_count_counter)
+        .to receive(:increment)
+        .and_call_original
+
+      expect(client).to receive(:requests_remaining?).and_return(true)
+
+      client.with_rate_limit { }
+    end
+
+    it 'ignores rate limiting when disabled' do
+      expect(client)
+        .to receive(:rate_limiting_enabled?)
+        .and_return(false)
+
+      expect(client)
+        .not_to receive(:requests_remaining?)
+
+      expect(client.with_rate_limit { 10 }).to eq(10)
+    end
+  end
+
+  describe '#requests_remaining?' do
+    let(:client) { described_class.new('foo') }
+
+    it 'returns true if enough requests remain' do
+      expect(client).to receive(:remaining_requests).and_return(9000)
+
+      expect(client.requests_remaining?).to eq(true)
+    end
+
+    it 'returns false if not enough requests remain' do
+      expect(client).to receive(:remaining_requests).and_return(1)
+
+      expect(client.requests_remaining?).to eq(false)
+    end
+  end
+
+  describe '#raise_or_wait_for_rate_limit' do
+    it 'raises RateLimitError when running in parallel mode' do
+      client = described_class.new('foo', parallel: true)
+
+      expect { client.raise_or_wait_for_rate_limit }
+        .to raise_error(Gitlab::GithubImport::RateLimitError)
     end
 
-    it 'uses supplied value' do
-      expect(client.client.options[:connection_opts][:ssl]).to eq({ verify: false })
-      expect(client.api.connection_options[:ssl]).to eq({ verify: false })
+    it 'sleeps when running in sequential mode' do
+      client = described_class.new('foo', parallel: false)
+
+      expect(client).to receive(:rate_limit_resets_in).and_return(1)
+      expect(client).to receive(:sleep).with(1)
+
+      client.raise_or_wait_for_rate_limit
+    end
+
+    it 'increments the rate limit counter' do
+      client = described_class.new('foo', parallel: false)
+
+      expect(client)
+        .to receive(:rate_limit_resets_in)
+        .and_return(1)
+
+      expect(client)
+        .to receive(:sleep)
+        .with(1)
+
+      expect(client.rate_limit_counter)
+        .to receive(:increment)
+        .and_call_original
+
+      client.raise_or_wait_for_rate_limit
+    end
+  end
+
+  describe '#remaining_requests' do
+    it 'returns the number of remaining requests' do
+      client = described_class.new('foo')
+      rate_limit = double(remaining: 1)
+
+      expect(client.octokit).to receive(:rate_limit).and_return(rate_limit)
+      expect(client.remaining_requests).to eq(1)
+    end
+  end
+
+  describe '#rate_limit_resets_in' do
+    it 'returns the number of seconds after which the rate limit is reset' do
+      client = described_class.new('foo')
+      rate_limit = double(resets_in: 1)
+
+      expect(client.octokit).to receive(:rate_limit).and_return(rate_limit)
+
+      expect(client.rate_limit_resets_in).to eq(6)
     end
   end
 
   describe '#api_endpoint' do
-    context 'when provider does not specity an API endpoint' do
-      it 'uses GitHub root API endpoint' do
-        expect(client.api.api_endpoint).to eq 'https://api.github.com/'
+    let(:client) { described_class.new('foo') }
+
+    context 'without a custom endpoint configured in Omniauth' do
+      it 'returns the default API endpoint' do
+        expect(client)
+          .to receive(:custom_api_endpoint)
+          .and_return(nil)
+
+        expect(client.api_endpoint).to eq('https://api.github.com')
       end
     end
 
-    context 'when provider specify a custom API endpoint' do
-      before do
-        github_provider['args']['client_options']['site'] = 'https://github.company.com/'
+    context 'with a custom endpoint configured in Omniauth' do
+      it 'returns the custom endpoint' do
+        endpoint = 'https://github.kittens.com'
+
+        expect(client)
+          .to receive(:custom_api_endpoint)
+          .and_return(endpoint)
+
+        expect(client.api_endpoint).to eq(endpoint)
       end
+    end
+  end
+
+  describe '#custom_api_endpoint' do
+    let(:client) { described_class.new('foo') }
+
+    context 'without a custom endpoint' do
+      it 'returns nil' do
+        expect(client)
+          .to receive(:github_omniauth_provider)
+          .and_return({})
+
+        expect(client.custom_api_endpoint).to be_nil
+      end
+    end
+
+    context 'with a custom endpoint' do
+      it 'returns the API endpoint' do
+        endpoint = 'https://github.kittens.com'
+
+        expect(client)
+          .to receive(:github_omniauth_provider)
+          .and_return({ 'args' => { 'client_options' => { 'site' => endpoint } } })
 
-      it 'uses the custom API endpoint' do
-        expect(OmniAuth::Strategies::GitHub).not_to receive(:default_options)
-        expect(client.api.api_endpoint).to eq 'https://github.company.com/'
+        expect(client.custom_api_endpoint).to eq(endpoint)
       end
     end
+  end
+
+  describe '#default_api_endpoint' do
+    it 'returns the default API endpoint' do
+      client = described_class.new('foo')
+
+      expect(client.default_api_endpoint).to eq('https://api.github.com')
+    end
+  end
+
+  describe '#verify_ssl' do
+    let(:client) { described_class.new('foo') }
 
-    context 'when given a host' do
-      subject(:client) { described_class.new(token, host: 'https://try.gitea.io/') }
+    context 'without a custom configuration' do
+      it 'returns true' do
+        expect(client)
+          .to receive(:github_omniauth_provider)
+          .and_return({})
 
-      it 'builds a endpoint with the given host and the default API version' do
-        expect(client.api.api_endpoint).to eq 'https://try.gitea.io/api/v3/'
+        expect(client.verify_ssl).to eq(true)
       end
     end
 
-    context 'when given an API version' do
-      subject(:client) { described_class.new(token, api_version: 'v3') }
+    context 'with a custom configuration' do
+      it 'returns the configured value' do
+        expect(client.verify_ssl).to eq(false)
+      end
+    end
+  end
+
+  describe '#github_omniauth_provider' do
+    let(:client) { described_class.new('foo') }
 
-      it 'does not use the API version without a host' do
-        expect(client.api.api_endpoint).to eq 'https://api.github.com/'
+    context 'without a configured provider' do
+      it 'returns an empty Hash' do
+        expect(Gitlab.config.omniauth)
+          .to receive(:providers)
+          .and_return([])
+
+        expect(client.github_omniauth_provider).to eq({})
       end
     end
 
-    context 'when given a host and version' do
-      subject(:client) { described_class.new(token, host: 'https://try.gitea.io/', api_version: 'v3') }
+    context 'with a configured provider' do
+      it 'returns the provider details as a Hash' do
+        hash = client.github_omniauth_provider
 
-      it 'builds a endpoint with the given options' do
-        expect(client.api.api_endpoint).to eq 'https://try.gitea.io/api/v3/'
+        expect(hash['name']).to eq('github')
+        expect(hash['url']).to eq('https://github.com/')
       end
     end
   end
 
-  it 'does not raise error when rate limit is disabled' do
-    stub_request(:get, /api.github.com/)
-    allow(client.api).to receive(:rate_limit!).and_raise(Octokit::NotFound)
+  describe '#rate_limiting_enabled?' do
+    let(:client) { described_class.new('foo') }
 
-    expect { client.issues {} }.not_to raise_error
+    it 'returns true when using GitHub.com' do
+      expect(client.rate_limiting_enabled?).to eq(true)
+    end
+
+    it 'returns false for GitHub enterprise installations' do
+      expect(client)
+        .to receive(:api_endpoint)
+        .and_return('https://github.kittens.com/')
+
+      expect(client.rate_limiting_enabled?).to eq(false)
+    end
   end
 end
diff --git a/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb b/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
new file mode 100644
index 00000000000..1568c657a1e
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/diff_note_importer_spec.rb
@@ -0,0 +1,152 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::DiffNoteImporter do
+  let(:project) { create(:project) }
+  let(:client) { double(:client) }
+  let(:user) { create(:user) }
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+
+  let(:hunk) do
+    '@@ -1 +1 @@
+    -Hello
+    +Hello world'
+  end
+
+  let(:note) do
+    Gitlab::GithubImport::Representation::DiffNote.new(
+      noteable_type: 'MergeRequest',
+      noteable_id: 1,
+      commit_id: '123abc',
+      file_path: 'README.md',
+      diff_hunk: hunk,
+      author: Gitlab::GithubImport::Representation::User
+        .new(id: user.id, login: user.username),
+      note: 'Hello',
+      created_at: created_at,
+      updated_at: updated_at,
+      github_id: 1
+    )
+  end
+
+  let(:importer) { described_class.new(note, project, client) }
+
+  describe '#execute' do
+    context 'when the merge request no longer exists' do
+      it 'does not import anything' do
+        expect(Gitlab::Database).not_to receive(:bulk_insert)
+
+        importer.execute
+      end
+    end
+
+    context 'when the merge request exists' do
+      let!(:merge_request) do
+        create(:merge_request, source_project: project, target_project: project)
+      end
+
+      before do
+        allow(importer)
+          .to receive(:find_merge_request_id)
+          .and_return(merge_request.id)
+      end
+
+      it 'imports the note' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .and_return([user.id, true])
+
+        expect(Gitlab::Database)
+          .to receive(:bulk_insert)
+          .with(
+            LegacyDiffNote.table_name,
+            [
+              {
+                noteable_type: 'MergeRequest',
+                noteable_id: merge_request.id,
+                project_id: project.id,
+                author_id: user.id,
+                note: 'Hello',
+                system: false,
+                commit_id: '123abc',
+                line_code: note.line_code,
+                type: 'LegacyDiffNote',
+                created_at: created_at,
+                updated_at: updated_at,
+                st_diff: note.diff_hash.to_yaml
+              }
+            ]
+          )
+          .and_call_original
+
+        importer.execute
+      end
+
+      it 'imports the note when the author could not be found' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .and_return([project.creator_id, false])
+
+        expect(Gitlab::Database)
+          .to receive(:bulk_insert)
+          .with(
+            LegacyDiffNote.table_name,
+            [
+              {
+                noteable_type: 'MergeRequest',
+                noteable_id: merge_request.id,
+                project_id: project.id,
+                author_id: project.creator_id,
+                note: "*Created by: #{user.username}*\n\nHello",
+                system: false,
+                commit_id: '123abc',
+                line_code: note.line_code,
+                type: 'LegacyDiffNote',
+                created_at: created_at,
+                updated_at: updated_at,
+                st_diff: note.diff_hash.to_yaml
+              }
+            ]
+          )
+          .and_call_original
+
+        importer.execute
+      end
+
+      it 'produces a valid LegacyDiffNote' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .and_return([user.id, true])
+
+        importer.execute
+
+        note = project.notes.diff_notes.take
+
+        expect(note).to be_valid
+        expect(note.diff).to be_an_instance_of(Gitlab::Git::Diff)
+      end
+
+      it 'does not import the note when a foreign key error is raised' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .and_return([project.creator_id, false])
+
+        expect(Gitlab::Database)
+          .to receive(:bulk_insert)
+          .and_raise(ActiveRecord::InvalidForeignKey, 'invalid foreign key')
+
+        expect { importer.execute }.not_to raise_error
+      end
+    end
+  end
+
+  describe '#find_merge_request_id' do
+    it 'returns a merge request ID' do
+      expect_any_instance_of(Gitlab::GithubImport::IssuableFinder)
+        .to receive(:database_id)
+        .and_return(10)
+
+      expect(importer.find_merge_request_id).to eq(10)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/diff_notes_importer_spec.rb b/spec/lib/gitlab/github_import/importer/diff_notes_importer_spec.rb
new file mode 100644
index 00000000000..4713c6795bb
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/diff_notes_importer_spec.rb
@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::DiffNotesImporter do
+  let(:project) { double(:project, id: 4, import_source: 'foo/bar') }
+  let(:client) { double(:client) }
+
+  let(:github_comment) do
+    double(
+      :response,
+      html_url: 'https://github.com/foo/bar/pull/42',
+      path: 'README.md',
+      commit_id: '123abc',
+      diff_hunk: "@@ -1 +1 @@\n-Hello\n+Hello world",
+      user: double(:user, id: 4, login: 'alice'),
+      body: 'Hello world',
+      created_at: Time.zone.now,
+      updated_at: Time.zone.now,
+      id: 1
+    )
+  end
+
+  describe '#parallel?' do
+    it 'returns true when running in parallel mode' do
+      importer = described_class.new(project, client)
+      expect(importer).to be_parallel
+    end
+
+    it 'returns false when running in sequential mode' do
+      importer = described_class.new(project, client, parallel: false)
+      expect(importer).not_to be_parallel
+    end
+  end
+
+  describe '#execute' do
+    context 'when running in parallel mode' do
+      it 'imports diff notes in parallel' do
+        importer = described_class.new(project, client)
+
+        expect(importer).to receive(:parallel_import)
+
+        importer.execute
+      end
+    end
+
+    context 'when running in sequential mode' do
+      it 'imports diff notes in sequence' do
+        importer = described_class.new(project, client, parallel: false)
+
+        expect(importer).to receive(:sequential_import)
+
+        importer.execute
+      end
+    end
+  end
+
+  describe '#sequential_import' do
+    it 'imports each diff note in sequence' do
+      importer = described_class.new(project, client, parallel: false)
+      diff_note_importer = double(:diff_note_importer)
+
+      allow(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(github_comment)
+
+      expect(Gitlab::GithubImport::Importer::DiffNoteImporter)
+        .to receive(:new)
+        .with(
+          an_instance_of(Gitlab::GithubImport::Representation::DiffNote),
+          project,
+          client
+        )
+        .and_return(diff_note_importer)
+
+      expect(diff_note_importer).to receive(:execute)
+
+      importer.sequential_import
+    end
+  end
+
+  describe '#parallel_import' do
+    it 'imports each diff note in parallel' do
+      importer = described_class.new(project, client)
+
+      allow(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(github_comment)
+
+      expect(Gitlab::GithubImport::ImportDiffNoteWorker)
+        .to receive(:perform_async)
+        .with(project.id, an_instance_of(Hash), an_instance_of(String))
+
+      waiter = importer.parallel_import
+
+      expect(waiter).to be_an_instance_of(Gitlab::JobWaiter)
+      expect(waiter.jobs_remaining).to eq(1)
+    end
+  end
+
+  describe '#id_for_already_imported_cache' do
+    it 'returns the ID of the given note' do
+      importer = described_class.new(project, client)
+
+      expect(importer.id_for_already_imported_cache(github_comment))
+        .to eq(1)
+    end
+  end
+
+  describe '#collection_options' do
+    it 'returns an empty Hash' do
+      # For large projects (e.g. kubernetes/kubernetes) GitHub's API may produce
+      # HTTP 500 errors when using explicit sorting options, regardless of what
+      # order you sort in. Not using any sorting options at all allows us to
+      # work around this.
+      importer = described_class.new(project, client)
+
+      expect(importer.collection_options).to eq({})
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/issue_and_label_links_importer_spec.rb b/spec/lib/gitlab/github_import/importer/issue_and_label_links_importer_spec.rb
new file mode 100644
index 00000000000..665b31ef244
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/issue_and_label_links_importer_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::IssueAndLabelLinksImporter do
+  describe '#execute' do
+    it 'imports an issue and its labels' do
+      issue = double(:issue)
+      project = double(:project)
+      client = double(:client)
+      label_links_instance = double(:label_links_importer)
+      importer = described_class.new(issue, project, client)
+
+      expect(Gitlab::GithubImport::Importer::IssueImporter)
+        .to receive(:import_if_issue)
+        .with(issue, project, client)
+
+      expect(Gitlab::GithubImport::Importer::LabelLinksImporter)
+        .to receive(:new)
+        .with(issue, project, client)
+        .and_return(label_links_instance)
+
+      expect(label_links_instance)
+        .to receive(:execute)
+
+      importer.execute
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb b/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb
new file mode 100644
index 00000000000..d34ca0b76b8
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/issue_importer_spec.rb
@@ -0,0 +1,201 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::IssueImporter, :clean_gitlab_redis_cache do
+  let(:project) { create(:project) }
+  let(:client) { double(:client) }
+  let(:user) { create(:user) }
+  let(:milestone) { create(:milestone, project: project) }
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+
+  let(:issue) do
+    Gitlab::GithubImport::Representation::Issue.new(
+      iid: 42,
+      title: 'My Issue',
+      description: 'This is my issue',
+      milestone_number: 1,
+      state: :opened,
+      assignees: [
+        Gitlab::GithubImport::Representation::User.new(id: 4, login: 'alice'),
+        Gitlab::GithubImport::Representation::User.new(id: 5, login: 'bob')
+      ],
+      label_names: %w[bug],
+      author: Gitlab::GithubImport::Representation::User.new(id: 4, login: 'alice'),
+      created_at: created_at,
+      updated_at: updated_at,
+      pull_request: false
+    )
+  end
+
+  describe '.import_if_issue' do
+    it 'imports an issuable if it is a regular issue' do
+      importer = double(:importer)
+
+      expect(described_class)
+        .to receive(:new)
+        .with(issue, project, client)
+        .and_return(importer)
+
+      expect(importer).to receive(:execute)
+
+      described_class.import_if_issue(issue, project, client)
+    end
+
+    it 'does not import the issuable if it is a pull request' do
+      expect(issue).to receive(:pull_request?).and_return(true)
+
+      expect(described_class).not_to receive(:new)
+
+      described_class.import_if_issue(issue, project, client)
+    end
+  end
+
+  describe '#execute' do
+    let(:importer) { described_class.new(issue, project, client) }
+
+    it 'creates the issue and assignees' do
+      expect(importer)
+        .to receive(:create_issue)
+        .and_return(10)
+
+      expect(importer)
+        .to receive(:create_assignees)
+        .with(10)
+
+      expect(importer.issuable_finder)
+        .to receive(:cache_database_id)
+        .with(10)
+
+      importer.execute
+    end
+  end
+
+  describe '#create_issue' do
+    let(:importer) { described_class.new(issue, project, client) }
+
+    before do
+      allow(importer.milestone_finder)
+        .to receive(:id_for)
+        .with(issue)
+        .and_return(milestone.id)
+    end
+
+    context 'when the issue author could be found' do
+      it 'creates the issue with the found author as the issue author' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .with(issue)
+          .and_return([user.id, true])
+
+        expect(Gitlab::GithubImport)
+          .to receive(:insert_and_return_id)
+          .with(
+            {
+              iid: 42,
+              title: 'My Issue',
+              author_id: user.id,
+              project_id: project.id,
+              description: 'This is my issue',
+              milestone_id: milestone.id,
+              state: :opened,
+              created_at: created_at,
+              updated_at: updated_at
+            },
+            project.issues
+          )
+          .and_call_original
+
+        importer.create_issue
+      end
+    end
+
+    context 'when the issue author could not be found' do
+      it 'creates the issue with the project creator as the issue author' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .with(issue)
+          .and_return([project.creator_id, false])
+
+        expect(Gitlab::GithubImport)
+          .to receive(:insert_and_return_id)
+          .with(
+            {
+              iid: 42,
+              title: 'My Issue',
+              author_id: project.creator_id,
+              project_id: project.id,
+              description: "*Created by: alice*\n\nThis is my issue",
+              milestone_id: milestone.id,
+              state: :opened,
+              created_at: created_at,
+              updated_at: updated_at
+            },
+            project.issues
+          )
+          .and_call_original
+
+        importer.create_issue
+      end
+    end
+
+    context 'when the import fails due to a foreign key error' do
+      it 'does not raise any errors' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .with(issue)
+          .and_return([user.id, true])
+
+        expect(Gitlab::GithubImport)
+          .to receive(:insert_and_return_id)
+          .and_raise(ActiveRecord::InvalidForeignKey, 'invalid foreign key')
+
+        expect { importer.create_issue }.not_to raise_error
+      end
+    end
+
+    it 'produces a valid Issue' do
+      allow(importer.user_finder)
+        .to receive(:author_id_for)
+        .with(issue)
+        .and_return([user.id, true])
+
+      importer.create_issue
+
+      expect(project.issues.take).to be_valid
+    end
+
+    it 'returns the ID of the created issue' do
+      allow(importer.user_finder)
+        .to receive(:author_id_for)
+        .with(issue)
+        .and_return([user.id, true])
+
+      expect(importer.create_issue).to be_a_kind_of(Numeric)
+    end
+  end
+
+  describe '#create_assignees' do
+    it 'inserts the issue assignees in bulk' do
+      importer = described_class.new(issue, project, client)
+
+      allow(importer.user_finder)
+        .to receive(:user_id_for)
+        .ordered.with(issue.assignees[0])
+        .and_return(4)
+
+      allow(importer.user_finder)
+        .to receive(:user_id_for)
+        .ordered.with(issue.assignees[1])
+        .and_return(5)
+
+      expect(Gitlab::Database)
+        .to receive(:bulk_insert)
+        .with(
+          IssueAssignee.table_name,
+          [{ issue_id: 1, user_id: 4 }, { issue_id: 1, user_id: 5 }]
+        )
+
+      importer.create_assignees(1)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/issues_importer_spec.rb b/spec/lib/gitlab/github_import/importer/issues_importer_spec.rb
new file mode 100644
index 00000000000..e237e79e94b
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/issues_importer_spec.rb
@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::IssuesImporter do
+  let(:project) { double(:project, id: 4, import_source: 'foo/bar') }
+  let(:client) { double(:client) }
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+
+  let(:github_issue) do
+    double(
+      :response,
+      number: 42,
+      title: 'My Issue',
+      body: 'This is my issue',
+      milestone: double(:milestone, number: 4),
+      state: 'open',
+      assignees: [double(:user, id: 4, login: 'alice')],
+      labels: [double(:label, name: 'bug')],
+      user: double(:user, id: 4, login: 'alice'),
+      created_at: created_at,
+      updated_at: updated_at,
+      pull_request: false
+    )
+  end
+
+  describe '#parallel?' do
+    it 'returns true when running in parallel mode' do
+      importer = described_class.new(project, client)
+      expect(importer).to be_parallel
+    end
+
+    it 'returns false when running in sequential mode' do
+      importer = described_class.new(project, client, parallel: false)
+      expect(importer).not_to be_parallel
+    end
+  end
+
+  describe '#execute' do
+    context 'when running in parallel mode' do
+      it 'imports issues in parallel' do
+        importer = described_class.new(project, client)
+
+        expect(importer).to receive(:parallel_import)
+
+        importer.execute
+      end
+    end
+
+    context 'when running in sequential mode' do
+      it 'imports issues in sequence' do
+        importer = described_class.new(project, client, parallel: false)
+
+        expect(importer).to receive(:sequential_import)
+
+        importer.execute
+      end
+    end
+  end
+
+  describe '#sequential_import' do
+    it 'imports each issue in sequence' do
+      importer = described_class.new(project, client, parallel: false)
+      issue_importer = double(:importer)
+
+      allow(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(github_issue)
+
+      expect(Gitlab::GithubImport::Importer::IssueAndLabelLinksImporter)
+        .to receive(:new)
+        .with(
+          an_instance_of(Gitlab::GithubImport::Representation::Issue),
+          project,
+          client
+        )
+        .and_return(issue_importer)
+
+      expect(issue_importer).to receive(:execute)
+
+      importer.sequential_import
+    end
+  end
+
+  describe '#parallel_import' do
+    it 'imports each issue in parallel' do
+      importer = described_class.new(project, client)
+
+      allow(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(github_issue)
+
+      expect(Gitlab::GithubImport::ImportIssueWorker)
+        .to receive(:perform_async)
+        .with(project.id, an_instance_of(Hash), an_instance_of(String))
+
+      waiter = importer.parallel_import
+
+      expect(waiter).to be_an_instance_of(Gitlab::JobWaiter)
+      expect(waiter.jobs_remaining).to eq(1)
+    end
+  end
+
+  describe '#id_for_already_imported_cache' do
+    it 'returns the issue number of the given issue' do
+      importer = described_class.new(project, client)
+
+      expect(importer.id_for_already_imported_cache(github_issue))
+        .to eq(42)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/label_links_importer_spec.rb b/spec/lib/gitlab/github_import/importer/label_links_importer_spec.rb
new file mode 100644
index 00000000000..e2a71e78574
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/label_links_importer_spec.rb
@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::LabelLinksImporter do
+  let(:project) { create(:project) }
+  let(:client) { double(:client) }
+  let(:issue) do
+    double(
+      :issue,
+      iid: 4,
+      label_names: %w[bug],
+      issuable_type: Issue,
+      pull_request?: false
+    )
+  end
+
+  let(:importer) { described_class.new(issue, project, client) }
+
+  describe '#execute' do
+    it 'creates the label links' do
+      importer = described_class.new(issue, project, client)
+
+      expect(importer).to receive(:create_labels)
+
+      importer.execute
+    end
+  end
+
+  describe '#create_labels' do
+    it 'inserts the label links in bulk' do
+      expect(importer.label_finder)
+        .to receive(:id_for)
+        .with('bug')
+        .and_return(2)
+
+      expect(importer)
+        .to receive(:find_target_id)
+        .and_return(1)
+
+      Timecop.freeze do
+        expect(Gitlab::Database)
+          .to receive(:bulk_insert)
+          .with(
+            LabelLink.table_name,
+            [
+              {
+                label_id: 2,
+                target_id: 1,
+                target_type: Issue,
+                created_at: Time.zone.now,
+                updated_at: Time.zone.now
+              }
+            ]
+          )
+
+        importer.create_labels
+      end
+    end
+
+    it 'does not insert label links for non-existing labels' do
+      expect(importer.label_finder)
+        .to receive(:id_for)
+        .with('bug')
+        .and_return(nil)
+
+      expect(Gitlab::Database)
+        .to receive(:bulk_insert)
+        .with(LabelLink.table_name, [])
+
+      importer.create_labels
+    end
+  end
+
+  describe '#find_target_id' do
+    it 'returns the ID of the issuable to create the label link for' do
+      expect_any_instance_of(Gitlab::GithubImport::IssuableFinder)
+        .to receive(:database_id)
+        .and_return(10)
+
+      expect(importer.find_target_id).to eq(10)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/labels_importer_spec.rb b/spec/lib/gitlab/github_import/importer/labels_importer_spec.rb
new file mode 100644
index 00000000000..156ef96a0fa
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/labels_importer_spec.rb
@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::LabelsImporter, :clean_gitlab_redis_cache do
+  let(:project) { create(:project, import_source: 'foo/bar') }
+  let(:client) { double(:client) }
+  let(:importer) { described_class.new(project, client) }
+
+  describe '#execute' do
+    it 'imports the labels in bulk' do
+      label_hash = { title: 'bug', color: '#fffaaa' }
+
+      expect(importer)
+        .to receive(:build_labels)
+        .and_return([label_hash])
+
+      expect(importer)
+        .to receive(:bulk_insert)
+        .with(Label, [label_hash])
+
+      expect(importer)
+        .to receive(:build_labels_cache)
+
+      importer.execute
+    end
+  end
+
+  describe '#build_labels' do
+    it 'returns an Array containnig label rows' do
+      label = double(:label, name: 'bug', color: 'ffffff')
+
+      expect(importer).to receive(:each_label).and_return([label])
+
+      rows = importer.build_labels
+
+      expect(rows.length).to eq(1)
+      expect(rows[0][:title]).to eq('bug')
+    end
+
+    it 'does not create labels that already exist' do
+      create(:label, project: project, title: 'bug')
+
+      label = double(:label, name: 'bug', color: 'ffffff')
+
+      expect(importer).to receive(:each_label).and_return([label])
+      expect(importer.build_labels).to be_empty
+    end
+  end
+
+  describe '#build_labels_cache' do
+    it 'builds the labels cache' do
+      expect_any_instance_of(Gitlab::GithubImport::LabelFinder)
+        .to receive(:build_cache)
+
+      importer.build_labels_cache
+    end
+  end
+
+  describe '#build' do
+    let(:label_hash) do
+      importer.build(double(:label, name: 'bug', color: 'ffffff'))
+    end
+
+    it 'returns the attributes of the label as a Hash' do
+      expect(label_hash).to be_an_instance_of(Hash)
+    end
+
+    context 'the returned Hash' do
+      it 'includes the label title' do
+        expect(label_hash[:title]).to eq('bug')
+      end
+
+      it 'includes the label color' do
+        expect(label_hash[:color]).to eq('#ffffff')
+      end
+
+      it 'includes the project ID' do
+        expect(label_hash[:project_id]).to eq(project.id)
+      end
+
+      it 'includes the label type' do
+        expect(label_hash[:type]).to eq('ProjectLabel')
+      end
+
+      it 'includes the created timestamp' do
+        Timecop.freeze do
+          expect(label_hash[:created_at]).to eq(Time.zone.now)
+        end
+      end
+
+      it 'includes the updated timestamp' do
+        Timecop.freeze do
+          expect(label_hash[:updated_at]).to eq(Time.zone.now)
+        end
+      end
+    end
+  end
+
+  describe '#each_label' do
+    it 'returns the labels' do
+      expect(client)
+        .to receive(:labels)
+        .with('foo/bar')
+
+      importer.each_label
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/milestones_importer_spec.rb b/spec/lib/gitlab/github_import/importer/milestones_importer_spec.rb
new file mode 100644
index 00000000000..b1cac3b6e46
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/milestones_importer_spec.rb
@@ -0,0 +1,120 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::MilestonesImporter, :clean_gitlab_redis_cache do
+  let(:project) { create(:project, import_source: 'foo/bar') }
+  let(:client) { double(:client) }
+  let(:importer) { described_class.new(project, client) }
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+
+  let(:milestone) do
+    double(
+      :milestone,
+      number: 1,
+      title: '1.0',
+      description: 'The first release',
+      state: 'open',
+      created_at: created_at,
+      updated_at: updated_at
+    )
+  end
+
+  describe '#execute' do
+    it 'imports the milestones in bulk' do
+      milestone_hash = { number: 1, title: '1.0' }
+
+      expect(importer)
+        .to receive(:build_milestones)
+        .and_return([milestone_hash])
+
+      expect(importer)
+        .to receive(:bulk_insert)
+        .with(Milestone, [milestone_hash])
+
+      expect(importer)
+        .to receive(:build_milestones_cache)
+
+      importer.execute
+    end
+  end
+
+  describe '#build_milestones' do
+    it 'returns an Array containnig milestone rows' do
+      expect(importer)
+        .to receive(:each_milestone)
+        .and_return([milestone])
+
+      rows = importer.build_milestones
+
+      expect(rows.length).to eq(1)
+      expect(rows[0][:title]).to eq('1.0')
+    end
+
+    it 'does not create milestones that already exist' do
+      create(:milestone, project: project, title: '1.0', iid: 1)
+
+      expect(importer)
+        .to receive(:each_milestone)
+        .and_return([milestone])
+
+      expect(importer.build_milestones).to be_empty
+    end
+  end
+
+  describe '#build_milestones_cache' do
+    it 'builds the milestones cache' do
+      expect_any_instance_of(Gitlab::GithubImport::MilestoneFinder)
+        .to receive(:build_cache)
+
+      importer.build_milestones_cache
+    end
+  end
+
+  describe '#build' do
+    let(:milestone_hash) { importer.build(milestone) }
+
+    it 'returns the attributes of the milestone as a Hash' do
+      expect(milestone_hash).to be_an_instance_of(Hash)
+    end
+
+    context 'the returned Hash' do
+      it 'includes the milestone number' do
+        expect(milestone_hash[:iid]).to eq(1)
+      end
+
+      it 'includes the milestone title' do
+        expect(milestone_hash[:title]).to eq('1.0')
+      end
+
+      it 'includes the milestone description' do
+        expect(milestone_hash[:description]).to eq('The first release')
+      end
+
+      it 'includes the project ID' do
+        expect(milestone_hash[:project_id]).to eq(project.id)
+      end
+
+      it 'includes the milestone state' do
+        expect(milestone_hash[:state]).to eq(:active)
+      end
+
+      it 'includes the created timestamp' do
+        expect(milestone_hash[:created_at]).to eq(created_at)
+      end
+
+      it 'includes the updated timestamp' do
+        expect(milestone_hash[:updated_at]).to eq(updated_at)
+      end
+    end
+  end
+
+  describe '#each_milestone' do
+    it 'returns the milestones' do
+      expect(client)
+        .to receive(:milestones)
+        .with('foo/bar', state: 'all')
+
+      importer.each_milestone
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/note_importer_spec.rb b/spec/lib/gitlab/github_import/importer/note_importer_spec.rb
new file mode 100644
index 00000000000..9bdcc42be19
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/note_importer_spec.rb
@@ -0,0 +1,151 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::NoteImporter do
+  let(:client) { double(:client) }
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+
+  let(:github_note) do
+    Gitlab::GithubImport::Representation::Note.new(
+      noteable_id: 1,
+      noteable_type: 'Issue',
+      author: Gitlab::GithubImport::Representation::User.new(id: 4, login: 'alice'),
+      note: 'This is my note',
+      created_at: created_at,
+      updated_at: updated_at,
+      github_id: 1
+    )
+  end
+
+  let(:importer) { described_class.new(github_note, project, client) }
+
+  describe '#execute' do
+    context 'when the noteable exists' do
+      let!(:issue_row) { create(:issue, project: project, iid: 1) }
+
+      before do
+        allow(importer)
+          .to receive(:find_noteable_id)
+          .and_return(issue_row.id)
+      end
+
+      context 'when the author could be found' do
+        it 'imports the note with the found author as the note author' do
+          expect(importer.user_finder)
+            .to receive(:author_id_for)
+            .with(github_note)
+            .and_return([user.id, true])
+
+          expect(Gitlab::Database)
+            .to receive(:bulk_insert)
+            .with(
+              Note.table_name,
+              [
+                {
+                  noteable_type: 'Issue',
+                  noteable_id: issue_row.id,
+                  project_id: project.id,
+                  author_id: user.id,
+                  note: 'This is my note',
+                  system: false,
+                  created_at: created_at,
+                  updated_at: updated_at
+                }
+              ]
+            )
+            .and_call_original
+
+          importer.execute
+        end
+      end
+
+      context 'when the note author could not be found' do
+        it 'imports the note with the project creator as the note author' do
+          expect(importer.user_finder)
+            .to receive(:author_id_for)
+            .with(github_note)
+            .and_return([project.creator_id, false])
+
+          expect(Gitlab::Database)
+            .to receive(:bulk_insert)
+            .with(
+              Note.table_name,
+              [
+                {
+                  noteable_type: 'Issue',
+                  noteable_id: issue_row.id,
+                  project_id: project.id,
+                  author_id: project.creator_id,
+                  note: "*Created by: alice*\n\nThis is my note",
+                  system: false,
+                  created_at: created_at,
+                  updated_at: updated_at
+                }
+              ]
+            )
+            .and_call_original
+
+          importer.execute
+        end
+      end
+    end
+
+    context 'when the noteable does not exist' do
+      it 'does not import the note' do
+        expect(Gitlab::Database).not_to receive(:bulk_insert)
+
+        importer.execute
+      end
+    end
+
+    context 'when the import fails due to a foreign key error' do
+      it 'does not raise any errors' do
+        issue_row = create(:issue, project: project, iid: 1)
+
+        allow(importer)
+          .to receive(:find_noteable_id)
+          .and_return(issue_row.id)
+
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .with(github_note)
+          .and_return([user.id, true])
+
+        expect(Gitlab::Database)
+          .to receive(:bulk_insert)
+          .and_raise(ActiveRecord::InvalidForeignKey, 'invalid foreign key')
+
+        expect { importer.execute }.not_to raise_error
+      end
+    end
+
+    it 'produces a valid Note' do
+      issue_row = create(:issue, project: project, iid: 1)
+
+      allow(importer)
+        .to receive(:find_noteable_id)
+        .and_return(issue_row.id)
+
+      allow(importer.user_finder)
+        .to receive(:author_id_for)
+        .with(github_note)
+        .and_return([user.id, true])
+
+      importer.execute
+
+      expect(project.notes.take).to be_valid
+    end
+  end
+
+  describe '#find_noteable_id' do
+    it 'returns the ID of the noteable' do
+      expect_any_instance_of(Gitlab::GithubImport::IssuableFinder)
+        .to receive(:database_id)
+        .and_return(10)
+
+      expect(importer.find_noteable_id).to eq(10)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/notes_importer_spec.rb b/spec/lib/gitlab/github_import/importer/notes_importer_spec.rb
new file mode 100644
index 00000000000..f046d13f879
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/notes_importer_spec.rb
@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::NotesImporter do
+  let(:project) { double(:project, id: 4, import_source: 'foo/bar') }
+  let(:client) { double(:client) }
+
+  let(:github_comment) do
+    double(
+      :response,
+      html_url: 'https://github.com/foo/bar/issues/42',
+      user: double(:user, id: 4, login: 'alice'),
+      body: 'Hello world',
+      created_at: Time.zone.now,
+      updated_at: Time.zone.now,
+      id: 1
+    )
+  end
+
+  describe '#parallel?' do
+    it 'returns true when running in parallel mode' do
+      importer = described_class.new(project, client)
+      expect(importer).to be_parallel
+    end
+
+    it 'returns false when running in sequential mode' do
+      importer = described_class.new(project, client, parallel: false)
+      expect(importer).not_to be_parallel
+    end
+  end
+
+  describe '#execute' do
+    context 'when running in parallel mode' do
+      it 'imports notes in parallel' do
+        importer = described_class.new(project, client)
+
+        expect(importer).to receive(:parallel_import)
+
+        importer.execute
+      end
+    end
+
+    context 'when running in sequential mode' do
+      it 'imports notes in sequence' do
+        importer = described_class.new(project, client, parallel: false)
+
+        expect(importer).to receive(:sequential_import)
+
+        importer.execute
+      end
+    end
+  end
+
+  describe '#sequential_import' do
+    it 'imports each note in sequence' do
+      importer = described_class.new(project, client, parallel: false)
+      note_importer = double(:note_importer)
+
+      allow(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(github_comment)
+
+      expect(Gitlab::GithubImport::Importer::NoteImporter)
+        .to receive(:new)
+        .with(
+          an_instance_of(Gitlab::GithubImport::Representation::Note),
+          project,
+          client
+        )
+        .and_return(note_importer)
+
+      expect(note_importer).to receive(:execute)
+
+      importer.sequential_import
+    end
+  end
+
+  describe '#parallel_import' do
+    it 'imports each note in parallel' do
+      importer = described_class.new(project, client)
+
+      allow(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(github_comment)
+
+      expect(Gitlab::GithubImport::ImportNoteWorker)
+        .to receive(:perform_async)
+        .with(project.id, an_instance_of(Hash), an_instance_of(String))
+
+      waiter = importer.parallel_import
+
+      expect(waiter).to be_an_instance_of(Gitlab::JobWaiter)
+      expect(waiter.jobs_remaining).to eq(1)
+    end
+  end
+
+  describe '#id_for_already_imported_cache' do
+    it 'returns the ID of the given note' do
+      importer = described_class.new(project, client)
+
+      expect(importer.id_for_already_imported_cache(github_comment))
+        .to eq(1)
+    end
+  end
+
+  describe '#collection_options' do
+    it 'returns an empty Hash' do
+      # For large projects (e.g. kubernetes/kubernetes) GitHub's API may produce
+      # HTTP 500 errors when using explicit sorting options, regardless of what
+      # order you sort in. Not using any sorting options at all allows us to
+      # work around this.
+      importer = described_class.new(project, client)
+
+      expect(importer.collection_options).to eq({})
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb
new file mode 100644
index 00000000000..35f3fdf8304
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb
@@ -0,0 +1,221 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitlab_redis_cache do
+  let(:project) { create(:project, :repository) }
+  let(:client) { double(:client) }
+  let(:user) { create(:user) }
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+  let(:merged_at) { Time.new(2017, 1, 1, 12, 17) }
+
+  let(:source_commit) { project.repository.commit('feature') }
+  let(:target_commit) { project.repository.commit('master') }
+  let(:milestone) { create(:milestone, project: project) }
+
+  let(:pull_request) do
+    alice = Gitlab::GithubImport::Representation::User.new(id: 4, login: 'alice')
+
+    Gitlab::GithubImport::Representation::PullRequest.new(
+      iid: 42,
+      title: 'My Pull Request',
+      description: 'This is my pull request',
+      source_branch: 'feature',
+      source_branch_sha: source_commit.id,
+      target_branch: 'master',
+      target_branch_sha: target_commit.id,
+      source_repository_id: 400,
+      target_repository_id: 200,
+      source_repository_owner: 'alice',
+      state: :closed,
+      milestone_number: milestone.iid,
+      author: alice,
+      assignee: alice,
+      created_at: created_at,
+      updated_at: updated_at,
+      merged_at: merged_at
+    )
+  end
+
+  let(:importer) { described_class.new(pull_request, project, client) }
+
+  describe '#execute' do
+    it 'imports the pull request' do
+      expect(importer)
+        .to receive(:create_merge_request)
+        .and_return(10)
+
+      expect_any_instance_of(Gitlab::GithubImport::IssuableFinder)
+        .to receive(:cache_database_id)
+        .with(10)
+
+      importer.execute
+    end
+  end
+
+  describe '#create_merge_request' do
+    before do
+      allow(importer.milestone_finder)
+        .to receive(:id_for)
+        .with(pull_request)
+        .and_return(milestone.id)
+    end
+
+    context 'when the author could be found' do
+      before do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .with(pull_request)
+          .and_return([user.id, true])
+
+        allow(importer.user_finder)
+          .to receive(:assignee_id_for)
+          .with(pull_request)
+          .and_return(user.id)
+      end
+
+      it 'imports the pull request with the pull request author as the merge request author' do
+        expect(Gitlab::GithubImport)
+          .to receive(:insert_and_return_id)
+          .with(
+            {
+              iid: 42,
+              title: 'My Pull Request',
+              description: 'This is my pull request',
+              source_project_id: project.id,
+              target_project_id: project.id,
+              source_branch: 'alice:feature',
+              target_branch: 'master',
+              state: :merged,
+              milestone_id: milestone.id,
+              author_id: user.id,
+              assignee_id: user.id,
+              created_at: created_at,
+              updated_at: updated_at
+            },
+            project.merge_requests
+          )
+          .and_call_original
+
+        importer.create_merge_request
+      end
+
+      it 'returns the ID of the created merge request' do
+        id = importer.create_merge_request
+
+        expect(id).to be_a_kind_of(Numeric)
+      end
+
+      it 'creates the merge request diffs' do
+        importer.create_merge_request
+
+        mr = project.merge_requests.take
+
+        expect(mr.merge_request_diffs.exists?).to eq(true)
+      end
+    end
+
+    context 'when the author could not be found' do
+      it 'imports the pull request with the project creator as the merge request author' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .with(pull_request)
+          .and_return([project.creator_id, false])
+
+        allow(importer.user_finder)
+          .to receive(:assignee_id_for)
+          .with(pull_request)
+          .and_return(user.id)
+
+        expect(Gitlab::GithubImport)
+          .to receive(:insert_and_return_id)
+          .with(
+            {
+              iid: 42,
+              title: 'My Pull Request',
+              description: "*Created by: alice*\n\nThis is my pull request",
+              source_project_id: project.id,
+              target_project_id: project.id,
+              source_branch: 'alice:feature',
+              target_branch: 'master',
+              state: :merged,
+              milestone_id: milestone.id,
+              author_id: project.creator_id,
+              assignee_id: user.id,
+              created_at: created_at,
+              updated_at: updated_at
+            },
+            project.merge_requests
+          )
+          .and_call_original
+
+        importer.create_merge_request
+      end
+    end
+
+    context 'when the source and target branch are identical' do
+      it 'uses a generated source branch name for the merge request' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .with(pull_request)
+          .and_return([user.id, true])
+
+        allow(importer.user_finder)
+          .to receive(:assignee_id_for)
+          .with(pull_request)
+          .and_return(user.id)
+
+        allow(pull_request)
+          .to receive(:source_repository_id)
+          .and_return(pull_request.target_repository_id)
+
+        allow(pull_request)
+          .to receive(:source_branch)
+          .and_return('master')
+
+        expect(Gitlab::GithubImport)
+          .to receive(:insert_and_return_id)
+          .with(
+            {
+              iid: 42,
+              title: 'My Pull Request',
+              description: 'This is my pull request',
+              source_project_id: project.id,
+              target_project_id: project.id,
+              source_branch: 'master-42',
+              target_branch: 'master',
+              state: :merged,
+              milestone_id: milestone.id,
+              author_id: user.id,
+              assignee_id: user.id,
+              created_at: created_at,
+              updated_at: updated_at
+            },
+            project.merge_requests
+          )
+          .and_call_original
+
+        importer.create_merge_request
+      end
+    end
+
+    context 'when the import fails due to a foreign key error' do
+      it 'does not raise any errors' do
+        allow(importer.user_finder)
+          .to receive(:author_id_for)
+          .with(pull_request)
+          .and_return([user.id, true])
+
+        allow(importer.user_finder)
+          .to receive(:assignee_id_for)
+          .with(pull_request)
+          .and_return(user.id)
+
+        expect(Gitlab::GithubImport)
+          .to receive(:insert_and_return_id)
+          .and_raise(ActiveRecord::InvalidForeignKey, 'invalid foreign key')
+
+        expect { importer.create_merge_request }.not_to raise_error
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
new file mode 100644
index 00000000000..d72572cd510
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
@@ -0,0 +1,272 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::PullRequestsImporter do
+  let(:project) { create(:project, import_source: 'foo/bar') }
+  let(:client) { double(:client) }
+
+  let(:pull_request) do
+    double(
+      :response,
+      number: 42,
+      title: 'My Pull Request',
+      body: 'This is my pull request',
+      state: 'closed',
+      head: double(
+        :head,
+        sha: '123abc',
+        ref: 'my-feature',
+        repo: double(:repo, id: 400),
+        user: double(:user, id: 4, login: 'alice')
+      ),
+      base: double(
+        :base,
+        sha: '456def',
+        ref: 'master',
+        repo: double(:repo, id: 200)
+      ),
+      milestone: double(:milestone, number: 4),
+      user: double(:user, id: 4, login: 'alice'),
+      assignee: double(:user, id: 4, login: 'alice'),
+      created_at: Time.zone.now,
+      updated_at: Time.zone.now,
+      merged_at: Time.zone.now
+    )
+  end
+
+  describe '#parallel?' do
+    it 'returns true when running in parallel mode' do
+      importer = described_class.new(project, client)
+      expect(importer).to be_parallel
+    end
+
+    it 'returns false when running in sequential mode' do
+      importer = described_class.new(project, client, parallel: false)
+      expect(importer).not_to be_parallel
+    end
+  end
+
+  describe '#execute' do
+    context 'when running in parallel mode' do
+      it 'imports pull requests in parallel' do
+        importer = described_class.new(project, client)
+
+        expect(importer).to receive(:parallel_import)
+
+        importer.execute
+      end
+    end
+
+    context 'when running in sequential mode' do
+      it 'imports pull requests in sequence' do
+        importer = described_class.new(project, client, parallel: false)
+
+        expect(importer).to receive(:sequential_import)
+
+        importer.execute
+      end
+    end
+  end
+
+  describe '#sequential_import' do
+    it 'imports each pull request in sequence' do
+      importer = described_class.new(project, client, parallel: false)
+      pull_request_importer = double(:pull_request_importer)
+
+      allow(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(pull_request)
+
+      expect(Gitlab::GithubImport::Importer::PullRequestImporter)
+        .to receive(:new)
+        .with(
+          an_instance_of(Gitlab::GithubImport::Representation::PullRequest),
+          project,
+          client
+        )
+        .and_return(pull_request_importer)
+
+      expect(pull_request_importer).to receive(:execute)
+
+      importer.sequential_import
+    end
+  end
+
+  describe '#parallel_import' do
+    it 'imports each note in parallel' do
+      importer = described_class.new(project, client)
+
+      allow(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(pull_request)
+
+      expect(Gitlab::GithubImport::ImportPullRequestWorker)
+        .to receive(:perform_async)
+        .with(project.id, an_instance_of(Hash), an_instance_of(String))
+
+      waiter = importer.parallel_import
+
+      expect(waiter).to be_an_instance_of(Gitlab::JobWaiter)
+      expect(waiter.jobs_remaining).to eq(1)
+    end
+  end
+
+  describe '#each_object_to_import', :clean_gitlab_redis_cache do
+    let(:importer) { described_class.new(project, client) }
+
+    before do
+      page = double(:page, objects: [pull_request], number: 1)
+
+      expect(client)
+        .to receive(:each_page)
+        .with(
+          :pull_requests,
+          'foo/bar',
+          { state: 'all', sort: 'created', direction: 'asc', page: 1 }
+        )
+        .and_yield(page)
+    end
+
+    it 'yields every pull request to the supplied block' do
+      expect { |b| importer.each_object_to_import(&b) }
+        .to yield_with_args(pull_request)
+    end
+
+    it 'updates the repository if a pull request was updated after the last clone' do
+      expect(importer)
+        .to receive(:update_repository?)
+        .with(pull_request)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:update_repository)
+
+      importer.each_object_to_import { }
+    end
+  end
+
+  describe '#update_repository' do
+    it 'updates the repository' do
+      importer = described_class.new(project, client)
+
+      expect(project.repository)
+        .to receive(:fetch_remote)
+        .with('github', forced: false)
+
+      expect(Rails.logger)
+        .to receive(:info)
+        .with(an_instance_of(String))
+
+      expect(importer.repository_updates_counter)
+        .to receive(:increment)
+        .with(project: project.path_with_namespace)
+        .and_call_original
+
+      Timecop.freeze do
+        importer.update_repository
+
+        expect(project.last_repository_updated_at).to eq(Time.zone.now)
+      end
+    end
+  end
+
+  describe '#update_repository?' do
+    let(:importer) { described_class.new(project, client) }
+
+    context 'when the pull request was updated after the last update' do
+      let(:pr) do
+        double(
+          :pr,
+          updated_at: Time.zone.now,
+          head: double(:head, sha: '123'),
+          base: double(:base, sha: '456')
+        )
+      end
+
+      before do
+        allow(project)
+          .to receive(:last_repository_updated_at)
+          .and_return(1.year.ago)
+      end
+
+      it 'returns true when the head SHA is not present' do
+        expect(importer)
+          .to receive(:commit_exists?)
+          .with(pr.head.sha)
+          .and_return(false)
+
+        expect(importer.update_repository?(pr)).to eq(true)
+      end
+
+      it 'returns true when the base SHA is not present' do
+        expect(importer)
+          .to receive(:commit_exists?)
+          .with(pr.head.sha)
+          .and_return(true)
+
+        expect(importer)
+          .to receive(:commit_exists?)
+          .with(pr.base.sha)
+          .and_return(false)
+
+        expect(importer.update_repository?(pr)).to eq(true)
+      end
+
+      it 'returns false if both the head and base SHAs are present' do
+        expect(importer)
+          .to receive(:commit_exists?)
+          .with(pr.head.sha)
+          .and_return(true)
+
+        expect(importer)
+          .to receive(:commit_exists?)
+          .with(pr.base.sha)
+          .and_return(true)
+
+        expect(importer.update_repository?(pr)).to eq(false)
+      end
+    end
+
+    context 'when the pull request was updated before the last update' do
+      it 'returns false' do
+        pr = double(:pr, updated_at: 1.year.ago)
+
+        allow(project)
+          .to receive(:last_repository_updated_at)
+          .and_return(Time.zone.now)
+
+        expect(importer.update_repository?(pr)).to eq(false)
+      end
+    end
+  end
+
+  describe '#commit_exists?' do
+    let(:importer) { described_class.new(project, client) }
+
+    it 'returns true when a commit exists' do
+      expect(project.repository)
+        .to receive(:lookup)
+        .with('123')
+        .and_return(double(:commit))
+
+      expect(importer.commit_exists?('123')).to eq(true)
+    end
+
+    it 'returns false when a commit does not exist' do
+      expect(project.repository)
+        .to receive(:lookup)
+        .with('123')
+        .and_raise(Rugged::OdbError)
+
+      expect(importer.commit_exists?('123')).to eq(false)
+    end
+  end
+
+  describe '#id_for_already_imported_cache' do
+    it 'returns the PR number of the given PR' do
+      importer = described_class.new(project, client)
+
+      expect(importer.id_for_already_imported_cache(pull_request))
+        .to eq(42)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/releases_importer_spec.rb b/spec/lib/gitlab/github_import/importer/releases_importer_spec.rb
new file mode 100644
index 00000000000..23ae026fb14
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/releases_importer_spec.rb
@@ -0,0 +1,125 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::ReleasesImporter do
+  let(:project) { create(:project) }
+  let(:client) { double(:client) }
+  let(:importer) { described_class.new(project, client) }
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+
+  let(:release) do
+    double(
+      :release,
+      tag_name: '1.0',
+      body: 'This is my release',
+      created_at: created_at,
+      updated_at: updated_at
+    )
+  end
+
+  describe '#execute' do
+    it 'imports the releases in bulk' do
+      release_hash = {
+        tag_name: '1.0',
+        description: 'This is my release',
+        created_at: created_at,
+        updated_at: updated_at
+      }
+
+      expect(importer).to receive(:build_releases).and_return([release_hash])
+      expect(importer).to receive(:bulk_insert).with(Release, [release_hash])
+
+      importer.execute
+    end
+  end
+
+  describe '#build_releases' do
+    it 'returns an Array containnig release rows' do
+      expect(importer).to receive(:each_release).and_return([release])
+
+      rows = importer.build_releases
+
+      expect(rows.length).to eq(1)
+      expect(rows[0][:tag]).to eq('1.0')
+    end
+
+    it 'does not create releases that already exist' do
+      create(:release, project: project, tag: '1.0', description: '1.0')
+
+      expect(importer).to receive(:each_release).and_return([release])
+      expect(importer.build_releases).to be_empty
+    end
+
+    it 'uses a default release description if none is provided' do
+      expect(release).to receive(:body).and_return('')
+      expect(importer).to receive(:each_release).and_return([release])
+
+      release = importer.build_releases.first
+
+      expect(release[:description]).to eq('Release for tag 1.0')
+    end
+  end
+
+  describe '#build' do
+    let(:release_hash) { importer.build(release) }
+
+    it 'returns the attributes of the release as a Hash' do
+      expect(release_hash).to be_an_instance_of(Hash)
+    end
+
+    context 'the returned Hash' do
+      it 'includes the tag name' do
+        expect(release_hash[:tag]).to eq('1.0')
+      end
+
+      it 'includes the release description' do
+        expect(release_hash[:description]).to eq('This is my release')
+      end
+
+      it 'includes the project ID' do
+        expect(release_hash[:project_id]).to eq(project.id)
+      end
+
+      it 'includes the created timestamp' do
+        expect(release_hash[:created_at]).to eq(created_at)
+      end
+
+      it 'includes the updated timestamp' do
+        expect(release_hash[:updated_at]).to eq(updated_at)
+      end
+    end
+  end
+
+  describe '#each_release' do
+    let(:release) { double(:release) }
+
+    before do
+      allow(project).to receive(:import_source).and_return('foo/bar')
+
+      allow(client)
+        .to receive(:releases)
+        .with('foo/bar')
+        .and_return([release].to_enum)
+    end
+
+    it 'returns an Enumerator' do
+      expect(importer.each_release).to be_an_instance_of(Enumerator)
+    end
+
+    it 'yields every release to the Enumerator' do
+      expect(importer.each_release.next).to eq(release)
+    end
+  end
+
+  describe '#description_for' do
+    it 'returns the description when present' do
+      expect(importer.description_for(release)).to eq(release.body)
+    end
+
+    it 'returns a generated description when one is not present' do
+      allow(release).to receive(:body).and_return('')
+
+      expect(importer.description_for(release)).to eq('Release for tag 1.0')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb b/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb
new file mode 100644
index 00000000000..168e5d07504
--- /dev/null
+++ b/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb
@@ -0,0 +1,227 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Importer::RepositoryImporter do
+  let(:repository) { double(:repository) }
+  let(:client) { double(:client) }
+
+  let(:project) do
+    double(
+      :project,
+      import_url: 'foo.git',
+      import_source: 'foo/bar',
+      repository_storage_path: 'foo',
+      disk_path: 'foo',
+      repository: repository
+    )
+  end
+
+  let(:importer) { described_class.new(project, client) }
+  let(:shell_adapter) { Gitlab::Shell.new }
+
+  before do
+    # The method "gitlab_shell" returns a new instance every call, making
+    # it harder to set expectations. To work around this we'll stub the method
+    # and return the same instance on every call.
+    allow(importer).to receive(:gitlab_shell).and_return(shell_adapter)
+  end
+
+  describe '#import_wiki?' do
+    it 'returns true if the wiki should be imported' do
+      repo = double(:repo, has_wiki: true)
+
+      expect(client)
+        .to receive(:repository)
+        .with('foo/bar')
+        .and_return(repo)
+
+      expect(project)
+        .to receive(:wiki_repository_exists?)
+        .and_return(false)
+
+      expect(importer.import_wiki?).to eq(true)
+    end
+
+    it 'returns false if the GitHub wiki is disabled' do
+      repo = double(:repo, has_wiki: false)
+
+      expect(client)
+        .to receive(:repository)
+        .with('foo/bar')
+        .and_return(repo)
+
+      expect(importer.import_wiki?).to eq(false)
+    end
+
+    it 'returns false if the wiki has already been imported' do
+      repo = double(:repo, has_wiki: true)
+
+      expect(client)
+        .to receive(:repository)
+        .with('foo/bar')
+        .and_return(repo)
+
+      expect(project)
+        .to receive(:wiki_repository_exists?)
+        .and_return(true)
+
+      expect(importer.import_wiki?).to eq(false)
+    end
+  end
+
+  describe '#execute' do
+    it 'imports the repository and wiki' do
+      expect(repository)
+        .to receive(:empty_repo?)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:import_wiki?)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:import_repository)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:import_wiki_repository)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:update_clone_time)
+
+      expect(importer.execute).to eq(true)
+    end
+
+    it 'does not import the repository if it already exists' do
+      expect(repository)
+        .to receive(:empty_repo?)
+        .and_return(false)
+
+      expect(importer)
+        .to receive(:import_wiki?)
+        .and_return(true)
+
+      expect(importer)
+        .not_to receive(:import_repository)
+
+      expect(importer)
+        .to receive(:import_wiki_repository)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:update_clone_time)
+
+      expect(importer.execute).to eq(true)
+    end
+
+    it 'does not import the wiki if it is disabled' do
+      expect(repository)
+        .to receive(:empty_repo?)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:import_wiki?)
+        .and_return(false)
+
+      expect(importer)
+        .to receive(:import_repository)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:update_clone_time)
+
+      expect(importer)
+        .not_to receive(:import_wiki_repository)
+
+      expect(importer.execute).to eq(true)
+    end
+
+    it 'does not import the wiki if the repository could not be imported' do
+      expect(repository)
+        .to receive(:empty_repo?)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:import_wiki?)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:import_repository)
+        .and_return(false)
+
+      expect(importer)
+        .not_to receive(:update_clone_time)
+
+      expect(importer)
+        .not_to receive(:import_wiki_repository)
+
+      expect(importer.execute).to eq(false)
+    end
+  end
+
+  describe '#import_repository' do
+    it 'imports the repository' do
+      expect(project)
+        .to receive(:ensure_repository)
+
+      expect(repository)
+        .to receive(:fetch_as_mirror)
+        .with(project.import_url, refmap: Gitlab::GithubImport.refmap, forced: true, remote_name: 'github')
+
+      expect(importer.import_repository).to eq(true)
+    end
+
+    it 'marks the import as failed when an error was raised' do
+      expect(project).to receive(:ensure_repository)
+        .and_raise(Gitlab::Git::Repository::NoRepository)
+
+      expect(importer)
+        .to receive(:fail_import)
+        .and_return(false)
+
+      expect(importer.import_repository).to eq(false)
+    end
+  end
+
+  describe '#import_wiki_repository' do
+    it 'imports the wiki repository' do
+      expect(importer.gitlab_shell)
+        .to receive(:import_repository)
+        .with('foo', 'foo.wiki', 'foo.wiki.git')
+
+      expect(importer.import_wiki_repository).to eq(true)
+    end
+
+    it 'marks the import as failed if an error was raised' do
+      expect(importer.gitlab_shell)
+        .to receive(:import_repository)
+        .and_raise(Gitlab::Shell::Error)
+
+      expect(importer)
+        .to receive(:fail_import)
+        .and_return(false)
+
+      expect(importer.import_wiki_repository).to eq(false)
+    end
+  end
+
+  describe '#fail_import' do
+    it 'marks the import as failed' do
+      expect(project).to receive(:mark_import_as_failed).with('foo')
+
+      expect(importer.fail_import('foo')).to eq(false)
+    end
+  end
+
+  describe '#update_clone_time' do
+    it 'sets the timestamp for when the cloning process finished' do
+      Timecop.freeze do
+        expect(project)
+          .to receive(:update_column)
+          .with(:last_repository_updated_at, Time.zone.now)
+
+        importer.update_clone_time
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/issuable_finder_spec.rb b/spec/lib/gitlab/github_import/issuable_finder_spec.rb
new file mode 100644
index 00000000000..da69911812a
--- /dev/null
+++ b/spec/lib/gitlab/github_import/issuable_finder_spec.rb
@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::IssuableFinder, :clean_gitlab_redis_cache do
+  let(:project) { double(:project, id: 4) }
+  let(:issue) do
+    double(:issue, issuable_type: MergeRequest, iid: 1)
+  end
+
+  let(:finder) { described_class.new(project, issue) }
+
+  describe '#database_id' do
+    it 'returns nil when no cache is in place' do
+      expect(finder.database_id).to be_nil
+    end
+
+    it 'returns the ID of an issuable when the cache is in place' do
+      finder.cache_database_id(10)
+
+      expect(finder.database_id).to eq(10)
+    end
+
+    it 'raises TypeError when the object is not supported' do
+      finder = described_class.new(project, double(:issue))
+
+      expect { finder.database_id }.to raise_error(TypeError)
+    end
+  end
+
+  describe '#cache_database_id' do
+    it 'caches the ID of a database row' do
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:write)
+        .with('github-import/issuable-finder/4/MergeRequest/1', 10)
+
+      finder.cache_database_id(10)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/label_finder_spec.rb b/spec/lib/gitlab/github_import/label_finder_spec.rb
new file mode 100644
index 00000000000..8ba766944d6
--- /dev/null
+++ b/spec/lib/gitlab/github_import/label_finder_spec.rb
@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::LabelFinder, :clean_gitlab_redis_cache do
+  let(:project) { create(:project) }
+  let(:finder) { described_class.new(project) }
+  let!(:bug) { create(:label, project: project, name: 'Bug') }
+  let!(:feature) { create(:label, project: project, name: 'Feature') }
+
+  describe '#id_for' do
+    context 'with a cache in place' do
+      before do
+        finder.build_cache
+      end
+
+      it 'returns the ID of the given label' do
+        expect(finder.id_for(feature.name)).to eq(feature.id)
+      end
+
+      it 'returns nil for an empty cache key' do
+        key = finder.cache_key_for(bug.name)
+
+        Gitlab::GithubImport::Caching.write(key, '')
+
+        expect(finder.id_for(bug.name)).to be_nil
+      end
+
+      it 'returns nil for a non existing label name' do
+        expect(finder.id_for('kittens')).to be_nil
+      end
+    end
+
+    context 'without a cache in place' do
+      it 'returns nil for a label' do
+        expect(finder.id_for(feature.name)).to be_nil
+      end
+    end
+  end
+
+  describe '#build_cache' do
+    it 'builds the cache of all project labels' do
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:write_multiple)
+        .with(
+          {
+            "github-import/label-finder/#{project.id}/Bug" => bug.id,
+            "github-import/label-finder/#{project.id}/Feature" => feature.id
+          }
+        )
+        .and_call_original
+
+      finder.build_cache
+    end
+  end
+
+  describe '#cache_key_for' do
+    it 'returns the cache key for a label name' do
+      expect(finder.cache_key_for('foo'))
+        .to eq("github-import/label-finder/#{project.id}/foo")
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/markdown_text_spec.rb b/spec/lib/gitlab/github_import/markdown_text_spec.rb
new file mode 100644
index 00000000000..1ff5b9d66b3
--- /dev/null
+++ b/spec/lib/gitlab/github_import/markdown_text_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::MarkdownText do
+  describe '.format' do
+    it 'formats the text' do
+      author = double(:author, login: 'Alice')
+      text = described_class.format('Hello', author)
+
+      expect(text).to eq("*Created by: Alice*\n\nHello")
+    end
+  end
+
+  describe '#to_s' do
+    it 'returns the text when the author was found' do
+      author = double(:author, login: 'Alice')
+      text = described_class.new('Hello', author, true)
+
+      expect(text.to_s).to eq('Hello')
+    end
+
+    it 'returns the text with an extra header when the author was not found' do
+      author = double(:author, login: 'Alice')
+      text = described_class.new('Hello', author)
+
+      expect(text.to_s).to eq("*Created by: Alice*\n\nHello")
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/milestone_finder_spec.rb b/spec/lib/gitlab/github_import/milestone_finder_spec.rb
new file mode 100644
index 00000000000..dff931a2fe8
--- /dev/null
+++ b/spec/lib/gitlab/github_import/milestone_finder_spec.rb
@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::MilestoneFinder, :clean_gitlab_redis_cache do
+  let!(:project) { create(:project) }
+  let!(:milestone) { create(:milestone, project: project) }
+  let(:finder) { described_class.new(project) }
+
+  describe '#id_for' do
+    let(:issuable) { double(:issuable, milestone_number: milestone.iid) }
+
+    context 'with a cache in place' do
+      before do
+        finder.build_cache
+      end
+
+      it 'returns the milestone ID of the given issuable' do
+        expect(finder.id_for(issuable)).to eq(milestone.id)
+      end
+
+      it 'returns nil for an empty cache key' do
+        key = finder.cache_key_for(milestone.iid)
+
+        Gitlab::GithubImport::Caching.write(key, '')
+
+        expect(finder.id_for(issuable)).to be_nil
+      end
+
+      it 'returns nil for an issuable with a non-existing milestone' do
+        expect(finder.id_for(double(:issuable, milestone_number: 5))).to be_nil
+      end
+    end
+
+    context 'without a cache in place' do
+      it 'returns nil' do
+        expect(finder.id_for(issuable)).to be_nil
+      end
+    end
+  end
+
+  describe '#build_cache' do
+    it 'builds the cache of all project milestones' do
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:write_multiple)
+        .with("github-import/milestone-finder/#{project.id}/1" => milestone.id)
+        .and_call_original
+
+      finder.build_cache
+    end
+  end
+
+  describe '#cache_key_for' do
+    it 'returns the cache key for an IID' do
+      expect(finder.cache_key_for(10))
+        .to eq("github-import/milestone-finder/#{project.id}/10")
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/page_counter_spec.rb b/spec/lib/gitlab/github_import/page_counter_spec.rb
new file mode 100644
index 00000000000..c2613a9a415
--- /dev/null
+++ b/spec/lib/gitlab/github_import/page_counter_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::PageCounter, :clean_gitlab_redis_cache do
+  let(:project) { double(:project, id: 1) }
+  let(:counter) { described_class.new(project, :issues) }
+
+  describe '#initialize' do
+    it 'sets the initial page number to 1 when no value is cached' do
+      expect(counter.current).to eq(1)
+    end
+
+    it 'sets the initial page number to the cached value when one is present' do
+      Gitlab::GithubImport::Caching.write(counter.cache_key, 2)
+
+      expect(described_class.new(project, :issues).current).to eq(2)
+    end
+  end
+
+  describe '#set' do
+    it 'overwrites the page number when the given number is greater than the current number' do
+      counter.set(4)
+      expect(counter.current).to eq(4)
+    end
+
+    it 'does not overwrite the page number when the given number is lower than the current number' do
+      counter.set(2)
+      counter.set(1)
+
+      expect(counter.current).to eq(2)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/parallel_importer_spec.rb b/spec/lib/gitlab/github_import/parallel_importer_spec.rb
new file mode 100644
index 00000000000..e2a821d4d5c
--- /dev/null
+++ b/spec/lib/gitlab/github_import/parallel_importer_spec.rb
@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::ParallelImporter do
+  describe '.async?' do
+    it 'returns true' do
+      expect(described_class).to be_async
+    end
+  end
+
+  describe '#execute', :clean_gitlab_redis_shared_state do
+    let(:project) { create(:project) }
+    let(:importer) { described_class.new(project) }
+
+    before do
+      expect(Gitlab::GithubImport::Stage::ImportRepositoryWorker)
+        .to receive(:perform_async)
+        .with(project.id)
+        .and_return('123')
+    end
+
+    it 'schedules the importing of the repository' do
+      expect(importer.execute).to eq(true)
+    end
+
+    it 'sets the JID in Redis' do
+      expect(Gitlab::SidekiqStatus)
+        .to receive(:set)
+        .with("github-importer/#{project.id}", StuckImportJobsWorker::IMPORT_JOBS_EXPIRATION)
+        .and_call_original
+
+      importer.execute
+    end
+
+    it 'updates the import JID of the project' do
+      importer.execute
+
+      expect(project.import_jid).to eq("github-importer/#{project.id}")
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb b/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb
new file mode 100644
index 00000000000..98205d3ee25
--- /dev/null
+++ b/spec/lib/gitlab/github_import/parallel_scheduling_spec.rb
@@ -0,0 +1,296 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::ParallelScheduling do
+  let(:importer_class) do
+    Class.new do
+      include(Gitlab::GithubImport::ParallelScheduling)
+
+      def collection_method
+        :issues
+      end
+    end
+  end
+
+  let(:project) { double(:project, id: 4, import_source: 'foo/bar') }
+  let(:client) { double(:client) }
+
+  describe '#parallel?' do
+    it 'returns true when running in parallel mode' do
+      expect(importer_class.new(project, client)).to be_parallel
+    end
+
+    it 'returns false when running in sequential mode' do
+      importer = importer_class.new(project, client, parallel: false)
+
+      expect(importer).not_to be_parallel
+    end
+  end
+
+  describe '#execute' do
+    it 'imports data in parallel when running in parallel mode' do
+      importer = importer_class.new(project, client)
+      waiter = double(:waiter)
+
+      expect(importer)
+        .to receive(:parallel_import)
+        .and_return(waiter)
+
+      expect(importer.execute)
+        .to eq(waiter)
+    end
+
+    it 'imports data in parallel when running in sequential mode' do
+      importer = importer_class.new(project, client, parallel: false)
+
+      expect(importer)
+        .to receive(:sequential_import)
+        .and_return([])
+
+      expect(importer.execute)
+        .to eq([])
+    end
+
+    it 'expires the cache used for tracking already imported objects' do
+      importer = importer_class.new(project, client)
+
+      expect(importer).to receive(:parallel_import)
+
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:expire)
+        .with(importer.already_imported_cache_key, a_kind_of(Numeric))
+
+      importer.execute
+    end
+  end
+
+  describe '#sequential_import' do
+    let(:importer) { importer_class.new(project, client, parallel: false) }
+
+    it 'imports data in sequence' do
+      repr_class = double(:representation_class)
+      repr_instance = double(:representation_instance)
+      gh_importer = double(:github_importer)
+      gh_importer_instance = double(:github_importer_instance)
+      object = double(:object)
+
+      expect(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(object)
+
+      expect(importer)
+        .to receive(:representation_class)
+        .and_return(repr_class)
+
+      expect(repr_class)
+        .to receive(:from_api_response)
+        .with(object)
+        .and_return(repr_instance)
+
+      expect(importer)
+        .to receive(:importer_class)
+        .and_return(gh_importer)
+
+      expect(gh_importer)
+        .to receive(:new)
+        .with(repr_instance, project, client)
+        .and_return(gh_importer_instance)
+
+      expect(gh_importer_instance)
+        .to receive(:execute)
+
+      importer.sequential_import
+    end
+  end
+
+  describe '#parallel_import' do
+    let(:importer) { importer_class.new(project, client) }
+
+    it 'imports data in parallel' do
+      repr_class = double(:representation)
+      worker_class = double(:worker)
+      object = double(:object)
+
+      expect(importer)
+        .to receive(:each_object_to_import)
+        .and_yield(object)
+
+      expect(importer)
+        .to receive(:representation_class)
+        .and_return(repr_class)
+
+      expect(importer)
+        .to receive(:sidekiq_worker_class)
+        .and_return(worker_class)
+
+      expect(repr_class)
+        .to receive(:from_api_response)
+        .with(object)
+        .and_return({ title: 'Foo' })
+
+      expect(worker_class)
+        .to receive(:perform_async)
+        .with(project.id, { title: 'Foo' }, an_instance_of(String))
+
+      expect(importer.parallel_import)
+        .to be_an_instance_of(Gitlab::JobWaiter)
+    end
+  end
+
+  describe '#each_object_to_import' do
+    let(:importer) { importer_class.new(project, client) }
+    let(:object) { double(:object) }
+
+    before do
+      expect(importer)
+        .to receive(:collection_options)
+        .and_return({ state: 'all' })
+    end
+
+    it 'yields every object to import' do
+      page = double(:page, objects: [object], number: 1)
+
+      expect(client)
+        .to receive(:each_page)
+        .with(:issues, 'foo/bar', { state: 'all', page: 1 })
+        .and_yield(page)
+
+      expect(importer.page_counter)
+        .to receive(:set)
+        .with(1)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:already_imported?)
+        .with(object)
+        .and_return(false)
+
+      expect(importer)
+        .to receive(:mark_as_imported)
+        .with(object)
+
+      expect { |b| importer.each_object_to_import(&b) }
+        .to yield_with_args(object)
+    end
+
+    it 'resumes from the last page' do
+      page = double(:page, objects: [object], number: 2)
+
+      expect(importer.page_counter)
+        .to receive(:current)
+        .and_return(2)
+
+      expect(client)
+        .to receive(:each_page)
+        .with(:issues, 'foo/bar', { state: 'all', page: 2 })
+        .and_yield(page)
+
+      expect(importer.page_counter)
+        .to receive(:set)
+        .with(2)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:already_imported?)
+        .with(object)
+        .and_return(false)
+
+      expect(importer)
+        .to receive(:mark_as_imported)
+        .with(object)
+
+      expect { |b| importer.each_object_to_import(&b) }
+        .to yield_with_args(object)
+    end
+
+    it 'does not yield any objects if the page number was not set' do
+      page = double(:page, objects: [object], number: 1)
+
+      expect(client)
+        .to receive(:each_page)
+        .with(:issues, 'foo/bar', { state: 'all', page: 1 })
+        .and_yield(page)
+
+      expect(importer.page_counter)
+        .to receive(:set)
+        .with(1)
+        .and_return(false)
+
+      expect { |b| importer.each_object_to_import(&b) }
+        .not_to yield_control
+    end
+
+    it 'does not yield the object if it was already imported' do
+      page = double(:page, objects: [object], number: 1)
+
+      expect(client)
+        .to receive(:each_page)
+        .with(:issues, 'foo/bar', { state: 'all', page: 1 })
+        .and_yield(page)
+
+      expect(importer.page_counter)
+        .to receive(:set)
+        .with(1)
+        .and_return(true)
+
+      expect(importer)
+        .to receive(:already_imported?)
+        .with(object)
+        .and_return(true)
+
+      expect(importer)
+        .not_to receive(:mark_as_imported)
+
+      expect { |b| importer.each_object_to_import(&b) }
+        .not_to yield_control
+    end
+  end
+
+  describe '#already_imported?', :clean_gitlab_redis_cache do
+    let(:importer) { importer_class.new(project, client) }
+
+    it 'returns false when an object has not yet been imported' do
+      object = double(:object, id: 10)
+
+      expect(importer)
+        .to receive(:id_for_already_imported_cache)
+        .with(object)
+        .and_return(object.id)
+
+      expect(importer.already_imported?(object))
+        .to eq(false)
+    end
+
+    it 'returns true when an object has already been imported' do
+      object = double(:object, id: 10)
+
+      allow(importer)
+        .to receive(:id_for_already_imported_cache)
+        .with(object)
+        .and_return(object.id)
+
+      importer.mark_as_imported(object)
+
+      expect(importer.already_imported?(object))
+        .to eq(true)
+    end
+  end
+
+  describe '#mark_as_imported', :clean_gitlab_redis_cache do
+    it 'marks an object as already imported' do
+      object = double(:object, id: 10)
+      importer = importer_class.new(project, client)
+
+      expect(importer)
+        .to receive(:id_for_already_imported_cache)
+        .with(object)
+        .and_return(object.id)
+
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:set_add)
+        .with(importer.already_imported_cache_key, object.id)
+        .and_call_original
+
+      importer.mark_as_imported(object)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/representation/diff_note_spec.rb b/spec/lib/gitlab/github_import/representation/diff_note_spec.rb
new file mode 100644
index 00000000000..7b0a1ea4948
--- /dev/null
+++ b/spec/lib/gitlab/github_import/representation/diff_note_spec.rb
@@ -0,0 +1,164 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Representation::DiffNote do
+  let(:hunk) do
+    '@@ -1 +1 @@
+    -Hello
+    +Hello world'
+  end
+
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+
+  shared_examples 'a DiffNote' do
+    it 'returns an instance of DiffNote' do
+      expect(note).to be_an_instance_of(described_class)
+    end
+
+    context 'the returned DiffNote' do
+      it 'includes the number of the note' do
+        expect(note.noteable_id).to eq(42)
+      end
+
+      it 'includes the file path of the diff' do
+        expect(note.file_path).to eq('README.md')
+      end
+
+      it 'includes the commit ID' do
+        expect(note.commit_id).to eq('123abc')
+      end
+
+      it 'includes the user details' do
+        expect(note.author)
+          .to be_an_instance_of(Gitlab::GithubImport::Representation::User)
+
+        expect(note.author.id).to eq(4)
+        expect(note.author.login).to eq('alice')
+      end
+
+      it 'includes the note body' do
+        expect(note.note).to eq('Hello world')
+      end
+
+      it 'includes the created timestamp' do
+        expect(note.created_at).to eq(created_at)
+      end
+
+      it 'includes the updated timestamp' do
+        expect(note.updated_at).to eq(updated_at)
+      end
+
+      it 'includes the GitHub ID' do
+        expect(note.github_id).to eq(1)
+      end
+
+      it 'returns the noteable type' do
+        expect(note.noteable_type).to eq('MergeRequest')
+      end
+    end
+  end
+
+  describe '.from_api_response' do
+    let(:response) do
+      double(
+        :response,
+        html_url: 'https://github.com/foo/bar/pull/42',
+        path: 'README.md',
+        commit_id: '123abc',
+        diff_hunk: hunk,
+        user: double(:user, id: 4, login: 'alice'),
+        body: 'Hello world',
+        created_at: created_at,
+        updated_at: updated_at,
+        id: 1
+      )
+    end
+
+    it_behaves_like 'a DiffNote' do
+      let(:note) { described_class.from_api_response(response) }
+    end
+
+    it 'does not set the user if the response did not include a user' do
+      allow(response)
+        .to receive(:user)
+        .and_return(nil)
+
+      note = described_class.from_api_response(response)
+
+      expect(note.author).to be_nil
+    end
+  end
+
+  describe '.from_json_hash' do
+    it_behaves_like 'a DiffNote' do
+      let(:hash) do
+        {
+          'noteable_type' => 'MergeRequest',
+          'noteable_id' => 42,
+          'file_path' => 'README.md',
+          'commit_id' => '123abc',
+          'diff_hunk' => hunk,
+          'author' => { 'id' => 4, 'login' => 'alice' },
+          'note' => 'Hello world',
+          'created_at' => created_at.to_s,
+          'updated_at' => updated_at.to_s,
+          'github_id' => 1
+        }
+      end
+
+      let(:note) { described_class.from_json_hash(hash) }
+    end
+
+    it 'does not convert the author if it was not specified' do
+      hash = {
+        'noteable_type' => 'MergeRequest',
+        'noteable_id' => 42,
+        'file_path' => 'README.md',
+        'commit_id' => '123abc',
+        'diff_hunk' => hunk,
+        'note' => 'Hello world',
+        'created_at' => created_at.to_s,
+        'updated_at' => updated_at.to_s,
+        'github_id' => 1
+      }
+
+      note = described_class.from_json_hash(hash)
+
+      expect(note.author).to be_nil
+    end
+  end
+
+  describe '#line_code' do
+    it 'returns a String' do
+      note = described_class.new(diff_hunk: hunk, file_path: 'README.md')
+
+      expect(note.line_code).to be_an_instance_of(String)
+    end
+  end
+
+  describe '#diff_hash' do
+    it 'returns a Hash containing the diff details' do
+      note = described_class.from_json_hash(
+        'noteable_type' => 'MergeRequest',
+        'noteable_id' => 42,
+        'file_path' => 'README.md',
+        'commit_id' => '123abc',
+        'diff_hunk' => hunk,
+        'author' => { 'id' => 4, 'login' => 'alice' },
+        'note' => 'Hello world',
+        'created_at' => created_at.to_s,
+        'updated_at' => updated_at.to_s,
+        'github_id' => 1
+      )
+
+      expect(note.diff_hash).to eq(
+        diff: hunk,
+        new_path: 'README.md',
+        old_path: 'README.md',
+        a_mode: '100644',
+        b_mode: '100644',
+        new_file: false
+      )
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/representation/expose_attribute_spec.rb b/spec/lib/gitlab/github_import/representation/expose_attribute_spec.rb
new file mode 100644
index 00000000000..15de0fe49ff
--- /dev/null
+++ b/spec/lib/gitlab/github_import/representation/expose_attribute_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Representation::ExposeAttribute do
+  it 'defines a getter method that returns an attribute value' do
+    klass = Class.new do
+      include Gitlab::GithubImport::Representation::ExposeAttribute
+
+      expose_attribute :number
+
+      attr_reader :attributes
+
+      def initialize
+        @attributes = { number: 42 }
+      end
+    end
+
+    expect(klass.new.number).to eq(42)
+  end
+end
diff --git a/spec/lib/gitlab/github_import/representation/issue_spec.rb b/spec/lib/gitlab/github_import/representation/issue_spec.rb
new file mode 100644
index 00000000000..99330ce42cb
--- /dev/null
+++ b/spec/lib/gitlab/github_import/representation/issue_spec.rb
@@ -0,0 +1,182 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Representation::Issue do
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+
+  shared_examples 'an Issue' do
+    it 'returns an instance of Issue' do
+      expect(issue).to be_an_instance_of(described_class)
+    end
+
+    context 'the returned Issue' do
+      it 'includes the issue number' do
+        expect(issue.iid).to eq(42)
+      end
+
+      it 'includes the issue title' do
+        expect(issue.title).to eq('My Issue')
+      end
+
+      it 'includes the issue description' do
+        expect(issue.description).to eq('This is my issue')
+      end
+
+      it 'includes the milestone number' do
+        expect(issue.milestone_number).to eq(4)
+      end
+
+      it 'includes the issue state' do
+        expect(issue.state).to eq(:opened)
+      end
+
+      it 'includes the issue assignees' do
+        expect(issue.assignees[0])
+          .to be_an_instance_of(Gitlab::GithubImport::Representation::User)
+
+        expect(issue.assignees[0].id).to eq(4)
+        expect(issue.assignees[0].login).to eq('alice')
+      end
+
+      it 'includes the label names' do
+        expect(issue.label_names).to eq(%w[bug])
+      end
+
+      it 'includes the author details' do
+        expect(issue.author)
+          .to be_an_instance_of(Gitlab::GithubImport::Representation::User)
+
+        expect(issue.author.id).to eq(4)
+        expect(issue.author.login).to eq('alice')
+      end
+
+      it 'includes the created timestamp' do
+        expect(issue.created_at).to eq(created_at)
+      end
+
+      it 'includes the updated timestamp' do
+        expect(issue.updated_at).to eq(updated_at)
+      end
+
+      it 'is not a pull request' do
+        expect(issue.pull_request?).to eq(false)
+      end
+    end
+  end
+
+  describe '.from_api_response' do
+    let(:response) do
+      double(
+        :response,
+        number: 42,
+        title: 'My Issue',
+        body: 'This is my issue',
+        milestone: double(:milestone, number: 4),
+        state: 'open',
+        assignees: [double(:user, id: 4, login: 'alice')],
+        labels: [double(:label, name: 'bug')],
+        user: double(:user, id: 4, login: 'alice'),
+        created_at: created_at,
+        updated_at: updated_at,
+        pull_request: false
+      )
+    end
+
+    it_behaves_like 'an Issue' do
+      let(:issue) { described_class.from_api_response(response) }
+    end
+
+    it 'does not set the user if the response did not include a user' do
+      allow(response)
+        .to receive(:user)
+        .and_return(nil)
+
+      issue = described_class.from_api_response(response)
+
+      expect(issue.author).to be_nil
+    end
+  end
+
+  describe '.from_json_hash' do
+    it_behaves_like 'an Issue' do
+      let(:hash) do
+        {
+          'iid' => 42,
+          'title' => 'My Issue',
+          'description' => 'This is my issue',
+          'milestone_number' => 4,
+          'state' => 'opened',
+          'assignees' => [{ 'id' => 4, 'login' => 'alice' }],
+          'label_names' => %w[bug],
+          'author' => { 'id' => 4, 'login' => 'alice' },
+          'created_at' => created_at.to_s,
+          'updated_at' => updated_at.to_s,
+          'pull_request' => false
+        }
+      end
+
+      let(:issue) { described_class.from_json_hash(hash) }
+    end
+
+    it 'does not convert the author if it was not specified' do
+      hash = {
+        'iid' => 42,
+        'title' => 'My Issue',
+        'description' => 'This is my issue',
+        'milestone_number' => 4,
+        'state' => 'opened',
+        'assignees' => [{ 'id' => 4, 'login' => 'alice' }],
+        'label_names' => %w[bug],
+        'created_at' => created_at.to_s,
+        'updated_at' => updated_at.to_s,
+        'pull_request' => false
+      }
+
+      issue = described_class.from_json_hash(hash)
+
+      expect(issue.author).to be_nil
+    end
+  end
+
+  describe '#labels?' do
+    it 'returns true when the issue has labels assigned' do
+      issue = described_class.new(label_names: %w[bug])
+
+      expect(issue.labels?).to eq(true)
+    end
+
+    it 'returns false when the issue has no labels assigned' do
+      issue = described_class.new(label_names: [])
+
+      expect(issue.labels?).to eq(false)
+    end
+  end
+
+  describe '#pull_request?' do
+    it 'returns false for an issue' do
+      issue = described_class.new(pull_request: false)
+
+      expect(issue.pull_request?).to eq(false)
+    end
+
+    it 'returns true for a pull request' do
+      issue = described_class.new(pull_request: true)
+
+      expect(issue.pull_request?).to eq(true)
+    end
+  end
+
+  describe '#truncated_title' do
+    it 'truncates the title to 255 characters' do
+      object = described_class.new(title: 'm' * 300)
+
+      expect(object.truncated_title.length).to eq(255)
+    end
+
+    it 'does not truncate the title if it is shorter than 255 characters' do
+      object = described_class.new(title: 'foo')
+
+      expect(object.truncated_title).to eq('foo')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/representation/note_spec.rb b/spec/lib/gitlab/github_import/representation/note_spec.rb
new file mode 100644
index 00000000000..f2c1c66b357
--- /dev/null
+++ b/spec/lib/gitlab/github_import/representation/note_spec.rb
@@ -0,0 +1,107 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Representation::Note do
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+
+  shared_examples 'a Note' do
+    it 'returns an instance of Note' do
+      expect(note).to be_an_instance_of(described_class)
+    end
+
+    context 'the returned Note' do
+      it 'includes the noteable ID' do
+        expect(note.noteable_id).to eq(42)
+      end
+
+      it 'includes the noteable type' do
+        expect(note.noteable_type).to eq('Issue')
+      end
+
+      it 'includes the author details' do
+        expect(note.author)
+          .to be_an_instance_of(Gitlab::GithubImport::Representation::User)
+
+        expect(note.author.id).to eq(4)
+        expect(note.author.login).to eq('alice')
+      end
+
+      it 'includes the note body' do
+        expect(note.note).to eq('Hello world')
+      end
+
+      it 'includes the created timestamp' do
+        expect(note.created_at).to eq(created_at)
+      end
+
+      it 'includes the updated timestamp' do
+        expect(note.updated_at).to eq(updated_at)
+      end
+
+      it 'includes the GitHub ID' do
+        expect(note.github_id).to eq(1)
+      end
+    end
+  end
+
+  describe '.from_api_response' do
+    let(:response) do
+      double(
+        :response,
+        html_url: 'https://github.com/foo/bar/issues/42',
+        user: double(:user, id: 4, login: 'alice'),
+        body: 'Hello world',
+        created_at: created_at,
+        updated_at: updated_at,
+        id: 1
+      )
+    end
+
+    it_behaves_like 'a Note' do
+      let(:note) { described_class.from_api_response(response) }
+    end
+
+    it 'does not set the user if the response did not include a user' do
+      allow(response)
+        .to receive(:user)
+        .and_return(nil)
+
+      note = described_class.from_api_response(response)
+
+      expect(note.author).to be_nil
+    end
+  end
+
+  describe '.from_json_hash' do
+    it_behaves_like 'a Note' do
+      let(:hash) do
+        {
+          'noteable_id' => 42,
+          'noteable_type' => 'Issue',
+          'author' => { 'id' => 4, 'login' => 'alice' },
+          'note' => 'Hello world',
+          'created_at' => created_at.to_s,
+          'updated_at' => updated_at.to_s,
+          'github_id' => 1
+        }
+      end
+
+      let(:note) { described_class.from_json_hash(hash) }
+    end
+
+    it 'does not convert the author if it was not specified' do
+      hash = {
+        'noteable_id' => 42,
+        'noteable_type' => 'Issue',
+        'note' => 'Hello world',
+        'created_at' => created_at.to_s,
+        'updated_at' => updated_at.to_s,
+        'github_id' => 1
+      }
+
+      note = described_class.from_json_hash(hash)
+
+      expect(note.author).to be_nil
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/representation/pull_request_spec.rb b/spec/lib/gitlab/github_import/representation/pull_request_spec.rb
new file mode 100644
index 00000000000..33f6ff0ae6a
--- /dev/null
+++ b/spec/lib/gitlab/github_import/representation/pull_request_spec.rb
@@ -0,0 +1,288 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Representation::PullRequest do
+  let(:created_at) { Time.new(2017, 1, 1, 12, 00) }
+  let(:updated_at) { Time.new(2017, 1, 1, 12, 15) }
+  let(:merged_at) { Time.new(2017, 1, 1, 12, 17) }
+
+  shared_examples 'a PullRequest' do
+    it 'returns an instance of PullRequest' do
+      expect(pr).to be_an_instance_of(described_class)
+    end
+
+    context 'the returned PullRequest' do
+      it 'includes the pull request number' do
+        expect(pr.iid).to eq(42)
+      end
+
+      it 'includes the pull request title' do
+        expect(pr.title).to eq('My Pull Request')
+      end
+
+      it 'includes the pull request description' do
+        expect(pr.description).to eq('This is my pull request')
+      end
+
+      it 'includes the source branch name' do
+        expect(pr.source_branch).to eq('my-feature')
+      end
+
+      it 'includes the source branch SHA' do
+        expect(pr.source_branch_sha).to eq('123abc')
+      end
+
+      it 'includes the target branch name' do
+        expect(pr.target_branch).to eq('master')
+      end
+
+      it 'includes the target branch SHA' do
+        expect(pr.target_branch_sha).to eq('456def')
+      end
+
+      it 'includes the milestone number' do
+        expect(pr.milestone_number).to eq(4)
+      end
+
+      it 'includes the user details' do
+        expect(pr.author)
+          .to be_an_instance_of(Gitlab::GithubImport::Representation::User)
+
+        expect(pr.author.id).to eq(4)
+        expect(pr.author.login).to eq('alice')
+      end
+
+      it 'includes the assignee details' do
+        expect(pr.assignee)
+          .to be_an_instance_of(Gitlab::GithubImport::Representation::User)
+
+        expect(pr.assignee.id).to eq(4)
+        expect(pr.assignee.login).to eq('alice')
+      end
+
+      it 'includes the created timestamp' do
+        expect(pr.created_at).to eq(created_at)
+      end
+
+      it 'includes the updated timestamp' do
+        expect(pr.updated_at).to eq(updated_at)
+      end
+
+      it 'includes the merged timestamp' do
+        expect(pr.merged_at).to eq(merged_at)
+      end
+
+      it 'includes the source repository ID' do
+        expect(pr.source_repository_id).to eq(400)
+      end
+
+      it 'includes the target repository ID' do
+        expect(pr.target_repository_id).to eq(200)
+      end
+
+      it 'includes the source repository owner name' do
+        expect(pr.source_repository_owner).to eq('alice')
+      end
+
+      it 'includes the pull request state' do
+        expect(pr.state).to eq(:merged)
+      end
+    end
+  end
+
+  describe '.from_api_response' do
+    let(:response) do
+      double(
+        :response,
+        number: 42,
+        title: 'My Pull Request',
+        body: 'This is my pull request',
+        state: 'closed',
+        head: double(
+          :head,
+          sha: '123abc',
+          ref: 'my-feature',
+          repo: double(:repo, id: 400),
+          user: double(:user, id: 4, login: 'alice')
+        ),
+        base: double(
+          :base,
+          sha: '456def',
+          ref: 'master',
+          repo: double(:repo, id: 200)
+        ),
+        milestone: double(:milestone, number: 4),
+        user: double(:user, id: 4, login: 'alice'),
+        assignee: double(:user, id: 4, login: 'alice'),
+        created_at: created_at,
+        updated_at: updated_at,
+        merged_at: merged_at
+      )
+    end
+
+    it_behaves_like 'a PullRequest' do
+      let(:pr) { described_class.from_api_response(response) }
+    end
+
+    it 'does not set the user if the response did not include a user' do
+      allow(response)
+        .to receive(:user)
+        .and_return(nil)
+
+      pr = described_class.from_api_response(response)
+
+      expect(pr.author).to be_nil
+    end
+  end
+
+  describe '.from_json_hash' do
+    it_behaves_like 'a PullRequest' do
+      let(:hash) do
+        {
+          'iid' => 42,
+          'title' => 'My Pull Request',
+          'description' => 'This is my pull request',
+          'source_branch' => 'my-feature',
+          'source_branch_sha' => '123abc',
+          'target_branch' => 'master',
+          'target_branch_sha' => '456def',
+          'source_repository_id' => 400,
+          'target_repository_id' => 200,
+          'source_repository_owner' => 'alice',
+          'state' => 'closed',
+          'milestone_number' => 4,
+          'author' => { 'id' => 4, 'login' => 'alice' },
+          'assignee' => { 'id' => 4, 'login' => 'alice' },
+          'created_at' => created_at.to_s,
+          'updated_at' => updated_at.to_s,
+          'merged_at' => merged_at.to_s
+        }
+      end
+
+      let(:pr) { described_class.from_json_hash(hash) }
+    end
+
+    it 'does not convert the author if it was not specified' do
+      hash = {
+        'iid' => 42,
+        'title' => 'My Pull Request',
+        'description' => 'This is my pull request',
+        'source_branch' => 'my-feature',
+        'source_branch_sha' => '123abc',
+        'target_branch' => 'master',
+        'target_branch_sha' => '456def',
+        'source_repository_id' => 400,
+        'target_repository_id' => 200,
+        'source_repository_owner' => 'alice',
+        'state' => 'closed',
+        'milestone_number' => 4,
+        'assignee' => { 'id' => 4, 'login' => 'alice' },
+        'created_at' => created_at.to_s,
+        'updated_at' => updated_at.to_s,
+        'merged_at' => merged_at.to_s
+      }
+
+      pr = described_class.from_json_hash(hash)
+
+      expect(pr.author).to be_nil
+    end
+  end
+
+  describe '#state' do
+    it 'returns :opened for an open pull request' do
+      pr = described_class.new(state: :opened)
+
+      expect(pr.state).to eq(:opened)
+    end
+
+    it 'returns :closed for a closed pull request' do
+      pr = described_class.new(state: :closed)
+
+      expect(pr.state).to eq(:closed)
+    end
+
+    it 'returns :merged for a merged pull request' do
+      pr = described_class.new(state: :closed, merged_at: merged_at)
+
+      expect(pr.state).to eq(:merged)
+    end
+  end
+
+  describe '#cross_project?' do
+    it 'returns false for a pull request submitted from the target project' do
+      pr = described_class.new(source_repository_id: 1, target_repository_id: 1)
+
+      expect(pr).not_to be_cross_project
+    end
+
+    it 'returns true for a pull request submitted from a different project' do
+      pr = described_class.new(source_repository_id: 1, target_repository_id: 2)
+
+      expect(pr).to be_cross_project
+    end
+
+    it 'returns true if no source repository is present' do
+      pr = described_class.new(target_repository_id: 2)
+
+      expect(pr).to be_cross_project
+    end
+  end
+
+  describe '#formatted_source_branch' do
+    context 'for a cross-project pull request' do
+      it 'includes the owner name in the branch name' do
+        pr = described_class.new(
+          source_repository_owner: 'foo',
+          source_branch: 'branch',
+          target_branch: 'master',
+          source_repository_id: 1,
+          target_repository_id: 2
+        )
+
+        expect(pr.formatted_source_branch).to eq('foo:branch')
+      end
+    end
+
+    context 'for a regular pull request' do
+      it 'returns the source branch name' do
+        pr = described_class.new(
+          source_repository_owner: 'foo',
+          source_branch: 'branch',
+          target_branch: 'master',
+          source_repository_id: 1,
+          target_repository_id: 1
+        )
+
+        expect(pr.formatted_source_branch).to eq('branch')
+      end
+    end
+
+    context 'for a pull request with the same source and target branches' do
+      it 'returns a generated source branch name' do
+        pr = described_class.new(
+          iid: 1,
+          source_repository_owner: 'foo',
+          source_branch: 'branch',
+          target_branch: 'branch',
+          source_repository_id: 1,
+          target_repository_id: 1
+        )
+
+        expect(pr.formatted_source_branch).to eq('branch-1')
+      end
+    end
+  end
+
+  describe '#truncated_title' do
+    it 'truncates the title to 255 characters' do
+      object = described_class.new(title: 'm' * 300)
+
+      expect(object.truncated_title.length).to eq(255)
+    end
+
+    it 'does not truncate the title if it is shorter than 255 characters' do
+      object = described_class.new(title: 'foo')
+
+      expect(object.truncated_title).to eq('foo')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/representation/to_hash_spec.rb b/spec/lib/gitlab/github_import/representation/to_hash_spec.rb
new file mode 100644
index 00000000000..c296aa0a45b
--- /dev/null
+++ b/spec/lib/gitlab/github_import/representation/to_hash_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Representation::ToHash do
+  describe '#to_hash' do
+    let(:user) { double(:user, attributes: { login: 'alice' }) }
+
+    let(:issue) do
+      double(
+        :issue,
+        attributes: { user: user, assignees: [user], number: 42 }
+      )
+    end
+
+    let(:issue_hash) { issue.to_hash }
+
+    before do
+      user.extend(described_class)
+      issue.extend(described_class)
+    end
+
+    it 'converts an object to a Hash' do
+      expect(issue_hash).to be_an_instance_of(Hash)
+    end
+
+    it 'converts nested objects to Hashes' do
+      expect(issue_hash[:user]).to eq({ login: 'alice' })
+    end
+
+    it 'converts Array values to Hashes' do
+      expect(issue_hash[:assignees]).to eq([{ login: 'alice' }])
+    end
+
+    it 'keeps values as-is if they do not respond to #to_hash' do
+      expect(issue_hash[:number]).to eq(42)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/representation/user_spec.rb b/spec/lib/gitlab/github_import/representation/user_spec.rb
new file mode 100644
index 00000000000..4e63e8ea568
--- /dev/null
+++ b/spec/lib/gitlab/github_import/representation/user_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Representation::User do
+  shared_examples 'a User' do
+    it 'returns an instance of User' do
+      expect(user).to be_an_instance_of(described_class)
+    end
+
+    context 'the returned User' do
+      it 'includes the user ID' do
+        expect(user.id).to eq(42)
+      end
+
+      it 'includes the username' do
+        expect(user.login).to eq('alice')
+      end
+    end
+  end
+
+  describe '.from_api_response' do
+    it_behaves_like 'a User' do
+      let(:response) { double(:response, id: 42, login: 'alice') }
+      let(:user) { described_class.from_api_response(response) }
+    end
+  end
+
+  describe '.from_json_hash' do
+    it_behaves_like 'a User' do
+      let(:hash) { { 'id' => 42, 'login' => 'alice' } }
+      let(:user) { described_class.from_json_hash(hash) }
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/representation_spec.rb b/spec/lib/gitlab/github_import/representation_spec.rb
new file mode 100644
index 00000000000..0b0610817b0
--- /dev/null
+++ b/spec/lib/gitlab/github_import/representation_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::Representation do
+  describe '.symbolize_hash' do
+    it 'returns a Hash with the keys as Symbols' do
+      hash = described_class.symbolize_hash('number' => 10)
+
+      expect(hash).to eq({ number: 10 })
+    end
+
+    it 'parses timestamp fields into Time instances' do
+      hash = described_class.symbolize_hash('created_at' => '2017-01-01 12:00')
+
+      expect(hash[:created_at]).to be_an_instance_of(Time)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/sequential_importer_spec.rb b/spec/lib/gitlab/github_import/sequential_importer_spec.rb
new file mode 100644
index 00000000000..6089b0b751f
--- /dev/null
+++ b/spec/lib/gitlab/github_import/sequential_importer_spec.rb
@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::SequentialImporter do
+  describe '#execute' do
+    it 'imports a project in sequence' do
+      repository = double(:repository)
+      project = double(:project, id: 1, repository: repository)
+      importer = described_class.new(project, token: 'foo')
+
+      expect_any_instance_of(Gitlab::GithubImport::Importer::RepositoryImporter)
+        .to receive(:execute)
+
+      described_class::SEQUENTIAL_IMPORTERS.each do |klass|
+        instance = double(:instance)
+
+        expect(klass).to receive(:new)
+          .with(project, importer.client)
+          .and_return(instance)
+
+        expect(instance).to receive(:execute)
+      end
+
+      described_class::PARALLEL_IMPORTERS.each do |klass|
+        instance = double(:instance)
+
+        expect(klass).to receive(:new)
+          .with(project, importer.client, parallel: false)
+          .and_return(instance)
+
+        expect(instance).to receive(:execute)
+      end
+
+      expect(repository).to receive(:after_import)
+      expect(importer.execute).to eq(true)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import/user_finder_spec.rb b/spec/lib/gitlab/github_import/user_finder_spec.rb
new file mode 100644
index 00000000000..29f4c00d9c7
--- /dev/null
+++ b/spec/lib/gitlab/github_import/user_finder_spec.rb
@@ -0,0 +1,333 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport::UserFinder, :clean_gitlab_redis_cache do
+  let(:project) { create(:project) }
+  let(:client) { double(:client) }
+  let(:finder) { described_class.new(project, client) }
+
+  describe '#author_id_for' do
+    it 'returns the user ID for the author of an object' do
+      user = double(:user, id: 4, login: 'kittens')
+      note = double(:note, author: user)
+
+      expect(finder).to receive(:user_id_for).with(user).and_return(42)
+
+      expect(finder.author_id_for(note)).to eq([42, true])
+    end
+
+    it 'returns the ID of the project creator if no user ID could be found' do
+      user = double(:user, id: 4, login: 'kittens')
+      note = double(:note, author: user)
+
+      expect(finder).to receive(:user_id_for).with(user).and_return(nil)
+
+      expect(finder.author_id_for(note)).to eq([project.creator_id, false])
+    end
+
+    it 'returns the ID of the ghost user when the object has no user' do
+      note = double(:note, author: nil)
+
+      expect(finder.author_id_for(note)).to eq([User.ghost.id, true])
+    end
+
+    it 'returns the ID of the ghost user when the given object is nil' do
+      expect(finder.author_id_for(nil)).to eq([User.ghost.id, true])
+    end
+  end
+
+  describe '#assignee_id_for' do
+    it 'returns the user ID for the assignee of an issuable' do
+      user = double(:user, id: 4, login: 'kittens')
+      issue = double(:issue, assignee: user)
+
+      expect(finder).to receive(:user_id_for).with(user).and_return(42)
+      expect(finder.assignee_id_for(issue)).to eq(42)
+    end
+
+    it 'returns nil if the issuable does not have an assignee' do
+      issue = double(:issue, assignee: nil)
+
+      expect(finder).not_to receive(:user_id_for)
+      expect(finder.assignee_id_for(issue)).to be_nil
+    end
+  end
+
+  describe '#user_id_for' do
+    it 'returns the user ID for the given user' do
+      user = double(:user, id: 4, login: 'kittens')
+
+      expect(finder).to receive(:find).with(user.id, user.login).and_return(42)
+      expect(finder.user_id_for(user)).to eq(42)
+    end
+  end
+
+  describe '#find' do
+    let(:user) { create(:user) }
+
+    before do
+      allow(finder).to receive(:email_for_github_username)
+        .and_return(user.email)
+    end
+
+    context 'without a cache' do
+      before do
+        allow(finder).to receive(:find_from_cache).and_return([false, nil])
+        expect(finder).to receive(:find_id_from_database).and_call_original
+      end
+
+      it 'finds a GitLab user for a GitHub user ID' do
+        user.identities.create!(provider: :github, extern_uid: 42)
+
+        expect(finder.find(42, user.username)).to eq(user.id)
+      end
+
+      it 'finds a GitLab user for a GitHub Email address' do
+        expect(finder.find(42, user.username)).to eq(user.id)
+      end
+    end
+
+    context 'with a cache' do
+      it 'returns the cached user ID' do
+        expect(finder).to receive(:find_from_cache).and_return([true, user.id])
+        expect(finder).not_to receive(:find_id_from_database)
+
+        expect(finder.find(42, user.username)).to eq(user.id)
+      end
+
+      it 'does not query the database if the cache key exists but is empty' do
+        expect(finder).to receive(:find_from_cache).and_return([true, nil])
+        expect(finder).not_to receive(:find_id_from_database)
+
+        expect(finder.find(42, user.username)).to be_nil
+      end
+    end
+  end
+
+  describe '#find_from_cache' do
+    it 'retrieves a GitLab user ID for a GitHub user ID' do
+      expect(finder)
+        .to receive(:cached_id_for_github_id)
+        .with(42)
+        .and_return([true, 4])
+
+      expect(finder.find_from_cache(42)).to eq([true, 4])
+    end
+
+    it 'retrieves a GitLab user ID for a GitHub Email address' do
+      email = 'kittens@example.com'
+
+      expect(finder)
+        .to receive(:cached_id_for_github_id)
+        .with(42)
+        .and_return([false, nil])
+
+      expect(finder)
+        .to receive(:cached_id_for_github_email)
+        .with(email)
+        .and_return([true, 4])
+
+      expect(finder.find_from_cache(42, email)).to eq([true, 4])
+    end
+
+    it 'does not query the cache for an Email address when none is given' do
+      expect(finder)
+        .to receive(:cached_id_for_github_id)
+        .with(42)
+        .and_return([false, nil])
+
+      expect(finder).not_to receive(:cached_id_for_github_id)
+
+      expect(finder.find_from_cache(42)).to eq([false])
+    end
+  end
+
+  describe '#find_id_from_database' do
+    let(:user) { create(:user) }
+
+    it 'returns the GitLab user ID for a GitHub user ID' do
+      user.identities.create!(provider: :github, extern_uid: 42)
+
+      expect(finder.find_id_from_database(42, user.email)).to eq(user.id)
+    end
+
+    it 'returns the GitLab user ID for a GitHub Email address' do
+      expect(finder.find_id_from_database(42, user.email)).to eq(user.id)
+    end
+  end
+
+  describe '#email_for_github_username' do
+    let(:email) { 'kittens@example.com' }
+
+    context 'when an Email address is cached' do
+      it 'reads the Email address from the cache' do
+        expect(Gitlab::GithubImport::Caching)
+          .to receive(:read)
+          .and_return(email)
+
+        expect(client).not_to receive(:user)
+        expect(finder.email_for_github_username('kittens')).to eq(email)
+      end
+    end
+
+    context 'when an Email address is not cached' do
+      let(:user) { double(:user, email: email) }
+
+      it 'retrieves the Email address from the GitHub API' do
+        expect(client).to receive(:user).with('kittens').and_return(user)
+        expect(finder.email_for_github_username('kittens')).to eq(email)
+      end
+
+      it 'caches the Email address when an Email address is available' do
+        expect(client).to receive(:user).with('kittens').and_return(user)
+
+        expect(Gitlab::GithubImport::Caching)
+          .to receive(:write)
+          .with(an_instance_of(String), email)
+
+        finder.email_for_github_username('kittens')
+      end
+
+      it 'returns nil if the user does not exist' do
+        expect(client)
+          .to receive(:user)
+          .with('kittens')
+          .and_return(nil)
+
+        expect(Gitlab::GithubImport::Caching)
+          .not_to receive(:write)
+
+        expect(finder.email_for_github_username('kittens')).to be_nil
+      end
+    end
+  end
+
+  describe '#cached_id_for_github_id' do
+    let(:id) { 4 }
+
+    it 'reads a user ID from the cache' do
+      Gitlab::GithubImport::Caching
+        .write(described_class::ID_CACHE_KEY % id, 4)
+
+      expect(finder.cached_id_for_github_id(id)).to eq([true, 4])
+    end
+
+    it 'reads a non existing cache key' do
+      expect(finder.cached_id_for_github_id(id)).to eq([false, nil])
+    end
+  end
+
+  describe '#cached_id_for_github_email' do
+    let(:email) { 'kittens@example.com' }
+
+    it 'reads a user ID from the cache' do
+      Gitlab::GithubImport::Caching
+        .write(described_class::ID_FOR_EMAIL_CACHE_KEY % email, 4)
+
+      expect(finder.cached_id_for_github_email(email)).to eq([true, 4])
+    end
+
+    it 'reads a non existing cache key' do
+      expect(finder.cached_id_for_github_email(email)).to eq([false, nil])
+    end
+  end
+
+  describe '#id_for_github_id' do
+    let(:id) { 4 }
+
+    it 'queries and caches the user ID for a given GitHub ID' do
+      expect(finder).to receive(:query_id_for_github_id)
+        .with(id)
+        .and_return(42)
+
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:write)
+        .with(described_class::ID_CACHE_KEY % id, 42)
+
+      finder.id_for_github_id(id)
+    end
+
+    it 'caches a nil value if no ID could be found' do
+      expect(finder).to receive(:query_id_for_github_id)
+        .with(id)
+        .and_return(nil)
+
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:write)
+        .with(described_class::ID_CACHE_KEY % id, nil)
+
+      finder.id_for_github_id(id)
+    end
+  end
+
+  describe '#id_for_github_email' do
+    let(:email) { 'kittens@example.com' }
+
+    it 'queries and caches the user ID for a given Email address' do
+      expect(finder).to receive(:query_id_for_github_email)
+        .with(email)
+        .and_return(42)
+
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:write)
+        .with(described_class::ID_FOR_EMAIL_CACHE_KEY % email, 42)
+
+      finder.id_for_github_email(email)
+    end
+
+    it 'caches a nil value if no ID could be found' do
+      expect(finder).to receive(:query_id_for_github_email)
+        .with(email)
+        .and_return(nil)
+
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:write)
+        .with(described_class::ID_FOR_EMAIL_CACHE_KEY % email, nil)
+
+      finder.id_for_github_email(email)
+    end
+  end
+
+  describe '#query_id_for_github_id' do
+    it 'returns the ID of the user for the given GitHub user ID' do
+      user = create(:user)
+
+      user.identities.create!(provider: :github, extern_uid: '42')
+
+      expect(finder.query_id_for_github_id(42)).to eq(user.id)
+    end
+
+    it 'returns nil when no user ID could be found' do
+      expect(finder.query_id_for_github_id(42)).to be_nil
+    end
+  end
+
+  describe '#query_id_for_github_email' do
+    it 'returns the ID of the user for the given Email address' do
+      user = create(:user, email: 'kittens@example.com')
+
+      expect(finder.query_id_for_github_email(user.email)).to eq(user.id)
+    end
+
+    it 'returns nil if no user ID could be found' do
+      expect(finder.query_id_for_github_email('kittens@example.com')).to be_nil
+    end
+  end
+
+  describe '#read_id_from_cache' do
+    it 'reads an ID from the cache' do
+      Gitlab::GithubImport::Caching.write('foo', 10)
+
+      expect(finder.read_id_from_cache('foo')).to eq([true, 10])
+    end
+
+    it 'reads a cache key with an empty value' do
+      Gitlab::GithubImport::Caching.write('foo', nil)
+
+      expect(finder.read_id_from_cache('foo')).to eq([true, nil])
+    end
+
+    it 'reads a cache key that does not exist' do
+      expect(finder.read_id_from_cache('foo')).to eq([false, nil])
+    end
+  end
+end
diff --git a/spec/lib/gitlab/github_import_spec.rb b/spec/lib/gitlab/github_import_spec.rb
new file mode 100644
index 00000000000..51414800e8c
--- /dev/null
+++ b/spec/lib/gitlab/github_import_spec.rb
@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe Gitlab::GithubImport do
+  let(:project) { double(:project) }
+
+  describe '.new_client_for' do
+    it 'returns a new Client with a custom token' do
+      expect(described_class::Client)
+        .to receive(:new)
+        .with('123', parallel: true)
+
+      described_class.new_client_for(project, token: '123')
+    end
+
+    it 'returns a new Client with a token stored in the import data' do
+      import_data = double(:import_data, credentials: { user: '123' })
+
+      expect(project)
+        .to receive(:import_data)
+        .and_return(import_data)
+
+      expect(described_class::Client)
+        .to receive(:new)
+        .with('123', parallel: true)
+
+      described_class.new_client_for(project)
+    end
+  end
+
+  describe '.insert_and_return_id' do
+    let(:attributes) { { iid: 1, title: 'foo' } }
+    let(:project) { create(:project) }
+
+    context 'on PostgreSQL' do
+      it 'returns the ID returned by the query' do
+        expect(Gitlab::Database)
+          .to receive(:bulk_insert)
+          .with(Issue.table_name, [attributes], return_ids: true)
+          .and_return([10])
+
+        id = described_class.insert_and_return_id(attributes, project.issues)
+
+        expect(id).to eq(10)
+      end
+    end
+
+    context 'on MySQL' do
+      it 'uses a separate query to retrieve the ID' do
+        issue = create(:issue, project: project, iid: attributes[:iid])
+
+        expect(Gitlab::Database)
+          .to receive(:bulk_insert)
+          .with(Issue.table_name, [attributes], return_ids: true)
+          .and_return([])
+
+        id = described_class.insert_and_return_id(attributes, project.issues)
+
+        expect(id).to eq(issue.id)
+      end
+    end
+  end
+
+  describe '.ghost_user_id', :clean_gitlab_redis_cache do
+    it 'returns the ID of the ghost user' do
+      expect(described_class.ghost_user_id).to eq(User.ghost.id)
+    end
+
+    it 'caches the ghost user ID' do
+      expect(Gitlab::GithubImport::Caching)
+        .to receive(:write)
+        .once
+        .and_call_original
+
+      2.times do
+        described_class.ghost_user_id
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/hook_data/issuable_builder_spec.rb b/spec/lib/gitlab/hook_data/issuable_builder_spec.rb
index 30da56bec16..26529c4759d 100644
--- a/spec/lib/gitlab/hook_data/issuable_builder_spec.rb
+++ b/spec/lib/gitlab/hook_data/issuable_builder_spec.rb
@@ -41,7 +41,8 @@ describe Gitlab::HookData::IssuableBuilder do
             labels: [
               [{ id: 1, title: 'foo' }],
               [{ id: 1, title: 'foo' }, { id: 2, title: 'bar' }]
-            ]
+            ],
+            total_time_spent: [1, 2]
           }
         end
         let(:data) { builder.build(user: user, changes: changes) }
@@ -53,6 +54,10 @@ describe Gitlab::HookData::IssuableBuilder do
             labels: {
               previous: [{ id: 1, title: 'foo' }],
               current: [{ id: 1, title: 'foo' }, { id: 2, title: 'bar' }]
+            },
+            total_time_spent: {
+              previous: 1,
+              current: 2
             }
           }))
         end
diff --git a/spec/lib/gitlab/hook_data/issue_builder_spec.rb b/spec/lib/gitlab/hook_data/issue_builder_spec.rb
index 6c529cdd051..aeacd577d18 100644
--- a/spec/lib/gitlab/hook_data/issue_builder_spec.rb
+++ b/spec/lib/gitlab/hook_data/issue_builder_spec.rb
@@ -11,7 +11,6 @@ describe Gitlab::HookData::IssueBuilder do
       %w[
         assignee_id
         author_id
-        branch_name
         closed_at
         confidential
         created_at
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index bf1e97654e5..0ecb50f7110 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -88,6 +88,7 @@ merge_requests:
 - metrics
 - timelogs
 - head_pipeline
+- latest_merge_request_diff
 merge_request_diff:
 - merge_request
 - merge_request_diff_commits
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
index f7c90093bde..f0752649121 100644
--- a/spec/lib/gitlab/import_export/project.json
+++ b/spec/lib/gitlab/import_export/project.json
@@ -3146,13 +3146,12 @@
       "merge_request_diff": {
         "id": 26,
         "state": "collected",
-        "st_commits": [
+        "merge_request_diff_commits": [
           {
-            "id": "0b4bc9a49b562e85de7cc9e834518ea6828729b9",
+            "merge_request_diff_id": 26,
+            "sha": "0b4bc9a49b562e85de7cc9e834518ea6828729b9",
+            "relative_order": 0,
             "message": "Feature added\n\nSigned-off-by: Dmitriy Zaporozhets \u003cdmitriy.zaporozhets@gmail.com\u003e\n",
-            "parent_ids": [
-              "ae73cb07c9eeaf35924a10f713b364d32b2dd34f"
-            ],
             "authored_date": "2014-02-27T09:26:01.000+01:00",
             "author_name": "Dmitriy Zaporozhets",
             "author_email": "dmitriy.zaporozhets@gmail.com",
@@ -3161,9 +3160,11 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           }
         ],
-        "utf8_st_diffs": [
+        "merge_request_diff_files": [
           {
-            "diff": "--- /dev/null\n+++ b/files/ruby/feature.rb\n@@ -0,0 +1,5 @@\n+class Feature\n+  def foo\n+    puts 'bar'\n+  end\n+end\n",
+            "merge_request_diff_id": 26,
+            "relative_order": 0,
+            "utf8_diff": "--- /dev/null\n+++ b/files/ruby/feature.rb\n@@ -0,0 +1,5 @@\n+class Feature\n+  def foo\n+    puts 'bar'\n+  end\n+end\n",
             "new_path": "files/ruby/feature.rb",
             "old_path": "files/ruby/feature.rb",
             "a_mode": "0",
@@ -3425,13 +3426,12 @@
       "merge_request_diff": {
         "id": 15,
         "state": "collected",
-        "st_commits": [
+        "merge_request_diff_commits": [
           {
-            "id": "94b8d581c48d894b86661718582fecbc5e3ed2eb",
+            "merge_request_diff_id": 15,
+            "relative_order": 0,
+            "sha": "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",
@@ -3440,9 +3440,11 @@
             "committer_email": "james@jameslopez.es"
           }
         ],
-        "utf8_st_diffs": [
+        "merge_request_diff_files": [
           {
-            "diff": "--- /dev/null\n+++ b/test\n",
+            "merge_request_diff_id": 15,
+            "relative_order": 0,
+            "utf8_diff": "--- /dev/null\n+++ b/test\n",
             "new_path": "test",
             "old_path": "test",
             "a_mode": "0",
@@ -3704,13 +3706,12 @@
       "merge_request_diff": {
         "id": 14,
         "state": "collected",
-        "st_commits": [
+        "merge_request_diff_commits": [
           {
-            "id": "ddd4ff416a931589c695eb4f5b23f844426f6928",
+            "merge_request_diff_id": 14,
+            "relative_order": 0,
+            "sha": "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",
@@ -3719,12 +3720,10 @@
             "committer_email": "james@jameslopez.es"
           },
           {
-            "id": "be93687618e4b132087f430a4d8fc3a609c9b77c",
+            "merge_request_diff_id": 14,
+            "relative_order": 1,
+            "sha": "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",
@@ -3733,11 +3732,10 @@
             "committer_email": "marin@gitlab.com"
           },
           {
-            "id": "048721d90c449b244b7b4c53a9186b04330174ec",
+            "merge_request_diff_id": 14,
+            "relative_order": 2,
+            "sha": "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",
@@ -3746,11 +3744,10 @@
             "committer_email": "maxlazio@gmail.com"
           },
           {
-            "id": "5f923865dde3436854e9ceb9cdb7815618d4e849",
+            "merge_request_diff_id": 14,
+            "relative_order": 3,
+            "sha": "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",
@@ -3759,12 +3756,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "d2d430676773caa88cdaf7c55944073b2fd5561a",
+            "merge_request_diff_id": 14,
+            "relative_order": 4,
+            "sha": "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",
@@ -3773,11 +3768,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73",
+            "merge_request_diff_id": 14,
+            "relative_order": 5,
+            "sha": "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",
@@ -3786,12 +3780,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+            "merge_request_diff_id": 14,
+            "relative_order": 6,
+            "sha": "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",
@@ -3800,11 +3792,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "66eceea0db202bb39c4e445e8ca28689645366c5",
+            "merge_request_diff_id": 14,
+            "relative_order": 7,
+            "sha": "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",
@@ -3813,11 +3804,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "08f22f255f082689c0d7d39d19205085311542bc",
+            "merge_request_diff_id": 14,
+            "relative_order": 8,
+            "sha": "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",
@@ -3826,12 +3816,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+            "merge_request_diff_id": 14,
+            "relative_order": 9,
+            "sha": "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",
@@ -3840,11 +3828,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "c642fe9b8b9f28f9225d7ea953fe14e74748d53b",
+            "merge_request_diff_id": 14,
+            "relative_order": 10,
+            "sha": "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",
@@ -3853,11 +3840,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0",
+            "merge_request_diff_id": 14,
+            "relative_order": 11,
+            "sha": "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",
@@ -3866,11 +3852,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+            "merge_request_diff_id": 14,
+            "relative_order": 12,
+            "sha": "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",
@@ -3879,12 +3864,10 @@
             "committer_email": "stanhu@packetzoom.com"
           },
           {
-            "id": "e56497bb5f03a90a51293fc6d516788730953899",
+            "merge_request_diff_id": 14,
+            "relative_order": 13,
+            "sha": "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",
@@ -3893,11 +3876,10 @@
             "committer_email": "sytse@gitlab.com"
           },
           {
-            "id": "4cd80ccab63c82b4bad16faa5193fbd2aa06df40",
+            "merge_request_diff_id": 14,
+            "relative_order": 14,
+            "sha": "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",
@@ -3906,11 +3888,10 @@
             "committer_email": "marmis85@gmail.com"
           },
           {
-            "id": "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
+            "merge_request_diff_id": 14,
+            "relative_order": 15,
+            "sha": "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",
@@ -3919,11 +3900,10 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           },
           {
-            "id": "570e7b2abdd848b95f2f578043fc23bd6f6fd24d",
+            "merge_request_diff_id": 14,
+            "relative_order": 16,
+            "sha": "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",
@@ -3932,11 +3912,10 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           },
           {
-            "id": "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9",
+            "merge_request_diff_id": 14,
+            "relative_order": 17,
+            "sha": "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",
@@ -3945,11 +3924,10 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           },
           {
-            "id": "d14d6c0abdd253381df51a723d58691b2ee1ab08",
+            "merge_request_diff_id": 14,
+            "relative_order": 18,
+            "sha": "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",
@@ -3958,11 +3936,10 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           },
           {
-            "id": "c1acaa58bbcbc3eafe538cb8274ba387047b69f8",
+            "merge_request_diff_id": 14,
+            "relative_order": 19,
+            "sha": "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",
@@ -3971,9 +3948,11 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           }
         ],
-        "utf8_st_diffs": [
+        "merge_request_diff_files": [
           {
-            "diff": "Binary files a/.DS_Store and /dev/null differ\n",
+            "merge_request_diff_id": 14,
+            "relative_order": 0,
+            "utf8_diff": "Binary files a/.DS_Store and /dev/null differ\n",
             "new_path": ".DS_Store",
             "old_path": ".DS_Store",
             "a_mode": "100644",
@@ -3984,7 +3963,9 @@
             "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",
+            "merge_request_diff_id": 14,
+            "relative_order": 1,
+            "utf8_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",
@@ -3995,7 +3976,9 @@
             "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",
+            "merge_request_diff_id": 14,
+            "relative_order": 2,
+            "utf8_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",
@@ -4006,7 +3989,9 @@
             "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",
+            "merge_request_diff_id": 14,
+            "relative_order": 3,
+            "utf8_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",
@@ -4017,7 +4002,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/encoding/iso8859.txt\n@@ -0,0 +1 @@\n+Äü\n",
+            "merge_request_diff_id": 14,
+            "relative_order": 4,
+            "utf8_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",
@@ -4028,7 +4015,9 @@
             "too_large": false
           },
           {
-            "diff": "Binary files a/files/.DS_Store and /dev/null differ\n",
+            "merge_request_diff_id": 14,
+            "relative_order": 5,
+            "utf8_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",
@@ -4039,7 +4028,9 @@
             "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",
+            "merge_request_diff_id": 14,
+            "relative_order": 6,
+            "utf8_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",
@@ -4050,7 +4041,9 @@
             "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",
+            "merge_request_diff_id": 14,
+            "relative_order": 7,
+            "utf8_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",
@@ -4061,7 +4054,9 @@
             "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",
+            "merge_request_diff_id": 14,
+            "relative_order": 8,
+            "utf8_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",
@@ -4072,7 +4067,9 @@
             "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",
+            "merge_request_diff_id": 14,
+            "relative_order": 9,
+            "utf8_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",
@@ -4083,7 +4080,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/files/whitespace\n@@ -0,0 +1 @@\n+test  \n",
+            "merge_request_diff_id": 14,
+            "relative_order": 10,
+            "utf8_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",
@@ -4094,7 +4093,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/foo/bar/.gitkeep\n",
+            "merge_request_diff_id": 14,
+            "relative_order": 11,
+            "utf8_diff": "--- /dev/null\n+++ b/foo/bar/.gitkeep\n",
             "new_path": "foo/bar/.gitkeep",
             "old_path": "foo/bar/.gitkeep",
             "a_mode": "0",
@@ -4105,7 +4106,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/gitlab-grack\n@@ -0,0 +1 @@\n+Subproject commit 645f6c4c82fd3f5e06f67134450a570b795e55a6\n",
+            "merge_request_diff_id": 14,
+            "relative_order": 12,
+            "utf8_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",
@@ -4116,7 +4119,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/gitlab-shell\n@@ -0,0 +1 @@\n+Subproject commit 79bceae69cb5750d6567b223597999bfa91cb3b9\n",
+            "merge_request_diff_id": 14,
+            "relative_order": 13,
+            "utf8_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",
@@ -4127,7 +4132,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/test\n",
+            "merge_request_diff_id": 14,
+            "relative_order": 14,
+            "utf8_diff": "--- /dev/null\n+++ b/test\n",
             "new_path": "test",
             "old_path": "test",
             "a_mode": "0",
@@ -4215,6 +4222,7 @@
           },
           "events": [
             {
+            "merge_request_diff_id": 14,
               "id": 529,
               "target_type": "Note",
               "target_id": 793,
@@ -4398,13 +4406,12 @@
       "merge_request_diff": {
         "id": 13,
         "state": "collected",
-        "st_commits": [
+        "merge_request_diff_commits": [
           {
-            "id": "0bfedc29d30280c7e8564e19f654584b459e5868",
+            "merge_request_diff_id": 13,
+            "relative_order": 0,
+            "sha": "0bfedc29d30280c7e8564e19f654584b459e5868",
             "message": "fixes #10\n",
-            "parent_ids": [
-              "be93687618e4b132087f430a4d8fc3a609c9b77c"
-            ],
             "authored_date": "2016-01-19T15:25:23.000+01:00",
             "author_name": "James Lopez",
             "author_email": "james@jameslopez.es",
@@ -4413,12 +4420,10 @@
             "committer_email": "james@jameslopez.es"
           },
           {
-            "id": "be93687618e4b132087f430a4d8fc3a609c9b77c",
+            "merge_request_diff_id": 13,
+            "relative_order": 1,
+            "sha": "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",
@@ -4427,11 +4432,10 @@
             "committer_email": "marin@gitlab.com"
           },
           {
-            "id": "048721d90c449b244b7b4c53a9186b04330174ec",
+            "merge_request_diff_id": 13,
+            "relative_order": 2,
+            "sha": "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",
@@ -4440,11 +4444,10 @@
             "committer_email": "maxlazio@gmail.com"
           },
           {
-            "id": "5f923865dde3436854e9ceb9cdb7815618d4e849",
+            "merge_request_diff_id": 13,
+            "relative_order": 3,
+            "sha": "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",
@@ -4453,12 +4456,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "d2d430676773caa88cdaf7c55944073b2fd5561a",
+            "merge_request_diff_id": 13,
+            "relative_order": 4,
+            "sha": "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",
@@ -4467,11 +4468,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73",
+            "merge_request_diff_id": 13,
+            "relative_order": 5,
+            "sha": "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",
@@ -4480,12 +4480,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+            "merge_request_diff_id": 13,
+            "relative_order": 6,
+            "sha": "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",
@@ -4494,11 +4492,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "66eceea0db202bb39c4e445e8ca28689645366c5",
+            "merge_request_diff_id": 13,
+            "relative_order": 7,
+            "sha": "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",
@@ -4507,11 +4504,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "08f22f255f082689c0d7d39d19205085311542bc",
+            "merge_request_diff_id": 13,
+            "relative_order": 8,
+            "sha": "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",
@@ -4520,12 +4516,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+            "merge_request_diff_id": 13,
+            "relative_order": 9,
+            "sha": "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",
@@ -4534,11 +4528,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "c642fe9b8b9f28f9225d7ea953fe14e74748d53b",
+            "merge_request_diff_id": 13,
+            "relative_order": 10,
+            "sha": "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",
@@ -4547,11 +4540,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0",
+            "merge_request_diff_id": 13,
+            "relative_order": 11,
+            "sha": "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",
@@ -4560,11 +4552,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+            "merge_request_diff_id": 13,
+            "relative_order": 12,
+            "sha": "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",
@@ -4573,12 +4564,10 @@
             "committer_email": "stanhu@packetzoom.com"
           },
           {
-            "id": "e56497bb5f03a90a51293fc6d516788730953899",
+            "merge_request_diff_id": 13,
+            "relative_order": 13,
+            "sha": "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",
@@ -4587,11 +4576,10 @@
             "committer_email": "sytse@gitlab.com"
           },
           {
-            "id": "4cd80ccab63c82b4bad16faa5193fbd2aa06df40",
+            "merge_request_diff_id": 13,
+            "relative_order": 14,
+            "sha": "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",
@@ -4600,9 +4588,11 @@
             "committer_email": "marmis85@gmail.com"
           }
         ],
-        "utf8_st_diffs": [
+        "merge_request_diff_files": [
           {
-            "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",
+            "merge_request_diff_id": 13,
+            "relative_order": 0,
+            "utf8_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",
@@ -4613,7 +4603,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/encoding/iso8859.txt\n@@ -0,0 +1 @@\n+Äü\n",
+            "merge_request_diff_id": 13,
+            "relative_order": 1,
+            "utf8_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",
@@ -4624,7 +4616,9 @@
             "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",
+            "merge_request_diff_id": 13,
+            "relative_order": 2,
+            "utf8_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",
@@ -4635,7 +4629,9 @@
             "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",
+            "merge_request_diff_id": 13,
+            "relative_order": 3,
+            "utf8_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",
@@ -4646,7 +4642,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/files/whitespace\n@@ -0,0 +1 @@\n+test  \n",
+            "merge_request_diff_id": 13,
+            "relative_order": 4,
+            "utf8_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",
@@ -4657,7 +4655,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/foo/bar/.gitkeep\n",
+            "merge_request_diff_id": 13,
+            "relative_order": 5,
+            "utf8_diff": "--- /dev/null\n+++ b/foo/bar/.gitkeep\n",
             "new_path": "foo/bar/.gitkeep",
             "old_path": "foo/bar/.gitkeep",
             "a_mode": "0",
@@ -4668,7 +4668,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/test\n",
+            "merge_request_diff_id": 13,
+            "relative_order": 6,
+            "utf8_diff": "--- /dev/null\n+++ b/test\n",
             "new_path": "test",
             "old_path": "test",
             "a_mode": "0",
@@ -4930,13 +4932,12 @@
       "merge_request_diff": {
         "id": 12,
         "state": "collected",
-        "st_commits": [
+        "merge_request_diff_commits": [
           {
-            "id": "97a0df9696e2aebf10c31b3016f40214e0e8f243",
+            "merge_request_diff_id": 12,
+            "relative_order": 0,
+            "sha": "97a0df9696e2aebf10c31b3016f40214e0e8f243",
             "message": "fixes #10\n",
-            "parent_ids": [
-              "be93687618e4b132087f430a4d8fc3a609c9b77c"
-            ],
             "authored_date": "2016-01-19T14:08:21.000+01:00",
             "author_name": "James Lopez",
             "author_email": "james@jameslopez.es",
@@ -4945,12 +4946,10 @@
             "committer_email": "james@jameslopez.es"
           },
           {
-            "id": "be93687618e4b132087f430a4d8fc3a609c9b77c",
+            "merge_request_diff_id": 12,
+            "relative_order": 1,
+            "sha": "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",
@@ -4959,11 +4958,10 @@
             "committer_email": "marin@gitlab.com"
           },
           {
-            "id": "048721d90c449b244b7b4c53a9186b04330174ec",
+            "merge_request_diff_id": 12,
+            "relative_order": 2,
+            "sha": "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",
@@ -4972,11 +4970,10 @@
             "committer_email": "maxlazio@gmail.com"
           },
           {
-            "id": "5f923865dde3436854e9ceb9cdb7815618d4e849",
+            "merge_request_diff_id": 12,
+            "relative_order": 3,
+            "sha": "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",
@@ -4985,12 +4982,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "d2d430676773caa88cdaf7c55944073b2fd5561a",
+            "merge_request_diff_id": 12,
+            "relative_order": 4,
+            "sha": "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",
@@ -4999,11 +4994,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73",
+            "merge_request_diff_id": 12,
+            "relative_order": 5,
+            "sha": "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",
@@ -5012,12 +5006,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+            "merge_request_diff_id": 12,
+            "relative_order": 6,
+            "sha": "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",
@@ -5026,11 +5018,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "66eceea0db202bb39c4e445e8ca28689645366c5",
+            "merge_request_diff_id": 12,
+            "relative_order": 7,
+            "sha": "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",
@@ -5039,11 +5030,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "08f22f255f082689c0d7d39d19205085311542bc",
+            "merge_request_diff_id": 12,
+            "relative_order": 8,
+            "sha": "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",
@@ -5052,12 +5042,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+            "merge_request_diff_id": 12,
+            "relative_order": 9,
+            "sha": "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",
@@ -5066,11 +5054,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "c642fe9b8b9f28f9225d7ea953fe14e74748d53b",
+            "merge_request_diff_id": 12,
+            "relative_order": 10,
+            "sha": "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",
@@ -5079,11 +5066,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0",
+            "merge_request_diff_id": 12,
+            "relative_order": 11,
+            "sha": "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",
@@ -5092,11 +5078,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+            "merge_request_diff_id": 12,
+            "relative_order": 12,
+            "sha": "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",
@@ -5105,9 +5090,11 @@
             "committer_email": "stanhu@packetzoom.com"
           }
         ],
-        "utf8_st_diffs": [
+        "merge_request_diff_files": [
           {
-            "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",
+            "merge_request_diff_id": 12,
+            "relative_order": 0,
+            "utf8_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",
@@ -5118,7 +5105,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/encoding/iso8859.txt\n@@ -0,0 +1 @@\n+Äü\n",
+            "merge_request_diff_id": 12,
+            "relative_order": 1,
+            "utf8_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",
@@ -5129,7 +5118,9 @@
             "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",
+            "merge_request_diff_id": 12,
+            "relative_order": 2,
+            "utf8_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",
@@ -5140,7 +5131,9 @@
             "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",
+            "merge_request_diff_id": 12,
+            "relative_order": 3,
+            "utf8_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",
@@ -5151,7 +5144,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/files/whitespace\n@@ -0,0 +1 @@\n+test  \n",
+            "merge_request_diff_id": 12,
+            "relative_order": 4,
+            "utf8_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",
@@ -5162,7 +5157,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/test\n",
+            "merge_request_diff_id": 12,
+            "relative_order": 5,
+            "utf8_diff": "--- /dev/null\n+++ b/test\n",
             "new_path": "test",
             "old_path": "test",
             "a_mode": "0",
@@ -5424,9 +5421,9 @@
       "merge_request_diff": {
         "id": 11,
         "state": "empty",
-        "st_commits": null,
-        "utf8_st_diffs": [
-
+        "merge_request_diff_commits": [
+        ],
+        "merge_request_diff_files": [
         ],
         "merge_request_id": 11,
         "created_at": "2016-06-14T15:02:23.772Z",
@@ -5679,13 +5676,12 @@
       "merge_request_diff": {
         "id": 10,
         "state": "collected",
-        "st_commits": [
+        "merge_request_diff_commits": [
           {
-            "id": "f998ac87ac9244f15e9c15109a6f4e62a54b779d",
+            "merge_request_diff_id": 10,
+            "relative_order": 0,
+            "sha": "f998ac87ac9244f15e9c15109a6f4e62a54b779d",
             "message": "fixes #10\n",
-            "parent_ids": [
-              "be93687618e4b132087f430a4d8fc3a609c9b77c"
-            ],
             "authored_date": "2016-01-19T14:43:23.000+01:00",
             "author_name": "James Lopez",
             "author_email": "james@jameslopez.es",
@@ -5694,12 +5690,10 @@
             "committer_email": "james@jameslopez.es"
           },
           {
-            "id": "be93687618e4b132087f430a4d8fc3a609c9b77c",
+            "merge_request_diff_id": 10,
+            "relative_order": 1,
+            "sha": "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",
@@ -5708,11 +5702,10 @@
             "committer_email": "marin@gitlab.com"
           },
           {
-            "id": "048721d90c449b244b7b4c53a9186b04330174ec",
+            "merge_request_diff_id": 10,
+            "relative_order": 2,
+            "sha": "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",
@@ -5721,11 +5714,10 @@
             "committer_email": "maxlazio@gmail.com"
           },
           {
-            "id": "5f923865dde3436854e9ceb9cdb7815618d4e849",
+            "merge_request_diff_id": 10,
+            "relative_order": 3,
+            "sha": "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",
@@ -5734,12 +5726,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "d2d430676773caa88cdaf7c55944073b2fd5561a",
+            "merge_request_diff_id": 10,
+            "relative_order": 4,
+            "sha": "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",
@@ -5748,11 +5738,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "2ea1f3dec713d940208fb5ce4a38765ecb5d3f73",
+            "merge_request_diff_id": 10,
+            "relative_order": 5,
+            "sha": "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",
@@ -5761,12 +5750,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "59e29889be61e6e0e5e223bfa9ac2721d31605b8",
+            "merge_request_diff_id": 10,
+            "relative_order": 6,
+            "sha": "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",
@@ -5775,11 +5762,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "66eceea0db202bb39c4e445e8ca28689645366c5",
+            "merge_request_diff_id": 10,
+            "relative_order": 7,
+            "sha": "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",
@@ -5788,11 +5774,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "08f22f255f082689c0d7d39d19205085311542bc",
+            "merge_request_diff_id": 10,
+            "relative_order": 8,
+            "sha": "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",
@@ -5801,12 +5786,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "19e2e9b4ef76b422ce1154af39a91323ccc57434",
+            "merge_request_diff_id": 10,
+            "relative_order": 9,
+            "sha": "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",
@@ -5815,11 +5798,10 @@
             "committer_email": "stanhu@gmail.com"
           },
           {
-            "id": "c642fe9b8b9f28f9225d7ea953fe14e74748d53b",
+            "merge_request_diff_id": 10,
+            "relative_order": 10,
+            "sha": "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",
@@ -5828,11 +5810,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "9a944d90955aaf45f6d0c88f30e27f8d2c41cec0",
+            "merge_request_diff_id": 10,
+            "relative_order": 11,
+            "sha": "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",
@@ -5841,11 +5822,10 @@
             "committer_email": "minsik.yoon@samsung.com"
           },
           {
-            "id": "c7fbe50c7c7419d9701eebe64b1fdacc3df5b9dd",
+            "merge_request_diff_id": 10,
+            "relative_order": 12,
+            "sha": "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",
@@ -5854,12 +5834,10 @@
             "committer_email": "stanhu@packetzoom.com"
           },
           {
-            "id": "e56497bb5f03a90a51293fc6d516788730953899",
+            "merge_request_diff_id": 10,
+            "relative_order": 13,
+            "sha": "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",
@@ -5868,11 +5846,10 @@
             "committer_email": "sytse@gitlab.com"
           },
           {
-            "id": "4cd80ccab63c82b4bad16faa5193fbd2aa06df40",
+            "merge_request_diff_id": 10,
+            "relative_order": 14,
+            "sha": "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",
@@ -5881,11 +5858,10 @@
             "committer_email": "marmis85@gmail.com"
           },
           {
-            "id": "5937ac0a7beb003549fc5fd26fc247adbce4a52e",
+            "merge_request_diff_id": 10,
+            "relative_order": 16,
+            "sha": "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",
@@ -5894,11 +5870,10 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           },
           {
-            "id": "570e7b2abdd848b95f2f578043fc23bd6f6fd24d",
+            "merge_request_diff_id": 10,
+            "relative_order": 17,
+            "sha": "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",
@@ -5907,11 +5882,10 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           },
           {
-            "id": "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9",
+            "merge_request_diff_id": 10,
+            "relative_order": 18,
+            "sha": "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",
@@ -5920,11 +5894,10 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           },
           {
-            "id": "d14d6c0abdd253381df51a723d58691b2ee1ab08",
+            "merge_request_diff_id": 10,
+            "relative_order": 19,
+            "sha": "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",
@@ -5933,11 +5906,10 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           },
           {
-            "id": "c1acaa58bbcbc3eafe538cb8274ba387047b69f8",
+            "merge_request_diff_id": 10,
+            "relative_order": 20,
+            "sha": "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",
@@ -5946,9 +5918,11 @@
             "committer_email": "dmitriy.zaporozhets@gmail.com"
           }
         ],
-        "utf8_st_diffs": [
+        "merge_request_diff_files": [
           {
-            "diff": "Binary files a/.DS_Store and /dev/null differ\n",
+            "merge_request_diff_id": 10,
+            "relative_order": 0,
+            "utf8_diff": "Binary files a/.DS_Store and /dev/null differ\n",
             "new_path": ".DS_Store",
             "old_path": ".DS_Store",
             "a_mode": "100644",
@@ -5959,7 +5933,9 @@
             "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",
+            "merge_request_diff_id": 10,
+            "relative_order": 1,
+            "utf8_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",
@@ -5970,7 +5946,9 @@
             "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",
+            "merge_request_diff_id": 10,
+            "relative_order": 2,
+            "utf8_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",
@@ -5981,7 +5959,9 @@
             "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",
+            "merge_request_diff_id": 10,
+            "relative_order": 3,
+            "utf8_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",
@@ -5992,7 +5972,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/encoding/iso8859.txt\n@@ -0,0 +1 @@\n+Äü\n",
+            "merge_request_diff_id": 10,
+            "relative_order": 4,
+            "utf8_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",
@@ -6003,7 +5985,9 @@
             "too_large": false
           },
           {
-            "diff": "Binary files a/files/.DS_Store and /dev/null differ\n",
+            "merge_request_diff_id": 10,
+            "relative_order": 5,
+            "utf8_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",
@@ -6014,7 +5998,9 @@
             "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",
+            "merge_request_diff_id": 10,
+            "relative_order": 6,
+            "utf8_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",
@@ -6025,7 +6011,9 @@
             "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",
+            "merge_request_diff_id": 10,
+            "relative_order": 7,
+            "utf8_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",
@@ -6036,7 +6024,9 @@
             "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",
+            "merge_request_diff_id": 10,
+            "relative_order": 8,
+            "utf8_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",
@@ -6047,7 +6037,9 @@
             "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",
+            "merge_request_diff_id": 10,
+            "relative_order": 9,
+            "utf8_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",
@@ -6058,7 +6050,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/files/whitespace\n@@ -0,0 +1 @@\n+test  \n",
+            "merge_request_diff_id": 10,
+            "relative_order": 10,
+            "utf8_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",
@@ -6069,7 +6063,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/foo/bar/.gitkeep\n",
+            "merge_request_diff_id": 10,
+            "relative_order": 11,
+            "utf8_diff": "--- /dev/null\n+++ b/foo/bar/.gitkeep\n",
             "new_path": "foo/bar/.gitkeep",
             "old_path": "foo/bar/.gitkeep",
             "a_mode": "0",
@@ -6080,7 +6076,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/gitlab-grack\n@@ -0,0 +1 @@\n+Subproject commit 645f6c4c82fd3f5e06f67134450a570b795e55a6\n",
+            "merge_request_diff_id": 10,
+            "relative_order": 12,
+            "utf8_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",
@@ -6091,7 +6089,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/gitlab-shell\n@@ -0,0 +1 @@\n+Subproject commit 79bceae69cb5750d6567b223597999bfa91cb3b9\n",
+            "merge_request_diff_id": 10,
+            "relative_order": 13,
+            "utf8_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",
@@ -6102,7 +6102,9 @@
             "too_large": false
           },
           {
-            "diff": "--- /dev/null\n+++ b/test\n",
+            "merge_request_diff_id": 10,
+            "relative_order": 14,
+            "utf8_diff": "--- /dev/null\n+++ b/test\n",
             "new_path": "test",
             "old_path": "test",
             "a_mode": "0",
@@ -6364,13 +6366,12 @@
       "merge_request_diff": {
         "id": 9,
         "state": "collected",
-        "st_commits": [
+        "merge_request_diff_commits": [
           {
-            "id": "a4e5dfebf42e34596526acb8611bc7ed80e4eb3f",
+            "merge_request_diff_id": 9,
+            "relative_order": 0,
+            "sha": "a4e5dfebf42e34596526acb8611bc7ed80e4eb3f",
             "message": "fixes #10\n",
-            "parent_ids": [
-              "be93687618e4b132087f430a4d8fc3a609c9b77c"
-            ],
             "authored_date": "2016-01-19T15:44:02.000+01:00",
             "author_name": "James Lopez",
             "author_email": "james@jameslopez.es",
@@ -6379,9 +6380,11 @@
             "committer_email": "james@jameslopez.es"
           }
         ],
-        "utf8_st_diffs": [
+        "merge_request_diff_files": [
           {
-            "diff": "--- /dev/null\n+++ b/test\n",
+            "merge_request_diff_id": 9,
+            "relative_order": 0,
+            "utf8_diff": "--- /dev/null\n+++ b/test\n",
             "new_path": "test",
             "old_path": "test",
             "a_mode": "0",
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 e4b4cf5ba85..0ab3afd0074 100644
--- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
@@ -95,26 +95,18 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
         end
       end
 
-      it 'has the correct data for merge request st_diffs' do
-        # makes sure we are renaming the custom method +utf8_st_diffs+ into +st_diffs+
-        # one MergeRequestDiff uses the new format, where st_diffs is expected to be nil
-
-        expect(MergeRequestDiff.where.not(st_diffs: nil).count).to eq(8)
-      end
-
       it 'has the correct data for merge request diff files' do
-        expect(MergeRequestDiffFile.where.not(diff: nil).count).to eq(9)
+        expect(MergeRequestDiffFile.where.not(diff: nil).count).to eq(55)
       end
 
-      it 'has the correct data for merge request diff commits in serialised and table formats' do
-        expect(MergeRequestDiff.where.not(st_commits: nil).count).to eq(7)
-        expect(MergeRequestDiffCommit.count).to eq(6)
+      it 'has the correct data for merge request diff commits' do
+        expect(MergeRequestDiffCommit.count).to eq(77)
       end
 
-      it 'has the correct time for merge request st_commits' do
-        st_commits = MergeRequestDiff.where.not(st_commits: nil).first.st_commits
-
-        expect(st_commits.first[:committed_date]).to be_kind_of(Time)
+      it 'has the correct data for merge request latest_merge_request_diff' do
+        MergeRequest.find_each do |merge_request|
+          expect(merge_request.latest_merge_request_diff_id).to eq(merge_request.merge_request_diffs.maximum(:id))
+        end
       end
 
       it 'has labels associated to label links, associated to issues' do
@@ -155,7 +147,7 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
         end
 
         it 'has no source if source/target differ' do
-          expect(MergeRequest.find_by_title('MR2').source_project_id).to eq(-1)
+          expect(MergeRequest.find_by_title('MR2').source_project_id).to be_nil
         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 ee173afbd50..6243b6ac9f0 100644
--- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
@@ -93,10 +93,6 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
         expect(saved_project_json['merge_requests'].first['merge_request_diff']).not_to be_empty
       end
 
-      it 'has merge requests diff st_diffs' do
-        expect(saved_project_json['merge_requests'].first['merge_request_diff']['utf8_st_diffs']).not_to be_nil
-      end
-
       it 'has merge request diff files' do
         expect(saved_project_json['merge_requests'].first['merge_request_diff']['merge_request_diff_files']).not_to be_empty
       end
@@ -172,12 +168,6 @@ describe Gitlab::ImportExport::ProjectTreeSaver do
         expect(saved_project_json['custom_attributes'].count).to eq(2)
       end
 
-      it 'does not complain about non UTF-8 characters in MR diffs' do
-        ActiveRecord::Base.connection.execute("UPDATE merge_request_diffs SET st_diffs = '---\n- :diff: !binary |-\n    LS0tIC9kZXYvbnVsbAorKysgYi9pbWFnZXMvbnVjb3IucGRmCkBAIC0wLDAg\n    KzEsMTY3OSBAQAorJVBERi0xLjUNJeLjz9MNCisxIDAgb2JqDTw8L01ldGFk\n    YXR'")
-
-        expect(project_tree_saver.save).to be true
-      end
-
       it 'does not complain about non UTF-8 characters in MR diff files' do
         ActiveRecord::Base.connection.execute("UPDATE merge_request_diff_files SET diff = '---\n- :diff: !binary |-\n    LS0tIC9kZXYvbnVsbAorKysgYi9pbWFnZXMvbnVjb3IucGRmCkBAIC0wLDAg\n    KzEsMTY3OSBAQAorJVBERi0xLjUNJeLjz9MNCisxIDAgb2JqDTw8L01ldGFk\n    YXR'")
 
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 4f97f2017ca..1016a7ab591 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -173,7 +173,6 @@ MergeRequest:
 MergeRequestDiff:
 - id
 - state
-- st_commits
 - merge_request_id
 - created_at
 - updated_at
diff --git a/spec/lib/gitlab/import_export/uploads_restorer_spec.rb b/spec/lib/gitlab/import_export/uploads_restorer_spec.rb
new file mode 100644
index 00000000000..63992ea8ab8
--- /dev/null
+++ b/spec/lib/gitlab/import_export/uploads_restorer_spec.rb
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Gitlab::ImportExport::UploadsRestorer do
+  describe 'bundle a project Git repo' do
+    let(:export_path) { "#{Dir.tmpdir}/uploads_saver_spec" }
+    let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
+    let(:uploads_path) { FileUploader.dynamic_path_segment(project) }
+
+    before do
+      allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+      FileUtils.mkdir_p(File.join(shared.export_path, 'uploads/random'))
+      FileUtils.touch(File.join(shared.export_path, 'uploads/random', "dummy.txt"))
+    end
+
+    after do
+      FileUtils.rm_rf(export_path)
+    end
+
+    describe 'legacy storage' do
+      let(:project) { create(:project) }
+
+      subject(:restorer) { described_class.new(project: project, shared: shared) }
+
+      it 'saves the uploads successfully' do
+        expect(restorer.restore).to be true
+      end
+
+      it 'copies the uploads to the project path' do
+        restorer.restore
+
+        uploads = Dir.glob(File.join(uploads_path, '**/*')).map { |file| File.basename(file) }
+
+        expect(uploads).to include('dummy.txt')
+      end
+    end
+
+    describe 'hashed storage' do
+      let(:project) { create(:project, :hashed) }
+
+      subject(:restorer) { described_class.new(project: project, shared: shared) }
+
+      it 'saves the uploads successfully' do
+        expect(restorer.restore).to be true
+      end
+
+      it 'copies the uploads to the project path' do
+        restorer.restore
+
+        uploads = Dir.glob(File.join(uploads_path, '**/*')).map { |file| File.basename(file) }
+
+        expect(uploads).to include('dummy.txt')
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/uploads_saver_spec.rb b/spec/lib/gitlab/import_export/uploads_saver_spec.rb
new file mode 100644
index 00000000000..e8948de1f3a
--- /dev/null
+++ b/spec/lib/gitlab/import_export/uploads_saver_spec.rb
@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Gitlab::ImportExport::UploadsSaver do
+  describe 'bundle a project Git repo' do
+    let(:export_path) { "#{Dir.tmpdir}/uploads_saver_spec" }
+    let(:file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+    let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: project.full_path) }
+
+    before do
+      allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+    end
+
+    after do
+      FileUtils.rm_rf(export_path)
+    end
+
+    describe 'legacy storage' do
+      let(:project) { create(:project) }
+
+      subject(:saver) { described_class.new(shared: shared, project: project) }
+
+      before do
+        UploadService.new(project, file, FileUploader).execute
+      end
+
+      it 'saves the uploads successfully' do
+        expect(saver.save).to be true
+      end
+
+      it 'copies the uploads to the export path' do
+        saver.save
+
+        uploads = Dir.glob(File.join(shared.export_path, 'uploads', '**/*')).map { |file| File.basename(file) }
+
+        expect(uploads).to include('banana_sample.gif')
+      end
+    end
+
+    describe 'hashed storage' do
+      let(:project) { create(:project, :hashed) }
+
+      subject(:saver) { described_class.new(shared: shared, project: project) }
+
+      before do
+        UploadService.new(project, file, FileUploader).execute
+      end
+
+      it 'saves the uploads successfully' do
+        expect(saver.save).to be true
+      end
+
+      it 'copies the uploads to the export path' do
+        saver.save
+
+        uploads = Dir.glob(File.join(shared.export_path, 'uploads', '**/*')).map { |file| File.basename(file) }
+
+        expect(uploads).to include('banana_sample.gif')
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_sources_spec.rb b/spec/lib/gitlab/import_sources_spec.rb
index c5725f47453..f2fa315e3ec 100644
--- a/spec/lib/gitlab/import_sources_spec.rb
+++ b/spec/lib/gitlab/import_sources_spec.rb
@@ -56,14 +56,14 @@ describe Gitlab::ImportSources do
 
   describe '.importer' do
     import_sources = {
-      'github' => Github::Import,
+      'github' => Gitlab::GithubImport::ParallelImporter,
       'bitbucket' => Gitlab::BitbucketImport::Importer,
       'gitlab' => Gitlab::GitlabImport::Importer,
       'google_code' => Gitlab::GoogleCodeImport::Importer,
       'fogbugz' => Gitlab::FogbugzImport::Importer,
       'git' => nil,
       'gitlab_project' => Gitlab::ImportExport::Importer,
-      'gitea' => Gitlab::GithubImport::Importer
+      'gitea' => Gitlab::LegacyGithubImport::Importer
     }
 
     import_sources.each do |name, klass|
diff --git a/spec/lib/gitlab/issuable_metadata_spec.rb b/spec/lib/gitlab/issuable_metadata_spec.rb
index 2455969a183..42635a68ee1 100644
--- a/spec/lib/gitlab/issuable_metadata_spec.rb
+++ b/spec/lib/gitlab/issuable_metadata_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Gitlab::IssuableMetadata do
-  let(:user)        { create(:user) }
-  let!(:project)    { create(:project, :public, :repository, creator: user, namespace: user.namespace) }
+  let(:user)     { create(:user) }
+  let!(:project) { create(:project, :public, :repository, creator: user, namespace: user.namespace) }
 
   subject { Class.new { include Gitlab::IssuableMetadata }.new }
 
@@ -10,6 +10,10 @@ describe Gitlab::IssuableMetadata do
     expect(subject.issuable_meta_data(Issue.none, 'Issue')).to eq({})
   end
 
+  it 'raises an error when given a collection with no limit' do
+    expect { subject.issuable_meta_data(Issue.all, 'Issue') }.to raise_error(/must have a limit/)
+  end
+
   context 'issues' do
     let!(:issue) { create(:issue, author: user, project: project) }
     let!(:closed_issue) { create(:issue, state: :closed, author: user, project: project) }
@@ -19,7 +23,7 @@ describe Gitlab::IssuableMetadata do
     let!(:closing_issues) { create(:merge_requests_closing_issues, issue: issue, merge_request: merge_request) }
 
     it 'aggregates stats on issues' do
-      data = subject.issuable_meta_data(Issue.all, 'Issue')
+      data = subject.issuable_meta_data(Issue.all.limit(10), 'Issue')
 
       expect(data.count).to eq(2)
       expect(data[issue.id].upvotes).to eq(1)
@@ -42,7 +46,7 @@ describe Gitlab::IssuableMetadata do
     let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") }
 
     it 'aggregates stats on merge requests' do
-      data = subject.issuable_meta_data(MergeRequest.all, 'MergeRequest')
+      data = subject.issuable_meta_data(MergeRequest.all.limit(10), 'MergeRequest')
 
       expect(data.count).to eq(2)
       expect(data[merge_request.id].upvotes).to eq(1)
diff --git a/spec/lib/gitlab/github_import/branch_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/branch_formatter_spec.rb
index 426b43f8b51..48655851140 100644
--- a/spec/lib/gitlab/github_import/branch_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/branch_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::BranchFormatter do
+describe Gitlab::LegacyGithubImport::BranchFormatter do
   let(:project) { create(:project, :repository) }
   let(:commit) { create(:commit, project: project) }
   let(:repo) { double }
diff --git a/spec/lib/gitlab/legacy_github_import/client_spec.rb b/spec/lib/gitlab/legacy_github_import/client_spec.rb
new file mode 100644
index 00000000000..80b767abce0
--- /dev/null
+++ b/spec/lib/gitlab/legacy_github_import/client_spec.rb
@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+describe Gitlab::LegacyGithubImport::Client do
+  let(:token) { '123456' }
+  let(:github_provider) { Settingslogic.new('app_id' => 'asd123', 'app_secret' => 'asd123', 'name' => 'github', 'args' => { 'client_options' => {} }) }
+
+  subject(:client) { described_class.new(token) }
+
+  before do
+    allow(Gitlab.config.omniauth).to receive(:providers).and_return([github_provider])
+  end
+
+  it 'convert OAuth2 client options to symbols' do
+    client.client.options.keys.each do |key|
+      expect(key).to be_kind_of(Symbol)
+    end
+  end
+
+  it 'does not crash (e.g. Settingslogic::MissingSetting) when verify_ssl config is not present' do
+    expect { client.api }.not_to raise_error
+  end
+
+  context 'when config is missing' do
+    before do
+      allow(Gitlab.config.omniauth).to receive(:providers).and_return([])
+    end
+
+    it 'is still possible to get an Octokit client' do
+      expect { client.api }.not_to raise_error
+    end
+
+    it 'is not be possible to get an OAuth2 client' do
+      expect { client.client }.to raise_error(Projects::ImportService::Error)
+    end
+  end
+
+  context 'allow SSL verification to be configurable on API' do
+    before do
+      github_provider['verify_ssl'] = false
+    end
+
+    it 'uses supplied value' do
+      expect(client.client.options[:connection_opts][:ssl]).to eq({ verify: false })
+      expect(client.api.connection_options[:ssl]).to eq({ verify: false })
+    end
+  end
+
+  describe '#api_endpoint' do
+    context 'when provider does not specity an API endpoint' do
+      it 'uses GitHub root API endpoint' do
+        expect(client.api.api_endpoint).to eq 'https://api.github.com/'
+      end
+    end
+
+    context 'when provider specify a custom API endpoint' do
+      before do
+        github_provider['args']['client_options']['site'] = 'https://github.company.com/'
+      end
+
+      it 'uses the custom API endpoint' do
+        expect(OmniAuth::Strategies::GitHub).not_to receive(:default_options)
+        expect(client.api.api_endpoint).to eq 'https://github.company.com/'
+      end
+    end
+
+    context 'when given a host' do
+      subject(:client) { described_class.new(token, host: 'https://try.gitea.io/') }
+
+      it 'builds a endpoint with the given host and the default API version' do
+        expect(client.api.api_endpoint).to eq 'https://try.gitea.io/api/v3/'
+      end
+    end
+
+    context 'when given an API version' do
+      subject(:client) { described_class.new(token, api_version: 'v3') }
+
+      it 'does not use the API version without a host' do
+        expect(client.api.api_endpoint).to eq 'https://api.github.com/'
+      end
+    end
+
+    context 'when given a host and version' do
+      subject(:client) { described_class.new(token, host: 'https://try.gitea.io/', api_version: 'v3') }
+
+      it 'builds a endpoint with the given options' do
+        expect(client.api.api_endpoint).to eq 'https://try.gitea.io/api/v3/'
+      end
+    end
+  end
+
+  it 'does not raise error when rate limit is disabled' do
+    stub_request(:get, /api.github.com/)
+    allow(client.api).to receive(:rate_limit!).and_raise(Octokit::NotFound)
+
+    expect { client.issues {} }.not_to raise_error
+  end
+end
diff --git a/spec/lib/gitlab/github_import/comment_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/comment_formatter_spec.rb
index 035ac8c7c1f..413654e108c 100644
--- a/spec/lib/gitlab/github_import/comment_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/comment_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::CommentFormatter do
+describe Gitlab::LegacyGithubImport::CommentFormatter do
   let(:client) { double }
   let(:project) { create(:project) }
   let(:octocat) { double(id: 123456, login: 'octocat', email: 'octocat@example.com') }
diff --git a/spec/lib/gitlab/github_import/importer_spec.rb b/spec/lib/gitlab/legacy_github_import/importer_spec.rb
index d570f34985b..20514486727 100644
--- a/spec/lib/gitlab/github_import/importer_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/importer_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::Importer do
-  shared_examples 'Gitlab::GithubImport::Importer#execute' do
+describe Gitlab::LegacyGithubImport::Importer do
+  shared_examples 'Gitlab::LegacyGithubImport::Importer#execute' do
     let(:expected_not_called) { [] }
 
     before do
@@ -35,7 +35,7 @@ describe Gitlab::GithubImport::Importer do
     end
   end
 
-  shared_examples 'Gitlab::GithubImport::Importer#execute an error occurs' do
+  shared_examples 'Gitlab::LegacyGithubImport::Importer#execute an error occurs' do
     before do
       allow(project).to receive(:import_data).and_return(double.as_null_object)
 
@@ -178,7 +178,7 @@ describe Gitlab::GithubImport::Importer do
     end
   end
 
-  shared_examples 'Gitlab::GithubImport unit-testing' do
+  shared_examples 'Gitlab::LegacyGithubImport unit-testing' do
     describe '#clean_up_restored_branches' do
       subject { described_class.new(project) }
 
@@ -188,7 +188,7 @@ describe Gitlab::GithubImport::Importer do
       end
 
       context 'when pull request stills open' do
-        let(:gh_pull_request) { Gitlab::GithubImport::PullRequestFormatter.new(project, pull_request) }
+        let(:gh_pull_request) { Gitlab::LegacyGithubImport::PullRequestFormatter.new(project, pull_request) }
 
         it 'does not remove branches' do
           expect(subject).not_to receive(:remove_branch)
@@ -197,7 +197,7 @@ describe Gitlab::GithubImport::Importer do
       end
 
       context 'when pull request is closed' do
-        let(:gh_pull_request) { Gitlab::GithubImport::PullRequestFormatter.new(project, closed_pull_request) }
+        let(:gh_pull_request) { Gitlab::LegacyGithubImport::PullRequestFormatter.new(project, closed_pull_request) }
 
         it 'does remove branches' do
           expect(subject).to receive(:remove_branch).at_least(2).times
@@ -262,14 +262,14 @@ describe Gitlab::GithubImport::Importer do
     let(:repo_root) { 'https://github.com' }
     subject { described_class.new(project) }
 
-    it_behaves_like 'Gitlab::GithubImport::Importer#execute'
-    it_behaves_like 'Gitlab::GithubImport::Importer#execute an error occurs'
-    it_behaves_like 'Gitlab::GithubImport unit-testing'
+    it_behaves_like 'Gitlab::LegacyGithubImport::Importer#execute'
+    it_behaves_like 'Gitlab::LegacyGithubImport::Importer#execute an error occurs'
+    it_behaves_like 'Gitlab::LegacyGithubImport unit-testing'
 
     describe '#client' do
       it 'instantiates a Client' do
         allow(project).to receive(:import_data).and_return(double(credentials: credentials))
-        expect(Gitlab::GithubImport::Client).to receive(:new).with(
+        expect(Gitlab::LegacyGithubImport::Client).to receive(:new).with(
           credentials[:user],
           {}
         )
@@ -288,16 +288,16 @@ describe Gitlab::GithubImport::Importer do
       project.update(import_type: 'gitea', import_url: "#{repo_root}/foo/group/project.git")
     end
 
-    it_behaves_like 'Gitlab::GithubImport::Importer#execute' do
+    it_behaves_like 'Gitlab::LegacyGithubImport::Importer#execute' do
       let(:expected_not_called) { [:import_releases] }
     end
-    it_behaves_like 'Gitlab::GithubImport::Importer#execute an error occurs'
-    it_behaves_like 'Gitlab::GithubImport unit-testing'
+    it_behaves_like 'Gitlab::LegacyGithubImport::Importer#execute an error occurs'
+    it_behaves_like 'Gitlab::LegacyGithubImport unit-testing'
 
     describe '#client' do
       it 'instantiates a Client' do
         allow(project).to receive(:import_data).and_return(double(credentials: credentials))
-        expect(Gitlab::GithubImport::Client).to receive(:new).with(
+        expect(Gitlab::LegacyGithubImport::Client).to receive(:new).with(
           credentials[:user],
           { host: "#{repo_root}:443/foo", api_version: 'v1' }
         )
diff --git a/spec/lib/gitlab/github_import/issuable_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/issuable_formatter_spec.rb
index 05294d227bd..3b5d8945344 100644
--- a/spec/lib/gitlab/github_import/issuable_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/issuable_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::IssuableFormatter do
+describe Gitlab::LegacyGithubImport::IssuableFormatter do
   let(:raw_data) do
     double(number: 42)
   end
diff --git a/spec/lib/gitlab/github_import/issue_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/issue_formatter_spec.rb
index 0fc56d92aa6..1a4d5dbfb70 100644
--- a/spec/lib/gitlab/github_import/issue_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/issue_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::IssueFormatter do
+describe Gitlab::LegacyGithubImport::IssueFormatter do
   let(:client) { double }
   let!(:project) { create(:project, namespace: create(:namespace, path: 'octocat')) }
   let(:octocat) { double(id: 123456, login: 'octocat', email: 'octocat@example.com') }
@@ -30,7 +30,7 @@ describe Gitlab::GithubImport::IssueFormatter do
     allow(client).to receive(:user).and_return(octocat)
   end
 
-  shared_examples 'Gitlab::GithubImport::IssueFormatter#attributes' do
+  shared_examples 'Gitlab::LegacyGithubImport::IssueFormatter#attributes' do
     context 'when issue is open' do
       let(:raw_data) { double(base_data.merge(state: 'open')) }
 
@@ -135,7 +135,7 @@ describe Gitlab::GithubImport::IssueFormatter do
     end
   end
 
-  shared_examples 'Gitlab::GithubImport::IssueFormatter#number' do
+  shared_examples 'Gitlab::LegacyGithubImport::IssueFormatter#number' do
     let(:raw_data) { double(base_data.merge(number: 1347)) }
 
     it 'returns issue number' do
@@ -144,8 +144,8 @@ describe Gitlab::GithubImport::IssueFormatter do
   end
 
   context 'when importing a GitHub project' do
-    it_behaves_like 'Gitlab::GithubImport::IssueFormatter#attributes'
-    it_behaves_like 'Gitlab::GithubImport::IssueFormatter#number'
+    it_behaves_like 'Gitlab::LegacyGithubImport::IssueFormatter#attributes'
+    it_behaves_like 'Gitlab::LegacyGithubImport::IssueFormatter#number'
   end
 
   context 'when importing a Gitea project' do
@@ -153,8 +153,8 @@ describe Gitlab::GithubImport::IssueFormatter do
       project.update(import_type: 'gitea')
     end
 
-    it_behaves_like 'Gitlab::GithubImport::IssueFormatter#attributes'
-    it_behaves_like 'Gitlab::GithubImport::IssueFormatter#number'
+    it_behaves_like 'Gitlab::LegacyGithubImport::IssueFormatter#attributes'
+    it_behaves_like 'Gitlab::LegacyGithubImport::IssueFormatter#number'
   end
 
   describe '#has_comments?' do
diff --git a/spec/lib/gitlab/github_import/label_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/label_formatter_spec.rb
index 83fdd2cc415..0d1d04f1bf6 100644
--- a/spec/lib/gitlab/github_import/label_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/label_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::LabelFormatter do
+describe Gitlab::LegacyGithubImport::LabelFormatter do
   let(:project) { create(:project) }
   let(:raw) { double(name: 'improvements', color: 'e6e6e6') }
 
diff --git a/spec/lib/gitlab/github_import/milestone_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/milestone_formatter_spec.rb
index 683fa51b78e..1db4bbb568c 100644
--- a/spec/lib/gitlab/github_import/milestone_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/milestone_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::MilestoneFormatter do
+describe Gitlab::LegacyGithubImport::MilestoneFormatter do
   let(:project) { create(:project) }
   let(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') }
   let(:updated_at) { DateTime.strptime('2011-01-27T19:01:12Z') }
@@ -19,7 +19,7 @@ describe Gitlab::GithubImport::MilestoneFormatter do
 
   subject(:formatter) { described_class.new(project, raw_data) }
 
-  shared_examples 'Gitlab::GithubImport::MilestoneFormatter#attributes' do
+  shared_examples 'Gitlab::LegacyGithubImport::MilestoneFormatter#attributes' do
     let(:data) { base_data.merge(iid_attr => 1347) }
 
     context 'when milestone is open' do
@@ -82,7 +82,7 @@ describe Gitlab::GithubImport::MilestoneFormatter do
   end
 
   context 'when importing a GitHub project' do
-    it_behaves_like 'Gitlab::GithubImport::MilestoneFormatter#attributes'
+    it_behaves_like 'Gitlab::LegacyGithubImport::MilestoneFormatter#attributes'
   end
 
   context 'when importing a Gitea project' do
@@ -91,6 +91,6 @@ describe Gitlab::GithubImport::MilestoneFormatter do
       project.update(import_type: 'gitea')
     end
 
-    it_behaves_like 'Gitlab::GithubImport::MilestoneFormatter#attributes'
+    it_behaves_like 'Gitlab::LegacyGithubImport::MilestoneFormatter#attributes'
   end
 end
diff --git a/spec/lib/gitlab/github_import/project_creator_spec.rb b/spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
index 948e7469a18..737c9a624e0 100644
--- a/spec/lib/gitlab/github_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::ProjectCreator do
+describe Gitlab::LegacyGithubImport::ProjectCreator do
   let(:user) { create(:user) }
   let(:namespace) { create(:group, owner: user) }
 
diff --git a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/pull_request_formatter_spec.rb
index 2e42f6239b7..267a41e3f32 100644
--- a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/pull_request_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::PullRequestFormatter do
+describe Gitlab::LegacyGithubImport::PullRequestFormatter do
   let(:client) { double }
   let(:project) { create(:project, :repository) }
   let(:source_sha) { create(:commit, project: project).id }
@@ -44,7 +44,7 @@ describe Gitlab::GithubImport::PullRequestFormatter do
     allow(client).to receive(:user).and_return(octocat)
   end
 
-  shared_examples 'Gitlab::GithubImport::PullRequestFormatter#attributes' do
+  shared_examples 'Gitlab::LegacyGithubImport::PullRequestFormatter#attributes' do
     context 'when pull request is open' do
       let(:raw_data) { double(base_data.merge(state: 'open')) }
 
@@ -189,7 +189,7 @@ describe Gitlab::GithubImport::PullRequestFormatter do
     end
   end
 
-  shared_examples 'Gitlab::GithubImport::PullRequestFormatter#number' do
+  shared_examples 'Gitlab::LegacyGithubImport::PullRequestFormatter#number' do
     let(:raw_data) { double(base_data) }
 
     it 'returns pull request number' do
@@ -197,7 +197,7 @@ describe Gitlab::GithubImport::PullRequestFormatter do
     end
   end
 
-  shared_examples 'Gitlab::GithubImport::PullRequestFormatter#source_branch_name' do
+  shared_examples 'Gitlab::LegacyGithubImport::PullRequestFormatter#source_branch_name' do
     context 'when source branch exists' do
       let(:raw_data) { double(base_data) }
 
@@ -231,7 +231,7 @@ describe Gitlab::GithubImport::PullRequestFormatter do
     end
   end
 
-  shared_examples 'Gitlab::GithubImport::PullRequestFormatter#target_branch_name' do
+  shared_examples 'Gitlab::LegacyGithubImport::PullRequestFormatter#target_branch_name' do
     context 'when target branch exists' do
       let(:raw_data) { double(base_data) }
 
@@ -250,10 +250,10 @@ describe Gitlab::GithubImport::PullRequestFormatter do
   end
 
   context 'when importing a GitHub project' do
-    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#attributes'
-    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#number'
-    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#source_branch_name'
-    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#target_branch_name'
+    it_behaves_like 'Gitlab::LegacyGithubImport::PullRequestFormatter#attributes'
+    it_behaves_like 'Gitlab::LegacyGithubImport::PullRequestFormatter#number'
+    it_behaves_like 'Gitlab::LegacyGithubImport::PullRequestFormatter#source_branch_name'
+    it_behaves_like 'Gitlab::LegacyGithubImport::PullRequestFormatter#target_branch_name'
   end
 
   context 'when importing a Gitea project' do
@@ -261,10 +261,10 @@ describe Gitlab::GithubImport::PullRequestFormatter do
       project.update(import_type: 'gitea')
     end
 
-    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#attributes'
-    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#number'
-    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#source_branch_name'
-    it_behaves_like 'Gitlab::GithubImport::PullRequestFormatter#target_branch_name'
+    it_behaves_like 'Gitlab::LegacyGithubImport::PullRequestFormatter#attributes'
+    it_behaves_like 'Gitlab::LegacyGithubImport::PullRequestFormatter#number'
+    it_behaves_like 'Gitlab::LegacyGithubImport::PullRequestFormatter#source_branch_name'
+    it_behaves_like 'Gitlab::LegacyGithubImport::PullRequestFormatter#target_branch_name'
   end
 
   describe '#valid?' do
diff --git a/spec/lib/gitlab/github_import/release_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/release_formatter_spec.rb
index 926bf725d6a..082e3b36dd0 100644
--- a/spec/lib/gitlab/github_import/release_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/release_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::ReleaseFormatter do
+describe Gitlab::LegacyGithubImport::ReleaseFormatter do
   let!(:project) { create(:project, namespace: create(:namespace, path: 'octocat')) }
   let(:octocat) { double(id: 123456, login: 'octocat') }
   let(:created_at) { DateTime.strptime('2011-01-26T19:01:12Z') }
diff --git a/spec/lib/gitlab/github_import/user_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/user_formatter_spec.rb
index 98e3a7c28b9..3cd096eb0ad 100644
--- a/spec/lib/gitlab/github_import/user_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/user_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::UserFormatter do
+describe Gitlab::LegacyGithubImport::UserFormatter do
   let(:client) { double }
   let(:octocat) { double(id: 123456, login: 'octocat', email: 'octocat@example.com') }
 
diff --git a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb b/spec/lib/gitlab/legacy_github_import/wiki_formatter_spec.rb
index 2662cc20b32..7723533aee2 100644
--- a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
+++ b/spec/lib/gitlab/legacy_github_import/wiki_formatter_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::GithubImport::WikiFormatter do
+describe Gitlab::LegacyGithubImport::WikiFormatter do
   let(:project) do
     create(:project,
            namespace: create(:namespace, path: 'gitlabhq'),
diff --git a/spec/lib/gitlab/metrics/method_call_spec.rb b/spec/lib/gitlab/metrics/method_call_spec.rb
index f1e9e414e0d..5341addf911 100644
--- a/spec/lib/gitlab/metrics/method_call_spec.rb
+++ b/spec/lib/gitlab/metrics/method_call_spec.rb
@@ -13,16 +13,52 @@ describe Gitlab::Metrics::MethodCall do
       expect(method_call.call_count).to eq(1)
     end
 
-    it 'observes the performance of the supplied block' do
-      expect(described_class.call_real_duration_histogram)
-        .to receive(:observe)
-              .with({ module: :Foo, method: '#bar' }, be_a_kind_of(Numeric))
+    context 'when measurement is above threshold' do
+      before do
+        allow(method_call).to receive(:above_threshold?).and_return(true)
+      end
 
-      expect(described_class.call_cpu_duration_histogram)
-        .to receive(:observe)
-              .with({ module: :Foo, method: '#bar' }, be_a_kind_of(Numeric))
+      context 'prometheus instrumentation is enabled' do
+        before do
+          Feature.get(:prometheus_metrics_method_instrumentation).enable
+        end
 
-      method_call.measure { 'foo' }
+        it 'observes the performance of the supplied block' do
+          expect(described_class.call_duration_histogram)
+            .to receive(:observe)
+                  .with({ module: :Foo, method: '#bar' }, be_a_kind_of(Numeric))
+
+          method_call.measure { 'foo' }
+        end
+      end
+
+      context 'prometheus instrumentation is disabled' do
+        before do
+          Feature.get(:prometheus_metrics_method_instrumentation).disable
+        end
+
+        it 'does not observe the performance' do
+          expect(described_class.call_duration_histogram)
+            .not_to receive(:observe)
+
+          method_call.measure { 'foo' }
+        end
+      end
+    end
+
+    context 'when measurement is below threshold' do
+      before do
+        allow(method_call).to receive(:above_threshold?).and_return(false)
+
+        Feature.get(:prometheus_metrics_method_instrumentation).enable
+      end
+
+      it 'does not observe the performance' do
+        expect(described_class.call_duration_histogram)
+          .not_to receive(:observe)
+
+        method_call.measure { 'foo' }
+      end
     end
   end
 
@@ -43,7 +79,13 @@ describe Gitlab::Metrics::MethodCall do
   end
 
   describe '#above_threshold?' do
+    before do
+      allow(Gitlab::Metrics).to receive(:method_call_threshold).and_return(100)
+    end
+
     it 'returns false when the total call time is not above the threshold' do
+      expect(method_call).to receive(:real_time).and_return(9)
+
       expect(method_call.above_threshold?).to eq(false)
     end
 
diff --git a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
index 6d69b5305d2..ae1d8b47fe9 100644
--- a/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
+++ b/spec/lib/gitlab/metrics/sidekiq_middleware_spec.rb
@@ -4,32 +4,40 @@ describe Gitlab::Metrics::SidekiqMiddleware do
   let(:middleware) { described_class.new }
   let(:message) { { 'args' => ['test'], 'enqueued_at' => Time.new(2016, 6, 23, 6, 59).to_f } }
 
-  def run(worker, message)
-    expect(Gitlab::Metrics::BackgroundTransaction).to receive(:new)
-      .with(worker.class)
-      .and_call_original
-
-    expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:set)
-      .with(:sidekiq_queue_duration, instance_of(Float))
+  describe '#call' do
+    it 'tracks the transaction' do
+      worker = double(:worker, class: double(:class, name: 'TestWorker'))
 
-    expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:finish)
+      expect(Gitlab::Metrics::BackgroundTransaction).to receive(:new)
+        .with(worker.class)
+        .and_call_original
 
-    middleware.call(worker, message, :test) { nil }
-  end
+      expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:set)
+        .with(:sidekiq_queue_duration, instance_of(Float))
 
-  describe '#call' do
-    let(:test_worker_class) { double(:class, name: 'TestWorker') }
-    let(:worker) { double(:worker, class: test_worker_class) }
+      expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:finish)
 
-    it 'tracks the transaction' do
-      run(worker, message)
+      middleware.call(worker, message, :test) { nil }
     end
 
     it 'tracks the transaction (for messages without `enqueued_at`)' do
-      run(worker, {})
+      worker = double(:worker, class: double(:class, name: 'TestWorker'))
+
+      expect(Gitlab::Metrics::BackgroundTransaction).to receive(:new)
+        .with(worker.class)
+        .and_call_original
+
+      expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:set)
+        .with(:sidekiq_queue_duration, instance_of(Float))
+
+      expect_any_instance_of(Gitlab::Metrics::Transaction).to receive(:finish)
+
+      middleware.call(worker, {}, :test) { nil }
     end
 
     it 'tracks any raised exceptions' do
+      worker = double(:worker, class: double(:class, name: 'TestWorker'))
+
       expect_any_instance_of(Gitlab::Metrics::Transaction)
         .to receive(:run).and_raise(RuntimeError)
 
diff --git a/spec/lib/gitlab/middleware/go_spec.rb b/spec/lib/gitlab/middleware/go_spec.rb
index 67121937398..60a134be939 100644
--- a/spec/lib/gitlab/middleware/go_spec.rb
+++ b/spec/lib/gitlab/middleware/go_spec.rb
@@ -127,6 +127,14 @@ describe Gitlab::Middleware::Go do
 
         include_examples 'go-get=1', enabled_protocol: nil
       end
+
+      context 'with nothing disabled (blank string)' do
+        before do
+          stub_application_setting(enabled_git_access_protocol: '')
+        end
+
+        include_examples 'go-get=1', enabled_protocol: nil
+      end
     end
 
     def go
diff --git a/spec/lib/gitlab/middleware/read_only_spec.rb b/spec/lib/gitlab/middleware/read_only_spec.rb
index 86be06ff595..07ba11b93a3 100644
--- a/spec/lib/gitlab/middleware/read_only_spec.rb
+++ b/spec/lib/gitlab/middleware/read_only_spec.rb
@@ -84,21 +84,23 @@ describe Gitlab::Middleware::ReadOnly do
     end
 
     it 'expects POST of new file that looks like an LFS batch url to be disallowed' do
+      expect(Rails.application.routes).to receive(:recognize_path).and_call_original
       response = request.post('/root/gitlab-ce/new/master/app/info/lfs/objects/batch')
 
       expect(response).to be_a_redirect
       expect(subject).to disallow_request
     end
 
-    context 'whitelisted requests' do
-      it 'expects DELETE request to logout to be allowed' do
-        response = request.delete('/users/sign_out')
+    it 'returns last_vistited_url for disallowed request' do
+      response = request.post('/test_request')
 
-        expect(response).not_to be_a_redirect
-        expect(subject).not_to disallow_request
-      end
+      expect(response.location).to eq 'http://localhost/'
+    end
 
+    context 'whitelisted requests' do
       it 'expects a POST internal request to be allowed' do
+        expect(Rails.application.routes).not_to receive(:recognize_path)
+
         response = request.post("/api/#{API::API.version}/internal")
 
         expect(response).not_to be_a_redirect
@@ -106,6 +108,7 @@ describe Gitlab::Middleware::ReadOnly do
       end
 
       it 'expects a POST LFS request to batch URL to be allowed' do
+        expect(Rails.application.routes).to receive(:recognize_path).and_call_original
         response = request.post('/root/rouge.git/info/lfs/objects/batch')
 
         expect(response).not_to be_a_redirect
@@ -113,6 +116,7 @@ describe Gitlab::Middleware::ReadOnly do
       end
 
       it 'expects a POST request to git-upload-pack URL to be allowed' do
+        expect(Rails.application.routes).to receive(:recognize_path).and_call_original
         response = request.post('/root/rouge.git/git-upload-pack')
 
         expect(response).not_to be_a_redirect
diff --git a/spec/lib/gitlab/o_auth/user_spec.rb b/spec/lib/gitlab/o_auth/user_spec.rb
index c7471a21fda..2f19fb7312d 100644
--- a/spec/lib/gitlab/o_auth/user_spec.rb
+++ b/spec/lib/gitlab/o_auth/user_spec.rb
@@ -662,4 +662,13 @@ describe Gitlab::OAuth::User do
       end
     end
   end
+
+  describe '.find_by_uid_and_provider' do
+    let!(:existing_user) { create(:omniauth_user, extern_uid: 'my-uid', provider: 'my-provider') }
+
+    it 'normalizes extern_uid' do
+      allow(oauth_user.auth_hash).to receive(:uid).and_return('MY-UID')
+      expect(oauth_user.find_user).to eql gl_user
+    end
+  end
 end
diff --git a/spec/lib/gitlab/project_search_results_spec.rb b/spec/lib/gitlab/project_search_results_spec.rb
index 9c3e7d7e9ba..a424f0f5cfe 100644
--- a/spec/lib/gitlab/project_search_results_spec.rb
+++ b/spec/lib/gitlab/project_search_results_spec.rb
@@ -70,6 +70,15 @@ describe Gitlab::ProjectSearchResults do
 
       subject { described_class.parse_search_result(search_result) }
 
+      it 'can correctly parse filenames including ":"' do
+        special_char_result = "\nmaster:testdata/project::function1.yaml-1----\nmaster:testdata/project::function1.yaml:2:test: data1\n"
+
+        blob = described_class.parse_search_result(special_char_result)
+
+        expect(blob.ref).to eq('master')
+        expect(blob.filename).to eq('testdata/project::function1.yaml')
+      end
+
       it "returns a valid FoundBlob" do
         is_expected.to be_an Gitlab::SearchResults::FoundBlob
         expect(subject.id).to be_nil
diff --git a/spec/lib/gitlab/reference_extractor_spec.rb b/spec/lib/gitlab/reference_extractor_spec.rb
index 476a3f1998d..ef874368077 100644
--- a/spec/lib/gitlab/reference_extractor_spec.rb
+++ b/spec/lib/gitlab/reference_extractor_spec.rb
@@ -250,4 +250,34 @@ describe Gitlab::ReferenceExtractor do
     subject { described_class.references_pattern }
     it { is_expected.to be_kind_of Regexp }
   end
+
+  describe 'referables prefixes' do
+    def prefixes
+      described_class::REFERABLES.each_with_object({}) do |referable, result|
+        klass = referable.to_s.camelize.constantize
+
+        next unless klass.respond_to?(:reference_prefix)
+
+        prefix = klass.reference_prefix
+        result[prefix] ||= []
+        result[prefix] << referable
+      end
+    end
+
+    it 'returns all supported prefixes' do
+      expect(prefixes.keys.uniq).to match_array(%w(@ # ~ % ! $ &))
+    end
+
+    it 'does not allow one prefix for multiple referables if not allowed specificly' do
+      # make sure you are not overriding existing prefix before changing this hash
+      multiple_allowed = {
+        '@' => 3
+      }
+
+      prefixes.each do |prefix, referables|
+        expected_count = multiple_allowed[prefix] || 1
+        expect(referables.count).to eq(expected_count)
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/shell_spec.rb b/spec/lib/gitlab/shell_spec.rb
index 2158b2837e2..eec6858a5de 100644
--- a/spec/lib/gitlab/shell_spec.rb
+++ b/spec/lib/gitlab/shell_spec.rb
@@ -200,18 +200,18 @@ describe Gitlab::Shell do
     describe '#fork_repository' do
       it 'returns true when the command succeeds' do
         expect(Gitlab::Popen).to receive(:popen)
-          .with([projects_path, 'fork-project', 'current/storage', 'project/path.git', 'new/storage', 'new-namespace'],
+          .with([projects_path, 'fork-repository', 'current/storage', 'project/path.git', 'new/storage', 'fork/path.git'],
                 nil, popen_vars).and_return([nil, 0])
 
-        expect(gitlab_shell.fork_repository('current/storage', 'project/path', 'new/storage', 'new-namespace')).to be true
+        expect(gitlab_shell.fork_repository('current/storage', 'project/path', 'new/storage', 'fork/path')).to be true
       end
 
       it 'return false when the command fails' do
         expect(Gitlab::Popen).to receive(:popen)
-          .with([projects_path, 'fork-project', 'current/storage', 'project/path.git', 'new/storage', 'new-namespace'],
+          .with([projects_path, 'fork-repository', 'current/storage', 'project/path.git', 'new/storage', 'fork/path.git'],
                 nil, popen_vars).and_return(["error", 1])
 
-        expect(gitlab_shell.fork_repository('current/storage', 'project/path', 'new/storage', 'new-namespace')).to be false
+        expect(gitlab_shell.fork_repository('current/storage', 'project/path', 'new/storage', 'fork/path')).to be false
       end
     end
 
diff --git a/spec/lib/gitlab/sidekiq_config_spec.rb b/spec/lib/gitlab/sidekiq_config_spec.rb
new file mode 100644
index 00000000000..09f95be2213
--- /dev/null
+++ b/spec/lib/gitlab/sidekiq_config_spec.rb
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+describe Gitlab::SidekiqConfig do
+  describe '.workers' do
+    it 'includes all workers' do
+      workers = described_class.workers
+
+      expect(workers).to include(PostReceive)
+      expect(workers).to include(MergeWorker)
+    end
+  end
+
+  describe '.worker_queues' do
+    it 'includes all queues' do
+      queues = described_class.worker_queues
+
+      expect(queues).to include('post_receive')
+      expect(queues).to include('merge')
+      expect(queues).to include('cronjob')
+      expect(queues).to include('mailers')
+      expect(queues).to include('default')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/sql/pattern_spec.rb b/spec/lib/gitlab/sql/pattern_spec.rb
index 48d56628ed5..ef51e3cc8df 100644
--- a/spec/lib/gitlab/sql/pattern_spec.rb
+++ b/spec/lib/gitlab/sql/pattern_spec.rb
@@ -137,22 +137,22 @@ describe Gitlab::SQL::Pattern do
     end
   end
 
-  describe '.to_fuzzy_arel' do
-    subject(:to_fuzzy_arel) { Issue.to_fuzzy_arel(:title, query) }
+  describe '.fuzzy_arel_match' do
+    subject(:fuzzy_arel_match) { Issue.fuzzy_arel_match(:title, query) }
 
     context 'with a word equal to 3 chars' do
       let(:query) { 'foo' }
 
       it 'returns a single ILIKE condition' do
-        expect(to_fuzzy_arel.to_sql).to match(/title.*I?LIKE '\%foo\%'/)
+        expect(fuzzy_arel_match.to_sql).to match(/title.*I?LIKE '\%foo\%'/)
       end
     end
 
     context 'with a word shorter than 3 chars' do
       let(:query) { 'fo' }
 
-      it 'returns nil' do
-        expect(to_fuzzy_arel).to be_nil
+      it 'returns a single equality condition' do
+        expect(fuzzy_arel_match.to_sql).to match(/title.*I?LIKE 'fo'/)
       end
     end
 
@@ -160,7 +160,23 @@ describe Gitlab::SQL::Pattern do
       let(:query) { 'foo baz' }
 
       it 'returns a joining LIKE condition using a AND' do
-        expect(to_fuzzy_arel.to_sql).to match(/title.+I?LIKE '\%foo\%' AND .*title.*I?LIKE '\%baz\%'/)
+        expect(fuzzy_arel_match.to_sql).to match(/title.+I?LIKE '\%foo\%' AND .*title.*I?LIKE '\%baz\%'/)
+      end
+    end
+
+    context 'with two words both shorter than 3 chars' do
+      let(:query) { 'fo ba' }
+
+      it 'returns a single ILIKE condition' do
+        expect(fuzzy_arel_match.to_sql).to match(/title.*I?LIKE 'fo ba'/)
+      end
+    end
+
+    context 'with two words, one shorter 3 chars' do
+      let(:query) { 'foo ba' }
+
+      it 'returns a single ILIKE condition using the longer word' do
+        expect(fuzzy_arel_match.to_sql).to match(/title.+I?LIKE '\%foo\%'/)
       end
     end
 
@@ -168,7 +184,7 @@ describe Gitlab::SQL::Pattern do
       let(:query) { 'foo "really bar" baz' }
 
       it 'returns a joining LIKE condition using a AND' do
-        expect(to_fuzzy_arel.to_sql).to match(/title.+I?LIKE '\%foo\%' AND .*title.*I?LIKE '\%baz\%' AND .*title.*I?LIKE '\%really bar\%'/)
+        expect(fuzzy_arel_match.to_sql).to match(/title.+I?LIKE '\%foo\%' AND .*title.*I?LIKE '\%baz\%' AND .*title.*I?LIKE '\%really bar\%'/)
       end
     end
   end
diff --git a/spec/lib/gitlab/storage_check/cli_spec.rb b/spec/lib/gitlab/storage_check/cli_spec.rb
new file mode 100644
index 00000000000..6db0925899c
--- /dev/null
+++ b/spec/lib/gitlab/storage_check/cli_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Gitlab::StorageCheck::CLI do
+  let(:options) { Gitlab::StorageCheck::Options.new('unix://tmp/socket.sock', nil, 1, false) }
+  subject(:runner) { described_class.new(options) }
+
+  describe '#update_settings' do
+    it 'updates the interval when changed in a valid response and logs the change' do
+      fake_response = double
+      expect(fake_response).to receive(:valid?).and_return(true)
+      expect(fake_response).to receive(:check_interval).and_return(42)
+      expect(runner.logger).to receive(:info)
+
+      runner.update_settings(fake_response)
+
+      expect(options.interval).to eq(42)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/storage_check/gitlab_caller_spec.rb b/spec/lib/gitlab/storage_check/gitlab_caller_spec.rb
new file mode 100644
index 00000000000..d869022fd31
--- /dev/null
+++ b/spec/lib/gitlab/storage_check/gitlab_caller_spec.rb
@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Gitlab::StorageCheck::GitlabCaller do
+  let(:options) { Gitlab::StorageCheck::Options.new('unix://tmp/socket.sock', nil, nil, false) }
+  subject(:gitlab_caller) { described_class.new(options) }
+
+  describe '#call!' do
+    context 'when a socket is given' do
+      it 'calls a socket' do
+        fake_connection = double
+        expect(fake_connection).to receive(:post)
+        expect(Excon).to receive(:new).with('unix://tmp/socket.sock', socket: "tmp/socket.sock") { fake_connection }
+
+        gitlab_caller.call!
+      end
+    end
+
+    context 'when a host is given' do
+      let(:options) { Gitlab::StorageCheck::Options.new('http://localhost:8080', nil, nil, false) }
+
+      it 'it calls a http response' do
+        fake_connection = double
+        expect(Excon).to receive(:new).with('http://localhost:8080', socket: nil) { fake_connection }
+        expect(fake_connection).to receive(:post)
+
+        gitlab_caller.call!
+      end
+    end
+  end
+
+  describe '#headers' do
+    it 'Adds the JSON header' do
+      headers = gitlab_caller.headers
+
+      expect(headers['Content-Type']).to eq('application/json')
+    end
+
+    context 'when a token was provided' do
+      let(:options) { Gitlab::StorageCheck::Options.new('unix://tmp/socket.sock', 'atoken', nil, false) }
+
+      it 'adds it to the headers' do
+        expect(gitlab_caller.headers['TOKEN']).to eq('atoken')
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/storage_check/option_parser_spec.rb b/spec/lib/gitlab/storage_check/option_parser_spec.rb
new file mode 100644
index 00000000000..cad4dfbefcf
--- /dev/null
+++ b/spec/lib/gitlab/storage_check/option_parser_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Gitlab::StorageCheck::OptionParser do
+  describe '.parse!' do
+    it 'assigns all options' do
+      args = %w(--target unix://tmp/hello/world.sock --token thetoken --interval 42)
+
+      options = described_class.parse!(args)
+
+      expect(options.token).to eq('thetoken')
+      expect(options.interval).to eq(42)
+      expect(options.target).to eq('unix://tmp/hello/world.sock')
+    end
+
+    it 'requires the interval to be a number' do
+      args = %w(--target unix://tmp/hello/world.sock --interval fortytwo)
+
+      expect { described_class.parse!(args) }.to raise_error(OptionParser::InvalidArgument)
+    end
+
+    it 'raises an error if the scheme is not included' do
+      args = %w(--target tmp/hello/world.sock)
+
+      expect { described_class.parse!(args) }.to raise_error(OptionParser::InvalidArgument)
+    end
+
+    it 'raises an error if both socket and host are missing' do
+      expect { described_class.parse!([]) }.to raise_error(OptionParser::InvalidArgument)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/storage_check/response_spec.rb b/spec/lib/gitlab/storage_check/response_spec.rb
new file mode 100644
index 00000000000..0ff2963e443
--- /dev/null
+++ b/spec/lib/gitlab/storage_check/response_spec.rb
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Gitlab::StorageCheck::Response do
+  let(:fake_json) do
+    {
+      check_interval: 42,
+      results: [
+        { storage: 'working', success: true },
+        { storage: 'skipped', success: nil },
+        { storage: 'failing', success: false }
+      ]
+    }.to_json
+  end
+
+  let(:fake_http_response) do
+    fake_response = instance_double("Excon::Response - Status check")
+    allow(fake_response).to receive(:status).and_return(200)
+    allow(fake_response).to receive(:body).and_return(fake_json)
+    allow(fake_response).to receive(:headers).and_return('Content-Type' => 'application/json')
+
+    fake_response
+  end
+  let(:response) { described_class.new(fake_http_response) }
+
+  describe '#valid?' do
+    it 'is valid for a success response with parseable JSON' do
+      expect(response).to be_valid
+    end
+  end
+
+  describe '#check_interval' do
+    it 'returns the result from the JSON' do
+      expect(response.check_interval).to eq(42)
+    end
+  end
+
+  describe '#responsive_shards' do
+    it 'contains the names of working shards' do
+      expect(response.responsive_shards).to contain_exactly('working')
+    end
+  end
+
+  describe '#skipped_shards' do
+    it 'contains the names of skipped shards' do
+      expect(response.skipped_shards).to contain_exactly('skipped')
+    end
+  end
+
+  describe '#failing_shards' do
+    it 'contains the name of failing shards' do
+      expect(response.failing_shards).to contain_exactly('failing')
+    end
+  end
+end
diff --git a/spec/lib/gitlab/url_blocker_spec.rb b/spec/lib/gitlab/url_blocker_spec.rb
index f18823b61ef..d9b3c2350b1 100644
--- a/spec/lib/gitlab/url_blocker_spec.rb
+++ b/spec/lib/gitlab/url_blocker_spec.rb
@@ -20,6 +20,22 @@ describe Gitlab::UrlBlocker do
       expect(described_class.blocked_url?('https://gitlab.com:25/foo/foo.git')).to be true
     end
 
+    it 'returns true for alternative version of 127.0.0.1 (0177.1)' do
+      expect(described_class.blocked_url?('https://0177.1:65535/foo/foo.git')).to be true
+    end
+
+    it 'returns true for alternative version of 127.0.0.1 (0x7f.1)' do
+      expect(described_class.blocked_url?('https://0x7f.1:65535/foo/foo.git')).to be true
+    end
+
+    it 'returns true for alternative version of 127.0.0.1 (2130706433)' do
+      expect(described_class.blocked_url?('https://2130706433:65535/foo/foo.git')).to be true
+    end
+
+    it 'returns true for alternative version of 127.0.0.1 (127.000.000.001)' do
+      expect(described_class.blocked_url?('https://127.000.000.001:65535/foo/foo.git')).to be true
+    end
+
     it 'returns true for a non-alphanumeric hostname' do
       stub_resolv
 
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index a4c1113ae37..b5f2a15ada3 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -103,7 +103,7 @@ describe Gitlab::UsageData do
     subject { described_class.features_usage_data_ce }
 
     it 'gathers feature usage data' do
-      expect(subject[:signup]).to eq(current_application_settings.signup_enabled?)
+      expect(subject[:signup]).to eq(current_application_settings.allow_signup?)
       expect(subject[:ldap]).to eq(Gitlab.config.ldap.enabled)
       expect(subject[:gravatar]).to eq(current_application_settings.gravatar_enabled?)
       expect(subject[:omniauth]).to eq(Gitlab.config.omniauth.enabled)
diff --git a/spec/lib/gitlab/utils/strong_memoize_spec.rb b/spec/lib/gitlab/utils/strong_memoize_spec.rb
new file mode 100644
index 00000000000..4a104ab6d97
--- /dev/null
+++ b/spec/lib/gitlab/utils/strong_memoize_spec.rb
@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Gitlab::Utils::StrongMemoize do
+  let(:klass) do
+    struct = Struct.new(:value) do
+      def method_name
+        strong_memoize(:method_name) do
+          trace << value
+          value
+        end
+      end
+
+      def trace
+        @trace ||= []
+      end
+    end
+
+    struct.include(described_class)
+    struct
+  end
+
+  subject(:object) { klass.new(value) }
+
+  shared_examples 'caching the value' do
+    it 'only calls the block once' do
+      value0 = object.method_name
+      value1 = object.method_name
+
+      expect(value0).to eq(value)
+      expect(value1).to eq(value)
+      expect(object.trace).to contain_exactly(value)
+    end
+
+    it 'returns and defines the instance variable for the exact value' do
+      returned_value = object.method_name
+      memoized_value = object.instance_variable_get(:@method_name)
+
+      expect(returned_value).to eql(value)
+      expect(memoized_value).to eql(value)
+    end
+  end
+
+  describe '#strong_memoize' do
+    [nil, false, true, 'value', 0, [0]].each do |value|
+      context "with value #{value}" do
+        let(:value) { value }
+
+        it_behaves_like 'caching the value'
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/utils_spec.rb b/spec/lib/gitlab/utils_spec.rb
index 3137a72fdc4..e872a5290c5 100644
--- a/spec/lib/gitlab/utils_spec.rb
+++ b/spec/lib/gitlab/utils_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Utils do
-  delegate :to_boolean, :boolean_to_yes_no, :slugify, :random_string, to: :described_class
+  delegate :to_boolean, :boolean_to_yes_no, :slugify, :random_string, :which, to: :described_class
 
   describe '.slugify' do
     {
@@ -59,4 +59,12 @@ describe Gitlab::Utils do
       expect(random_string).to be_kind_of(String)
     end
   end
+
+  describe '.which' do
+    it 'finds the full path to an executable binary' do
+      expect(File).to receive(:executable?).with('/bin/sh').and_return(true)
+
+      expect(which('sh', 'PATH' => '/bin')).to eq('/bin/sh')
+    end
+  end
 end
diff --git a/spec/lib/google_api/cloud_platform/client_spec.rb b/spec/lib/google_api/cloud_platform/client_spec.rb
index fac23dce44d..ecb4034ec8b 100644
--- a/spec/lib/google_api/cloud_platform/client_spec.rb
+++ b/spec/lib/google_api/cloud_platform/client_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 describe GoogleApi::CloudPlatform::Client do
   let(:token) { 'token' }
   let(:client) { described_class.new(token, nil) }
+  let(:user_agent_options) { client.instance_eval { user_agent_header } }
 
   describe '.session_key_for_redirect_uri' do
     let(:state) { 'random_string' }
@@ -55,7 +56,8 @@ describe GoogleApi::CloudPlatform::Client do
 
     before do
       allow_any_instance_of(Google::Apis::ContainerV1::ContainerService)
-        .to receive(:get_zone_cluster).and_return(gke_cluster)
+        .to receive(:get_zone_cluster).with(any_args, options: user_agent_options)
+        .and_return(gke_cluster)
     end
 
     it { is_expected.to eq(gke_cluster) }
@@ -74,7 +76,8 @@ describe GoogleApi::CloudPlatform::Client do
 
     before do
       allow_any_instance_of(Google::Apis::ContainerV1::ContainerService)
-        .to receive(:create_cluster).and_return(operation)
+        .to receive(:create_cluster).with(any_args, options: user_agent_options)
+        .and_return(operation)
     end
 
     it { is_expected.to eq(operation) }
@@ -102,7 +105,8 @@ describe GoogleApi::CloudPlatform::Client do
 
     before do
       allow_any_instance_of(Google::Apis::ContainerV1::ContainerService)
-        .to receive(:get_zone_operation).and_return(operation)
+        .to receive(:get_zone_operation).with(any_args, options: user_agent_options)
+        .and_return(operation)
     end
 
     it { is_expected.to eq(operation) }
@@ -125,4 +129,18 @@ describe GoogleApi::CloudPlatform::Client do
       it { is_expected.to be_nil }
     end
   end
+
+  describe '#user_agent_header' do
+    subject { client.instance_eval { user_agent_header } }
+
+    it 'returns a RequestOptions object' do
+      expect(subject).to be_instance_of(Google::Apis::RequestOptions)
+    end
+
+    it 'has the correct GitLab version in User-Agent header' do
+      stub_const('Gitlab::VERSION', '10.3.0-pre')
+
+      expect(subject.header).to eq({ 'User-Agent': 'GitLab/10.3 (GPN:GitLab;)' })
+    end
+  end
 end
diff --git a/spec/lib/milestone_array_spec.rb b/spec/lib/milestone_array_spec.rb
new file mode 100644
index 00000000000..df91677b925
--- /dev/null
+++ b/spec/lib/milestone_array_spec.rb
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe MilestoneArray do
+  let(:object1) { instance_double("BirdMilestone", due_date: Time.now, start_date: Time.now - 15.days, title: 'v2.0') }
+  let(:object2) { instance_double("CatMilestone", due_date: Time.now - 1.day, start_date: nil, title: 'v1.0') }
+  let(:object3) { instance_double("DogMilestone", due_date: nil, start_date: Time.now - 30.days, title: 'v3.0') }
+  let(:array) { [object1, object3, object2] }
+
+  describe '#sort' do
+    it 'reorders array with due date in ascending order with nulls last' do
+      expect(described_class.sort(array, 'due_date_asc')).to eq([object2, object1, object3])
+    end
+
+    it 'reorders array with due date in desc order with nulls last' do
+      expect(described_class.sort(array, 'due_date_desc')).to eq([object1, object2, object3])
+    end
+
+    it 'reorders array with start date in ascending order with nulls last' do
+      expect(described_class.sort(array, 'start_date_asc')).to eq([object3, object1, object2])
+    end
+
+    it 'reorders array with start date in descending order with nulls last' do
+      expect(described_class.sort(array, 'start_date_desc')).to eq([object1, object3, object2])
+    end
+
+    it 'reorders array with title in ascending order' do
+      expect(described_class.sort(array, 'name_asc')).to eq([object2, object1, object3])
+    end
+
+    it 'reorders array with title in descending order' do
+      expect(described_class.sort(array, 'name_desc')).to eq([object3, object1, object2])
+    end
+  end
+end