Merge branch '11-7-stable-prepare-rc3' into '11-7-stable'

Prepare 11.7 RC3 release

See merge request gitlab-org/gitlab-ce!24241

app/assets/javascripts/releases/components/release_block.vue

@@ -87,7 +87,7 @@ export default {
       <div
         v-if="assets.links.length || assets.sources.length"
-        Sclass="card-text prepend-top-default"
+        class="card-text prepend-top-default"
       >
         <b>
           {{ __('Assets') }}

app/models/repository.rb

@@ -1072,19 +1072,11 @@ class Repository
   end
   def cache
-    @cache ||= if is_wiki
-                 Gitlab::RepositoryCache.new(self, extra_namespace: 'wiki')
-               else
-                 Gitlab::RepositoryCache.new(self)
-               end
+    @cache ||= Gitlab::RepositoryCache.new(self)
   end
   def request_store_cache
-    @request_store_cache ||= if is_wiki
-                               Gitlab::RepositoryCache.new(self, extra_namespace: 'wiki', backend: Gitlab::SafeRequestStore)
-                             else
-                               Gitlab::RepositoryCache.new(self, backend: Gitlab::SafeRequestStore)
-                             end
+    @request_store_cache ||= Gitlab::RepositoryCache.new(self, backend: Gitlab::SafeRequestStore)
   end
   def tags_sorted_by_committed_date

app/views/shared/issuable/_sidebar_assignees.html.haml

@@ -25,7 +25,7 @@
   .value.hide-collapsed
     - if issuable_sidebar[:assignee]
       = link_to_member(@project, assignee, size: 32, extra_class: 'bold') do
-        - if issuable_sidebar[:assignee][:can_merge]
+        - unless issuable_sidebar[:assignee][:can_merge]
           %span.float-right.cannot-be-merged{ data: { toggle: 'tooltip', placement: 'left' }, title: _('Not allowed to merge') }
             = icon('exclamation-triangle', 'aria-hidden': 'true')
         %span.username

changelogs/unreleased/56076-releases-margin.yml

+---
+title: Fixes missing margin in releases block
+merge_request:
+author:
+type: fixed

lib/gitlab/repository_cache.rb

@@ -7,13 +7,13 @@ module Gitlab
     def initialize(repository, extra_namespace: nil, backend: Rails.cache)
       @repository = repository
-      @namespace = "project:#{repository.project.id}"
+      @namespace = "#{repository.full_path}:#{repository.project.id}"
       @namespace = "#{@namespace}:#{extra_namespace}" if extra_namespace
       @backend = backend
     end
     def cache_key(type)
-      "#{namespace}:#{type}"
+      "#{type}:#{namespace}"
     end
     def expire(key)

spec/features/projects/files/user_browses_lfs_files_spec.rb

@@ -12,6 +12,7 @@ describe 'Projects > Files > User browses LFS files' do
     before do
       allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(false)
       visit project_tree_path(project, 'lfs')
+      wait_for_requests
     end
     it 'is possible to see raw content of LFS pointer' do
@@ -26,10 +27,11 @@ describe 'Projects > Files > User browses LFS files' do
     end
   end
-  context 'when LFS is enabled' do
+  context 'when LFS is enabled', :js do
     before do
       allow_any_instance_of(Project).to receive(:lfs_enabled?).and_return(true)
       visit project_tree_path(project, 'lfs')
+      wait_for_requests
     end
     it 'shows an LFS object' do

spec/lib/gitlab/repository_cache_spec.rb

@@ -4,14 +4,14 @@ describe Gitlab::RepositoryCache do
   let(:backend) { double('backend').as_null_object }
   let(:project) { create(:project) }
   let(:repository) { project.repository }
-  let(:namespace) { "project:#{project.id}" }
+  let(:namespace) { "#{repository.full_path}:#{project.id}" }
   let(:cache) { described_class.new(repository, backend: backend) }
   describe '#cache_key' do
     subject { cache.cache_key(:foo) }
     it 'includes the namespace' do
-      expect(subject).to eq "#{namespace}:foo"
+      expect(subject).to eq "foo:#{namespace}"
     end
     context 'with a given namespace' do
@@ -22,7 +22,7 @@ describe Gitlab::RepositoryCache do
       end
       it 'includes the full namespace' do
-        expect(subject).to eq "#{namespace}:#{extra_namespace}:foo"
+        expect(subject).to eq "foo:#{namespace}:#{extra_namespace}"
       end
     end
   end
@@ -30,21 +30,21 @@ describe Gitlab::RepositoryCache do
   describe '#expire' do
     it 'expires the given key from the cache' do
       cache.expire(:foo)
-      expect(backend).to have_received(:delete).with("#{namespace}:foo")
+      expect(backend).to have_received(:delete).with("foo:#{namespace}")
     end
   end
   describe '#fetch' do
     it 'fetches the given key from the cache' do
       cache.fetch(:bar)
-      expect(backend).to have_received(:fetch).with("#{namespace}:bar")
+      expect(backend).to have_received(:fetch).with("bar:#{namespace}")
     end
     it 'accepts a block' do
       p = -> {}
       cache.fetch(:baz, &p)
-      expect(backend).to have_received(:fetch).with("#{namespace}:baz", &p)
+      expect(backend).to have_received(:fetch).with("baz:#{namespace}", &p)
     end
   end
@@ -67,7 +67,7 @@ describe Gitlab::RepositoryCache do
         end
         it 'caches the value' do
-          expect(backend).to receive(:write).with("#{namespace}:#{key}", true)
+          expect(backend).to receive(:write).with("#{key}:#{namespace}", true)
           cache.fetch_without_caching_false(key) { true }
         end
@@ -83,7 +83,7 @@ describe Gitlab::RepositoryCache do
         end
         it 'does not cache the value' do
-          expect(backend).not_to receive(:write).with("#{namespace}:#{key}", true)
+          expect(backend).not_to receive(:write).with("#{key}:#{namespace}", true)
           cache.fetch_without_caching_false(key, &p)
         end
@@ -92,7 +92,7 @@ describe Gitlab::RepositoryCache do
     context 'when the cached value is truthy' do
       before do
-        backend.write("#{namespace}:#{key}", true)
+        backend.write("#{key}:#{namespace}", true)
       end
       it 'returns the cached value' do
@@ -116,7 +116,7 @@ describe Gitlab::RepositoryCache do
     context 'when the cached value is falsey' do
       before do
-        backend.write("#{namespace}:#{key}", false)
+        backend.write("#{key}:#{namespace}", false)
       end
       it 'returns the result of the block' do
@@ -126,7 +126,7 @@ describe Gitlab::RepositoryCache do
       end
       it 'writes the truthy value to the cache' do
-        expect(backend).to receive(:write).with("#{namespace}:#{key}", 'block result')
+        expect(backend).to receive(:write).with("#{key}:#{namespace}", 'block result')
         cache.fetch_without_caching_false(key) { 'block result' }
       end

spec/models/repository_spec.rb

@@ -2400,22 +2400,4 @@ describe Repository do
       repository.merge_base('master', 'fix')
     end
   end
-
-  describe '#cache' do
-    subject(:cache) { repository.send(:cache) }
-
-    it 'returns a RepositoryCache' do
-      expect(subject).to be_kind_of Gitlab::RepositoryCache
-    end
-
-    it 'when is_wiki it includes wiki as part of key' do
-      allow(repository).to receive(:is_wiki) { true }
-
-      expect(subject.namespace).to include('wiki')
-    end
-
-    it 'when is_wiki is false extra_namespace is nil' do
-      expect(subject.namespace).not_to include('wiki')
-    end
-  end
 end

spec/views/projects/merge_requests/show.html.haml_spec.rb

@@ -32,11 +32,7 @@ describe 'projects/merge_requests/show.html.haml' do
     assign(:noteable, closed_merge_request)
     assign(:notes, [])
     assign(:pipelines, Ci::Pipeline.none)
-    assign(
-      :issuable_sidebar,
-      MergeRequestSerializer.new(current_user: user, project: project)
-        .represent(closed_merge_request, serializer: 'sidebar')
-    )
+    assign(:issuable_sidebar, serialize_issuable_sidebar(user, project, closed_merge_request))
     preload_view_requirements
@@ -45,6 +41,33 @@ describe 'projects/merge_requests/show.html.haml' do
                                     current_application_settings: Gitlab::CurrentSettings.current_application_settings)
   end
