Skip to content

Commit 46f3261

Browse files
committed
Update: message bus, rack mini profiler and flame graph so they are sourced from ruby gems.
MessageBus.diagnostics() in chrome dev tools Update: annotate models to latest, no need for git sourcing
1 parent 0e44b90 commit 46f3261

2 files changed

Lines changed: 22 additions & 41 deletions

File tree

Gemfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ gem 'barber'
7070

7171
gem 'vestal_versions', git: 'https://github.com/SamSaffron/vestal_versions'
7272

73-
gem 'message_bus', git: 'https://github.com/SamSaffron/message_bus'
73+
gem 'message_bus'
7474
gem 'rails_multisite', path: 'vendor/gems/rails_multisite'
7575
gem 'simple_handlebars_rails', path: 'vendor/gems/simple_handlebars_rails'
7676

@@ -79,6 +79,8 @@ gem 'airbrake', '3.1.2', require: false # errbit is broken with 3.1.3 for now
7979
gem 'sidetiq', '>= 0.3.6'
8080
gem 'eventmachine'
8181
gem 'fast_xs'
82+
83+
# https://github.com/CodeMonkeySteve/fast_xor/issues/6
8284
gem 'fast_xor', git: 'https://github.com/CodeMonkeySteve/fast_xor.git'
8385
gem 'fastimage'
8486
gem 'fog', '1.18.0', require: false
@@ -159,8 +161,7 @@ group :development do
159161
gem 'better_errors'
160162
gem 'binding_of_caller'
161163
gem 'librarian', '>= 0.0.25', require: false
162-
# https://github.com/ctran/annotate_models/pull/106
163-
gem 'annotate', :git => 'https://github.com/SamSaffron/annotate_models.git'
164+
gem 'annotate'
164165
end
165166

166167
# Gem that enables support for plugins. It is required.
@@ -179,8 +180,8 @@ gem 'lru_redux'
179180
# If you want to amend mini profiler to do the monkey patches in the railstie
180181
# we are open to it. by deferring require to the initializer we can configure disourse installs without it
181182

182-
gem 'flamegraph', git: 'https://github.com/SamSaffron/flamegraph.git', require: false
183-
gem 'rack-mini-profiler', git: 'https://github.com/MiniProfiler/rack-mini-profiler.git', require: false
183+
gem 'flamegraph', require: false
184+
gem 'rack-mini-profiler', '0.9.0.pre ', require: false
184185

185186
# used for caching, optional
186187
gem 'rack-cors', require: false

Gemfile_rails4.lock

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,6 @@ GIT
3131
rake
3232
rake-compiler
3333

34-
GIT
35-
remote: https://github.com/MiniProfiler/rack-mini-profiler.git
36-
revision: 740970f50af5cdb2655c7f468f1a627bf1d7c644
37-
specs:
38-
rack-mini-profiler (0.1.31)
39-
rack (>= 1.1.3)
40-
41-
GIT
42-
remote: https://github.com/SamSaffron/annotate_models.git
43-
revision: ebe4ba7e3f6ceeb43e4e40078da2b261a1bb71b2
44-
specs:
45-
annotate (2.6.0.beta1)
46-
activerecord (>= 2.3.0)
47-
rake (>= 0.8.7)
48-
49-
GIT
50-
remote: https://github.com/SamSaffron/flamegraph.git
51-
revision: 07bd0ffdfd352e2fceb4edaf281990ba99156355
52-
specs:
53-
flamegraph (0.0.5)
54-
fast_stack
55-
56-
GIT
57-
remote: https://github.com/SamSaffron/message_bus
58-
revision: 2343e7968e84ea70f5e562f5730dfef3ce9602d9
59-
specs:
60-
message_bus (0.9.2)
61-
eventmachine
62-
rack (>= 1.1.3)
63-
redis
64-
6534
GIT
6635
remote: https://github.com/SamSaffron/vestal_versions
6736
revision: 007b30a5274db7db55da745a4482243559247782
@@ -137,6 +106,9 @@ GEM
137106
airbrake (3.1.2)
138107
activesupport
139108
builder
109+
annotate (2.6.0)
110+
activerecord (>= 2.3.0)
111+
rake (>= 0.8.7)
140112
arel (4.0.1)
141113
atomic (1.1.14)
142114
barber (0.4.2)
@@ -189,6 +161,8 @@ GEM
189161
fast_xs (0.8.0)
190162
fastimage (1.5.2)
191163
ffi (1.9.3)
164+
flamegraph (0.0.5)
165+
fast_stack
192166
fog (1.18.0)
193167
builder
194168
excon (~> 0.28.0)
@@ -238,6 +212,10 @@ GEM
238212
mail (2.5.4)
239213
mime-types (~> 1.16)
240214
treetop (~> 1.4.8)
215+
message_bus (0.9.3.1)
216+
eventmachine
217+
rack (>= 1.1.3)
218+
redis
241219
metaclass (0.0.1)
242220
method_source (0.8.2)
243221
mime-types (1.25.1)
@@ -308,6 +286,8 @@ GEM
308286
rack (1.5.2)
309287
rack-cors (0.2.8)
310288
rack
289+
rack-mini-profiler (0.9.0.pre)
290+
rack (>= 1.1.3)
311291
rack-openid (1.3.1)
312292
rack (>= 1.1.0)
313293
ruby-openid (>= 2.1.8)
@@ -332,7 +312,7 @@ GEM
332312
thor (>= 0.18.1, < 2.0)
333313
raindrops (0.12.0)
334314
rake (10.1.0)
335-
rake-compiler (0.9.1)
315+
rake-compiler (0.9.2)
336316
rake
337317
rb-fsevent (0.9.3)
338318
rb-inotify (0.9.2)
@@ -466,7 +446,7 @@ DEPENDENCIES
466446
actionpack-action_caching
467447
active_model_serializers
468448
airbrake (= 3.1.2)
469-
annotate!
449+
annotate
470450
barber
471451
better_errors
472452
binding_of_caller
@@ -483,7 +463,7 @@ DEPENDENCIES
483463
fast_xor!
484464
fast_xs
485465
fastimage
486-
flamegraph!
466+
flamegraph
487467
fog (= 1.18.0)
488468
handlebars-source (~> 1.1.2)
489469
highline
@@ -494,7 +474,7 @@ DEPENDENCIES
494474
librarian (>= 0.0.25)
495475
listen (= 0.7.3)
496476
lru_redux
497-
message_bus!
477+
message_bus
498478
minitest
499479
mocha
500480
mock_redis
@@ -517,7 +497,7 @@ DEPENDENCIES
517497
puma
518498
qunit-rails
519499
rack-cors
520-
rack-mini-profiler!
500+
rack-mini-profiler (= 0.9.0.pre)
521501
rack-protection
522502
rails
523503
rails-observers

0 commit comments

Comments
 (0)