aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Fix template resolver cache concurrency: "can't add a new key into hash ↵Jeremy Daer2016-05-021-2/+2
| | | | | | | | during iteration" Resolved by https://github.com/ruby-concurrency/concurrent-ruby/pull/529 Fixes #24627.
* Prep Rails 5 beta 4eileencodes2016-04-271-35/+37
|
* Merge pull request #23461 from kamipo/prepared_statements_for_mysql2_adapterJeremy Daer2016-04-231-4/+4
|\ | | | | | | Add prepared statements support for `Mysql2Adapter`
| * Add prepared statements support for `Mysql2Adapter`Ryuta Kamizono2016-04-211-4/+4
| |
* | Make file update checker tests more resilient on WindowsSean Griffin2016-04-211-0/+2
|/ | | | | | | | | Without the `wdm` gem, it appears that `listen` keeps an open handle to each of these files, causing them not to be removed when the tempdir tries to clean iteslf up, and then directory to fail to unlink. In addition to fixing that particular failure, we now construct OS agnostic paths, and capture exceptions if the directory fails to unlink so that minitest will report it rather than crash
* Update Gemfile.lockyui-knk2016-03-311-1/+1
| | | | | 'rake' gem is bundled to '>= 11.1' by 30279704646fff33e64c71ee3c4de34bf75232c4 (#23499), but it seems the commit did not fully include Gemfile.lock's.
* Run latest precompiled JRuby on CI only against ActionPackBenjamin Fleischer2016-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses latest precompiled JRuby so that we don't spend time downloading versions Travis has not already compiled. http://rubies.travis-ci.org/ Uses latest jdk: oraclejdk8 per https://docs.travis-ci.com/user/build-environment-updates/2015-02-03/#Ruby-VM and https://docs.travis-ci.com/user/languages/ruby/#Supported-Ruby-Versions-and-RVM Follows on work in https://github.com/rails/rails/pull/23927 which was reverted https://github.com/rails/rails/commit/26fe5fa08d52384bcea09c4210e3b3baaf5e9b95 JRUBY_OPTS minimize GC, disable JIT, for max test speed - https://github.com/rails/rails/pull/16613 - https://github.com/rails/rails/pull/17088 Have Rails use JRuby-compatible Rake 11.1 - The Rake task was passing --verbose, an invalid option, to contemporary JRuby - https://github.com/ruby/rake/pull/120 - https://github.com/rails-api/active_model_serializers/pull/1585 - https://github.com/jruby/jruby/issues/3653#issuecomment-195883717 No advantage to directly mounting JRuby over installing from cache; both on S3 - https://github.com/rails/rails/pull/23499/commits/b2d5b336b5a812009444571b22eed90777cd9a8c - https://github.com/rails/rails/pull/23499/commits/f4fad041b2755d81e82ee3fc66d96f334b4653db
* Fix Gemfile.lockPrathamesh Sonpatki2016-03-121-1/+1
| | | | | - Resque version was locked to < 1.26 in 92f869a0c85268 but Gemfile.lock was not updated.
* Fix Gemfile.lockRafael Mendonça França2016-03-101-5/+4
|
* Merge pull request #23992 from matthewd/em-optionMatthew Draper2016-03-041-1/+1
|\ | | | | Support faye-websocket + EventMachine as an option
| * Support faye-websocket + EventMachine as an optionMatthew Draper2016-03-021-1/+1
| |
* | Add test to make sure the sprockets cache is not shared per environmentRafael Mendonça França2016-03-021-2/+2
|/
* Prep release for Rails 5 beta3eileencodes2016-02-241-34/+34
|
* Update to the latest Turbolinks gemsSam Stephenson2016-02-231-3/+3
|
* Update dalli gemyui-knk2016-02-141-1/+1
| | | | | | | | | dalli 2.7.6 fixed deprecation warning caused by using `Rack::Session::Abstract::ID`. This commit suppress warnings on ActionPack tests. See: https://github.com/petergoldstein/dalli/commit/9874a7c3ad67eb1e31cafba0a51966db4f0c7e42
* Update turbolinks-rails for passing railties testPrathamesh Sonpatki2016-02-051-3/+8
| | | | Ref - https://github.com/turbolinks/turbolinks-rails/pull/3
* Test with Turbolinks 5Rafael Mendonça França2016-02-041-3/+4
|
* Remove unused dependencyMike Perham2016-02-031-1/+0
| | | railties uses method_source, activesupport does not. I assume code was refactored and the dependency wasn't removed.
* Remove json gem dependencyMike Perham2016-02-031-2/+0
| | | All modern Rubies ship JSON as part of stdlib. Using the gem actually hurts multi-platform support due to build difficulties on Windows.
* Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-011-34/+34
|
* Merge pull request #23381 from matthewd/uneventful-redisMatthew Draper2016-02-021-0/+1
|\ | | | | Redis sans EventMachine
| * Switch the default redis adapter to a single-stream modelMatthew Draper2016-02-011-0/+1
| | | | | | | | | | | | 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.
* | Update Gemfile.lockPrathamesh Sonpatki2016-02-011-1/+0
|/ | | | - Leftover from https://github.com/rails/rails/commit/93abf58787396661230f31c7a2f58c18f30dbec9.
* Add a couple of tests that connect with a WS clientMatthew Draper2016-01-301-0/+4
|
* Revert "Revert "Eliminate the EventMachine dependency""Matthew Draper2016-01-301-5/+2
|
* Bundle update to fix tests locallyRafael Mendonça França2016-01-281-27/+26
|
* Remove celluloid from the GemfileRafael Mendonça França2016-01-271-21/+0
|
* Merge pull request #23284 from maclover7/suckerpunch-2Eileen M. Uchitelle2016-01-271-5/+5
|\ | | | | Update ActiveJob adapter for sucker_punch 2.0
| * Update ActiveJob adapter for sucker_punch 2.0Jon Moss2016-01-271-5/+5
| | | | | | | | | | | | | | | | 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.
* | Revert "Eliminate the EventMachine dependency"David Heinemeier Hansson2016-01-271-2/+5
|/
* Update `Gemfile.lock`Ryuta Kamizono2016-01-261-32/+32
|
* Import the relevant portions of faye-websocketMatthew Draper2016-01-241-12/+1
| | | | (as adapted to use concurrent-ruby / nio4r instead of eventmachine)
* Using a hacked faye-websocket, drop EventMachineMatthew Draper2016-01-241-4/+12
|
* Add tests for the ActionCable adaptersMatthew Draper2016-01-241-0/+6
|
* Fix code review commentsJon Moss2016-01-181-0/+1
| | | | | | | - 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
* All Redis deps are now optional, Postgres --> PostgreSQL adapterJon Moss2016-01-181-6/+0
|
* Checked in changes to Gemfile.lock on latest masterPrathamesh Sonpatki2016-01-171-2/+1
| | | | - Eventmachine version gets updated when `bundle` is run locally.
* Revert "Merge pull request #22977 from rails/revert-22934-master"David Heinemeier Hansson2016-01-161-1/+1
| | | | | This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25.
* Revert "Move async execution from celluloid to concurrent-ruby"David Heinemeier Hansson2016-01-081-1/+1
|
* Merge pull request #22934 from mperham/masterDavid Heinemeier Hansson2016-01-081-1/+1
|\ | | | | Move async execution from celluloid to concurrent-ruby
| * Move async execution from celluloid to concurrent-rubyMike Perham2016-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | remove activemodel dependency on builderLachlan Sylvester2016-01-061-1/+0
|/
* Updated Gemfile.lock with latest change related to sucker_punch dependencyPrathamesh Sonpatki2016-01-031-1/+1
| | | | - Followup of https://github.com/rails/rails/commit/bc194937ad6c1fa12bca73cfc05de39a97ba783d.
* Change `alpha` to `beta1` to prep for release of Rails 5eileencodes2015-12-181-32/+32
| | | | :tada: :beers:
* Use released rackRafael Mendonça França2015-12-181-9/+2
|
* Install jquery-railsRafael Mendonça França2015-12-181-0/+5
| | | | | It will make sure that the generated application in the tests get the gem.
* Merge pull request #22642 from seuros/remove-mysql-adapterMatthew Draper2015-12-181-3/+0
|\ | | | | | | Remove legacy mysql adapter
| * Remove legacy mysql adapterAbdelkader Boudih2015-12-171-3/+0
| |
* | Use released GlobalID now that it provides URI::GID::MissingModelIdError for ↵Jeremy Daer2015-12-171-10/+3
| | | | | | | | Active Job
* | Require Nokogiri >= 1.6.7.1Jon Moss2015-12-171-1/+1
| | | | | | | | Many CVEs released: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s