Commit graph

316 commits

Author SHA1 Message Date
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
Erik Ordway
f1e8bdaee5 Remove cas auth from core and convert the settings over so they can be used by the plugin 2014-02-11 15:57:08 -08:00
Sam
7ad00f426c FEATURE REMOVAL: persona login
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
2014-02-11 16:56:48 +11:00
Sam
212ece3e80 Remove memory profiler at least until I push a new docker image 2014-02-10 15:40:32 +11:00
Sam
d3b8ec36d0 warning if running an old version of bundler 2014-02-10 15:34:08 +11:00
Sam
ca170e4636 Add memory profiler gem for ruby 2.1 2014-02-10 15:27:46 +11:00
Sam
e1f293ad66 FEATURE: new scheduler
Removed sidetiq, introduced new scheduler

- add basic UI
- add schedule discover
- add scheduling in initializer
2014-02-06 10:26:16 +11:00
Sam
176bf41efd therubyracer now ships with my timeout fix, no need for a forked gem 2014-02-04 11:14:04 +11:00
Eric Thomas
bc32a825e2 Remove invalid comment.
This was added in 1076aa50a8 when
ember-rails was installed from a revision number. This was changed to
use the latest gem release in ad6705cca7
2014-01-31 08:21:32 -07:00
Robin Ward
e453bfa073 Work in progress: Swap out onebox code for onebox gem 2014-01-29 14:14:07 -05:00
Robin Ward
39c6e48aa5 FEATURE: Return only the first paragraph of text in HTML digests, unless
there is only one post. In that case return everything. Remove
dependency on 'html_truncator'
2014-01-22 12:37:37 -05:00
Sam
b703d8c77a BUGFIX: redis-rails has always been a problem child
implemented an ActiveSupport::Cache::Store for our internal use.
* allows for expire by family
* works correctly in multisite
* namespaced correctly

Removed redis-rails from the project, no longer needed
2014-01-06 16:50:04 +11:00
Sam
e6d9903db1 update to latest version of mini profiler 2014-01-06 12:22:02 +11:00
Sam
2d536532b1 rbtrace is an mri thing 2014-01-03 12:29:47 +11:00
Robin Ward
4f8aed295a FEATURE: Embeddable Discourse comments, now with simple-rss instead of feedzirra 2013-12-31 15:01:22 -05:00
Robin Ward
62db063e1e Revert "Support for Embeddable Comments via IFRAME" - it depends on Curl
which not every server has. Have to rethink this.

