aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | | | | | With dependencies for Sidekiq and Sucker PunchDavid Heinemeier Hansson2014-05-181-0/+14
| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge pull request #5 from seuros/masterDavid Heinemeier Hansson2014-05-1810-4/+61
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Sidekiq adapter/wrapper fixes #3
| | | | * | | | | | | | | | | | | | | | Add Sucker Punch adapter/wrapperAbdelkader Boudih2014-05-186-2/+31
| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Correct typo in version.rbAbdelkader Boudih2014-05-181-1/+1
| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Add Sidekiq adapter/wrapper fixes #3Abdelkader Boudih2014-05-186-3/+31
| | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | Merge pull request #1 from charliesome/patch-1David Heinemeier Hansson2014-05-181-9/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up JobWrappers::ResqueWrapper.perform
| | | | * | | | | | | | | | | | | | | | Clean up JobWrappers::ResqueWrapper.performCharlie Somerville2014-05-191-9/+3
| | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not only easier to read, but it'll also properly raise an ArgumentError rather than a NoMethodError when called with no arguments. It also allocates 4 fewer objects per call (8 down from 12), and is about 50% faster according to a quick benchmark.
| | | * | | | | | | | | | | | | | | | Queue naming with a base, which requires a JobWrapper to comply to Resques ↵David Heinemeier Hansson2014-05-185-5/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expectation of a class variable
| | | * | | | | | | | | | | | | | | | Add ResqueAdapter and provide test infrastructure for the now multiple adaptersDavid Heinemeier Hansson2014-05-189-10/+76
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Rename to InlineAdapter to match *Adapter form, even if the queue is ↵David Heinemeier Hansson2014-05-181-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | embedded in there too
| | | * | | | | | | | | | | | | | | | Simplest job and inline queueDavid Heinemeier Hansson2014-05-184-2/+37
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Run tests through RakeDavid Heinemeier Hansson2014-05-181-0/+27
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Skeleton gemDavid Heinemeier Hansson2014-05-1812-0/+184
| | | / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge pull request #16532 from gsamokovarov/lock-web-console-for-4.2.0.beta1David Heinemeier Hansson2014-08-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lock web-console to 2.0.0.beta1 for the first 4.2 beta
| | * | | | | | | | | | | | | | | | | Lock web-console to 2.0.0.beta1 for the first 4.2 betaGenadi Samokovarov2014-08-181-1/+1
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The console on exception code isn't available on the stable releases yet. Lock it for now, so the beta users get a sneak peak of the console features.
* / / / / / / / / / / / / / / / / / Dont encourage people to run without autoflush in productionDavid Heinemeier Hansson2014-08-171-3/+0
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-1740-1333/+428
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use AS::JSON for (de)serializing cookiesGodfrey Chan2014-08-173-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the Active Support JSON encoder for cookie jars using the `:json` or `:hybrid` serializer. This allows you to serialize custom Ruby objects into cookies by defining the `#as_json` hook on such objects. Fixes #16520.
| * | | | | | | | | | | | | | | | | Preload UnicodeDatabase outside the loopAkira Matsuda2014-08-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes random multibyte_chars_test fail under Ruby 1.9.3. I don't know why the tests fail. And I really don't know why this fixes. Maybe we need some more investigation...
| * | | | | | | | | | | | | | | | | formatAkira Matsuda2014-08-181-2/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | `responders` 1.x won't do it. Told you to RTFM for details!Godfrey Chan2014-08-172-3/+8
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #16458 from chancancode/ar_fix_reserved_inheritanceGodfrey Chan2014-08-173-5/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue w/custom accessors + reserved name + inheritance Conflicts: activerecord/CHANGELOG.md
| | * | | | | | | | | | | | | | | | | Fixed issue w/custom accessors + reserved name + inheritanceGodfrey Chan2014-08-113-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed an issue where custom accessor methods (such as those generated by `enum`) with the same name as a global method are incorrectly overridden when subclassing. This was partially fixed in 4155431 then broken again by e5f15a8. Fixes #16288.
| * | | | | | | | | | | | | | | | | | The gem is called 'responders'Godfrey Chan2014-08-172-4/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Raise a more helpful error for people who are using these extracted featuresGodfrey Chan2014-08-172-1/+46
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fixed broken reference caused by 14965baGodfrey Chan2014-08-171-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #16467 from strzalek/cookies-digest-config-option2Godfrey Chan2014-08-175-5/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies digest config option (pt. 2) Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/middleware/cookies.rb
| | * | | | | | | | | | | | | | | | | | Add config option for cookies digestŁukasz Strzałkowski2014-08-125-5/+68
| | | |_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now configure custom digest for cookies in the same way as `serializer`: config.action_dispatch.cookies_digest = 'SHA256'
| * | | | | | | | | | | | | | | | | | Merge pull request #16484 from strzalek/remove-redundant-null-serializerGodfrey Chan2014-08-171-16/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant NullSerializer
| | * | | | | | | | | | | | | | | | | | Remove redundant NullSerializerŁukasz Strzałkowski2014-08-131-16/+7
| | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use one from ActiveSupport::MessageEncryptor module.
| * | | | | | | | | | | | | | | | | | Merge pull request #16526 from rails/jv-no-respondersJosé Valim2014-08-1714-1276/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move respond_with to the responders gem
| | * | | | | | | | | | | | | | | | | | Remove more references to respond_withJosé Valim2014-08-179-8/+7
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Remove usafe of respond_to in ActionView testsJosé Valim2014-08-171-3/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Move respond_with to the responders gemJosé Valim2014-08-174-1265/+8
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | respond_with (and consequently the class-level respond_to) are being removed from Rails. Instead of moving it to a 3rd library, the functionality will be moved to responders gem (at github.com/plataformatec/responders) which already provides some responders extensions.
| * | | | | | | | | | | | | | | | | | Merge pull request #16529 from y-yagi/patch-1Zachary Scott2014-08-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fix sample code in Layouts and Rendering guide
| | * | | | | | | | | | | | | | | | | | [ci skip] Fix sample code in Layouts and Rendering guideyuuji.yaginuma2014-08-171-1/+1
| | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Allow usage of bundle local config for rack by specifying the branchCarlos Antonio da Silva2014-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | Merge pull request #16338 from robin850/rbx-safe-constantizeMatthew Draper2014-08-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid relying on error messages when rescuing
| | * | | | | | | | | | | | | | | | | | Avoid relying on error messages when rescuingRobin Dupret2014-08-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are rescuing from an error, it's a brittle approach to do checks with regular expressions on the raised message because it may change in in the future and error messages are different across implementations. The NameError API could be improved at the MRI level but for now we need to rely on its #name. A #== check will only pass for top level constants or only when the last constant of the path is missing so we need to rely on #include? instead. For instance: begin Namespace::Foo rescue NameError => e e.name # => :Namespace end However, if the name-space already exists, only the name of the first missing constant in the path is returned (e.g. for Math::PHI, the name would be :PHI). JRuby will return a fully qualified name (:"Math::PHI"). We need to keep the == check for 1.9 compatibility since const_get will raise a NameError with a name attribute set to the given string if it's one of "::" or "". See http://git.io/jnSN7g for further information.
| * | | | | | | | | | | | | | | | | | | Merge pull request #16527 from jeremy/etag_with_template_digestJeremy Kemper2014-08-177-9/+136
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | When your templates change, browser caches bust automatically.
| | * | | | | | | | | | | | | | | | | | When your templates change, browser caches bust automatically.Jeremy Kemper2014-08-177-9/+136
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New default: the template digest is automatically included in your ETags. When you call `fresh_when @post`, the digest for `posts/show.html.erb` is mixed in so future changes to the HTML will blow HTTP caches for you. This makes it easy to HTTP-cache many more of your actions. If you render a different template, you can now pass the `:template` option to include its digest instead: fresh_when @post, template: 'widgets/show' Pass `template: false` to skip the lookup. To turn this off entirely, set: config.action_controller.etag_with_template_digest = false
| * | | | | | | | | | | | | | | | | | Merge pull request #16189 from sgrif/sg-attribute-was-in-placeGodfrey Chan2014-08-169-20/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement `_was` and `changes` for in-place mutations of AR attributes
| | * | | | | | | | | | | | | | | | | | Don't expose these new APIs yet (added in 877ea78 / #16189)Godfrey Chan2014-08-163-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WARNING: don't use them! They might change or go away between future beta/RC/ patch releases! Also added a CHANGELOG entry for this.
| | * | | | | | | | | | | | | | | | | | Implement `_was` and `changes` for in-place mutations of AR attributesSean Griffin2014-08-168-21/+62
| |/ / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / Fix rounding errors with #travel_to by resetting the usec on any passed time ↵David Heinemeier Hansson2014-08-173-4/+20
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to zero, so we only travel with per-second precision, not anything deeper than that.
* | | | | | | | | | | | | | | | | | Merge pull request #16517 from sgrif/sg-comparable-attributesRafael Mendonça França2014-08-164-0/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement `==` on `Type::Value` and `Attribute`
| * | | | | | | | | | | | | | | | | | Implement `==` on `Type::Value` and `Attribute`Sean Griffin2014-08-154-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a small self contained piece of the refactoring that I am working on, which required these objects to be comparable.
* | | | | | | | | | | | | | | | | | | Merge pull request #16523 from tomkadwill/cookie_store_rewordingRafael Mendonça França2014-08-161-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] re-worded section on CookieStore to make it more readable.
| * | | | | | | | | | | | | | | | | | | [ci skip] re-worded section on CookieStore to make it more readable.Tom Kadwill2014-08-161-3/+3
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Avoid mutating the constants in a test caseAkira Matsuda2014-08-162-6/+4
| | | | | | | | | | | | | | | | | | |