Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22586 from rails/merge-action-cable | David Heinemeier Hansson | 2015-12-17 | 1 | -0/+22 |
|\ | | | | | Merge Action Cable into master | ||||
| * | Merge branch 'master' into merge-action-cable | Rafael Mendonça França | 2015-12-16 | 1 | -48/+37 |
| |\ | |||||
| * | | Update Gemfile.lock | Rafael Mendonça França | 2015-12-14 | 1 | -5/+0 |
| | | | |||||
| * | | Initial stab at adding Action Cable to rails/master | David Heinemeier Hansson | 2015-12-14 | 1 | -1/+32 |
| |\ \ | |||||
| | * | | Get ready to merge into Rails | David Heinemeier Hansson | 2015-12-14 | 1 | -132/+0 |
| | | | | |||||
| | * | | Don't ask an yanked celluloid version | Rafael Mendonça França | 2015-10-23 | 1 | -4/+4 |
| | | | | |||||
| | * | | Test against Rails edge by default. CI against 4.2 also. | Jeremy Daer | 2015-10-16 | 1 | -34/+59 |
| | | | | | | | | | | | | | | | | * Don't deep-require to AD::Http::Request since it misses Mime autoload | ||||
| | * | | Fix the gem version in Gemfile.lock | Kasper Timm Hansen | 2015-07-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | Use Celluloid 0.16.0 until termination issue in 0.17.0 is resolved | Javan Makhmali | 2015-07-24 | 1 | -44/+2 |
| | | | | | | | | | | | | | | | | The issue: https://github.com/celluloid/celluloid/issues/637 | ||||
| | * | | Update gems and requires | Thomas Walpole | 2015-07-22 | 1 | -9/+50 |
| | | | | |||||
| | * | | Remove version requirements. | constXife | 2015-07-20 | 1 | -3/+3 |
| | | | | |||||
| | * | | Add coffee-rails as a dependency. | constXife | 2015-07-20 | 1 | -0/+15 |
| | | | | |||||
| | * | | Move dev dependencies from Gemfile to the gemspec: rake, puma, mocha | Jeremy Kemper | 2015-07-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | Updated Gemfile.lock | Pratik Naik | 2015-07-12 | 1 | -8/+8 |
| | | | | |||||
| | * | | Add actionpack as a dependency | Pratik Naik | 2015-07-12 | 1 | -1/+32 |
| | | | | |||||
| | * | | Load mocha for tests | Pratik Naik | 2015-07-12 | 1 | -0/+4 |
| | | | | |||||
| | * | | Freshen Gemfile.lock | Jeffrey Hardy | 2015-07-08 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generated from a fresh `bundle install` * Add websocket-driver * Update activesupport * Rename `actioncable` -> `action_cable` | ||||
| | * | | Use latest Bundler | David Heinemeier Hansson | 2015-07-07 | 1 | -1/+4 |
| | | | | |||||
| | * | | Latest dependencies | David Heinemeier Hansson | 2015-06-19 | 1 | -6/+8 |
| | | | | |||||
| | * | | Add connection identifier and an internal redis channel | Pratik Naik | 2015-04-06 | 1 | -2/+7 |
| | | | | |||||
| | * | | Support Rails 5 | Jeremy Kemper | 2015-02-16 | 1 | -3/+3 |
| | | | | |||||
| | * | | New Gemfile.lock | Pratik Naik | 2015-02-13 | 1 | -14/+7 |
| | | | | |||||
| | * | | Latest gems and fix a callback bug | Pratik Naik | 2015-01-15 | 1 | -0/+54 |
| | / | |||||
* | / | Add mysql back to the Gemfile | Sean Griffin | 2015-12-16 | 1 | -1/+1 |
| |/ |/| | | | | | I didn't mean to commit that! | ||||
* | | Merge branch 'sprockets-3' | Rafael Mendonça França | 2015-12-16 | 1 | -48/+33 |
|\ \ | |||||
| * | | Use sprockets 3 in the Rails 5 release | Rafael Mendonça França | 2015-12-16 | 1 | -47/+39 |
| |/ | |||||
* / | Avoid conditionals in the Gemfile | Sean Griffin | 2015-12-16 | 1 | -4/+12 |
|/ | | | | | "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" | ||||
* | Update nokogiri to 1.6.7 | Tamir Duberstein | 2015-12-10 | 1 | -4/+4 |
| | | | | | This picks up https://github.com/sparklemotion/nokogiri/pull/1218 which allows nokogiri to compile on Xcode-only OS X systems. | ||||
* | Revert "Add prepared statements support for `Mysql2Adapter`" | Sean Griffin | 2015-11-26 | 1 | -2/+2 |
| | |||||
* | Upgrade to listen 3.0.5, re-enable tests | Godfrey Chan | 2015-11-26 | 1 | -2/+2 |
| | | | | | | | | | | 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 | ||||
* | Add prepared statements support for `Mysql2Adapter` | Ryuta Kamizono | 2015-11-26 | 1 | -2/+2 |
| | |||||
* | Use latest byebug | Takashi Kokubun | 2015-11-18 | 1 | -1/+1 |
| | |||||
* | Using released concurrent-ruby | Rafael Mendonça França | 2015-11-16 | 1 | -2/+2 |
| | |||||
* | upgrade listen to 3.0.4 | Xavier Noria | 2015-11-08 | 1 | -2/+2 |
| | | | | 3.0.3 has a bug in OS X. | ||||
* | implements an evented file update checker [Puneet Agarwal] | Xavier Noria | 2015-11-08 | 1 | -0/+10 |
| | | | | | | | | | | | | 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. | ||||
* | Require only necessary concurrent-ruby classes. | Jerry D'Antonio | 2015-11-04 | 1 | -2/+2 |
| | |||||
* | Upgrade all the gems | Rafael Mendonça França | 2015-10-20 | 1 | -36/+47 |
| | |||||
* | use methods for accessing the cache control headers | Aaron Patterson | 2015-10-06 | 1 | -1/+1 |
| | | | | | Use the methods rack provides so we don't have to worry about the exact header key. | ||||
* | etag header is in Rack, so use it's response methods | Aaron Patterson | 2015-10-06 | 1 | -1/+1 |
| | | | | | Rack implements the Etag header manipulation methods, so we can use those instead of ours. | ||||
* | Introduce `Headers#add`. Move `Response#add_header` upstream. | Jeremy Daer | 2015-10-03 | 1 | -1/+1 |
| | | | | | | | * 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. | ||||
* | YAGNI concurrent-ruby master branch now that 1.0.0.pre3 is released with ↵ | Jeremy Daer | 2015-10-03 | 1 | -7/+1 |
| | | | | fixes for warnings and circular require | ||||
* | run against edge sass to eliminate circular require warnings | Aaron Patterson | 2015-09-30 | 1 | -2/+8 |
| | |||||
* | Fixed concurrent-ruby warnings. | Jerry D'Antonio | 2015-09-29 | 1 | -4/+4 |
| | | | | | Bumped version of concurrent-ruby to 1.0.0.pre3, which fixes all interpreter warnings. | ||||
* | Bump concurrent-ruby to shush circular require warning | Jeremy Daer | 2015-09-29 | 1 | -1/+1 |
| | |||||
* | Eliminate overlapping `app/assets` load path | Jeremy Daer | 2015-09-29 | 1 | -5/+11 |
| | | | | | | | | | | * 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. | ||||
* | Update to latest turbolinks | Andrew White | 2015-09-21 | 1 | -1/+1 |
| | |||||
* | Use master version of Turbolinks gem | Andrew White | 2015-09-21 | 1 | -3/+9 |
| | | | | | 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`. | ||||
* | Replaced `ThreadSafe::Map` with successor `Concurrent::Map`. | Jerry D'Antonio | 2015-09-19 | 1 | -3/+2 |
| | | | | | | | 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. | ||||
* | Do not use conditionals at Gemfile | Rafael Mendonça França | 2015-09-14 | 1 | -5/+5 |
| | | | | This will make the Gemfile.lock be dirty in some environments | ||||
* | Ruby 2.2.3 in windows need nokogiri 1.6.7.rc3 as it's the only version ↵ | Eric Guo | 2015-09-12 | 1 | -28/+31 |
| | | | | having correct pre-compiled so |