Add latest changes from gitlab-org/gitlab@master

Gemfile

@@ -352,15 +352,10 @@ group :development, :test do
   gem 'pry-rails', '~> 0.3.4'
 
   gem 'awesome_print', require: false
-  gem 'fuubar', '~> 2.2.0'
 
   gem 'database_cleaner', '~> 1.7.0'
   gem 'factory_bot_rails', '~> 5.1.0'
-  gem 'rspec-rails', '~> 3.8.0'
-  gem 'rspec-retry', '~> 0.6.1'
-  gem 'rspec_profiling', '~> 0.0.5'
-  gem 'rspec-set', '~> 0.1.3'
-  gem 'rspec-parameterized', require: false
+  gem 'rspec-rails', '~> 4.0.0.beta3'
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
   gem 'minitest', '~> 5.11.0'
@@ -368,10 +363,6 @@ group :development, :test do
   # Generate Fake data
   gem 'ffaker', '~> 2.10'
 
-  gem 'capybara', '~> 3.22.0'
-  gem 'capybara-screenshot', '~> 1.0.22'
-  gem 'selenium-webdriver', '~> 3.141'
-
   gem 'spring', '~> 2.0.0'
   gem 'spring-commands-rspec', '~> 1.0.4'
 
@@ -403,6 +394,16 @@ group :development, :test, :omnibus do
 end
 
 group :test do
+  gem 'fuubar', '~> 2.2.0'
+  gem 'rspec-retry', '~> 0.6.1'
+  gem 'rspec_profiling', '~> 0.0.5'
+  gem 'rspec-set', '~> 0.1.3'
+  gem 'rspec-parameterized', require: false
+
+  gem 'capybara', '~> 3.22.0'
+  gem 'capybara-screenshot', '~> 1.0.22'
+  gem 'selenium-webdriver', '~> 3.141'
+
   gem 'shoulda-matchers', '~> 4.0.1', require: false
   gem 'email_spec', '~> 2.2.0'
   gem 'json-schema', '~> 2.8.0'

Gemfile.lock

@@ -881,14 +881,14 @@ GEM
       proc_to_ast
       rspec (>= 2.13, < 4)
       unparser
-    rspec-rails (3.8.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
+    rspec-rails (4.0.0.beta3)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.8)
+      rspec-expectations (~> 3.8)
+      rspec-mocks (~> 3.8)
+      rspec-support (~> 3.8)
     rspec-retry (0.6.1)
       rspec-core (> 3.3)
     rspec-set (0.1.3)
