Merge remote-tracking branch 'upstream/master' into rename-builds-controller

* upstream/master: (31 commits)
  Remove 'no changes' entries from changelog
  Check if OLD is set when migrating issue assignees
  Fix data migration from trigger schedules
  Replace EFS section in AWS guide
  Add warning about AWS EFS and performance
  Consolidate opening text from about.gitlab.com and add active/passive note
  Fix invalid object reference in ee_compat_check script
  Fix Ordered Task List Items
  Add auxiliary viewer for README
  Update fe_guide testing.md
  Add auxiliary blob viewer for CHANGELOG
  Add spec for last commit info when browsing repository files
  Show last commit for current tree on tree page
  Use same last commit widget on project homepage and tree view
  Fix unassigned checkmark
  Add missing changelog for iPython notebook rendering feature
  Convert fa-history to svg; tweak alignment
  Get rid of pluck in app/services/members/authorized_destroy_service.rb
  Removes duplicate environment variable in documentation
  Fixed spacing issues in issue sidebar
  ...

1 files changed, 17 insertions, 0 deletions

diff --git a/spec/serializers/merge_request_entity_spec.rb b/spec/serializers/merge_request_entity_spec.rb
index bb6e83ae4bd..b75c73e78c2 100644
--- a/spec/serializers/merge_request_entity_spec.rb
+++ b/spec/serializers/merge_request_entity_spec.rb
@@ -65,6 +65,23 @@ describe MergeRequestEntity do
       .to eq(resource.merge_commit_message(include_description: true))
   end
 
+  describe 'new_blob_path' do
+    context 'when user can push to project' do
+      it 'returns path' do
+        project.add_developer(user)
+
+        expect(subject[:new_blob_path])
+          .to eq("/#{resource.project.full_path}/new/#{resource.source_branch}")
+      end
+    end
+
+    context 'when user cannot push to project' do
+      it 'returns nil' do
+        expect(subject[:new_blob_path]).to be_nil
+      end
+    end
+  end
+
   describe 'diff_head_sha' do
     before do
       allow(resource).to receive(:diff_head_sha) { 'sha' }