Automatic merge of gitlab-org/gitlab-ce master

doc/ci/yaml/README.md

@@ -2078,8 +2078,8 @@ of the `group/my-project`:
 
 ```yaml
 include:
-  - local: : /templates/docker-build.yml
-  - local: : /templates/docker-testing.yml
+  - local: /templates/docker-build.yml
+  - local: /templates/docker-testing.yml
 ```
 
 Our `/templates/docker-build.yml` present in `group/my-project` adds a `docker-build` job:

doc/install/installation.md

@@ -111,7 +111,7 @@ sudo apt-get install -y libcurl4-openssl-dev libexpat1-dev gettext libz-dev libs
 # Download and compile from source
 cd /tmp
 curl --remote-name --location --progress https://www.kernel.org/pub/software/scm/git/git-2.21.0.tar.gz
-echo '85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee'  git-2.21.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.21.0.tar.gz
+echo '85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee  git-2.21.0.tar.gz' | shasum -a256 -c - && tar -xzf git-2.21.0.tar.gz
 cd git-2.21.0/
 ./configure
 make prefix=/usr/local all

spec/features/dashboard/user_filters_projects_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'Dashboard > User filters projects' do
   let(:user) { create(:user) }
-  let(:project) { create(:project, name: 'Victorialand', namespace: user.namespace) }
+  let(:project) { create(:project, name: 'Victorialand', namespace: user.namespace, created_at: 2.seconds.ago, updated_at: 2.seconds.ago) }
   let(:user2) { create(:user) }
-  let(:project2) { create(:project, name: 'Treasure', namespace: user2.namespace) }
+  let(:project2) { create(:project, name: 'Treasure', namespace: user2.namespace, created_at: 1.second.ago, updated_at: 1.second.ago) }
 
   before do
     project.add_maintainer(user)
@@ -129,7 +129,7 @@ describe 'Dashboard > User filters projects' do
 
         list = page.all('.projects-list .project-name').map(&:text)
 
-        expect(list).to match(["Private project", "Treasure", "Victorialand"])
+        expect(list).to contain_exactly("Private project", "Treasure", "Victorialand")
       end
 
       it 'filters internal projects only' do
@@ -139,14 +139,14 @@ describe 'Dashboard > User filters projects' do
 
         list = page.all('.projects-list .project-name').map(&:text)
 
-        expect(list).to match(['Internal project'])
+        expect(list).to contain_exactly('Internal project')
       end
 
       it 'filters any project' do
         select_dropdown_option '#filtered-search-visibility-dropdown', 'Any'
         list = page.all('.projects-list .project-name').map(&:text)
 
-        expect(list).to match(["Internal project", "Private project", "Treasure", "Victorialand"])
+        expect(list).to contain_exactly("Internal project", "Private project", "Treasure", "Victorialand")
       end
     end