Merge branch...

Merge branch '9540-broken-master-due-to-spec-finders-merge_requests_finder_spec-rb-292-syntax-error-unexpected-keyword_end-expecting-end-of-input' into 'master'

Resolve "Broken master due to "spec/finders/merge_requests_finder_spec.rb:292: syntax error, unexpected keyword_end, expecting end-of-input""

Closes #9540

See merge request gitlab-org/gitlab-ee!9379

app/views/layouts/nav/sidebar/_project.html.haml

@@ -301,6 +301,7 @@
                   = _('Packages')
 
       - if project_nav_tab? :wiki
+        - wiki_url = project_wiki_path(@project, :home)
         = nav_link(controller: :wikis) do
           = link_to wiki_url, class: 'shortcuts-wiki qa-wiki-link' do
             .nav-icon-container

locale/gitlab.pot

@@ -3722,6 +3722,9 @@ msgstr ""
 msgid "External URL"
 msgstr ""
 
+msgid "External Wiki"
+msgstr ""
+
 msgid "External authentication"
 msgstr ""
 

spec/finders/merge_requests_finder_spec.rb

@@ -74,8 +74,9 @@ describe MergeRequestsFinder do
       expect(merge_requests.size).to eq(2)
     end
 
-    it 'filters by group' do
-      params = { group_id: group.id }
+    context 'filtering by group' do
+      it 'includes all merge requests when user has access' do
+        params = { group_id: group.id }
 
         merge_requests = described_class.new(user, params).execute
 

spec/services/members/destroy_service_spec.rb

@@ -51,11 +51,15 @@ describe Members::DestroyService do
 
       expect(member_user.assigned_open_merge_requests_count).to be(1)
       expect(member_user.assigned_open_issues_count).to be(1)
+      expect(member_user.todos_pending_count).to be(1)
+      expect(member_user.todos_done_count).to be(1)
 
       described_class.new(current_user).execute(member, opts)
 
       expect(member_user.assigned_open_merge_requests_count).to be(0)
       expect(member_user.assigned_open_issues_count).to be(0)
+      expect(member_user.todos_pending_count).to be(0)
+      expect(member_user.todos_done_count).to be(0)
     end
   end