summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-12-26 18:03:21 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-12-26 18:03:21 +0800
commit82bf55c8db3d149c27807e5646ff8ff4454a5ea7 (patch)
tree65e2523a9288ec64421b19ccf27cbce0c371c40c /spec/spec_helper.rb
parentcc06bb2c6ec1facf2b1eb50803dbedc076abe017 (diff)
parent145079b3540ca832e1d981bbc685cc8c27d47ea0 (diff)
downloadgitlab-ce-82bf55c8db3d149c27807e5646ff8ff4454a5ea7.tar.gz
Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-merge-request-due-to-nil-commit_email_hostname
* upstream/master: (115 commits) [CE] Speed up login page usage Add new line and comments Fix the seeder 24_forks.rb cannot find public project Milestones on community contribution issues Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rb Fix and move specs into admin_disables_git_access_protocol_spec.rb Fix HTTP/SSH clone panel for mobile Add spec for HTTP/SSH clone panel Fix missing Git clone button when protocol restriction setting enabled Fix deprecation: Using positional arguments in integration tests Extend override check to also check arity Update tm cli version Bump Gitaly version to v1.12.0 Add @dbalexandre to CODEOWNERS Update verbiage for clarity Change group-cluster beta to regular note Change alpha states to use note instead of warning Update registry section. Update serverless.yaml formatting Clarify obtaining application URL Add @godfat to CODEOWNERS ...
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e8554377d77..89357056c93 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -228,7 +228,7 @@ RSpec.configure do |config|
end
config.around(:each, :nested_groups) do |example|
- example.run if Group.supports_nested_groups?
+ example.run if Group.supports_nested_objects?
end
config.around(:each, :postgresql) do |example|