Add latest changes from gitlab-org/gitlab@master

6 files changed, 33 insertions, 13 deletions

diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index bac5c9f568e..acdc38038aa 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 describe 'Contributions Calendar', :js do
+  include MobileHelpers
+
   let(:user) { create(:user) }
   let(:contributed_project) { create(:project, :public, :repository) }
   let(:issue_note) { create(:note, project: contributed_project) }
@@ -122,15 +124,15 @@ describe 'Contributions Calendar', :js do
     end
   end
 
-  describe 'calendar daily activities' do
-    shared_context 'visit user page' do
-      before do
-        visit user.username
-        page.find('.js-overview-tab a').click
-        wait_for_requests
-      end
+  shared_context 'visit user page' do
+    before do
+      visit user.username
+      page.find('.js-overview-tab a').click
+      wait_for_requests
     end
+  end
 
+  describe 'calendar daily activities' do
     shared_examples 'a day with activity' do |contribution_count:|
       include_context 'visit user page'
 
@@ -199,4 +201,22 @@ describe 'Contributions Calendar', :js do
       end
     end
   end
+
+  describe 'on smaller screens' do
+    shared_examples 'hidden activity calendar' do
+      include_context 'visit user page'
+
+      it 'hides the activity calender' do
+        expect(find('#js-overview')).not_to have_css('.js-contrib-calendar')
+      end
+    end
+
+    context 'size xs' do
+      before do
+        resize_screen_xs
+      end
+
+      it_behaves_like 'hidden activity calendar'
+    end
+  end
 end
diff --git a/spec/features/invites_spec.rb b/spec/features/invites_spec.rb
index 0571ab007e9..7884a16c118 100644
--- a/spec/features/invites_spec.rb
+++ b/spec/features/invites_spec.rb
@@ -169,7 +169,7 @@ describe 'Invites' do
         end
       end
 
-      it "doesn't accept invitations until the user confirms his email" do
+      it "doesn't accept invitations until the user confirms their email" do
         fill_in_sign_up_form(new_user)
         sign_in(owner)
 
diff --git a/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb b/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
index 1f4d555c6ae..cf9441bcd55 100644
--- a/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
+++ b/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Group member cannot request access to his group project' do
+describe 'Projects > Members > Group member cannot request access to their group project' do
   let(:user) { create(:user) }
   let(:group) { create(:group) }
   let(:project) { create(:project, namespace: group) }
diff --git a/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
index 606444b36a2..e2b57472b2e 100644
--- a/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
+++ b/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Member cannot request access to his project' do
+describe 'Projects > Members > Member cannot request access to their project' do
   let(:member) { create(:user) }
   let(:project) { create(:project) }
 
diff --git a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
index 2fb76da36ad..5643a29b4e4 100644
--- a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
+++ b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Projects > Members > Owner cannot request access to his project' do
+describe 'Projects > Members > Owner cannot request access to their own project' do
   let(:project) { create(:project) }
 
   before do
diff --git a/spec/features/signed_commits_spec.rb b/spec/features/signed_commits_spec.rb
index f56bd055224..851e155480b 100644
--- a/spec/features/signed_commits_spec.rb
+++ b/spec/features/signed_commits_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 describe 'GPG signed commits' do
   let(:project) { create(:project, :public, :repository) }
 
-  it 'changes from unverified to verified when the user changes his email to match the gpg key', :sidekiq_might_not_need_inline do
+  it 'changes from unverified to verified when the user changes their email to match the gpg key', :sidekiq_might_not_need_inline do
     ref = GpgHelpers::SIGNED_AND_AUTHORED_SHA
     user = create(:user, email: 'unrelated.user@example.org')
 
@@ -18,7 +18,7 @@ describe 'GPG signed commits' do
     expect(page).to have_button 'Unverified'
     expect(page).not_to have_button 'Verified'
 
-    # user changes his email which makes the gpg key verified
+    # user changes their email which makes the gpg key verified
     perform_enqueued_jobs do
       user.skip_reconfirmation!
       user.update!(email: GpgHelpers::User1.emails.first)