This reverts commit e3e4c62887.
2013-12-31 12:52:31 -05:00
Robin Ward
e3e4c62887 Support for Embeddable Comments via IFRAME 2013-12-31 12:26:24 -05:00
Godfrey Chan
bb768a30ca Added a rails_master section to Gemfile 2013-12-30 14:36:51 -08:00
Régis Hanol
567d2bd23c add top page 2013-12-24 00:50:36 +01:00
Sam
a1c439c21c spork rails now sourced from gem 2013-12-15 11:34:38 +11:00
Sam
1c64f34eff redis rails no longer sourced from github, was only used due to a rack cache bug which is no longer used 2013-12-15 11:07:39 +11:00
Sam
74c16ca1af Only 1 complicated git dependency left 2013-12-15 11:02:00 +11:00
Régis Hanol
06dd7ffe3c better revision history 2013-12-12 03:41:34 +01:00
Sam
2179baf062 downgrade pg, pg 1.7 is buggy it is being fixed, we need to wait for the next release
see: https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4
2013-12-10 11:41:05 +11:00
Sam
eb956a909f v8 now sourced from my branch while fix is being applied 2013-12-09 12:44:09 +11:00
Sam
c71d7a3c6d one less gem from github for greater good 2013-12-06 15:22:15 +11:00
Sam
46f3261025 Update: message bus, rack mini profiler and flame graph so they are sourced from ruby gems.
MessageBus.diagnostics() in chrome dev tools
Update: annotate models to latest, no need for git sourcing
2013-12-05 17:40:16 +11:00
Robin Ward
48bfcfadd9 Upgrade Ember.js, fix swallowing of template errors, report unresolved promises in development mode. 2013-12-02 13:15:58 -05:00
Robin Ward
3da2285ef1 FIX: Missing styles in HTML digest emails 2013-11-29 12:21:36 -05:00
Robin Ward
8c8645f158 FIX: Code and Emoticon formatting in HTML emails. 2013-11-28 17:21:14 -05:00
Sam
6617478878 update some gems 2013-11-26 13:40:02 +11:00
Régis Hanol
30e0d102e3 add unf gem to remove warning 2013-11-21 17:33:43 +01:00
Robin Ward
5055da76e6 Abort triggers for email body processing 2013-11-20 13:30:01 -05:00
Sam
8278fdb9dd relocate emoji plugin, stop pre-compiling assets 2013-11-20 14:38:21 +11:00
Sam
7603faa20d add rbtrace for production tracing 2013-11-20 10:10:12 +11:00
Sam
a45334d2b9 no need "booting rails 4" message, just add booting rails 3 for now 2013-11-19 09:43:32 +11:00
Sam
2c1104237c including sass twice is pointless 2013-11-15 14:44:30 +11:00
Neil Lalonde
ad850f7349 Downgrade Sidekiq to 2.15.1 because our sidekiq workers are dying 2013-11-06 15:58:14 -05:00
Régis Hanol
1dcbe9c1c0 update fog gem 2013-11-06 12:16:30 +01:00
Sam
b11e665ecc Rails 4 is now the out-of-the-box default 2013-11-05 09:36:52 +11:00
Sam
233cca79b5 dead git repo broke discourse 2013-11-01 15:21:40 +11:00
Raul Murciano
4f9aa6a92a Declare rack-protection dependency explicitely 2013-10-28 17:00:31 -07:00
Sam
3e2bd3ca93 fabrication is now released no need to source from git 2013-10-24 13:34:20 +11:00
Sam
6fac09aeaa fix listen version to one that works for us in autospec, TODO upgrade it 2013-10-24 13:02:01 +11:00
Sam
3d647a4b41 remove rack cache, it has been causing trouble
instead implement an aggressive anonymous cache that is stored in redis
this cache is sitting in the front of the middleware stack enabled only in production
TODO: expire it more intelligently when stuff is created
2013-10-16 16:39:18 +11:00
Sam Saffron
748ef94ce0 flamegraph update to support embedded graphs 2013-09-19 14:11:02 +10:00
Sam Saffron
fef39ee4c9 Mini Profiler and fast stack update, resolves infinite loop in flame graphs 2013-09-17 17:14:45 +10:00
Sam
98267d439a fixed ruby 2.0 p0 bug in fast_stack so re-pushing 2013-09-09 21:19:23 +10:00
Sam
3fb0f52574 disable flamegraph while I figure out why fast stack is not working for some people on x32 2013-09-07 08:50:16 +10:00
Sam
c495a0b996 move seed fu to work with my branch of seed fu while https://github.com/mbleigh/seed-fu/pull/54 is being decided 2013-09-06 14:04:31 +10:00
Sam
51eb764345 mini profiler update to use latest flame graph engine 2013-09-03 17:58:56 +10:00
Sam
33800969a8 upgraded the ruby racer and mini profiler 2013-08-30 16:44:34 +10:00
Sam
2b1a140c9b add a soft puma dependency so people can run Discourse on puma 2013-08-29 15:27:59 +10:00
Sam
9526415789 em-redis is never used, don't require it
hiredis was never wired up properly ... use it ... it is way faster
2013-08-21 10:23:32 +10:00
Sam
0061fc33cd rack mini profiler updated 2013-08-20 16:51:15 +10:00
Michael Kirk
e0cb1d4086 omniauth-oauth2 should be required in plugin which uses it 2013-08-17 22:35:07 -07:00
Michael Kirk
4af8a9102e Authenticate with Discourse via OAuth2
See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
2013-08-17 21:45:20 -07:00
Sam
dd29e0b3b9 removing Guardfile, we no longer use is and rake autospec covers everything it used to do. 2013-08-15 12:55:19 +10:00
Stephan Kaag
a6b4b5dbf2 Replace Clockwork with Sidetiq 2013-08-14 21:39:40 +02:00
Sam
09f9ed3609 nuking turbo sprockets, having lots of issues precompiling on jenkins 2013-08-02 10:07:57 +10:00
Sam
75345c1f8f rails 4 to use github branch so we get all fixes (in particular order fixes) 2013-08-02 09:59:25 +10:00
Sam
df3a4c05cd upgrade rack mini profiler
fixes for ruby 1.9.3
2013-07-30 17:36:34 +10:00
Sam
1e107fd68a mock redis for mock redis goodness 2013-07-29 12:23:21 +10:00
Stephan Kaag
f99acebdaa Rails 4 updates 2013-07-24 21:09:18 +02:00
Sam
38b8e9b1b4 get rake autospec working in rails 4 2013-07-24 11:49:26 +10:00
Stephan Kaag
b19f631b3a Some Rails4 updates 2013-07-22 19:01:22 +02:00
Sam
9e4b0df7ff 69 specs fail in rails 4 now ...not too bad 2013-07-22 15:07:20 +10:00
Sam
e7e00601c6 ok, we now dual boot rails 4 and rails 3 ... to run in rails 4 mode: RAILS4=1 bundle exec thin start 2013-07-21 10:56:48 +10:00
Robin Ward
980d258f32 Hard code handlebars release 2013-07-16 13:43:43 -04:00
Robin Ward
1927263d1d FIX: Compile templates with the correct ember 2013-07-16 11:47:26 -04:00
Robin Ward
d466d11e71 Ember RC6 update 2013-07-16 10:35:18 -04:00
Sam
c6c8246399 added sample unicorn config
added utility to measure real memory usage
don't require thin by default
2013-07-07 14:31:07 +10:00
Sam
3af12ba7d3 Merge pull request #1088 from ComputerDruid/fix-ipv6
Fix ipv6 addresses in the database
2013-06-25 17:25:48 -07:00
Sam
3d75e69bd5 gem update 2013-06-26 10:04:41 +10:00
Dan Johnson
98f926f193 remove unneeded has_ip_address gem 2013-06-25 19:47:32 -04:00
Robin Ward
9a19c0d9c4 Fix for multiple paragraph emails with text em-dashes in them (--). 2013-06-25 14:06:05 -04:00
Robin Ward
82c21868f3 Moved JSHint into Qunit suite. It's much harder to forget about now! 2013-06-21 14:07:11 -04:00
Robin Ward
8c4aac7f94 Migrate all jasmine specs to Qunit. Removed Jasmine. 2013-06-19 18:18:35 -04:00
Robin Ward
d5643551cc Remove dependency on Webrick for QUnit tests 2013-06-19 14:36:26 -04:00
Robin Ward
60fce196c7 More Qunit tests including a CLI runner 2013-06-18 13:44:20 -04:00
Robin Ward
e29f4a3496 Work in Progress: Reply By Email:
- Add support classes and settings to enable reply by email
- Split out Email builder to be more OO, add many specs
2013-06-13 12:39:56 -04:00
Robin Ward
a104c37d63 Experiment: QUnit for integration Ember integration tests 2013-06-12 11:56:59 -04:00
Robin Ward
ad6705cca7 Update Ember to latest master (RC5) 2013-06-10 10:14:42 -04:00
Pavel Penkov
cb3b79407d Added admin:create rake task 2013-06-10 05:56:51 +04:00
Sam
6ed79e66bc jquery 1.9.1 upgrade ... remove jquery rails 2013-06-07 09:12:46 +10:00
Robin Ward
a3d62fdf69 Temporarily roll back ember rc5. We identified some things we need to fix. 2013-06-06 01:25:43 -04:00
Robin Ward
7d089fdfb5 FIX: Compile templates properly with the latest handlebars 2013-06-05 14:00:02 -04:00
Sam
46389754d6 Merge pull request #892 from eriko/cas_support
Cas support
2013-05-28 16:13:29 -07:00
Neil Lalonde
29bf540a34 Add the sidekiq-failures gem so that we can diagnose failed jobs 2013-05-28 14:56:46 -04:00
Robin Ward
e1781240a6 Merge branch 'refactoring' of git://github.com/mattvanhorn/discourse
Conflicts:
	lib/text_sentinel.rb
2013-05-27 10:42:20 -04:00
Sam
661ddbb158 introduce strong_parameters 2013-05-27 11:06:09 +10:00
Matt Van Horn
e72694c4ee Make pry a bit more useful 2013-05-24 13:36:50 -07:00
Sam
2cd95bc649 lets try out annotations 2013-05-24 12:35:14 +10:00