mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 15:48:43 -05:00
big gem update
This commit is contained in:
Sam
parent
bb30ccb5db
commit
1076aa50a8
2 changed files with 105 additions and 134 deletions
16
Gemfile
16
Gemfile
|
|
@ -1,7 +1,12 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'active_model_serializers', git: 'git://github.com/rails-api/active_model_serializers.git'
|
||||
gem 'ember-rails', git: 'git://github.com/emberjs/ember-rails.git' # so we get the pre version
|
||||
|
||||
# we had issues with latest, stick to the rev till we figure this out
|
||||
# PR that makes it all hang together welcome
|
||||
gem 'ember-rails', git: 'git://github.com/emberjs/ember-rails.git', ref: '57bbe32'
|
||||
gem 'barber', '0.3.0'
|
||||
|
||||
gem 'vestal_versions', git: 'git://github.com/zhangyuan/vestal_versions'
|
||||
|
||||
gem 'message_bus', path: 'vendor/gems/message_bus'
|
||||
|
|
@ -29,8 +34,8 @@ gem 'image_optim'
|
|||
# note: for image_sorcery to correctly work you need
|
||||
# sudo apt-get install -y imagemagick
|
||||
gem 'image_sorcery'
|
||||
# it patches stuff, I think we need it in prd
|
||||
gem 'jquery-rails'
|
||||
gem 'minitest'
|
||||
gem 'multi_json'
|
||||
gem 'mustache'
|
||||
gem 'nokogiri'
|
||||
|
|
@ -43,7 +48,9 @@ gem "omniauth-github"
|
|||
gem "omniauth-browserid", :git => "git://github.com/callahad/omniauth-browserid.git", :branch => "observer_api"
|
||||
gem 'oj'
|
||||
gem 'pg'
|
||||
gem 'rails'
|
||||
# we had pain with the 3.2.13 upgrade so monkey patch the security fix
|
||||
# next time around we hope to upgrade
|
||||
gem 'rails', '3.2.12'
|
||||
gem 'rake'
|
||||
gem 'redis'
|
||||
gem 'redis-rails'
|
||||
|
|
@ -80,7 +87,8 @@ group :assets do
|
|||
end
|
||||
|
||||
group :test do
|
||||
gem "fakeweb", "~> 1.3.0"
|
||||
gem 'fakeweb', '~> 1.3.0'
|
||||
gem 'minitest'
|
||||
end
|
||||
|
||||
group :test, :development do
|
||||
|
|
|
|||
223
Gemfile.lock
223
Gemfile.lock
|
|
@ -30,6 +30,7 @@ GIT
|
|||
GIT
|
||||
remote: git://github.com/emberjs/ember-rails.git
|
||||
revision: 57bbe3202725e55a8e4eaccba83d663b26bcf024
|
||||
ref: 57bbe32
|
||||
specs:
|
||||
ember-rails (0.10.1)
|
||||
active_model_serializers
|
||||
|
|
@ -39,7 +40,7 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/rails-api/active_model_serializers.git
|
||||
revision: c129ae20161861ff70abe584da7abb8be7d0f0d2
|
||||
revision: 329a38a7ddee4350f96d657256a5f6a277865291
|
||||
specs:
|
||||
active_model_serializers (0.7.0)
|
||||
activemodel (>= 3.0)
|
||||
|
|
@ -109,8 +110,9 @@ GEM
|
|||
activesupport (= 3.2.12)
|
||||
arel (~> 3.0.2)
|
||||
tzinfo (~> 0.3.29)
|
||||
activerecord-postgres-hstore (0.7.1)
|
||||
rails
|
||||
activerecord-postgres-hstore (0.7.6)
|
||||
activerecord (>= 3.1)
|
||||
pg-hstore (>= 1.1.5)
|
||||
rake
|
||||
activeresource (3.2.12)
|
||||
activemodel (= 3.2.12)
|
||||
|
|
@ -123,40 +125,24 @@ GEM
|
|||
airbrake (3.1.2)
|
||||
activesupport
|
||||
builder
|
||||
archive-tar-minitar (0.5.2)
|
||||
arel (3.0.2)
|
||||
barber (0.3.0)
|
||||
execjs
|
||||
better_errors (0.7.2)
|
||||
better_errors (0.8.0)
|
||||
coderay (>= 1.0.0)
|
||||
erubis (>= 2.6.6)
|
||||
binding_of_caller (0.7.1)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bourne (1.1.2)
|
||||
mocha (= 0.10.5)
|
||||
bourne (1.4.0)
|
||||
mocha (~> 0.13.2)
|
||||
builder (3.0.4)
|
||||
celluloid (0.12.4)
|
||||
facter (>= 1.6.12)
|
||||
celluloid (0.13.0)
|
||||
timers (>= 1.0.0)
|
||||
certified (0.1.1)
|
||||
chef (11.2.0)
|
||||
erubis
|
||||
highline (>= 1.6.9)
|
||||
json (~> 1.7.6, >= 1.4.4)
|
||||
mixlib-authentication (>= 1.3.0)
|
||||
mixlib-cli (~> 1.3.0)
|
||||
mixlib-config (>= 1.1.2)
|
||||
mixlib-log (>= 1.3.0)
|
||||
mixlib-shellout
|
||||
net-ssh (~> 2.6)
|
||||
net-ssh-multi (~> 1.1.0)
|
||||
ohai (>= 0.6.0)
|
||||
rest-client (>= 1.0.4, < 1.7.0)
|
||||
yajl-ruby (~> 1.1)
|
||||
childprocess (0.3.7)
|
||||
ffi (~> 1.0, >= 1.0.6)
|
||||
clockwork (0.4.1)
|
||||
tzinfo
|
||||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
clockwork (0.5.0)
|
||||
tzinfo (~> 0.3.35)
|
||||
coderay (1.0.9)
|
||||
coffee-rails (3.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
|
|
@ -164,49 +150,48 @@ GEM
|
|||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.4.0)
|
||||
coffee-script-source (1.6.2)
|
||||
connection_pool (1.0.0)
|
||||
daemons (1.1.9)
|
||||
debug_inspector (0.0.2)
|
||||
diff-lcs (1.1.3)
|
||||
diffy (2.1.3)
|
||||
diff-lcs (1.2.4)
|
||||
diffy (2.1.4)
|
||||
em-redis (0.3.0)
|
||||
eventmachine
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.3)
|
||||
excon (0.16.10)
|
||||
excon (0.20.1)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
fabrication (2.5.4)
|
||||
facter (1.6.18)
|
||||
fabrication (2.6.5)
|
||||
fakeweb (1.3.0)
|
||||
faraday (0.8.5)
|
||||
faraday (0.8.7)
|
||||
multipart-post (~> 1.1)
|
||||
fast_blank (0.0.1)
|
||||
rake
|
||||
rake-compiler
|
||||
fast_xs (0.8.0)
|
||||
fastimage (1.2.13)
|
||||
ffi (1.3.1)
|
||||
fog (1.9.0)
|
||||
fastimage (1.3.0)
|
||||
ffi (1.8.1)
|
||||
fog (1.10.1)
|
||||
builder
|
||||
excon (~> 0.14)
|
||||
excon (~> 0.20)
|
||||
formatador (~> 0.2.0)
|
||||
mime-types
|
||||
multi_json (~> 1.0)
|
||||
net-scp (~> 1.0.4)
|
||||
net-scp (~> 1.1)
|
||||
net-ssh (>= 2.1.3)
|
||||
nokogiri (~> 1.5.0)
|
||||
ruby-hmac
|
||||
formatador (0.2.4)
|
||||
fspath (2.0.4)
|
||||
guard (1.6.2)
|
||||
guard (1.7.0)
|
||||
formatador (>= 0.2.4)
|
||||
listen (>= 0.6.0)
|
||||
lumberjack (>= 1.0.2)
|
||||
pry (>= 0.9.10)
|
||||
terminal-table (>= 1.4.3)
|
||||
thor (>= 0.14.6)
|
||||
guard-jasmine (1.12.2)
|
||||
guard-jasmine (1.15.1)
|
||||
childprocess
|
||||
guard (>= 1.1.0)
|
||||
multi_json
|
||||
|
|
@ -214,96 +199,75 @@ GEM
|
|||
guard-jshint-on-rails (0.0.2)
|
||||
guard (>= 1.0.0)
|
||||
jshint_on_rails (>= 1.0.2)
|
||||
guard-rspec (2.5.1)
|
||||
guard-rspec (2.5.4)
|
||||
guard (>= 1.1)
|
||||
rspec (~> 2.11)
|
||||
guard-spork (1.4.2)
|
||||
guard-spork (1.5.0)
|
||||
childprocess (>= 0.2.3)
|
||||
guard (>= 1.1)
|
||||
spork (>= 0.8.4)
|
||||
haml (3.1.7)
|
||||
haml (4.0.2)
|
||||
tilt
|
||||
has_ip_address (0.0.1)
|
||||
hashie (1.2.0)
|
||||
highline (1.6.15)
|
||||
hashie (2.0.4)
|
||||
highline (1.6.18)
|
||||
hike (1.2.2)
|
||||
hiredis (0.4.5)
|
||||
httpauth (0.2.0)
|
||||
i18n (0.6.4)
|
||||
image_optim (0.7.2)
|
||||
image_optim (0.8.0)
|
||||
fspath (~> 2.0.3)
|
||||
image_size (~> 1.1)
|
||||
image_size (~> 1.1.2)
|
||||
in_threads (~> 1.1.1)
|
||||
progress (~> 2.4.0)
|
||||
image_size (1.1.1)
|
||||
image_size (1.1.2)
|
||||
image_sorcery (1.1.0)
|
||||
in_threads (1.1.1)
|
||||
ipaddress (0.8.0)
|
||||
jasminerice (0.0.10)
|
||||
coffee-rails
|
||||
haml
|
||||
journey (1.0.4)
|
||||
jquery-rails (2.2.0)
|
||||
jquery-rails (2.2.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jshint_on_rails (1.0.2)
|
||||
json (1.7.7)
|
||||
jwt (0.1.5)
|
||||
multi_json (>= 1.0)
|
||||
librarian (0.0.26)
|
||||
archive-tar-minitar (>= 0.5.2)
|
||||
chef (>= 0.10)
|
||||
jwt (0.1.8)
|
||||
multi_json (>= 1.5)
|
||||
librarian (0.1.0)
|
||||
highline
|
||||
thor (~> 0.15)
|
||||
libv8 (3.11.8.17)
|
||||
listen (0.7.2)
|
||||
listen (0.7.3)
|
||||
lru_redux (0.0.6)
|
||||
lumberjack (1.0.2)
|
||||
lumberjack (1.0.3)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
metaclass (0.0.1)
|
||||
method_source (0.8.1)
|
||||
mime-types (1.21)
|
||||
minitest (4.3.3)
|
||||
mixlib-authentication (1.3.0)
|
||||
mixlib-log
|
||||
mixlib-cli (1.3.0)
|
||||
mixlib-config (1.1.2)
|
||||
mixlib-log (1.4.1)
|
||||
mixlib-shellout (1.1.0)
|
||||
mocha (0.10.5)
|
||||
mime-types (1.23)
|
||||
minitest (4.7.3)
|
||||
mocha (0.13.3)
|
||||
metaclass (~> 0.0.1)
|
||||
multi_json (1.7.2)
|
||||
multipart-post (1.1.5)
|
||||
multipart-post (1.2.0)
|
||||
mustache (0.99.4)
|
||||
net-scp (1.0.4)
|
||||
net-ssh (>= 1.99.1)
|
||||
net-ssh (2.6.3)
|
||||
net-ssh-gateway (1.1.0)
|
||||
net-ssh (>= 1.99.1)
|
||||
net-ssh-multi (1.1)
|
||||
net-ssh (>= 2.1.4)
|
||||
net-ssh-gateway (>= 0.99.0)
|
||||
nokogiri (1.5.6)
|
||||
net-scp (1.1.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.6.7)
|
||||
nokogiri (1.5.9)
|
||||
oauth (0.4.7)
|
||||
oauth2 (0.8.0)
|
||||
oauth2 (0.8.1)
|
||||
faraday (~> 0.8)
|
||||
httpauth (~> 0.1)
|
||||
jwt (~> 0.1.4)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.2)
|
||||
ohai (6.16.0)
|
||||
ipaddress
|
||||
mixlib-cli
|
||||
mixlib-config
|
||||
mixlib-log
|
||||
mixlib-shellout
|
||||
systemu
|
||||
yajl-ruby
|
||||
oj (2.0.3)
|
||||
omniauth (1.1.1)
|
||||
hashie (~> 1.2)
|
||||
oj (2.0.11)
|
||||
omniauth (1.1.4)
|
||||
hashie (>= 1.2, < 3)
|
||||
rack
|
||||
omniauth-facebook (1.4.1)
|
||||
omniauth-oauth2 (~> 1.1.0)
|
||||
|
|
@ -319,16 +283,17 @@ GEM
|
|||
omniauth-openid (1.0.1)
|
||||
omniauth (~> 1.0)
|
||||
rack-openid (~> 1.3.1)
|
||||
omniauth-twitter (0.0.14)
|
||||
omniauth-twitter (0.0.16)
|
||||
multi_json (~> 1.3)
|
||||
omniauth-oauth (~> 1.0)
|
||||
openid-redis-store (0.0.2)
|
||||
redis
|
||||
ruby-openid
|
||||
pg (0.14.1)
|
||||
pg (0.15.1)
|
||||
pg-hstore (1.1.7)
|
||||
polyglot (0.3.3)
|
||||
progress (2.4.0)
|
||||
pry (0.9.11.4)
|
||||
pry (0.9.12.1)
|
||||
coderay (~> 1.0.5)
|
||||
method_source (~> 0.8)
|
||||
slop (~> 3.4)
|
||||
|
|
@ -344,7 +309,7 @@ GEM
|
|||
rack-openid (1.3.1)
|
||||
rack (>= 1.1.0)
|
||||
ruby-openid (>= 2.1.8)
|
||||
rack-protection (1.3.2)
|
||||
rack-protection (1.5.0)
|
||||
rack
|
||||
rack-ssl (1.3.3)
|
||||
rack
|
||||
|
|
@ -371,10 +336,10 @@ GEM
|
|||
rb-fsevent (0.9.3)
|
||||
rb-inotify (0.8.8)
|
||||
ffi (>= 0.5.0)
|
||||
rdoc (3.12.1)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redcarpet (2.2.2)
|
||||
redis (3.0.3)
|
||||
redis (3.0.4)
|
||||
redis-actionpack (3.2.3)
|
||||
actionpack (~> 3.2.3)
|
||||
redis-rack (~> 1.4.0)
|
||||
|
|
@ -399,27 +364,27 @@ GEM
|
|||
ref (1.0.4)
|
||||
rest-client (1.6.7)
|
||||
mime-types (>= 1.16)
|
||||
rinku (1.7.2)
|
||||
rspec (2.12.0)
|
||||
rspec-core (~> 2.12.0)
|
||||
rspec-expectations (~> 2.12.0)
|
||||
rspec-mocks (~> 2.12.0)
|
||||
rspec-core (2.12.2)
|
||||
rspec-expectations (2.12.1)
|
||||
diff-lcs (~> 1.1.3)
|
||||
rspec-mocks (2.12.2)
|
||||
rspec-rails (2.12.2)
|
||||
rinku (1.7.3)
|
||||
rspec (2.13.0)
|
||||
rspec-core (~> 2.13.0)
|
||||
rspec-expectations (~> 2.13.0)
|
||||
rspec-mocks (~> 2.13.0)
|
||||
rspec-core (2.13.1)
|
||||
rspec-expectations (2.13.0)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-mocks (2.13.1)
|
||||
rspec-rails (2.13.0)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 2.12.0)
|
||||
rspec-expectations (~> 2.12.0)
|
||||
rspec-mocks (~> 2.12.0)
|
||||
rspec-core (~> 2.13.0)
|
||||
rspec-expectations (~> 2.13.0)
|
||||
rspec-mocks (~> 2.13.0)
|
||||
ruby-hmac (0.4.0)
|
||||
ruby-openid (2.2.2)
|
||||
ruby-openid (2.2.3)
|
||||
sanitize (2.0.3)
|
||||
nokogiri (>= 1.4.4, < 1.6)
|
||||
sass (3.2.5)
|
||||
sass (3.2.8)
|
||||
sass-rails (3.2.6)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
|
|
@ -427,15 +392,15 @@ GEM
|
|||
seed-fu (2.2.0)
|
||||
activerecord (~> 3.1)
|
||||
activesupport (~> 3.1)
|
||||
shoulda (3.3.2)
|
||||
shoulda-context (~> 1.0.1)
|
||||
shoulda-matchers (~> 1.4.1)
|
||||
shoulda-context (1.0.2)
|
||||
shoulda-matchers (1.4.2)
|
||||
shoulda (3.4.0)
|
||||
shoulda-context (~> 1.0, >= 1.0.1)
|
||||
shoulda-matchers (~> 1.0, >= 1.4.1)
|
||||
shoulda-context (1.1.1)
|
||||
shoulda-matchers (1.5.6)
|
||||
activesupport (>= 3.0.0)
|
||||
bourne (~> 1.1.2)
|
||||
sidekiq (2.8.0)
|
||||
celluloid (~> 0.12.0)
|
||||
bourne (~> 1.3)
|
||||
sidekiq (2.11.1)
|
||||
celluloid (~> 0.13.0)
|
||||
connection_pool (~> 1.0)
|
||||
multi_json (~> 1)
|
||||
redis (~> 3)
|
||||
|
|
@ -444,19 +409,17 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
simplecov-html (~> 0.7.1)
|
||||
simplecov-html (0.7.1)
|
||||
sinatra (1.3.4)
|
||||
sinatra (1.3.6)
|
||||
rack (~> 1.4)
|
||||
rack-protection (~> 1.3)
|
||||
tilt (~> 1.3, >= 1.3.3)
|
||||
slim (1.3.6)
|
||||
temple (~> 0.5.5)
|
||||
slim (1.3.8)
|
||||
temple (~> 0.6.3)
|
||||
tilt (~> 1.3.3)
|
||||
slop (3.4.3)
|
||||
slop (3.4.4)
|
||||
spork (0.9.2)
|
||||
systemu (2.5.2)
|
||||
temple (0.5.5)
|
||||
temple (0.6.4)
|
||||
terminal-notifier-guard (1.5.3)
|
||||
terminal-table (1.4.5)
|
||||
therubyracer (0.11.4)
|
||||
libv8 (~> 3.11.8.12)
|
||||
ref
|
||||
|
|
@ -464,8 +427,8 @@ GEM
|
|||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 0.12.6)
|
||||
rack (>= 1.0.0)
|
||||
thor (0.17.0)
|
||||
tilt (1.3.3)
|
||||
thor (0.18.1)
|
||||
tilt (1.3.7)
|
||||
timers (1.1.0)
|
||||
treetop (1.4.12)
|
||||
polyglot
|
||||
|
|
@ -477,7 +440,6 @@ GEM
|
|||
uglifier (2.0.1)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
yajl-ruby (1.1.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -488,6 +450,7 @@ DEPENDENCIES
|
|||
activerecord-postgres-hstore
|
||||
acts_as_paranoid
|
||||
airbrake (= 3.1.2)
|
||||
barber (= 0.3.0)
|
||||
better_errors
|
||||
binding_of_caller
|
||||
certified
|
||||
|
|
@ -537,7 +500,7 @@ DEPENDENCIES
|
|||
rack-cache
|
||||
rack-cors
|
||||
rack-mini-profiler
|
||||
rails
|
||||
rails (= 3.2.12)
|
||||
rails_multisite!
|
||||
rake
|
||||
rb-fsevent
|
||||
|
|
|
|||
Loading…
Reference in a new issue