summaryrefslogtreecommitdiff
path: root/spec/spec_helper.rb
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-11-02 17:05:06 -0500
committerMike Greiling <mike@pixelcog.com>2017-11-02 17:05:06 -0500
commit11c21e953fe1d8aa108c7558d715300e3221a308 (patch)
tree46a55d65375e712f4ef59cead95c07179fbfefe3 /spec/spec_helper.rb
parent2b29a4675bbaf79ed463e5ffc059e81aeb3251a8 (diff)
parent1d4efeec2e1a203be113077e6504d8f256271db1 (diff)
downloadgitlab-ce-11c21e953fe1d8aa108c7558d715300e3221a308.tar.gz
Merge branch 'master' into sh-headless-chrome-support
* master: (109 commits) Remove Filesystem check metrics that use too much CPU to handle requests Set merge_request_diff_id on MR when creating Add a column linking an MR to its diff Remove useless closeReopenReport specs Clarify external artifacts only working when GitLab pages is enabled Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in Remove an exception from the git user default SSH config check Geo route whitelisting is too optimistic Update .nvmrc to current stable (v9.0.0) Update documentation Address Douwe's feedback Refactor responsive table styles to support nested error block Add changelog items Update specs for sudo behavior Move RSS and incoming email tokens from User Settings > Accounts to User Settings > Access Tokens Remove user authentication_token column Migrate user private tokens to personal access tokens Add sudo API scope Consistently use PersonalAccessToken instead of PersonalToken Remove User#private_token ...
Diffstat (limited to 'spec/spec_helper.rb')
-rw-r--r--spec/spec_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 97bd7257e47..7c8331f6c60 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -52,6 +52,7 @@ RSpec.configure do |config|
config.include InputHelper, :js
config.include InspectRequests, :js
config.include WaitForRequests, :js
+ config.include LiveDebugger, :js
config.include StubConfiguration
config.include EmailHelpers, :mailer, type: :mailer
config.include TestEnv