add bullet_instructure gem and config
Change-Id: I044b10725d73cabccdee07403b4fa269c1d10944 Reviewed-on: https://gerrit.instructure.com/38279 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Bryan Madsen <bryan@instructure.com> Product-Review: Bryan Madsen <bryan@instructure.com> QA-Review: Bryan Madsen <bryan@instructure.com> Reviewed-by: Adam Ard <aard@instructure.com>
This commit is contained in:
parent
485b90a6f7
commit
23a1ee79f8
|
@ -4,6 +4,7 @@ group :test do
|
|||
gem 'simplecov-rcov', '0.2.3', :require => false
|
||||
gem 'bluecloth', '2.0.10' # for generating api docs
|
||||
gem 'redcarpet', '3.0.0'
|
||||
gem 'bullet_instructure', '4.0.3', :require => 'bullet'
|
||||
if RUBY_VERSION >= '2.1'
|
||||
gem 'mocha', github: 'eac/mocha', :branch => 'eac/alias_method_fix', :ref => 'bb8813fbb4cc589d7c58073d93983722d61b6919', :require => false
|
||||
gem 'metaclass', '0.0.2'
|
||||
|
@ -37,6 +38,4 @@ group :test do
|
|||
gem 'yard', '0.8.0'
|
||||
gem 'yard-appendix', '>=0.1.8'
|
||||
gem 'timecop', '0.6.3'
|
||||
gem 'bullet', '4.5.0', :require => false
|
||||
gem 'uniform_notifier', '1.4.0'
|
||||
end
|
||||
|
|
|
@ -19,18 +19,8 @@ end
|
|||
|
||||
environment_configuration(defined?(config) && config) do |config|
|
||||
|
||||
if ENV['BULLET'] == "1"
|
||||
puts "Bullet enabled"
|
||||
require 'bullet'
|
||||
|
||||
config.after_initialize do
|
||||
Bullet.enable = true
|
||||
Bullet.bullet_logger = true
|
||||
end
|
||||
|
||||
elsif ENV['BULLET_GEM'] == "1"
|
||||
puts "Bullet enabled"
|
||||
require 'bullet_instructure'
|
||||
if ENV['BULLET_GEM']
|
||||
puts "Bullet Instructure enabled"
|
||||
|
||||
config.after_initialize do
|
||||
Bullet.enable = true
|
||||
|
@ -38,7 +28,7 @@ environment_configuration(defined?(config) && config) do |config|
|
|||
end
|
||||
|
||||
else
|
||||
puts "Bullet not enabled"
|
||||
puts "Bullet Instructure not enabled"
|
||||
end
|
||||
|
||||
# Settings specified here will take precedence over those in config/application.rb
|
||||
|
|
Loading…
Reference in New Issue