mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Rebuild Gemfile_master.lock based on the lastest Gemfile.lock
This commit is contained in:
Godfrey Chan
parent
a90176550c
commit
903b505394
@ -7,57 +7,57 @@ GIT
|
|||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: https://github.com/rails/rails.git
|
remote: https://github.com/rails/rails.git
|
||||||
revision: 316962d0922992fbe756521bd7c94a751aa1253e
|
revision: aa6637d140c2ebd28bbd23fc250af033a065dbe8
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.0.beta1)
|
actionmailer (4.2.0.beta4)
|
||||||
actionpack (= 4.2.0.beta1)
|
actionpack (= 4.2.0.beta4)
|
||||||
actionview (= 4.2.0.beta1)
|
actionview (= 4.2.0.beta4)
|
||||||
activejob (= 4.2.0.beta1)
|
activejob (= 4.2.0.beta4)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.2)
|
rails-dom-testing (~> 1.0, >= 1.0.4)
|
||||||
actionpack (4.2.0.beta1)
|
actionpack (4.2.0.beta4)
|
||||||
actionview (= 4.2.0.beta1)
|
actionview (= 4.2.0.beta4)
|
||||||
activesupport (= 4.2.0.beta1)
|
activesupport (= 4.2.0.beta4)
|
||||||
rack (~> 1.6.0.beta)
|
rack (~> 1.6.0.beta)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.2)
|
rails-dom-testing (~> 1.0, >= 1.0.4)
|
||||||
rails-html-sanitizer (~> 1.0)
|
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||||
actionview (4.2.0.beta1)
|
actionview (4.2.0.beta4)
|
||||||
activesupport (= 4.2.0.beta1)
|
activesupport (= 4.2.0.beta4)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.2)
|
rails-dom-testing (~> 1.0, >= 1.0.4)
|
||||||
rails-html-sanitizer (~> 1.0)
|
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||||
activejob (4.2.0.beta1)
|
activejob (4.2.0.beta4)
|
||||||
activesupport (= 4.2.0.beta1)
|
activesupport (= 4.2.0.beta4)
|
||||||
globalid (>= 0.2.3)
|
globalid (>= 0.3.0)
|
||||||
activemodel (4.2.0.beta1)
|
activemodel (4.2.0.beta4)
|
||||||
activesupport (= 4.2.0.beta1)
|
activesupport (= 4.2.0.beta4)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.0.beta1)
|
activerecord (4.2.0.beta4)
|
||||||
activemodel (= 4.2.0.beta1)
|
activemodel (= 4.2.0.beta4)
|
||||||
activesupport (= 4.2.0.beta1)
|
activesupport (= 4.2.0.beta4)
|
||||||
arel (>= 6.0.0.beta1, < 6.1)
|
arel (>= 6.0.0.beta2, < 6.1)
|
||||||
activesupport (4.2.0.beta1)
|
activesupport (4.2.0.beta4)
|
||||||
i18n (>= 0.7.0.beta1, < 0.8)
|
i18n (>= 0.7.0.beta1, < 0.8)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
rails (4.2.0.beta1)
|
rails (4.2.0.beta4)
|
||||||
actionmailer (= 4.2.0.beta1)
|
actionmailer (= 4.2.0.beta4)
|
||||||
actionpack (= 4.2.0.beta1)
|
actionpack (= 4.2.0.beta4)
|
||||||
actionview (= 4.2.0.beta1)
|
actionview (= 4.2.0.beta4)
|
||||||
activejob (= 4.2.0.beta1)
|
activejob (= 4.2.0.beta4)
|
||||||
activemodel (= 4.2.0.beta1)
|
activemodel (= 4.2.0.beta4)
|
||||||
activerecord (= 4.2.0.beta1)
|
activerecord (= 4.2.0.beta4)
|
||||||
activesupport (= 4.2.0.beta1)
|
activesupport (= 4.2.0.beta4)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.0.beta1)
|
railties (= 4.2.0.beta4)
|
||||||
sprockets-rails (~> 3.0.0.beta1)
|
sprockets-rails (~> 3.0.0.beta1)
|
||||||
railties (4.2.0.beta1)
|
railties (4.2.0.beta4)
|
||||||
actionpack (= 4.2.0.beta1)
|
actionpack (= 4.2.0.beta4)
|
||||||
activesupport (= 4.2.0.beta1)
|
activesupport (= 4.2.0.beta4)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
|
|
||||||
@ -82,13 +82,10 @@ GEM
|
|||||||
active_model_serializers (0.8.2)
|
active_model_serializers (0.8.2)
|
||||||
activemodel (>= 3.0)
|
activemodel (>= 3.0)
|
||||||
addressable (2.3.6)
|
addressable (2.3.6)
|
||||||
airbrake (3.1.2)
|
|
||||||
activesupport
|
|
||||||
builder
|
|
||||||
annotate (2.6.5)
|
annotate (2.6.5)
|
||||||
activerecord (>= 2.3.0)
|
activerecord (>= 2.3.0)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
arel (6.0.0.beta1)
|
arel (6.0.0.beta2)
|
||||||
barber (0.4.2)
|
barber (0.4.2)
|
||||||
ember-source
|
ember-source
|
||||||
execjs
|
execjs
|
||||||
@ -114,25 +111,25 @@ GEM
|
|||||||
dotenv-deployment (~> 0.0.2)
|
dotenv-deployment (~> 0.0.2)
|
||||||
dotenv-deployment (0.0.2)
|
dotenv-deployment (0.0.2)
|
||||||
email_reply_parser-discourse (0.6)
|
email_reply_parser-discourse (0.6)
|
||||||
ember-data-source (1.0.0.beta.9)
|
ember-data-source (0.14)
|
||||||
ember-source
|
ember-source
|
||||||
ember-rails (0.15.0)
|
ember-rails (0.14.1)
|
||||||
active_model_serializers
|
active_model_serializers
|
||||||
barber (>= 0.4.1)
|
barber (>= 0.4.1)
|
||||||
ember-data-source (>= 1.0.0.beta.5)
|
ember-data-source
|
||||||
ember-source (>= 1.1.0)
|
ember-source
|
||||||
execjs (>= 1.2)
|
execjs (>= 1.2)
|
||||||
handlebars-source (> 1.0.0)
|
handlebars-source
|
||||||
jquery-rails (>= 1.0.17)
|
jquery-rails (>= 1.0.17)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
ember-source (1.6.0.beta.2)
|
ember-source (1.6.0.beta.2)
|
||||||
handlebars-source (~> 1.0)
|
handlebars-source (~> 1.0)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.0.3)
|
eventmachine (1.0.3)
|
||||||
excon (0.39.5)
|
excon (0.39.6)
|
||||||
execjs (2.2.1)
|
execjs (2.2.1)
|
||||||
exifr (1.1.3)
|
exifr (1.1.3)
|
||||||
fabrication (2.11.3)
|
fabrication (2.9.8)
|
||||||
fakeweb (1.3.0)
|
fakeweb (1.3.0)
|
||||||
faraday (0.9.0)
|
faraday (0.9.0)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
@ -146,7 +143,7 @@ GEM
|
|||||||
fast_xs (0.8.0)
|
fast_xs (0.8.0)
|
||||||
fastimage (1.6.3)
|
fastimage (1.6.3)
|
||||||
addressable (~> 2.3, >= 2.3.5)
|
addressable (~> 2.3, >= 2.3.5)
|
||||||
ffi (1.9.3)
|
ffi (1.9.5)
|
||||||
flamegraph (0.0.5)
|
flamegraph (0.0.5)
|
||||||
fast_stack
|
fast_stack
|
||||||
fog (1.22.1)
|
fog (1.22.1)
|
||||||
@ -155,7 +152,7 @@ GEM
|
|||||||
fog-json
|
fog-json
|
||||||
ipaddress (~> 0.5)
|
ipaddress (~> 0.5)
|
||||||
nokogiri (~> 1.5, >= 1.5.11)
|
nokogiri (~> 1.5, >= 1.5.11)
|
||||||
fog-brightbox (0.5.0)
|
fog-brightbox (0.5.1)
|
||||||
fog-core (~> 1.22)
|
fog-core (~> 1.22)
|
||||||
fog-json
|
fog-json
|
||||||
inflecto
|
inflecto
|
||||||
@ -176,7 +173,7 @@ GEM
|
|||||||
gctools (0.2.3)
|
gctools (0.2.3)
|
||||||
given_core (3.5.4)
|
given_core (3.5.4)
|
||||||
sorcerer (>= 0.3.7)
|
sorcerer (>= 0.3.7)
|
||||||
globalid (0.2.3)
|
globalid (0.3.0)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
guess_html_encoding (0.0.9)
|
guess_html_encoding (0.0.9)
|
||||||
handlebars-source (1.3.0)
|
handlebars-source (1.3.0)
|
||||||
@ -205,7 +202,7 @@ GEM
|
|||||||
librarian (0.1.2)
|
librarian (0.1.2)
|
||||||
highline
|
highline
|
||||||
thor (~> 0.15)
|
thor (~> 0.15)
|
||||||
libv8 (3.16.14.3)
|
libv8 (3.16.14.7)
|
||||||
listen (0.7.3)
|
listen (0.7.3)
|
||||||
logster (0.1.6)
|
logster (0.1.6)
|
||||||
loofah (2.0.1)
|
loofah (2.0.1)
|
||||||
@ -215,15 +212,15 @@ GEM
|
|||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
memory_profiler (0.0.4)
|
memory_profiler (0.0.4)
|
||||||
message_bus (0.9.5)
|
message_bus (1.0.5)
|
||||||
eventmachine
|
eventmachine
|
||||||
rack (>= 1.1.3)
|
rack (>= 1.1.3)
|
||||||
redis
|
redis
|
||||||
metaclass (0.0.4)
|
metaclass (0.0.4)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_portile (0.6.0)
|
mini_portile (0.6.1)
|
||||||
minitest (5.4.1)
|
minitest (5.4.2)
|
||||||
mocha (1.1.0)
|
mocha (1.1.0)
|
||||||
metaclass (~> 0.0.1)
|
metaclass (~> 0.0.1)
|
||||||
mock_redis (0.13.2)
|
mock_redis (0.13.2)
|
||||||
@ -237,8 +234,8 @@ GEM
|
|||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (2.9.1)
|
net-ssh (2.9.1)
|
||||||
netrc (0.7.7)
|
netrc (0.7.7)
|
||||||
nokogiri (1.6.3.1)
|
nokogiri (1.6.4.1)
|
||||||
mini_portile (= 0.6.0)
|
mini_portile (~> 0.6.0)
|
||||||
nokogumbo (1.1.12)
|
nokogumbo (1.1.12)
|
||||||
nokogiri
|
nokogiri
|
||||||
oauth (0.4.7)
|
oauth (0.4.7)
|
||||||
@ -274,7 +271,7 @@ GEM
|
|||||||
omniauth-twitter (1.0.1)
|
omniauth-twitter (1.0.1)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
omniauth-oauth (~> 1.0)
|
omniauth-oauth (~> 1.0)
|
||||||
onebox (1.4.9)
|
onebox (1.5.3)
|
||||||
moneta (~> 0.7)
|
moneta (~> 0.7)
|
||||||
multi_json (~> 1.7)
|
multi_json (~> 1.7)
|
||||||
mustache (~> 0.99)
|
mustache (~> 0.99)
|
||||||
@ -293,7 +290,7 @@ GEM
|
|||||||
pry (>= 0.9.10, < 0.11.0)
|
pry (>= 0.9.10, < 0.11.0)
|
||||||
pry-rails (0.3.2)
|
pry-rails (0.3.2)
|
||||||
pry (>= 0.9.10)
|
pry (>= 0.9.10)
|
||||||
puma (2.9.0)
|
puma (2.9.1)
|
||||||
rack (>= 1.1, < 2.0)
|
rack (>= 1.1, < 2.0)
|
||||||
qunit-rails (0.0.7)
|
qunit-rails (0.0.7)
|
||||||
railties
|
railties
|
||||||
@ -307,13 +304,13 @@ GEM
|
|||||||
rack
|
rack
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails-deprecated_sanitizer (1.0.2)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0.alpha)
|
||||||
rails-dom-testing (1.0.2)
|
rails-dom-testing (1.0.4)
|
||||||
activesupport
|
activesupport (>= 4.2.0.beta, < 5.0)
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
rails-html-sanitizer (1.0.0)
|
rails-html-sanitizer (1.0.1)
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
rails-observers (0.1.2)
|
rails-observers (0.1.2)
|
||||||
activemodel (~> 4.0)
|
activemodel (~> 4.0)
|
||||||
@ -338,29 +335,28 @@ GEM
|
|||||||
netrc (~> 0.7)
|
netrc (~> 0.7)
|
||||||
rinku (1.7.3)
|
rinku (1.7.3)
|
||||||
rmmseg-cpp (0.2.9)
|
rmmseg-cpp (0.2.9)
|
||||||
rspec (3.0.0)
|
rspec (2.99.0)
|
||||||
rspec-core (~> 3.0.0)
|
rspec-core (~> 2.99.0)
|
||||||
rspec-expectations (~> 3.0.0)
|
rspec-expectations (~> 2.99.0)
|
||||||
rspec-mocks (~> 3.0.0)
|
rspec-mocks (~> 2.99.0)
|
||||||
rspec-core (3.0.4)
|
rspec-collection_matchers (1.0.0)
|
||||||
rspec-support (~> 3.0.0)
|
rspec-expectations (>= 2.99.0.beta1)
|
||||||
rspec-expectations (3.0.4)
|
rspec-core (2.99.2)
|
||||||
diff-lcs (>= 1.2.0, < 2.0)
|
rspec-expectations (2.99.2)
|
||||||
rspec-support (~> 3.0.0)
|
diff-lcs (>= 1.1.3, < 2.0)
|
||||||
rspec-given (3.5.4)
|
rspec-given (3.5.4)
|
||||||
given_core (= 3.5.4)
|
given_core (= 3.5.4)
|
||||||
rspec (>= 2.12)
|
rspec (>= 2.12)
|
||||||
rspec-mocks (3.0.4)
|
rspec-mocks (2.99.2)
|
||||||
rspec-support (~> 3.0.0)
|
rspec-rails (2.99.0)
|
||||||
rspec-rails (3.0.2)
|
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
|
activemodel (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
railties (>= 3.0)
|
railties (>= 3.0)
|
||||||
rspec-core (~> 3.0.0)
|
rspec-collection_matchers
|
||||||
rspec-expectations (~> 3.0.0)
|
rspec-core (~> 2.99.0)
|
||||||
rspec-mocks (~> 3.0.0)
|
rspec-expectations (~> 2.99.0)
|
||||||
rspec-support (~> 3.0.0)
|
rspec-mocks (~> 2.99.0)
|
||||||
rspec-support (3.0.4)
|
|
||||||
rtlit (0.0.5)
|
rtlit (0.0.5)
|
||||||
ruby-openid (2.5.0)
|
ruby-openid (2.5.0)
|
||||||
ruby-readability (0.7.0)
|
ruby-readability (0.7.0)
|
||||||
@ -370,7 +366,7 @@ GEM
|
|||||||
crass (~> 0.2.0)
|
crass (~> 0.2.0)
|
||||||
nokogiri (>= 1.4.4)
|
nokogiri (>= 1.4.4)
|
||||||
nokogumbo (= 1.1.12)
|
nokogumbo (= 1.1.12)
|
||||||
sass (3.4.2)
|
sass (3.2.19)
|
||||||
seed-fu (2.3.3)
|
seed-fu (2.3.3)
|
||||||
activerecord (>= 3.1, < 4.2)
|
activerecord (>= 3.1, < 4.2)
|
||||||
activesupport (>= 3.1, < 4.2)
|
activesupport (>= 3.1, < 4.2)
|
||||||
@ -380,16 +376,16 @@ GEM
|
|||||||
shoulda-context (1.2.1)
|
shoulda-context (1.2.1)
|
||||||
shoulda-matchers (2.7.0)
|
shoulda-matchers (2.7.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
sidekiq (3.2.3)
|
sidekiq (3.2.5)
|
||||||
celluloid (>= 0.15.2)
|
celluloid (= 0.15.2)
|
||||||
connection_pool (>= 2.0.0)
|
connection_pool (>= 2.0.0)
|
||||||
json
|
json
|
||||||
redis (>= 3.0.6)
|
redis (>= 3.0.6)
|
||||||
redis-namespace (>= 1.3.1)
|
redis-namespace (>= 1.3.1)
|
||||||
simple-rss (1.3.1)
|
simple-rss (1.3.1)
|
||||||
simplecov (0.9.0)
|
simplecov (0.9.1)
|
||||||
docile (~> 1.1.0)
|
docile (~> 1.1.0)
|
||||||
multi_json
|
multi_json (~> 1.0)
|
||||||
simplecov-html (~> 0.8.0)
|
simplecov-html (~> 0.8.0)
|
||||||
simplecov-html (0.8.0)
|
simplecov-html (0.8.0)
|
||||||
sinatra (1.4.5)
|
sinatra (1.4.5)
|
||||||
@ -402,7 +398,7 @@ GEM
|
|||||||
spork-rails (4.0.0)
|
spork-rails (4.0.0)
|
||||||
rails (>= 3.0.0, < 5)
|
rails (>= 3.0.0, < 5)
|
||||||
spork (>= 1.0rc0)
|
spork (>= 1.0rc0)
|
||||||
sprockets (2.12.1)
|
sprockets (2.12.3)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
@ -447,7 +443,6 @@ PLATFORMS
|
|||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
actionpack-action_caching!
|
actionpack-action_caching!
|
||||||
active_model_serializers (~> 0.8.0)
|
active_model_serializers (~> 0.8.0)
|
||||||
airbrake (= 3.1.2)
|
|
||||||
annotate
|
annotate
|
||||||
barber
|
barber
|
||||||
better_errors
|
better_errors
|
||||||
@ -457,7 +452,7 @@ DEPENDENCIES
|
|||||||
ember-rails
|
ember-rails
|
||||||
ember-source (= 1.6.0.beta.2)
|
ember-source (= 1.6.0.beta.2)
|
||||||
eventmachine
|
eventmachine
|
||||||
fabrication
|
fabrication (= 2.9.8)
|
||||||
fakeweb (~> 1.3.0)
|
fakeweb (~> 1.3.0)
|
||||||
fast_blank
|
fast_blank
|
||||||
fast_xor
|
fast_xor
|
||||||
@ -514,6 +509,7 @@ DEPENDENCIES
|
|||||||
rest-client
|
rest-client
|
||||||
rinku
|
rinku
|
||||||
rmmseg-cpp
|
rmmseg-cpp
|
||||||
|
rspec (= 2.99.0)
|
||||||
rspec-given
|
rspec-given
|
||||||
rspec-rails
|
rspec-rails
|
||||||
rtlit
|
rtlit
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user