ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switch back to the official marginalia gem 

The fix was merged and a new gem was released.

Test plan: enable with marginalia.yml, then test that the appropriate
comments still show up in logged SQL statements. For instance, load a
page in canvas, then look at the logs and verify the logged SQL
statements include controller, action and request id.

Change-Id: Ib7024c41b860ff7d4530974c74996c37e6c3d1a8
Reviewed-on: https://gerrit.instructure.com/49319
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: August Thornton <august@instructure.com>
Product-Review: Brian Palmer <brianp@instructure.com>
This commit is contained in:
Brian Palmer 2015-02-24 07:47:46 -08:00
parent e30146bc8f
commit 25f32fb78d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.d/other_stuff.rb
View File

@ -62,7 +62,7 @@ gem 'macaddr', '1.0.0' # macaddr 1.2.0 tries to require 'systemu' which isn't a
gem 'mail', '2.5.4'
gem 'treetop', '1.4.15'
gem 'polyglot', '0.3.5'
gem 'instructure-marginalia', '1.1.6', :require => false
gem 'marginalia', '1.3.0', :require => false
gem 'mime-types', '1.17.2', :require => 'mime/types'
# attachment_fu (even the current technoweenie one on github) does not work
# with mini_magick 3.1