mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
61,114 Commits 61 Branches 565 Tags 420 MiB
Commit Graph

211 Commits

Author SHA1 Message Date
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 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
Rafael Mendonça França 5e3e5de48b Do not use conditionals at Gemfile 
This will make the Gemfile.lock be dirty in some environments
 2015-09-14 20:12:09 -03:00
Eric Guo bbfd17689b Ruby 2.2.3 in windows need nokogiri 1.6.7.rc3 as it's the only version having correct pre-compiled so 2015-09-12 23:46:37 +08:00
Rafael Mendonça França ed3d213eb6 Use released mysql2 2015-09-08 14:01:04 -03:00
Jeremy Daer 5da5e3772c Support mysql2 0.4.0, first release with prepared statements support 
Known failure on Ruby 2.3/trunk: brianmario/mysql2#671
 2015-09-07 16:37:25 -07:00
Aaron Patterson bcfa2a0d5e stop using deprecated Abstract::ID class 2015-09-04 18:58:49 -07:00
Aaron Patterson 529136d670 stop inheriting from Rack::Request 
Just include the modules necessary in the Request object to implement
the things we need.  This should make it easier to build delegate
request objects because the API is smaller
 2015-09-04 17:37:22 -07:00
Aaron Patterson e25fdad2f1 use `Rack::Utils.unescape_path` to unescape paths 
Escaping and unescaping paths is different than query parameters, and we
need to respect that.  This commit uses the new method in Rack to escape
and unescape paths.  Fixes #11816
 2015-09-04 14:43:46 -07:00
Rafael Mendonça França 9f28cb9dc7 Add windows version of nokogiri 2015-09-01 16:02:03 -03:00
claudiob 6d02b75b2b Require sprockets-rails >= 2 
Fixes 4d157ea8c1

Without any specification about the version of sprockets-rails, running a
`bundle install` on a brand new app might result in sprockets 0.0.1 being
installed.

