Commit Graph

408 Commits

Author SHA1 Message Date
Sam Saffron fb513fc936 another messagebus upgrade to work around rubygems bug 2016-05-11 12:01:00 +10:00
Sam Saffron d0b9b69cba FIX: message_bus upgrade to correct CORS issue 2016-05-11 10:42:34 +10:00
Régis Hanol df14926e42 SECURITY: check magic bytes before using ImageMagick tools 2016-05-03 21:54:07 +02:00
Guo Xiang Tan 44868c9e77
Update message_bus. 2016-05-03 13:37:35 +08:00
Guo Xiang Tan 256d7a00e9 Update sprockets. (#4167)
* Update sass-rails.

* FIX: Tilt dependency has been removed from Ember::Handlebars::Template.

* Update `DiscourseIIFE` to new Sprockets API.

* `Rails.application.assets` returns `nil` in production.

* Move sprockets-rails out of the assets group.

* Pin ember-rails to 0.18.5 which works with Sprockets 3.x.

* Update sprockets to 3.6.0.

* Make `DiscourseSassCompiler` work with Sprockets 3.

* Use `Sass::Rails::SassImporterGlobbing` instead of haxxing our own.

* Moneky patch so that we don't add dependencies for our custom css.

* FIX: Missing class.

* Upgrade ember-handlebars-template.

* FIX: require path needs to share the same root as the folder's path.

* Bump discourse-qunit-rails.

* Update ember-template-compiler.js to 1.12.2.

* `prepend` is private in Ruby 2.0.0.
2016-04-18 10:47:52 +08:00
Régis Hanol 59a2720b2a update email_reply_trimmer 2016-03-31 19:06:36 +02:00
Régis Hanol 480e8d0dc7 update 'email_reply_trimmer' to latest version 2016-03-29 12:35:50 +02:00
Sam 963d558bee update message bus 2016-03-11 14:17:06 +11:00
Régis Hanol 6e3dcdeea1 update email_reply_trimmer to latest 2016-03-07 19:17:14 +01:00
Sam fe6ea48123 Merge pull request #4038 from markbiegel/instagram-login
FEATURE: Instagram OmniAuth login methods
2016-03-07 14:05:07 +11:00
Sam Saffron 7598037080 Only pull in gem if it is being used, remove middleware 2016-03-04 23:17:14 +11:00
Régis Hanol 1135d2094a Merge pull request #4006 from scossar/set-locale-from-header
Feature: (WIP) Set locale from Accept-Language header
2016-03-04 09:12:30 +01:00
Sam 5dd746d61f Upgrade message bus to latest 2016-02-29 10:54:40 +11:00
scossar 0a396583ed set locale for anonymous from header
set locale on signup

update spec

add locale option
2016-02-26 13:45:00 -08:00
Ubuntu 5c603bf8ec Added Instagram login method 2016-02-25 12:13:59 +10:00
Régis Hanol 3b9223c5da bump email_reply_trimmer to latest version 2016-02-18 16:56:45 +01:00
Régis Hanol 1beb6070aa update email_reply_trimmer to latest version 2016-02-08 18:29:49 +01:00
Régis Hanol e8969b0c34 use bug-free version of email_reply_trimmer gem 2016-02-04 17:06:12 +01:00
Régis Hanol 5ee845fc5f update email_reply_trimmer to latest version 2016-02-04 16:39:57 +01:00
Régis Hanol 46b6c55197 FIX: replace 'discourse_email_parser' with 'email_reply_trimmer' to better trim replies from plain text emails
FIX: undefined method `number_to_human_size' when email contains attachments
2016-01-30 01:29:31 +01:00
Guo Xiang Tan 9b9f0ab4af Upgrade omniauth-google-oauth2. 2016-01-29 23:14:51 +08:00
Guo Xiang Tan 0e73660c8d Remove addressable from Discourse. 2016-01-25 18:34:58 +08:00
Robin Ward 4bbbdd8dc4 SECURITY: Upgrade Ember to fix CVE-2015-7565. Also upgrade Handlebars 2016-01-15 13:57:45 -05:00
Robin Ward 7a28338a07 Revert "SECURITY: Upgrade Ember to fix CVE-2015-7565"
This reverts commit 211521df4f.
2016-01-15 11:39:07 -05:00
Robin Ward 211521df4f SECURITY: Upgrade Ember to fix CVE-2015-7565 2016-01-15 11:31:02 -05:00
Sam Saffron 38c63c2185 update google oauth
early versions are not working with omniauth so we are stuck with this and addressable
2016-01-11 23:48:31 +11:00
Sam Saffron da25502bed downgrade google omniauth 2016-01-11 23:29:01 +11:00
Sam Saffron 61650edfd4 big gem update 2016-01-11 18:17:13 +11:00
Sam eaab27325d upgrade message_bus, had stray console.log :( 2016-01-06 20:20:23 +11:00
Sam Saffron 93855db158 FEATURE: upgrade message_bus
New version has support for chunked encoding, this cuts down
significantly on network usage when lots of messages are sent

We no longer have to re-establish a connection after we get a message,
 we simply reuse.
2016-01-05 21:39:25 +11:00
Sam Saffron 426299d261 FEATURE: upgrade to Sidekiq 4 2016-01-01 15:40:31 +11:00
Sam af91d6f35b Revert "FEATURE: upgrade sidekiq to version 4.0"
This reverts commit af93a1d94c.

We need to wait a bit to clean up our internal API usage.
2015-12-31 16:35:02 +11:00
Sam af93a1d94c FEATURE: upgrade sidekiq to version 4.0 2015-12-31 16:14:58 +11:00
Sam 0fdac4fc42 Update Gemfile
fix for certain bundlers
2015-12-28 22:32:45 +11:00
Guo Xiang Tan ba29bba987 Add Ruby 2.3 platform to profiling tools in Gemfile. 2015-12-28 09:53:52 +08:00
Sam f3e24bac4f we need spork rails to run our specs 2015-12-21 16:47:42 +11:00
Sam 2e6af399a8 update rails, remove spork 2015-12-21 16:39:15 +11:00
Sam 950b69cfb0 Prepare for Rails 5, don't simply include Rails be explicit 2015-12-21 16:15:30 +11:00
Arpit Jalan 553248de86 FEATURE: new gem discourse_email_parser 2015-12-11 01:02:28 +05:30
Arpit Jalan 7a8e5a50ff FEATURE: better email reply parsing 2015-12-09 23:47:01 +05:30
Robin Ward 434deb1bd3 SECURITY: Backported XSS fixes from Handlebars 2015-11-24 16:08:08 -05:00
kerryliu b7803fc68e FIX: allow emoji class when crawling embedded content, add rspc-html-matchers 2015-11-05 18:51:26 -08:00
Sam a27abf5ce7 we got our gem back! 2015-10-13 15:17:40 +11:00
Sam cf52671feb stop vendoring rails multisite 2015-10-12 17:26:20 +11:00
Gerhard Schlager 8b3b14a704 Disable byebug when RubyMine is used for debugging
Debugger in RubyMine doesn't work well with byebug.
For example, debugging Sidekiq jobs doesn't work when byebug is loaded.
2015-10-09 21:51:47 +02:00
Sam ffb8cb8cac FEATURE: remove dependency of Redcarpet
PERF: cache fancy_title in topics table

New pure ruby implementation is far more flexible and easier to amend.
2015-09-24 13:37:53 +10:00
Sam 613761d1cd FEATURE: upgrade to Rails 4.2.4 2015-09-23 15:24:30 +10:00
Sam cd8d82aa31 correct file size and add note about impending breakage of image_optim 2015-09-10 14:37:46 +10:00
Anton Davydov b97764554b Add plugin for displaying sidekiq statistic in web ui 2015-09-03 01:24:02 +03:00
Régis Hanol 1b44924cb0 replace 'open_uri_redirections' gem with a single freedom_patches file 2015-08-18 14:56:36 +02:00
Régis Hanol a3e76dc193 FIX: allow HTTP <-> HTTPS redirections when downloading images 2015-08-17 19:21:30 +02:00
Guo Xiang Tan 8cdc302d74 DEV: Add byebug. 2015-08-14 15:09:51 +08:00
Sam a269366886 update gemfile to match gem lock 2015-08-14 09:30:18 +10:00
camelmasa f2b3312ee2 Remove actionpack-action_caching gem from Gemfile
Discourse is not using the gem.
2015-06-10 20:12:42 +09:00
Sam 2c3062548b FEATURE: upgrade image compression gem 2015-05-29 12:39:55 +10:00
Sam f079dd63ed PERF: remove "fog" dependency 2015-05-25 17:57:06 +10:00
Sam ff55bcb4d0 eventmachine is no longer a strong dependency 2015-05-25 12:45:08 +10:00
Robin Ward 01d4085125 Removed bad JS tests, upgrade QUnit + ember-qunit 2015-05-13 14:13:37 -04:00
Robin Ward d9e5302a16 FIX: HTMLBars compilation was broken in production mode 2015-05-11 11:20:46 -04:00
Erick Guan b772ff6e13 FEATURE: add slug geneartion options 2015-05-05 18:08:30 +08:00
Arthur Neves 25e28a1bdd
Add rails42 and remove bundler patch 2015-04-28 23:20:07 -04:00
Godfrey Chan 0887f33d77
Bump to sass-rails 4.0.5 for Rails 4.2 support 2015-04-28 23:19:45 -04:00
Godfrey Chan 233f56b6aa
AMS 0.8.3 was released with the patch we want 2015-04-28 23:15:26 -04:00
Godfrey Chan fd5b0bb26b
Remove support for bundler < 1.5 2015-04-28 23:15:26 -04:00
Sam 4eaee8f611 Merge pull request #3377 from scossar/auto-rtl
Auto rtl
2015-04-28 07:58:35 +10:00
Sam 0f6d9f749c Merge pull request #3397 from zzakcanncode/bumprails41
Bump rails to latest patch 4.1 release. (4.1.10)
2015-04-28 07:52:48 +10:00
Sam 531fd97957 Merge pull request #3398 from zzakcanncode/bump_observers
Bump rails-observers to master version.
2015-04-28 07:51:45 +10:00
Arthur Neves f84541b1ba
Update rspec to rspec 3.2.0 2015-04-25 18:29:43 -04:00
Arthur Neves a9b2483277
Bump rails-observers to master version.
876c522184
Has the patched applied on SamSaffron/rails-observers.
2015-04-24 16:38:48 -04:00
Arthur Neves e6655e7d7e
Bump rails to latest patch 4.1 release. (4.1.10)
We should be using the latest patch release of the current supported
version.
Also this adds a more explicit version of rails on the Gemfile. This is
will help to test on rails 4.2 and master.
2015-04-24 15:36:46 -04:00
Sam Saffron fdb434f4a7 correct previous commit 2015-04-16 16:16:15 +10:00
Sam Saffron b2c30d0e34 Revert "travis likes old bundler"
This reverts commit 1adda31cbc.
2015-04-16 16:15:04 +10:00
Sam Saffron 1adda31cbc travis likes old bundler 2015-04-16 16:13:48 +10:00
Sam Saffron 9baebcaf03 Use stackprof and memory_profiler under ruby 2.2 2015-04-16 15:55:21 +10:00
Simon Cossar 0ed67e919c Add r2 gem for rtl stylesheet conversion 2015-04-14 18:53:02 -07:00
Robin Ward 4691fe35b3 FIX: 6to5 was renamed to Babel
I can't believe they just pulled the old gem and broke people deploying
our site to production. I get it, your name changed, but don't break
other people's apps with no deprecations.
2015-03-05 13:08:32 -05:00
Sam 0b7c92166c upgrade pg, appears to be false positive 2015-02-15 08:27:35 +11:00
Sam cd0fa12562 FIX: downgrade pg to stop memory leak 2015-02-13 10:10:15 +11:00
Sam c5fde808cf PERF: remove addressable gem, its consuming huge amount of memory 2015-02-11 14:30:12 +11:00
Robin Ward a65e0a80ba Add support for more ES6 features 2015-02-06 13:26:33 -05:00
Sam e089f699c1 upgrade pg to version 0.18, may fix encoding issue 2015-01-06 06:16:22 +11:00
jaanus f6026ad1d0 Added eu-central-1 S3 bucket. 2014-12-29 18:31:21 +02:00
Régis Hanol 5ac0fd019e Merge pull request #3059 from simi/patch-1
Fix typo in Gemfile
2014-12-29 12:40:33 +01:00
Sam ef62933034 Ruby 2.2 fixes 2014-12-29 13:31:15 +11:00
Josef Šimánek 6d770d0e6e Fix typo in Gemfile
[ci skip]
2014-12-27 14:03:48 +01:00
Robin Ward 5659b93c71 Many fixes for Ember 1.9.0 2014-12-17 09:31:40 -05:00
Régis Hanol a6074af711 Merge pull request #3010 from techAPJ/patch-1
FEATURE: switch to GitHub email_reply_parser library and parse plain tex...
2014-12-01 11:18:24 +01:00
Sam 9defb6879b upgrade to rails master 2014-12-01 15:34:50 +11:00
Arpit Jalan 529014d56e FEATURE: switch to GitHub email_reply_parser library and parse plain text email content 2014-12-01 09:00:35 +05:30
Sam ab481bb7a9 pull in latest arel 2014-11-13 08:51:06 +11:00
Régis Hanol 961f676b91 FIX: proper hack to support underscores in URLs 2014-11-12 18:15:50 +01:00
Régis Hanol 7244266174 FIX: support for underscores in URLs (when using S3 storage) 2014-11-12 17:08:11 +01:00
Sam a2ba9a735e Merge pull request #2943 from fantasticfears/slug
Add stringex for Chinese slug generation
2014-11-12 08:57:59 +11:00
Erick Guan 667758ff40 Add stringex for Chinese slug generation 2014-11-11 21:12:07 +08:00
Godfrey Chan 5cc9f5bff5 Add RAILS_MASTER to the travis build matrix 2014-11-10 01:05:47 -08:00
Godfrey Chan b4679075de Upgrade to the latest AMS 0.8.x (unreleased)
The current released version (0.8.2) does not work with Rails master at all. In
fact, it was quite surprising to me that this is the only test that broke...

See https://github.com/rails-api/active_model_serializers/pull/655
2014-11-10 01:05:47 -08:00
Godfrey Chan 84d4307b1c actionpack-action_caching was released a long time ago 2014-11-10 01:05:46 -08:00
Sam c43f6455f2 hold back some gems, do fix rspec issue 2014-09-25 11:04:22 +10:00
Sam 5e0623d1e5 FEATURE: airbrake dependency removed, can be added via a plugin if needed 2014-09-25 10:30:29 +10:00
Sam 5aae2e937a minor hacking to get rails master to work
(note broken cause type mapping changed but close to working)

commented gemfile a bit
2014-09-04 17:11:42 +10:00
Sam fdc89b1735 SECURITY: GitHub authenticator returning unverified emails 2014-09-03 12:53:22 +10:00
Sam 9a8d7d3ef0 comment gemfile 2014-08-25 08:22:14 +10:00
Sam 32d1e962d2 Merge pull request #2689 from chancancode/lock_mail_gem
Lock `mail` gem to ~> 2.5.4
2014-08-25 08:21:41 +10:00
Godfrey Chan 09b9cec009 Use the latest version of seed-fu
seed-fu#54 has been merged, so we don't have to use the custom fork anymore.
It also include some changes that are required for Rails 4.2+, at least for now.

See d6c1205584 (commitcomment-7502487)
2014-08-24 02:39:05 -07:00
Godfrey Chan b0f35cbf6a Lock `mail` gem to ~> 2.5.4
Rails 4.1.6+ will relax the mail gem version requirement to `~> 2.5, >= 2.5.4`.
However, mail gem 2.6.x currently does not work with discourse because of the
reference to `Mail::RFC2822Parser` in `lib/email.rb`. This ensure discourse
would continue to work with Rails 4.1.6+ when it is released.
2014-08-24 00:43:08 -07:00
Sam ab73d046a0 add comment for alternate source 2014-08-22 11:38:31 +10:00
Zohar Arad 6ba4243b3e ensure rtlit gem in Gemfile is not required by default 2014-08-08 15:54:31 +03:00
Zohar Arad 557af8b8bd Add RTL support to Discourse CSS pre-processing using the RTLit gem and configurable via discourse.conf 2014-08-08 09:31:31 +03:00
Robin Ward c93a7020ec Merge pull request #2565 from swalkinshaw/move-discourse-plugin
Move discourse_plugin to lib
2014-07-23 10:56:12 -04:00
Sam 46c406360d FIX: cors setting was broken
Some days I wonder why we bother taking a whole gem
dependency when 10 lines of code does the job right
2014-07-23 17:04:09 +10:00
Scott Walkinshaw 7e2aa5acfb Move discourse_plugin to lib 2014-07-23 00:03:48 -04:00
Régis Hanol 7658b72556 BUGFIX: S3 backups failed when using a region
TRIVIAL: updated fog gem to latest version (1.22.1)
BUGFIX: fixed algorithm used to remove old backups
2014-07-08 20:46:08 +02:00
Sam d05fd7f837 FIX: Slim is no longer required for Sidekiq Web 2014-06-30 12:33:04 +10:00
Jim Kingdon 78f6943e8f Replaced by `bundle config local.logster ../logster` 2014-06-29 17:38:29 -07:00
Sam 3c84876660 BUGFIX: Chinese search was broken
BUGFIX: User locale was used index data
BUGFIX: missing Norwegian fulltext config
FEATURE: store the text used to index stuff in fulltext (for diagnostics / in page search)
FEATURE: re-index posts when locale changes (in bg job)
FEATURE: allow reindexing by trucating post_search_data

Note: I removed japanese specific config cause it requires custom pg config,
  happy to add it once our base docker config ships with it
2014-06-24 17:11:13 +10:00
Sam Saffron 05ca1e6e46 Added code block normalization routing for import 2014-06-06 10:34:21 +10:00
Sam 69a54af835 We dont need image sorcery gem for a single convenience method 2014-05-27 09:48:13 +10:00
Sam 90508fa251 oops 2014-05-23 13:11:10 +10:00
Sam 1fcd72231a Use pry in development as advertised. 2014-05-23 09:49:36 +10:00
Neil Lalonde 742841ddce Add Google Oauth2 authenticator. The current Google OpenID authentication has been deprecated by Google and will NOT work for any new websites. 2014-05-21 18:35:10 -04:00
Kane York c03866a5bc Include pry-rails in production 2014-05-17 12:51:02 -07:00
Sam 3c2a923271 update logster 2014-05-13 07:04:55 +10:00
Robin Ward bc8f3b1de6 Try again to remove gem 2014-05-08 12:05:06 -04:00
Robin Ward 5ca6d0d750 Revert "Should not use the module transpiler gem"
This reverts commit 7ea427a4c6.
2014-05-08 12:01:55 -04:00
Robin Ward 7ea427a4c6 Should not use the module transpiler gem 2014-05-08 11:51:39 -04:00
Robin Ward a4e30e8f93 Proof of concept: Load controller via ES6 module in Discourse 2014-05-08 11:35:33 -04:00
Sam 31c575687b memory_profiler should be shipped with mini profiler 2014-05-08 14:47:54 +10:00
Sam 4af0aa9cbc logster integration (in production as well) 2014-05-07 08:24:15 +10:00
Sam e9de700dca Remove sidekiq-failures, use logster instead 2014-05-07 08:24:15 +10:00
Robin Ward fd153623bb Revert "Proof of concept: Load controller via ES6 module in Discourse"
This reverts commit 0327f469c1.
2014-05-05 13:58:57 -04:00
Robin Ward 0327f469c1 Proof of concept: Load controller via ES6 module in Discourse 2014-05-05 13:23:45 -04:00
Robin Ward c680d74571 Disable logster for now due to a conflict. 2014-05-05 12:50:46 -04:00
Sam 24d63a4cb7 Logster in dev mode ... Go to /logs to see logs in dev. 2014-05-05 17:51:50 +10:00
Sam 6006494609 Update sidekiq failures to sidekiq 3 compat 2014-04-24 10:15:10 +10:00
Robin Ward 73cc722ed5 Update Ember.js, Handlebars and jQuery to latest 2014-04-17 10:45:06 -04:00
Sam ead7c52a06 Refactor demonizer in prep for unicorn forking
Upgrade sidekiq
2014-04-17 15:58:00 +10:00
Sam 86985e345e My patch was accepted and pushed into the gem :) 2014-04-15 14:45:00 +10:00
Sam e5f41b8a21 FEATURE: whitelist and blacklist selectors for embeds 2014-04-15 14:07:30 +10:00
Sam 0462969ba8 Merge pull request #2138 from chancancode/upgrade_4_0_4
Upgraded rails to 4.0.4
2014-03-21 16:20:59 +11:00
David Czarnecki 481c0fc404 Use require: false for foreman gem 2014-03-18 22:06:10 -04:00
David Czarnecki d71ec77737 Adding foreman gem to development group 2014-03-18 16:48:46 -04:00
Godfrey Chan c6ed8f8587 Use sass-rails 4.0.2 2014-03-18 01:30:35 -07:00
Sam 9fd7b0b814 use 1.9 syntax 2014-03-18 15:22:53 +11:00
Josh Sullivan 6c5777838f Typo fix 2014-03-01 18:27:44 -05:00
Sam b74675e153 UPDATE: omniauth gem and some others
needed to update omniauth for security issues
2014-02-24 10:11:16 +11:00
Sam 0679c668b0 UPDATE: sidekiq 2014-02-24 10:00:25 +11:00
Sam c4f2e49b85 move patching to better spot 2014-02-18 15:58:56 +11:00
Sam Saffron 057d8b2b42 Add some Ruby 2.1 specific Gems, get people to upgrade bundler 2014-02-18 13:24:42 +11:00
Stephan Kaag f12925887c Drop Rails3 support 2014-02-17 19:42:08 +01:00
Robin Ward 200b1c40bc Use stable version of onebox gem rather than github 2014-02-13 11:53:14 -05:00