diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 14:11:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 14:11:44 +0300 |
| commit | 25989ab7ef1a444ed2abd5479f176d58e1d9462a (patch) | |
| tree | 271bb24f3c7178f320cb9de0be0833a285327d09 /spec/rubocop | |
| parent | 9bbb32b29703f3ce33dd35d5101145774b793a6d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/rubocop')
| -rw-r--r-- | spec/rubocop/cop/migration/add_timestamps_spec.rb | 1 | ||||
| -rw-r--r-- | spec/rubocop/cop/migration/timestamps_spec.rb | 1 | ||||
| -rw-r--r-- | spec/rubocop/cop/scalability/file_uploads_spec.rb | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/spec/rubocop/cop/migration/add_timestamps_spec.rb b/spec/rubocop/cop/migration/add_timestamps_spec.rb index fae0177d5f5..33f1bb85af8 100644 --- a/spec/rubocop/cop/migration/add_timestamps_spec.rb +++ b/spec/rubocop/cop/migration/add_timestamps_spec.rb @@ -9,6 +9,7 @@ describe RuboCop::Cop::Migration::AddTimestamps do include CopHelper subject(:cop) { described_class.new } + let(:migration_with_add_timestamps) do %q( class Users < ActiveRecord::Migration[4.2] diff --git a/spec/rubocop/cop/migration/timestamps_spec.rb b/spec/rubocop/cop/migration/timestamps_spec.rb index 1812818692a..cafe255dc9a 100644 --- a/spec/rubocop/cop/migration/timestamps_spec.rb +++ b/spec/rubocop/cop/migration/timestamps_spec.rb @@ -9,6 +9,7 @@ describe RuboCop::Cop::Migration::Timestamps do include CopHelper subject(:cop) { described_class.new } + let(:migration_with_timestamps) do %q( class Users < ActiveRecord::Migration[4.2] diff --git a/spec/rubocop/cop/scalability/file_uploads_spec.rb b/spec/rubocop/cop/scalability/file_uploads_spec.rb index 2a94fde5ba2..a35d423581c 100644 --- a/spec/rubocop/cop/scalability/file_uploads_spec.rb +++ b/spec/rubocop/cop/scalability/file_uploads_spec.rb @@ -10,6 +10,7 @@ describe RuboCop::Cop::Scalability::FileUploads do include ExpectOffense subject(:cop) { described_class.new } + let(:message) { 'Do not upload files without workhorse acceleration. Please refer to https://docs.gitlab.com/ee/development/uploads.html' } context 'with required params' do |