Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-20

app/assets/javascripts/single_file_diff.js

@@ -88,6 +88,8 @@ export default class SingleFileDiff {
 
         if (cb) cb();
       })
-      .catch(createFlash(__('An error occurred while retrieving diff')));
+      .catch(() => {
+        createFlash(__('An error occurred while retrieving diff'));
+      });
   }
 }

app/controllers/root_controller.rb

@@ -13,8 +13,11 @@ class RootController < Dashboard::ProjectsController
   before_action :redirect_logged_user, if: -> { current_user.present? }
 
   def index
+    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37434
+    Gitlab::GitalyClient.allow_n_plus_1_calls do
       super
     end
+  end
 
   private
 

bin/changelog

@@ -214,9 +214,10 @@ class ChangelogEntry
   end
 
   def unreleased_path
-    File.join('changelogs', 'unreleased').tap do |path|
-      path << '-ee' if ee?
-    end
+    path = File.join('changelogs', 'unreleased')
+    path = File.join('ee', path) if ee?
+
+    path
   end
 
   def ee?

doc/development/changelog.md

@@ -125,7 +125,7 @@ author:
 type:
 ```
 If you're working on the GitLab EE repository, the entry will be added to
-`changelogs/unreleased-ee/` instead.
+`ee/changelogs/unreleased/` instead.
 
 ### Arguments
 

doc/user/project/integrations/custom_issue_tracker.md

@@ -13,6 +13,8 @@ in the table below.
 | `issues_url`    | The URL to the issue in the issue tracker project that is linked to this GitLab project. Note that the `issues_url` requires `:id` in the URL. This ID is used by GitLab as a placeholder to replace the issue number. For example, `https://customissuetracker.com/project-name/:id`. |
 | `new_issue_url` | Currently unused. Will be changed in a future release. |
 
+Once you have configured and enabled Custom Issue Tracker Service you'll see a link on the GitLab project pages that takes you to that custom issue tracker.
+
 
 ## Referencing issues
 

spec/lib/gitlab/git/blob_spec.rb

@@ -276,6 +276,7 @@ describe Gitlab::Git::Blob, seed_helper: true do
 
         expect(blobs.count).to eq(1)
         expect(blobs).to all( be_a(Gitlab::Git::Blob) )
+        expect(blobs).to be_an(Array)
       end
 
       it 'accepts blob IDs as a lazy enumerator' do

spec/lib/gitlab/git/commit_spec.rb

@@ -102,6 +102,10 @@ describe Gitlab::Git::Commit, seed_helper: true do
         expect(described_class.find(repository, SeedRepo::Commit::ID)).to be_valid_commit
       end
 
+      it "returns an array of parent ids" do
+        expect(described_class.find(repository, SeedRepo::Commit::ID).parent_ids).to be_an(Array)
+      end
+
       it "should return valid commit for tag" do
         expect(described_class.find(repository, 'v1.0.0').id).to eq('6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9')
       end