diff --git a/.gitignore b/.gitignore index 06f2bd768..b4a9e14be 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ config/version.rb .ruby-version .ruby-gemset .rbenv +bundler_stubs/* diff --git a/Gemfile b/Gemfile index d2df18df7..ec4f3d696 100644 --- a/Gemfile +++ b/Gemfile @@ -189,7 +189,7 @@ gem 'lru_redux' # we are open to it. by deferring require to the initializer we can configure disourse installs without it gem 'flamegraph', require: false -gem 'rack-mini-profiler', require: false +gem 'rack-mini-profiler', git: 'https://github.com/MiniProfiler/rack-mini-profiler.git', require: false # used for caching, optional # redis-rack-cache is missing a sane expiry policy, it hogs redis diff --git a/Gemfile.lock b/Gemfile.lock index 3c44c3169..d1931ab13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,6 +22,13 @@ GIT rake rake-compiler +GIT + remote: https://github.com/MiniProfiler/rack-mini-profiler.git + revision: 292cb226b37ab58200f06aaa3cbe165dc25e7cc9 + specs: + rack-mini-profiler (0.1.31) + rack (>= 1.1.3) + GIT remote: https://github.com/SamSaffron/annotate_models.git revision: ebe4ba7e3f6ceeb43e4e40078da2b261a1bb71b2 @@ -188,7 +195,7 @@ GEM fast_blank (0.0.1) rake rake-compiler - fast_stack (0.0.6) + fast_stack (0.1.0) rake rake-compiler fast_xs (0.8.0) @@ -309,8 +316,6 @@ GEM rack (>= 0.4) rack-cors (0.2.7) rack - rack-mini-profiler (0.1.31) - rack (>= 1.1.3) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -518,7 +523,7 @@ DEPENDENCIES qunit-rails rack-cache rack-cors - rack-mini-profiler + rack-mini-profiler! rails (= 3.2.12) rails_multisite! rake diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index 6e4e48e63..d87c10fc6 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -89,6 +89,13 @@ GIT rake rake-compiler +GIT + remote: https://github.com/MiniProfiler/rack-mini-profiler.git + revision: 292cb226b37ab58200f06aaa3cbe165dc25e7cc9 + specs: + rack-mini-profiler (0.1.31) + rack (>= 1.1.3) + GIT remote: https://github.com/SamSaffron/annotate_models.git revision: ebe4ba7e3f6ceeb43e4e40078da2b261a1bb71b2 @@ -216,7 +223,7 @@ GEM fast_blank (0.0.1) rake rake-compiler - fast_stack (0.0.6) + fast_stack (0.1.0) rake rake-compiler fast_xs (0.8.0) @@ -341,8 +348,6 @@ GEM rack (>= 0.4) rack-cors (0.2.8) rack - rack-mini-profiler (0.1.31) - rack (>= 1.1.3) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -523,7 +528,7 @@ DEPENDENCIES qunit-rails rack-cache rack-cors - rack-mini-profiler + rack-mini-profiler! rails! rails-observers rails_multisite!