Merge branch 'master' into sh-headless-chrome-support

* master: (113 commits)
  Introduce new hook data builders for Issue and MergeRequest
  Don't create todos for old issue assignees
  Start adding Gitlab::HookData::IssuableBuilder
  Include the changes in issuable webhook payloads
  Rename the `codeclimate` job to `codequality`
  Don't show an "Unsubscribe" link in snippet comment notifications
  Add QA::Scenario::Gitlab::Group::Create
  Removes CommitsList from global namespace
  Fix wiki empty page translation namespace not being removed
  Fixes mini graph in commit view
  Fix link to new i18n index page
  Update i18n docs
  Move i18n/introduction to i18n/index
  Resolve "Simple documentation update - backup to restore in restore section"
  Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace
  Move cycle analytics banner into a vue file
  Updated Icons + Fix for Collapsed Groups Angle
  Don't create fork networks for root projects that are deleted
  Remove executable permissions on images to make docs lint happy
  Sync up hard coded DN class in migration
  ...

1 files changed, 14 insertions, 14 deletions

diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 961d0202a5c..cd97dd18c00 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -270,7 +270,7 @@ describe 'Issues', :js do
       visit namespace_project_issues_path(user.namespace, project1)
     end
 
-    it 'changes incoming email address token', js: true do
+    it 'changes incoming email address token', :js do
       find('.issue-email-modal-btn').click
       previous_token = find('input#issue_email').value
       find('.incoming-email-token-reset').click
@@ -286,7 +286,7 @@ describe 'Issues', :js do
     end
   end
 
-  describe 'update labels from issue#show', js: true do
+  describe 'update labels from issue#show', :js do
     let(:issue) { create(:issue, project: project, author: user, assignees: [user]) }
     let!(:label) { create(:label, project: project) }
 
@@ -309,7 +309,7 @@ describe 'Issues', :js do
     let(:issue) { create(:issue, project: project, author: user, assignees: [user]) }
 
     context 'by authorized user' do
-      it 'allows user to select unassigned', js: true do
+      it 'allows user to select unassigned', :js do
         visit project_issue_path(project, issue)
 
         page.within('.assignee') do
@@ -327,7 +327,7 @@ describe 'Issues', :js do
         expect(issue.reload.assignees).to be_empty
       end
 
-      it 'allows user to select an assignee', js: true do
+      it 'allows user to select an assignee', :js do
         issue2 = create(:issue, project: project, author: user)
         visit project_issue_path(project, issue2)
 
@@ -348,7 +348,7 @@ describe 'Issues', :js do
         end
       end
 
-      it 'allows user to unselect themselves', js: true do
+      it 'allows user to unselect themselves', :js do
         issue2 = create(:issue, project: project, author: user)
         visit project_issue_path(project, issue2)
 
@@ -377,7 +377,7 @@ describe 'Issues', :js do
         project.team << [[guest], :guest]
       end
 
-      it 'shows assignee text', js: true do
+      it 'shows assignee text', :js do
         sign_out(:user)
         sign_in(guest)
 
@@ -392,7 +392,7 @@ describe 'Issues', :js do
     let!(:milestone) { create(:milestone, project: project) }
 
     context 'by authorized user' do
-      it 'allows user to select unassigned', js: true do
+      it 'allows user to select unassigned', :js do
         visit project_issue_path(project, issue)
 
         page.within('.milestone') do
@@ -410,7 +410,7 @@ describe 'Issues', :js do
         expect(issue.reload.milestone).to be_nil
       end
 
-      it 'allows user to de-select milestone', js: true do
+      it 'allows user to de-select milestone', :js do
         visit project_issue_path(project, issue)
 
         page.within('.milestone') do
@@ -440,7 +440,7 @@ describe 'Issues', :js do
         issue.save
       end
 
-      it 'shows milestone text', js: true do
+      it 'shows milestone text', :js do
         sign_out(:user)
         sign_in(guest)
 
@@ -473,7 +473,7 @@ describe 'Issues', :js do
       end
     end
 
-    context 'dropzone upload file', js: true do
+    context 'dropzone upload file', :js do
       before do
         visit new_project_issue_path(project)
       end
@@ -544,7 +544,7 @@ describe 'Issues', :js do
   end
 
   describe 'due date' do
-    context 'update due on issue#show', js: true do
+    context 'update due on issue#show', :js do
       let(:issue) { create(:issue, project: project, author: user, assignees: [user]) }
 
       before do
@@ -588,8 +588,8 @@ describe 'Issues', :js do
     end
   end
 
-  describe 'title issue#show', js: true do
-    it 'updates the title', js: true do
+  describe 'title issue#show', :js do
+    it 'updates the title', :js do
       issue = create(:issue, author: user, assignees: [user], project: project, title: 'new title')
 
       visit project_issue_path(project, issue)
@@ -603,7 +603,7 @@ describe 'Issues', :js do
     end
   end
 
-  describe 'confidential issue#show', js: true do
+  describe 'confidential issue#show', :js do
     it 'shows confidential sibebar information as confidential and can be turned off' do
       issue = create(:issue, :confidential, project: project)