diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-11-22 17:07:01 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-11-22 17:07:01 +0800 |
| commit | 663593e87e81d199a5b9a4926d4644ed15416ab0 (patch) | |
| tree | 4e4c331e27bdfe744360e3c620460c04d86f7c7f /rubocop/rubocop.rb | |
| parent | 166a2d7a67787d3cf8cebb1e75fc557e2409e669 (diff) | |
| parent | 6369db0196ec7b6e288b16382c95243424a59b62 (diff) | |
| download | gitlab-ce-663593e87e81d199a5b9a4926d4644ed15416ab0.tar.gz | |
Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules
* upstream/master: (126 commits)
Update VERSION to 10.3.0-pre
Update CHANGELOG.md for 10.2.0
default fill color for SVGs
ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`
Use Redis cache for branch existence checks
Update CONTRIBUTING.md: Link definition of done to criteria
Use `make install` for Gitaly setups in non-test environments
FileUploader should check for hashed_storage?(:attachments) to use disk_path
Set the default gitlab-shell timeout to 3 hours
Update composite pipelines index to include "id"
Use arrays in Pipeline#latest_builds_with_artifacts
Fix blank states using old css
Skip confirmation user api
Custom issue tracker
Revert "check for `read_only?` first before seeing if request is disallowed"
add `#with_metadata` scope to remove a N+1 from the notes' API
Fix promoting milestone updating all issuables without milestone
Batchload blobs for diff generation
check for `read_only?` first before seeing if request is disallowed
use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers`
...
Diffstat (limited to 'rubocop/rubocop.rb')
| -rw-r--r-- | rubocop/rubocop.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index c4bab18faee..3b29da37ad4 100644 --- a/rubocop/rubocop.rb +++ b/rubocop/rubocop.rb @@ -3,12 +3,12 @@ require_relative 'cop/active_record_serialize' require_relative 'cop/custom_error_class' require_relative 'cop/gem_fetcher' require_relative 'cop/in_batches' +require_relative 'cop/line_break_after_guard_clauses' require_relative 'cop/polymorphic_associations' require_relative 'cop/project_path_helper' require_relative 'cop/redirect_with_status' require_relative 'cop/gitlab/module_with_instance_variables' require_relative 'cop/migration/add_column' -require_relative 'cop/migration/add_column_with_default_to_large_table' require_relative 'cop/migration/add_concurrent_foreign_key' require_relative 'cop/migration/add_concurrent_index' require_relative 'cop/migration/add_index' @@ -21,6 +21,7 @@ require_relative 'cop/migration/reversible_add_column_with_default' require_relative 'cop/migration/safer_boolean_column' require_relative 'cop/migration/timestamps' require_relative 'cop/migration/update_column_in_batches' +require_relative 'cop/migration/update_large_table' require_relative 'cop/rspec/env_assignment' require_relative 'cop/rspec/single_line_hook' require_relative 'cop/rspec/verbose_include_metadata' |