However, the minimum requirement is sprockets-rails 2 (see https://github.com/rails/rails/pull/17752/files)
 2015-09-01 09:30:38 -07:00
Carlos Antonio da Silva a90d79330b Add master branch to github gems to be able to use local clones 2015-09-01 08:44:32 -03:00
Aaron Patterson 14af136371 implement the API required by the abstract Rack request. 2015-08-27 11:13:11 -07:00
Aaron Patterson 97d088ebf2 use the non-hash dependent Rack utils API 
eventually we will refactor this to not know about header hashes
 2015-08-27 11:13:10 -07:00
Jerry D'Antonio 25a4155257 Initial implementation of ActiveJob AsyncAdapter. 2015-08-25 14:22:11 -04:00
Aaron Patterson 5fe141638f use a request object in the session middleware 
This commit allows us to use one request object rather than allocating
multiple request objects to deal with the session.
 2015-08-22 17:57:45 -07:00
Aaron Patterson 1fbf5ad7f7 dup the request and mutate its headers object. 
duping the request will dup it's underlying env hash.
 2015-08-21 16:59:12 -07:00
Aaron Patterson 51211a94bd point at rack master 2015-08-20 13:45:11 -07:00
Andrei Istratii d0e0fbafb2 Migrate to Sprockets 4. 2015-08-19 21:45:46 +03:00
Rafael Mendonça França 9a4a436fd7 Merge pull request #20647 from twalpole/method_source_dependency 
Add method_source dependency to activesupport
 2015-08-14 14:06:23 -03:00
Yves Senn 68e3279163 implement `provider_job_id` for `queue_classic`. 
The latest, currently unreleased, version of queue_classic is required
for this to work. See
https://github.com/QueueClassic/queue_classic/pull/262 for more details.
 2015-08-13 10:00:19 +02:00
Rafael Mendonça França 67b07f809b Update Gemfile.lock 2015-08-10 00:30:03 -03:00
Thomas Walpole 8e2f267f62 Add method_source dependency to activesupport 2015-07-29 22:21:53 -07:00
Kasper Timm Hansen 65fde3bf75 Fix the gem version in Gemfile.lock 2015-07-29 22:22:39 +02:00
Javan Makhmali ccfb1a8b1c Use Celluloid 0.16.0 until termination issue in 0.17.0 is resolved 
The issue: https://github.com/celluloid/celluloid/issues/637
 2015-07-24 12:05:31 -04:00
Thomas Walpole 5d8c848273 Update gems and requires 2015-07-22 14:54:48 -07:00
constXife c47e628da4 Remove version requirements. 2015-07-20 09:22:29 +06:00
constXife a0048e3020 Add coffee-rails as a dependency. 2015-07-20 00:44:19 +06:00
Rafael Mendonça França 9dc06bc1f3 Fix Gemfile.lock 2015-07-14 15:20:15 -03:00
Jeremy Kemper f1b9095bdc Move dev dependencies from Gemfile to the gemspec: rake, puma, mocha 2015-07-13 19:28:14 -07:00
Jerry D'Antonio 284a9ba8ec Replaced `ActiveSupport::Concurrency::Latch` with concurrent-ruby. 
The concurrent-ruby gem is a toolset containing many concurrency
utilities. Many of these utilities include runtime-specific
optimizations when possible. Rather than clutter the Rails codebase with
concurrency utilities separate from the core task, such tools can be
superseded by similar tools in the more specialized gem. This commit
replaces `ActiveSupport::Concurrency::Latch` with
`Concurrent::CountDownLatch`, which is functionally equivalent.
 2015-07-13 15:44:21 -04:00
Pratik Naik 13fb9b8c7b Updated Gemfile.lock 2015-07-12 13:25:24 -05:00
Pratik Naik 53c82f6dc0 Add actionpack as a dependency 2015-07-12 11:44:56 -05:00
Pratik Naik f207245cc7 Load mocha for tests 2015-07-12 11:44:56 -05:00
Jeffrey Hardy 42ac768562 Freshen Gemfile.lock 
Generated from a fresh `bundle install`

* Add websocket-driver
* Update activesupport
* Rename `actioncable` -> `action_cable`
 2015-07-08 23:16:23 -04:00
David Heinemeier Hansson 4bb995a4aa Use latest Bundler 2015-07-07 19:03:57 +02:00
Kasper Timm Hansen 5294bf1ef6 Add gemfile entry for GlobalID until a new release is cut. 2015-07-05 14:50:33 +02:00
David Heinemeier Hansson 2b41ede6f8 Latest dependencies 2015-06-19 18:55:14 +02:00
Tim Rogers 2e4221779e Update bundler to v1.10.4 2015-06-17 11:35:24 +01:00
Yves Senn c0b4654dba let's use the latest bundler version. 2015-06-13 11:34:34 +02:00
Sean Griffin 0ef7e73f0a Ensure symbols passed to `select` are always quoted 
Our general contract in Active Record is that strings are assumed to be
SQL literals, and symbols are assumed to reference a column. If a from
clause is given, we shouldn't include the table name, but we should
still quote the value as if it were a column.

Upon fixing this, the tests were still failing on SQLite. This was
because the column name being returned by the query was `"\"join\""`
instead of `"join"`. This is actually a bug in SQLite that was fixed a
long time ago, but I was using the version of SQLite included by OS X
which has this bug. Since I'm guessing this will be a common case for
contributors, I also added an explicit check with a more helpful error
message.

Fixes #20360
 2015-05-30 12:35:51 -06:00
Samuel E. Giddins 783637eb20 Generate Bundler 1.10.1 lockfile 2015-05-28 22:40:29 -07:00
Semyon Pupkov ee68786953 Unlock sneakers adapter version 2015-04-28 14:52:29 +05:00
Arthur Neves ac98359c83
Use latest sprockets-rails on internal dev 2015-04-26 11:42:13 -04:00
Godfrey Chan 78b51a8071 Uncomment byebug in framework Gemfile 
History:

1. `debugger` was there until d2ed433b where it was commented out, and I
   couldn't figure out why

2. Since then we inherited that when switching to `byebug` in 93559da4

Reasons:

1. It's nice to have a debugger when working on framework bugs

2. It's an uncommented dependency in app Gemfiles since Rails 4.2 (see fbe38c9e)
 2015-04-24 01:24:50 -04:00
Toshi MARUYAMA 7008dfba66 Gemfile: temporay pin "bcrypt" version and run "bundle update bcrypt" on Linux 
Related: #19617, #19187, #19533, #19689, #19675.

This is POC (Proof Of Concept) which bundler does not remove mingw lines.
https://github.com/rails/rails/pull/19617#issuecomment-90293795
 2015-04-09 19:25:11 -03:00
Akira Matsuda 6c98100620 redcarpet 3.2.2 has an XSS vulnerability 
see: http://www.openwall.com/lists/oss-security/2015/04/07/11
 2015-04-09 18:20:53 +09:00
Pratik Naik eec92d0229 Add connection identifier and an internal redis channel 2015-04-06 12:21:22 -05:00
Carlos Antonio da Silva 4ba1376c60 Remove old mri platform entries from our Gemfile 
Since we now only support Ruby 2.2+, we can safely remove the old mri
entries from the Gemfile.

This also allows us not to lock to a specific bundler version, since
:mri_22 was defined only on 1.7.11.

Closes #19611.
 2015-04-01 17:09:58 -03:00
Rafael Mendonça França a8225eeec2 Test using sprockets 3 2015-03-29 22:58:32 -03:00
Arthur Neves 9afd9d232c method_source needs to be a hard dependency on railties 2015-03-19 10:15:03 -04:00
Arthur Neves d6ed046d30 Add method_source to gemfile 2015-03-18 09:52:16 +01:00
Rafael Mendonça França 2b2bf22e8d Use the released gem 2015-03-10 17:31:35 -03:00
Kasper Timm Hansen 37695b8aab Let strip_tags leave HTML escaping to Rails. 
Prevents double escaping errors, such as "&" becoming "&".
 2015-03-10 20:04:01 +01:00
Cristian Bica cb786219f4 Fixed ActiveJob integration tests 2015-03-05 23:57:57 +02:00
Robin Dupret 5140c07c02 Test against the mail gem's edge 
The edge version ships with a patch that uses composition over
inheritance for the Mail::PartsList object (see mikel/mail#782).
Let's test Action Mailer against it to prevent eventual regressions
and experience it.

Moreover, this branch makes the Action Mailer suite green against
Rubinius.
 2015-03-02 16:55:27 +01:00
eileencodes e1e2b54e85 Bump rack-test to fix nil values being sent to `parse_nested_query` 
I found that nil values were being incorrectly sent to
`parse_nested_query` in Rack. Originally it was thought that Rails was
doing something incorrect but it was actually rack-test. This was fixed
in brynary/rack-test@4a4b2c1 and is no longer an issue. This commit
bumps rack-test in Rails so changes to Rack don't cause failures.

See rack/rack#813 for more information.
 2015-03-01 16:58:15 -05:00
Ryuta Kamizono a088ee9691 Format the time string according to the precision of the time column 
It is also necessary to format a time column like a datetime column.
 2015-02-20 10:25:31 +09:00
Rafael Mendonça França b1edc3789a Track Gemfile.lock at the repository 
The main reason is to make bisect easier.

In some points, we have a lot of git dependencies. Since we don't have
the information of which commit we are referring to, bundler get the
latest commit of the master branch of the dependency. This sometimes
returns a version that is not compatible with Rails anymore, making the
tests fail and the harder to identify the commit that introduced a bug.

Also this will make sure that a contributor will always get a set of
dependencies that are passing with our tests.

In our CI server we delete the lock file to make sure we are always
testing against the newest release of our dependencies.
 2015-02-18 15:14:46 -02:00
Jeremy Kemper 144a381c5e Support Rails 5 2015-02-16 08:15:22 -08:00
Pratik Naik 06397077e4 New Gemfile.lock 2015-02-13 17:29:17 +05:30
Pratik Naik a5c3a8d3e3 Latest gems and fix a callback bug 2015-01-15 21:07:31 +05:30