Commit Graph

132 Commits

Author SHA1 Message Date
Prathamesh Sonpatki
2669f3753d Update turbolinks-rails for passing railties test
Ref - https://github.com/turbolinks/turbolinks-rails/pull/3
2016-02-05 17:02:22 +05:30
Rafael Mendonça França
dd67df6136 Test with Turbolinks 5 2016-02-04 14:24:36 -02:00
Mike Perham
cf18c34e3a Remove unused dependency
railties uses method_source, activesupport does not.  I assume code was refactored and the dependency wasn't removed.
2016-02-03 14:28:55 -08:00
Mike Perham
f3433f7c75 Remove json gem dependency
All modern Rubies ship JSON as part of stdlib.  Using the gem actually hurts multi-platform support due to build difficulties on Windows.
2016-02-03 10:49:14 -08:00
Sean Griffin
49f6ce63f3 Preparing for Rails 5.0.0.beta2 2016-02-01 14:37:52 -07:00
Matthew Draper
8a51f6fbbf Merge pull request #23381 from matthewd/uneventful-redis
Redis sans EventMachine
2016-02-02 02:44:06 +10:30
Prathamesh Sonpatki
ad9ed7e36c Update Gemfile.lock
- Leftover from 93abf58787.
2016-02-01 06:18:04 +05:30
Matthew Draper
e77368637e Switch the default redis adapter to a single-stream model
This new adapter does get a little more intimate with the redis-rb gem's
implementation than I would like, but it's the least bad of the
approaches I've come up with.
2016-02-01 01:56:47 +10:30
Matthew Draper
ce37de4a19 Add a couple of tests that connect with a WS client 2016-01-30 03:46:37 +10:30
Matthew Draper
74497eabd5 Revert "Revert "Eliminate the EventMachine dependency"" 2016-01-30 03:46:37 +10:30
Rafael Mendonça França
04de7353c2 Bundle update to fix tests locally 2016-01-28 14:57:08 -05:00
Rafael Mendonça França
2c131141ca Remove celluloid from the Gemfile 2016-01-27 15:44:26 -05:00
Eileen M. Uchitelle
cadb8af32d Merge pull request #23284 from maclover7/suckerpunch-2
Update ActiveJob adapter for sucker_punch 2.0
2016-01-27 15:31:52 -05:00
Jon Moss
a9a64c490d Update ActiveJob adapter for sucker_punch 2.0
This PR includes two changes for 2.0.0:

- Breaking API change around `async.perform` --> `perform_async`
- New addition of `perform_in`, which now allows end users of the
  adapter to use the `enqueued_at` public API method.
2016-01-27 12:49:35 -05:00
David Heinemeier Hansson
9ea7aa84d1 Revert "Eliminate the EventMachine dependency" 2016-01-27 14:33:15 +01:00
Ryuta Kamizono
943bb6d7ac Update Gemfile.lock 2016-01-26 08:53:30 +09:00
Matthew Draper
322dca293b Import the relevant portions of faye-websocket
(as adapted to use concurrent-ruby / nio4r instead of eventmachine)
2016-01-24 22:52:40 +10:30
Matthew Draper
68a9060d02 Using a hacked faye-websocket, drop EventMachine 2016-01-24 22:51:06 +10:30
Matthew Draper
9ff28c10eb Add tests for the ActionCable adapters 2016-01-24 21:13:40 +10:30
Jon Moss
ae31da20cd Fix code review comments
- adapter -> pubsub (re)rename internally
- Change variable names to match method names
- Add EventMachine `~> 1.0` as a runtime dependency of ActionCable
- Refactor dependency loading for adapters
2016-01-18 19:37:25 -05:00
Jon Moss
6aeaed4c1a All Redis deps are now optional, Postgres --> PostgreSQL adapter 2016-01-18 18:59:30 -05:00
Prathamesh Sonpatki
330469e7c7 Checked in changes to Gemfile.lock on latest master
- Eventmachine version gets updated when `bundle` is run locally.
2016-01-17 19:26:10 +05:30
David Heinemeier Hansson
01c320001b Revert "Merge pull request #22977 from rails/revert-22934-master"
This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing
changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25.
2016-01-16 15:42:20 +01:00
David Heinemeier Hansson
36fe301564 Revert "Move async execution from celluloid to concurrent-ruby" 2016-01-08 20:09:25 +01:00
David Heinemeier Hansson
3b7ccadfc1 Merge pull request #22934 from mperham/master
Move async execution from celluloid to concurrent-ruby
2016-01-08 18:23:41 +01:00
Lachlan Sylvester
4ba66ef108 remove activemodel dependency on builder 2016-01-06 18:55:59 +11:00
Mike Perham
547713b4c9 Move async execution from celluloid to concurrent-ruby
This removes 8 runtime gem dependencies from Rails:

