errplane 0.0.5 → 0.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/errplane/railtie.rb +0 -8
- data/lib/errplane/version.rb +1 -1
- metadata +1 -1
data/lib/errplane/railtie.rb
CHANGED
|
@@ -15,18 +15,10 @@ module Errplane
|
|
|
15
15
|
config.logger ||= ::Rails.logger
|
|
16
16
|
config.rails_environment ||= ::Rails.env
|
|
17
17
|
config.rails_root ||= ::Rails.root
|
|
18
|
-
<<<<<<< HEAD
|
|
19
|
-
config.framework = "Rails #{::Rails::VERSION::STRING}"
|
|
20
|
-
=======
|
|
21
|
-
<<<<<<< HEAD
|
|
22
|
-
config.framework = "Rails #{::Rails::VERSION::STRING}"
|
|
23
|
-
=======
|
|
24
18
|
config.framework = "Rails"
|
|
25
19
|
config.framework_version = ::Rails::VERSION::STRING
|
|
26
20
|
config.language = "Ruby"
|
|
27
21
|
config.language_version = RUBY_VERSION
|
|
28
|
-
>>>>>>> Add more configurability and some initial Sinatra support. Also add some Rails logging for debugging purposes.
|
|
29
|
-
>>>>>>> Add more configurability and some initial Sinatra support. Also add some Rails logging for debugging purposes.
|
|
30
22
|
end
|
|
31
23
|
|
|
32
24
|
if defined?(::ActionDispatch::DebugExceptions)
|
data/lib/errplane/version.rb
CHANGED