Skip to content

Commit 94eae18

Browse files
seurosseuros
committed
update gems.
1 parent 02a81c0 commit 94eae18

File tree

3 files changed

+47
-44
lines changed

3 files changed

+47
-44
lines changed

‎Gemfile.lock

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
GIT
2+
remote: git://github.com/emberjs/ember-rails.git
3+
revision: 5e5a398f3c67c3a3b84b7513b93b22bf81055cc9
4+
specs:
5+
ember-rails (0.15.0)
6+
active_model_serializers
7+
barber (>= 0.4.1)
8+
ember-data-source (>= 1.0.0.beta.5)
9+
ember-source (>= 1.1.0)
10+
execjs (>= 1.2)
11+
handlebars-source (> 1.0.0)
12+
jquery-rails (>= 1.0.17)
13+
railties (>= 3.1)
14+
115
GIT
216
remote: git://github.com/nixme/jazz_hands.git
317
revision: 5e4b48f145883ecb14b55bf04eacc28ac9662676
@@ -17,27 +31,13 @@ GIT
1731

1832
GIT
1933
remote: git://github.com/stripe/stripe-ruby.git
20-
revision: 9cf5089dc15534b7ed581e0ce4d84fa82f592efb
34+
revision: 2c6f4caa99916c33d3f9af57f66422ff5ea913cf
2135
specs:
22-
stripe (1.14.0)
36+
stripe (1.15.0)
2337
json (~> 1.8.1)
2438
mime-types (>= 1.25, < 3.0)
2539
rest-client (~> 1.4)
2640

