mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 09:42:07 +08:00
Only 1 complicated git dependency left
This commit is contained in:
Sam
parent
7124a4a694
commit
74c16ca1af
17
Gemfile
17
Gemfile
|
|
@ -34,7 +34,9 @@ else
|
|||
puts "Booting in Rails 3 mode"
|
||||
end
|
||||
|
||||
gem 'seed-fu' , github: 'SamSaffron/seed-fu'
|
||||
# see: https://github.com/mbleigh/seed-fu/pull/54
|
||||
# taking forever to get changes upstream in seed-fu
|
||||
gem 'seed-fu-discourse', require: 'seed-fu'
|
||||
|
||||
if rails4?
|
||||
gem 'rails'
|
||||
|
|
@ -84,7 +86,11 @@ gem 'fastimage'
|
|||
gem 'fog', '1.18.0', require: false
|
||||
gem 'unf', require: false
|
||||
|
||||
gem 'email_reply_parser', git: 'https://github.com/lawrencepit/email_reply_parser.git'
|
||||
# see: https://twitter.com/samsaffron/status/412360162297393152
|
||||
# Massive amount of changes made in branch we use, no PR upstreamed
|
||||
# We need to get this sorted
|
||||
# https://github.com/samsaffron/email_reply_parser
|
||||
gem 'email_reply_parser-discourse', require: 'email_reply_parser'
|
||||
|
||||
# note: for image_optim to correctly work you need
|
||||
# sudo apt-get install -y advancecomp gifsicle jpegoptim libjpeg-progs optipng pngcrush
|
||||
|
|
@ -102,7 +108,10 @@ gem 'omniauth-facebook'
|
|||
gem 'omniauth-twitter'
|
||||
gem 'omniauth-github'
|
||||
gem 'omniauth-oauth2', require: false
|
||||
gem 'omniauth-browserid', git: 'https://github.com/callahad/omniauth-browserid.git', branch: 'observer_api'
|
||||
# abandoned gem hard to tell what is going on, multiple PRs upstream being ignored:
|
||||
# https://twitter.com/samsaffron/status/412372111710109696
|
||||
# we use: gem 'omniauth-browserid', git: 'https://github.com/samsaffron/omniauth-browserid.git', branch: 'observer_api'
|
||||
gem 'omniauth-browserid-discourse', require: 'omniauth-browserid'
|
||||
gem 'omniauth-cas'
|
||||
gem 'oj'
|
||||
# while resolving https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4
|
||||
|
|
@ -120,7 +129,7 @@ gem 'sinatra', require: nil
|
|||
gem 'slim' # required for sidekiq-web
|
||||
|
||||
# URGENT fix needed see: https://github.com/cowboyd/therubyracer/pull/280
|
||||
gem 'therubyracer', require: 'v8', git: 'https://github.com/SamSaffron/therubyracer.git'
|
||||
gem 'therubyracer-discourse', require: 'v8'
|
||||
gem 'thin', require: false
|
||||
gem 'highline', require: false
|
||||
gem 'rack-protection' # security
|
||||
|
|
|
|||
|
|
@ -1,11 +1,3 @@
|
|||
GIT
|
||||
remote: git://github.com/SamSaffron/seed-fu.git
|
||||
revision: 502c8b8514df3bf028c9231cc3a6ea3cff4f37f0
|
||||
specs:
|
||||
seed-fu (2.2.0)
|
||||
activerecord (>= 3.1, < 4.1)
|
||||
activesupport (>= 3.1, < 4.1)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/sporkrb/spork-rails.git
|
||||
revision: 0dd45e59d3237b4c8f9efc215b46d9c07072a95e
|
||||
|
|
@ -23,30 +15,6 @@ GIT
|
|||
redis-activesupport (>= 3.2.3)
|
||||
redis-store (~> 1.1.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/SamSaffron/therubyracer.git
|
||||
revision: 885ea08cb0bbe150e53d6d59ce60ef434245e6f3
|
||||
specs:
|
||||
therubyracer (0.12.0)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
|
||||
GIT
|
||||
remote: https://github.com/callahad/omniauth-browserid.git
|
||||
revision: af62d667626c1622de6fe13b60849c3640765ab1
|
||||
branch: observer_api
|
||||
specs:
|
||||
omniauth-browserid (0.0.2)
|
||||
faraday
|
||||
multi_json
|
||||
omniauth (~> 1.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/lawrencepit/email_reply_parser.git
|
||||
revision: 67408dfb1b99fb8d5f145f782b9e22d1851a8e5a
|
||||
specs:
|
||||
email_reply_parser (0.6)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/discourse_plugin
|
||||
specs:
|
||||
|
|
@ -121,6 +89,7 @@ GEM
|
|||
daemons (1.1.9)
|
||||
debug_inspector (0.0.2)
|
||||
diff-lcs (1.2.4)
|
||||
email_reply_parser-discourse (0.6)
|
||||
ember-data-source (0.14)
|
||||
ember-source
|
||||
ember-rails (0.14.1)
|
||||
|
|
@ -238,6 +207,10 @@ GEM
|
|||
omniauth (1.1.4)
|
||||
hashie (>= 1.2, < 3)
|
||||
rack
|
||||
omniauth-browserid-discourse (0.0.2)
|
||||
faraday
|
||||
multi_json
|
||||
omniauth (~> 1.0)
|
||||
omniauth-cas (1.0.4)
|
||||
addressable (~> 2.3)
|
||||
nokogiri (~> 1.6)
|
||||
|
|
@ -362,6 +335,9 @@ GEM
|
|||
railties (>= 4.0.0, < 5.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
seed-fu-discourse (2.2.0)
|
||||
activerecord (>= 3.1, < 4.1)
|
||||
activesupport (>= 3.1, < 4.1)
|
||||
shoulda (3.5.0)
|
||||
shoulda-context (~> 1.0, >= 1.0.1)
|
||||
shoulda-matchers (>= 1.4.1, < 3.0)
|
||||
|
|
@ -404,6 +380,9 @@ GEM
|
|||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
temple (0.6.7)
|
||||
therubyracer-discourse (0.12.0)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
thin (1.6.1)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 1.0.0)
|
||||
|
|
@ -443,7 +422,7 @@ DEPENDENCIES
|
|||
binding_of_caller
|
||||
certified
|
||||
discourse_plugin!
|
||||
email_reply_parser!
|
||||
email_reply_parser-discourse
|
||||
ember-rails
|
||||
ember-source (~> 1.2.0.1)
|
||||
eventmachine
|
||||
|
|
@ -473,7 +452,7 @@ DEPENDENCIES
|
|||
nokogiri
|
||||
oj
|
||||
omniauth
|
||||
omniauth-browserid!
|
||||
omniauth-browserid-discourse
|
||||
omniauth-cas
|
||||
omniauth-facebook
|
||||
omniauth-github
|
||||
|
|
@ -506,7 +485,7 @@ DEPENDENCIES
|
|||
sanitize
|
||||
sass
|
||||
sass-rails
|
||||
seed-fu!
|
||||
seed-fu-discourse
|
||||
shoulda
|
||||
sidekiq (= 2.15.1)
|
||||
sidekiq-failures
|
||||
|
|
@ -516,7 +495,7 @@ DEPENDENCIES
|
|||
sinatra
|
||||
slim
|
||||
spork-rails!
|
||||
therubyracer!
|
||||
therubyracer-discourse
|
||||
thin
|
||||
timecop
|
||||
uglifier
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user