@@ -1307,7 +1307,7 @@ DEPENDENCIES
   rouge (~> 3.11.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
-  rspec-rails (~> 3.8.0)
+  rspec-rails (~> 4.0.0.beta3)
   rspec-retry (~> 0.6.1)
   rspec-set (~> 0.1.3)
   rspec_junit_formatter

app/views/projects/settings/ci_cd/show.html.haml

@@ -58,3 +58,4 @@
       = _("Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions.")
   .settings-content
     = render 'projects/triggers/index'
+

lib/gitlab/chaos.rb

@@ -19,9 +19,11 @@ module Gitlab
 
     # cpu_spin will consume all CPU on a single core for the specified duration
     def self.cpu_spin(duration_s)
-      expected_end_time = Time.now + duration_s
+      return unless Gitlab::Metrics::System.thread_cpu_time
+
+      expected_end_time = Gitlab::Metrics::System.thread_cpu_time + duration_s
 
-      rand while Time.now < expected_end_time
+      rand while Gitlab::Metrics::System.thread_cpu_time < expected_end_time
     end
 
     # db_spin will query the database in a tight loop for the specified duration

locale/gitlab.pot

@@ -12220,6 +12220,9 @@ msgstr ""
 msgid "Pipeline quota"
 msgstr ""
 
+msgid "Pipeline subscriptions"
+msgstr ""
+
 msgid "Pipeline triggers"
 msgstr ""
 
@@ -13207,6 +13210,9 @@ msgstr ""
 msgid "Project overview"
 msgstr ""
 
+msgid "Project path"
+msgstr ""
+
 msgid "Project slug"
 msgstr ""
 
@@ -15651,6 +15657,9 @@ msgstr ""
 msgid "Set up new password"
 msgstr ""
 
+msgid "Set up pipeline subscriptions for this project."
+msgstr ""
+
 msgid "Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically."
 msgstr ""
 
@@ -16661,6 +16670,12 @@ msgstr ""
 msgid "SubscriptionTable|Usage count is performed once a day at 12:00 PM."
 msgstr ""
 
+msgid "Subscriptions"
+msgstr ""
+
+msgid "Subscriptions allow successfully completed pipelines on the %{default_branch_docs} of the subscribed project to trigger a new pipeline on thee default branch of this project."
+msgstr ""
+
 msgid "Subtracted"
 msgstr ""
 
@@ -17395,6 +17410,9 @@ msgstr ""
 msgid "There are no unstaged changes"
 msgstr ""
 
+msgid "There is a limit of 100 subscriptions from or to a project."
+msgstr ""
+
 msgid "There is already a repository with that name on disk"
 msgstr ""
 
@@ -20566,6 +20584,9 @@ msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "default branch"
+msgstr ""
+
 msgid "deleted"
 msgstr ""
 

qa/qa/tools/revoke_all_personal_access_tokens.rb

@@ -32,9 +32,9 @@ module QA
 
         token_name = 'api-test-token'
 
-        Page::Profile::PersonalAccessTokens.perform do |page| # rubocop:disable QA/AmbiguousPageObjectName
-          while page.has_token_row_for_name?(token_name)
-            page.revoke_first_token_with_name(token_name)
+        Page::Profile::PersonalAccessTokens.perform do |tokens_page|
+          while tokens_page.has_token_row_for_name?(token_name)
+            tokens_page.revoke_first_token_with_name(token_name)
             print "\e[32m.\e[0m"
           end
         end

spec/models/repository_spec.rb

@@ -845,7 +845,7 @@ describe Repository do
   end
 
   describe '#get_raw_changes' do
-    context `with non-UTF8 bytes in paths` do
+    context 'with non-UTF8 bytes in paths' do
       let(:old_rev) { 'd0888d297eadcd7a345427915c309413b1231e65' }
       let(:new_rev) { '19950f03c765f7ac8723a73a0599764095f52fc0' }
       let(:changes) { repository.raw_changes_between(old_rev, new_rev) }

spec/views/projects/commits/_commit.html.haml_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 describe 'projects/commits/_commit.html.haml' do
+  let(:template) { 'projects/commits/commit.html.haml' }
   let(:project) { create(:project, :repository) }
   let(:commit) { project.repository.commit(ref) }
 
@@ -14,7 +15,7 @@ describe 'projects/commits/_commit.html.haml' do
     let(:ref) { GpgHelpers::SIGNED_COMMIT_SHA }
 
     it 'does not display a loading spinner for GPG status' do
-      render partial: 'projects/commits/commit', locals: {
+      render partial: template, locals: {
         project: project,
         ref: ref,
         commit: commit
@@ -50,7 +51,7 @@ describe 'projects/commits/_commit.html.haml' do
       end
 
       it 'does not display a ci status icon' do
-        render partial: 'projects/commits/commit', locals: {
+        render partial: template, locals: {
           project: project,
           ref: ref,
           commit: commit
@@ -66,7 +67,7 @@ describe 'projects/commits/_commit.html.haml' do
       end
 
       it 'does display a ci status icon when pipelines are enabled' do
-        render partial: 'projects/commits/commit', locals: {
+        render partial: template, locals: {
           project: project,
           ref: ref,
           commit: commit

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

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'projects/show' do
+describe 'projects/show.html.haml' do
   include Devise::Test::ControllerHelpers
 
   let(:user) { create(:admin) }

spec/views/projects/tags/index.html.haml_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'projects/tags/index' do
+describe 'projects/tags/index.html.haml' do
   let(:project)  { create(:project, :repository) }
   let(:tags)     { TagsFinder.new(project.repository, {}).execute }
   let(:git_tag)  { project.repository.tags.last }