27-
GIT
28-
remote: git://github.com/emberjs/ember-rails.git
29-
revision: 5e5a398f3c67c3a3b84b7513b93b22bf81055cc9
30-
specs:
31-
ember-rails (0.15.0)
32-
active_model_serializers
33-
barber (>= 0.4.1)
34-
ember-data-source (>= 1.0.0.beta.5)
35-
ember-source (>= 1.1.0)
36-
execjs (>= 1.2)
37-
handlebars-source (> 1.0.0)
38-
jquery-rails (>= 1.0.17)
39-
railties (>= 3.1)
40-
4141
GEM
4242
remote: https://rubygems.org/
4343
remote: https://rails-assets.org/
@@ -55,8 +55,8 @@ GEM
5555
rack-cache (~> 1.2)
5656
rack-test (~> 0.6.1)
5757
sprockets (~> 2.2.1)
58-
active_model_serializers (0.8.1)
59-
activemodel (>= 3.0)
58+
active_model_serializers (0.9.0)
59+
activemodel (>= 3.2)
6060
activemodel (3.2.19)
6161
activesupport (= 3.2.19)
6262
builder (~> 3.0.0)
@@ -83,7 +83,7 @@ GEM
8383
ansi (1.4.3)
8484
arel (3.0.3)
8585
ast (2.0.0)
86-
autoprefixer-rails (2.2.0.20140727)
86+
autoprefixer-rails (3.0.0.20140821)
8787
execjs
8888
awesome_print (1.2.0)
8989
backbone-on-rails (1.1.1.0)
@@ -100,9 +100,10 @@ GEM
100100
ember-source
101101
execjs
102102
handlebars-source
103-
better_errors (1.1.0)
103+
better_errors (2.0.0)
104104
coderay (>= 1.0.0)
105105
erubis (>= 2.6.6)
106+
rack (>= 0.9.0)
106107
binding_of_caller (0.7.2)
107108
debug_inspector (>= 0.0.1)
108109
bson (1.10.2)
@@ -132,7 +133,7 @@ GEM
132133
carrierwave (>= 0.8.0, < 0.11.0)
133134
mongoid (>= 3.0, < 5.0)
134135
mongoid-grid_fs (>= 1.3, < 3.0)
135-
carrierwave_backgrounder (0.0.8)
136+
carrierwave_backgrounder (0.4.1)
136137
carrierwave (~> 0.5)
137138
celluloid (0.15.2)
138139
timers (~> 1.1.0)
@@ -142,7 +143,7 @@ GEM
142143
clockwork (0.7.7)
143144
activesupport
144145
tzinfo
145-
codeclimate-test-reporter (0.3.0)
146+
codeclimate-test-reporter (0.4.0)
146147
simplecov (>= 0.7.1, < 1.0.0)
147148
coderay (1.1.0)
148149
coffee-rails (3.2.2)
@@ -178,7 +179,7 @@ GEM
178179
descendants_tracker (0.0.4)
179180
thread_safe (~> 0.3, >= 0.3.1)
180181
diff-lcs (1.2.5)
181-
diffy (3.0.5)
182+
diffy (3.0.6)
182183
docile (1.1.5)
183184
dotenv (0.11.1)
184185
dotenv-deployment (~> 0.0.2)
@@ -199,9 +200,9 @@ GEM
199200
http_parser.rb (>= 0.6.0)
200201
em-socksify (0.3.0)
201202
eventmachine (>= 1.0.0.beta.4)
202-
ember-data-source (1.0.0.beta.8)
203+
ember-data-source (1.0.0.beta.9)
203204
ember-source
204-
ember-source (1.6.1)
205+
ember-source (1.7.0)
205206
handlebars-source (~> 1.0)
206207
ephemeral (2.3.3)
207208
activesupport
@@ -211,7 +212,7 @@ GEM
211212
ethon (0.7.1)
212213
ffi (>= 1.3.0)
213214
eventmachine (1.0.3)
214-
excon (0.39.0)
215+
excon (0.39.5)
215216
execjs (2.2.1)
216217
fabrication (2.11.3)
217218
fabrication-rails (0.0.1)
@@ -225,7 +226,7 @@ GEM
225226
curb (~> 0.8.1)
226227
loofah (~> 2.0.0)
227228
sax-machine (~> 0.2.1)
228-
ffaker (1.24.0)
229+
ffaker (1.25.0)
229230
ffi (1.9.3)
230231
flog (4.3.0)
231232
ruby_parser (~> 3.1, > 3.1.0)
@@ -237,7 +238,7 @@ GEM
237238
fog-softlayer
238239
ipaddress (~> 0.5)
239240
nokogiri (~> 1.5, >= 1.5.11)
240-
fog-brightbox (0.1.1)
241+
fog-brightbox (0.3.0)
241242
fog-core (~> 1.22)
242243
fog-json
243244
inflecto
@@ -250,7 +251,7 @@ GEM
250251
net-ssh (>= 2.1.3)
251252
fog-json (1.0.0)
252253
multi_json (~> 1.0)
253-
fog-softlayer (0.3.11)
254+
fog-softlayer (0.3.15)
254255
fog-core
255256
fog-json
256257
foreman (0.74.0)
@@ -267,7 +268,7 @@ GEM
267268
fuubar (2.0.0.rc1)
268269
rspec (~> 3.0.rc1)
269270
ruby-progressbar (~> 1.4)
270-
geocoder (1.2.3)
271+
geocoder (1.2.4)
271272
gh (0.13.2)
272273
addressable
273274
backports
@@ -343,15 +344,15 @@ GEM
343344
rb-inotify (>= 0.9)
344345
local_time (1.0.0)
345346
coffee-rails
346-
loofah (2.0.0)
347+
loofah (2.0.1)
347348
nokogiri (>= 1.5.9)
348349
lumberjack (1.0.9)
349350
mail (2.5.4)
350351
mime-types (~> 1.16)
351352
treetop (~> 1.4.8)
352353
memoizable (0.4.2)
353354
thread_safe (~> 0.3, >= 0.3.1)
354-
metamagic (3.1.3)
355+
metamagic (3.1.6)
355356
rails (>= 3.0.0)
356357
method_source (0.8.2)
357358
mime-types (1.25.1)
@@ -388,7 +389,7 @@ GEM
388389
never_wastes (1.0.0)
389390
activerecord (>= 3.0.0)
390391
activesupport (>= 3.0.0)
391-
newrelic_rpm (3.9.1.236)
392+
newrelic_rpm (3.9.2.239)
392393
nokogiri (1.6.3.1)
393394
mini_portile (= 0.6.0)
394395
nokogumbo (1.1.9)
@@ -400,9 +401,9 @@ GEM
400401
jwt (~> 0.1.4)
401402
multi_json (~> 1.0)
402403
rack (~> 1.2)
403-
octokit (3.2.0)
404+
octokit (3.3.1)
404405
sawyer (~> 0.5.3)
405-
oj (2.9.9)
406+
oj (2.10.2)
406407
omniauth (1.1.4)
407408
hashie (>= 1.2, < 3)
408409
rack
@@ -553,12 +554,12 @@ GEM
553554
rspec-core (~> 3.0.0)
554555
rspec-expectations (~> 3.0.0)
555556
rspec-mocks (~> 3.0.0)
556-
rspec-core (3.0.3)
557+
rspec-core (3.0.4)
557558
rspec-support (~> 3.0.0)
558-
rspec-expectations (3.0.3)
559+
rspec-expectations (3.0.4)
559560
diff-lcs (>= 1.2.0, < 2.0)
560561
rspec-support (~> 3.0.0)
561-
rspec-mocks (3.0.3)
562+
rspec-mocks (3.0.4)
562563
rspec-support (~> 3.0.0)
563564
rspec-rails (3.0.2)
564565
actionpack (>= 3.0)
@@ -568,7 +569,7 @@ GEM
568569
rspec-expectations (~> 3.0.0)
569570
rspec-mocks (~> 3.0.0)
570571
rspec-support (~> 3.0.0)
571-
rspec-support (3.0.3)
572+
rspec-support (3.0.4)
572573
rubocop (0.23.0)
573574
json (>= 1.7.7, < 2)
574575
parser (~> 2.1.9)
@@ -589,15 +590,15 @@ GEM
589590
railties (~> 3.2.0)
590591
sass (>= 3.1.10)
591592
tilt (~> 1.3)
592-
sawyer (0.5.4)
593+
sawyer (0.5.5)
593594
addressable (~> 2.3.5)
594595
faraday (~> 0.8, < 0.10)
595596
sax-machine (0.2.1)
596597
nokogiri (~> 1.6.0)
597-
sexp_processor (4.4.3)
598+
sexp_processor (4.4.4)
598599
shoulda-matchers (2.6.2)
599600
activesupport (>= 3.0.0)
600-
sidekiq (3.2.1)
601+
sidekiq (3.2.2)
601602
celluloid (>= 0.15.2)
602603
connection_pool (>= 2.0.0)
603604
json
@@ -686,7 +687,7 @@ GEM
686687
simple_oauth (~> 0.2.0)
687688
typhoeus (0.6.9)
688689
ethon (>= 0.7.1)
689-
tzinfo (0.3.40)
690+
tzinfo (0.3.41)
690691
uglifier (2.5.3)
691692
execjs (>= 0.3.0)
692693
json (>= 1.8.0)

‎config/initializers/sidekiq.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
ActiveRecord::Base.establish_connection
77
end
88
end
9+
10+
Sidekiq.app_url = '/admin'

‎spec/fabricators/team_fabricator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Fabricator(:team) do
2-
name { 'Coderwall' }
2+
name { Faker::Company.name }
33
end

0 commit comments

Comments
 (0)