Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-filefix-git-hooks-when-creating-file

* upstream/master: (190 commits)
  Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion.
  update spec
  Change the reply shortcut to focus the field even without a selection.
  use destroy_all
  Remove settings cog from within admin scroll tabs; keep links centered
  add changelog
  remove old project members from project
  add spec replicating validation error
  Fix small typo on new branch button spec
  Improve styling of the new issue message
  Don't capitalize environment name in show page
  Abillity to promote project labels to group labels
  Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles
  Update and pin the `jwt` gem to ~> 1.5.6
  refactor merge request build service
  Update index.md
  Clarify that Auto Deploy requires a public project.
  19164 Add settings dropdown to mobile screens
  cop for gem fetched from a git source
  Add CHANGELOG entry
  ...

2 files changed, 45 insertions, 0 deletions

diff --git a/spec/helpers/issuables_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb
index a4f08dc4af0..df71680e44c 100644
--- a/spec/helpers/issuables_helper_spec.rb
+++ b/spec/helpers/issuables_helper_spec.rb
@@ -115,6 +115,46 @@ describe IssuablesHelper do
     end
   end
 
+  describe '#issuable_reference' do
+    context 'when show_full_reference truthy' do
+      it 'display issuable full reference' do
+        assign(:show_full_reference, true)
+        issue = build_stubbed(:issue)
+
+        expect(helper.issuable_reference(issue)).to eql(issue.to_reference(full: true))
+      end
+    end
+
+    context 'when show_full_reference falsey' do
+      context 'when @group present' do
+        it 'display issuable reference to @group' do
+          project = build_stubbed(:project)
+
+          assign(:show_full_reference, nil)
+          assign(:group, project.namespace)
+
+          issue = build_stubbed(:issue)
+
+          expect(helper.issuable_reference(issue)).to eql(issue.to_reference(project.namespace))
+        end
+      end
+
+      context 'when @project present' do
+        it 'display issuable reference to @project' do
+          project = build_stubbed(:project)
+
+          assign(:show_full_reference, nil)
+          assign(:group, nil)
+          assign(:project, project)
+
+          issue = build_stubbed(:issue)
+
+          expect(helper.issuable_reference(issue)).to eql(issue.to_reference(project))
+        end
+      end
+    end
+  end
+
   describe '#issuable_filter_present?' do
     it 'returns true when any key is present' do
       allow(helper).to receive(:params).and_return(
diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index e51720f10ed..b7e547dc1f5 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -41,6 +41,11 @@ describe SearchHelper do
         expect(search_autocomplete_opts("gro").size).to eq(1)
       end
 
+      it "includes nested group" do
+        create(:group, :nested, name: 'foo').add_owner(user)
+        expect(search_autocomplete_opts('foo').size).to eq(1)
+      end
+
       it "includes the user's projects" do
         project = create(:empty_project, namespace: create(:namespace, owner: user))
         expect(search_autocomplete_opts(project.name).size).to eq(1)