diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 15:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 15:09:12 +0300 |
| commit | cbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 (patch) | |
| tree | e4879b35d019d3bbba1689f3ac4c48b81bf7b451 /config | |
| parent | 3fd97b4bba24ca412112aad025a38a32c7a6cf8c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 3 | ||||
| -rw-r--r-- | config/initializers/5_backend.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 41d20b5062b..25d57467060 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -11,6 +11,9 @@ Rails.application.configure do config.consider_all_requests_local = true config.action_controller.perform_caching = false + # Show a warning when a large data set is loaded into memory + config.active_record.warn_on_records_fetched_greater_than = 1000 + # Print deprecation notices to the Rails logger config.active_support.deprecation = :log diff --git a/config/initializers/5_backend.rb b/config/initializers/5_backend.rb index 482613dacc9..46854af9b55 100644 --- a/config/initializers/5_backend.rb +++ b/config/initializers/5_backend.rb @@ -1,6 +1,6 @@ unless Rails.env.test? required_version = Gitlab::VersionInfo.parse(Gitlab::Shell.version_required) - current_version = Gitlab::VersionInfo.parse(Gitlab::Shell.new.version) + current_version = Gitlab::VersionInfo.parse(Gitlab::Shell.version) unless current_version.valid? && required_version <= current_version warn "WARNING: This version of GitLab depends on gitlab-shell #{required_version}, but you're running #{current_version}. Please update gitlab-shell." |