```
Using hitimes 1.2.3
Using timers 4.1.1
Using celluloid-essentials 0.20.5
Using celluloid-extras 0.20.5
Using celluloid-fsm 0.20.5
Using celluloid-pool 0.20.5
Using celluloid-supervision 0.20.5
Using celluloid 0.17.2
```
2016-01-05 14:31:16 -08:00
Prathamesh Sonpatki
64e4739102 Updated Gemfile.lock with latest change related to sucker_punch dependency
- Followup of bc194937ad.
2016-01-03 17:21:00 +05:30
eileencodes
7eae0bb88e Change alpha to beta1 to prep for release of Rails 5
🎉 🍻
2015-12-18 12:14:09 -05:00
Rafael Mendonça França
477bed8871 Use released rack 2015-12-18 04:54:50 -02:00
Rafael Mendonça França
8f8cb1baa3 Install jquery-rails
It will make sure that the generated application in the tests get the
gem.
2015-12-18 04:13:53 -02:00
Matthew Draper
4a58aef7e3 Merge pull request #22642 from seuros/remove-mysql-adapter
Remove legacy mysql adapter
2015-12-18 13:51:04 +10:30
Jeremy Daer
7a6772c0e7 Use released GlobalID now that it provides URI::GID::MissingModelIdError for Active Job 2015-12-17 17:20:19 -07:00
Jon Moss
5d8ee1250f Require Nokogiri >= 1.6.7.1
Many CVEs released: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
2015-12-17 17:35:25 -05:00
Rafael Mendonça França
af5b05a4c0 Use release sprockets-rails 2015-12-17 18:22:58 -02:00
Rafael Mendonça França
d41386d788 Use released jquery-rails 2015-12-17 18:17:52 -02:00
Rafael Mendonça França
b611350e7c Use released arel 2015-12-17 18:11:29 -02:00
Rafael Mendonça França
9b28b252e2 Use released mail gem 2015-12-17 17:16:08 -02:00
Abdelkader Boudih
fb24d0ed6c Remove legacy mysql adapter 2015-12-17 15:54:57 +00:00
Rafael Mendonça França
606c435450 Use released turbolinks in the test suite 2015-12-17 13:31:49 -02:00
David Heinemeier Hansson
48f5cecdb0 Merge pull request #22586 from rails/merge-action-cable
Merge Action Cable into master
2015-12-17 12:13:22 +01:00
Sean Griffin
f39aa4dd39 Add mysql back to the Gemfile
I didn't mean to commit that!
2015-12-16 13:59:00 -07:00
Rafael Mendonça França
4b669dbb91 Merge branch 'master' into merge-action-cable 2015-12-16 17:05:16 -02:00
Rafael Mendonça França
b1c19eb052 Merge branch 'sprockets-3' 2015-12-16 16:57:11 -02:00
Rafael Mendonça França
877a411d0c Use sprockets 3 in the Rails 5 release 2015-12-16 16:30:58 -02:00
Sean Griffin
48c4edc4a6 Avoid conditionals in the Gemfile
"conditionals in the gemfile creates conditional code in the Gemfile.lock.
Since it is checked in the repository I think it is better to avoid it"
2015-12-16 10:33:09 -07:00
Rafael Mendonça França
ccc805591a Update Gemfile.lock 2015-12-14 14:43:04 -02:00
David Heinemeier Hansson
760de782f7 Initial stab at adding Action Cable to rails/master 2015-12-14 16:38:37 +01:00
David Heinemeier Hansson
bf40bddfce Get ready to merge into Rails 2015-12-14 15:48:54 +01:00
Tamir Duberstein
991d83f8ed Update nokogiri to 1.6.7
This picks up https://github.com/sparklemotion/nokogiri/pull/1218
which allows nokogiri to compile on Xcode-only OS X systems.
2015-12-10 13:46:08 -05:00