mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
55,779 Commits 56 Branches 544 Tags 410 MiB
Commit Graph

110 Commits

Author SHA1 Message Date
David Heinemeier Hansson 01c320001b Revert "Merge pull request #22977 from rails/revert-22934-master" 
This reverts commit d0393fccff, reversing
changes made to 3b7ccadfc1.
 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
Sean Griffin b5bbdbd3bc Revert "Add prepared statements support for `Mysql2Adapter`" 2015-11-26 11:53:10 -07:00
Godfrey Chan 14b20ce9b3 Upgrade to listen 3.0.5, re-enable tests 
In listen 3.0.4 and below, the `#stop` method on the notification
backends are a no-op, meaning that we are leaking them per test. This
ended up triggering another bug in Ruby that causes our builds to fail
randomly on CI.

listen bug: https://github.com/guard/listen/issues/353
ruby bug: https://bugs.ruby-lang.org/issues/11744
 2015-11-26 10:35:20 -08:00
Ryuta Kamizono 38746d085b Add prepared statements support for `Mysql2Adapter` 2015-11-26 11:16:26 +09:00
Takashi Kokubun 85fed82bfe Use latest byebug 2015-11-18 01:46:03 -06:00
Rafael Mendonça França 788d7bce3d Using released concurrent-ruby 2015-11-16 18:26:39 -02:00
Xavier Noria d47b982268 upgrade listen to 3.0.4 
3.0.3 has a bug in OS X.
 2015-11-08 22:49:50 -08:00
Xavier Noria 785adabc4b implements an evented file update checker [Puneet Agarwal] 
This is the implementation of the file update checker written
by Puneet Agarwal for GSoC 2015 (except for the tiny version
of the listen gem, which was 3.0.2 in the original patch).

Puneet's branch became too out of sync with upstream. This is
the final work in one single clean commit.

Credit goes in the first line using a convention understood
by the contrib app.
 2015-11-08 22:49:49 -08:00
Jerry D'Antonio 23b6f65fd1 Require only necessary concurrent-ruby classes. 2015-11-04 21:12:28 -05:00
Rafael Mendonça França d88bad3e96 Don't ask an yanked celluloid version 2015-10-23 20:41:33 -02:00
Rafael Mendonça França cbfe5bb3c4 Upgrade all the gems 2015-10-20 15:58:57 -02:00
Jeremy Daer d7ab5c8f1f Test against Rails edge by default. CI against 4.2 also. 
* Don't deep-require to AD::Http::Request since it misses Mime autoload
 2015-10-16 00:58:06 -07:00
Aaron Patterson 895c359182 use methods for accessing the cache control headers 
Use the methods rack provides so we don't have to worry about the exact
header key.
 2015-10-06 13:39:03 -07:00
Aaron Patterson cddb700cc2 etag header is in Rack, so use it's response methods 
Rack implements the Etag header manipulation methods, so we can use
those instead of ours.
 2015-10-06 13:39:03 -07:00
Jeremy Daer 2356403330 Introduce `Headers#add`. Move `Response#add_header` upstream. 
* Introduce `ActionDispatch::Http::Headers#add` to add a value to
  a multivalued header.
* Move `Response#add_header` upstream: https://github.com/rack/rack/pull/957
* Match upstream `Response#have_header?` -> `#has_header?` name change.
 2015-10-03 21:59:18 -07:00
Jeremy Daer f849cfe36c YAGNI concurrent-ruby master branch now that 1.0.0.pre3 is released with fixes for warnings and circular require 2015-10-03 19:24:16 -07:00
Aaron Patterson ff30db1372 run against edge sass to eliminate circular require warnings 2015-09-30 07:42:58 -07:00
Jerry D'Antonio 33e506cb4a Fixed concurrent-ruby warnings. 
Bumped version of concurrent-ruby to 1.0.0.pre3, which fixes all
interpreter warnings.
 2015-09-29 21:31:49 -04:00
Jeremy Daer 56625b2815 Bump concurrent-ruby to shush circular require warning 2015-09-29 14:52:59 -07:00
Jeremy Daer 20ec1e922c Eliminate overlapping `app/assets` load path 
* Move `app/assets/manifest.js` to `app/assets/config/manifest.js`.
  Avoid the suggestion that you can/should deep-link `stylesheets/foo`.
* Pull in all toplevel stylesheets and JavaScripts, not just
  `application.js` and `.css`. Demonstrate how to use `link_directory`
  with a specified `.js`/`.css` type.
* Fix RAILS_ENV handling in assets tests.
* Shush warnings spam from third-party libs that distract from tests.
 2015-09-29 11:56:58 -07:00
Andrew White 8f32f60439 Update to latest turbolinks 2015-09-21 14:10:56 +01:00
Andrew White 2b16816bc3 Use master version of Turbolinks gem 
Since `alias_method_chain` is deprecated we need to use the master version
of the Turbolinks gem as it has support for using `Module#prepend`.
 2015-09-21 14:02:41 +01:00
Jerry D'Antonio 56ac6e4768 Replaced `ThreadSafe::Map` with successor `Concurrent::Map`. 
The thread_safe gem is being deprecated and all its code has been merged
into the concurrent-ruby gem. The new class, Concurrent::Map, is exactly
the same as its predecessor except for fixes to two bugs discovered
during the merge.
 2015-09-19 09:56:26 -04:00