+  describe 'merge request assignee sidebar' do
+    context 'when assignee is allowed to merge' do
+      it 'does not show a warning icon' do
+        closed_merge_request.update(assignee_id: user.id)
+        project.add_maintainer(user)
+        assign(:issuable_sidebar, serialize_issuable_sidebar(user, project, closed_merge_request))
+
+        render
+
+        expect(rendered).not_to have_css('.cannot-be-merged')
+      end
+    end
+
+    context 'when assignee is not allowed to merge' do
+      it 'shows a warning icon' do
+        reporter = create(:user)
+        project.add_reporter(reporter)
+        closed_merge_request.update(assignee_id: reporter.id)
+        assign(:issuable_sidebar, serialize_issuable_sidebar(user, project, closed_merge_request))
+
+        render
+
+        expect(rendered).to have_css('.cannot-be-merged')
+      end
+    end
+  end
+
   context 'when the merge request is closed' do
     it 'shows the "Reopen" button' do
       render
@@ -80,4 +103,10 @@ describe 'projects/merge_requests/show.html.haml' do
       expect(rendered).to have_css('a', visible: false, text: 'Close')
     end
   end
+
+  def serialize_issuable_sidebar(user, project, merge_request)
+    MergeRequestSerializer
+      .new(current_user: user, project: project)
+      .represent(closed_merge_request, serializer: 'sidebar')
+  end
 end