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

32740 Commits

Author SHA1 Message Date
Jeremy Kemper 1d6668dec0 Point to the contributing-to-Rails guide 2012-09-17 10:01:05 -07:00
Rafael Mendonça França 8f0d332af3 Merge pull request #7660 from senny/7646_wrong_status_code_on_not_found 
log 404 status when ActiveRecord::RecordNotFound was raised (#7646)
 2012-09-17 09:21:23 -07:00
Yves Senn dadfa9ab32 cleanup, remove whitespace from CHANGELOG 2012-09-17 18:17:37 +02:00
Yves Senn 370dcd99b7 log 404 status when ActiveRecord::RecordNotFound was raised (#7646) 2012-09-17 18:16:41 +02:00
Xavier Noria 3c48b32f6e removes unnecessary self 2012-09-17 17:32:19 +02:00
Xavier Noria a8b21aca31 revises the RDoc of AC::Base.without_modules 2012-09-17 17:32:19 +02:00
Xavier Noria 2919f0df9a documents the request and response methods in AC::Base 2012-09-17 17:32:19 +02:00
Xavier Noria 18dbad80ab revises RDoc in AC::Metal [ci skip] 2012-09-17 17:32:19 +02:00
Xavier Noria 4363368e85 removes unnecessary self 2012-09-17 17:32:18 +02:00
Carlos Antonio da Silva a2194990fa Merge pull request #7669 from guilleiguaran/rename-rb-handler 
Rename .rb template handler to .ruby to avoid conflicts with mustache classes
 2012-09-17 08:13:08 -07:00
Guillermo Iguaran de1060f4e0 Rename .rb template handler to .ruby to avoid conflicts with mustache views classes 2012-09-17 10:07:08 -05:00
Rafael Mendonça França d9f936e61b Merge pull request #7644 from insside/register_template_handler-method-refactoring 
Allowing pass couple extension to one register_template_handler call
 2012-09-17 07:20:14 -07:00
Tima Maslyuchenko 13b0af736e allowing pass couple extension to register_template_handler call 2012-09-17 17:16:05 +03:00
Rafael Mendonça França c35a7d78ec Use the CHANGELOG convention [ci skip] 2012-09-17 10:49:28 -03:00
Rafael Mendonça França 82d507b4c3 Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt 
Fix collection= on hm:t join models when unsaved
 2012-09-17 06:40:38 -07:00
Ernie Miller 610b63288f Fix collection= on hm:t join models when unsaved 
If assigning to a has_many :through collection against an unsaved
object using the collection=[<array_of_items>] syntax, the join models
were not properly created, previously.
 2012-09-17 09:20:18 -04:00
Rafael Mendonça França 896594f5ae Merge pull request #7595 from guilleiguaran/update-ap-changelog 
Add missing entry in CHANGELOG about change of AD::Session::MemCacheStore
 2012-09-17 06:11:46 -07:00
Rafael Mendonça França 73d3c933ee Merge pull request #7667 from kennyj/fix_unnecessary_code_20120917 
Remove unncessary code.
 2012-09-17 06:08:46 -07:00
kennyj 87321488da Remove unncessary code. 2012-09-17 21:33:43 +09:00
Rafael Mendonça França c1b1215230 Merge pull request #7664 from arunagw/build_fix_railties 
Fix build for Queue.
 2012-09-17 05:31:10 -07:00
Rafael Mendonça França a036dc87e1 Merge pull request #7666 from kennyj/fix_9fa3f102813eeeec440abd75870dfa7b23835665 
Fix warning: method redefine. Testcase name are duplicated.
 2012-09-17 05:28:35 -07:00
kennyj 3b18f34bde Fix warning: method redefine. Testcase name are duplicated. 2012-09-17 21:25:50 +09:00
Arun Agrawal 3e4458b73b Fix build for Queue. 2012-09-17 12:13:15 +05:30
Jeremy Kemper 2a301505ec Use synchronous queue by default. Separate queued message delivery jobs from the queued message wrappers so the queue itself needn't be marshaled (due to queue reference QueuedMessage). 2012-09-16 22:37:47 -07:00
Jeremy Kemper b881be7331 Always run jobs using a consumer, even in synchronous & test queues, to ensure shared behavior. 2012-09-16 22:37:47 -07:00
Guillermo Iguaran 0654f76a5a Add missing entries in AP changelog 2012-09-16 23:57:25 -05:00
Rafael Mendonça França e08a564e87 Merge pull request #7662 from frodsan/ar_changelog 
improve AR/CHANGELOG [ci skip]
 2012-09-16 20:37:55 -07:00
Francesco Rodriguez 0aaf87c1e1 improve AR/CHANGELOG [ci skip] 2012-09-16 22:34:43 -05:00
Rafael Mendonça França beaac33f9f Merge pull request #7547 from danmcclain/pg-arrays 
Adds migration and type casting support for PostgreSQL Array datatype
 2012-09-16 20:07:28 -07:00
Rafael Mendonça França 4434e3f72b Remove debug code 💣 2012-09-16 23:32:23 -03:00
Rafael Mendonça França 9ae79af042 Merge pull request #7651 from steveklabnik/issue_3956 
Don't preserve SELECT columns on COUNT

Closes #7651
 2012-09-16 23:27:19 -03:00
Steve Klabnik 9fa3f10281 Don't preserve SELECT columns on COUNT 
The COUNT clause of a finder_sql relationship is being rewritten from
COUNT(*) to COUNT(table_name.*). This does not appear to be valid syntax
in MySQL:

```
mysql> SELECT COUNT( table_name.* ) FROM `table_name`;
ERROR 1064 (42000): You have an error in your SQL syntax; check the
manual that corresponds to your MySQL server version for the right
syntax to use near '* ) FROM `table_name`' at line 1
```

This fixes the bug, as well as adding tests so we don't re-introduce
it in the future.

Fixes #3956.
 2012-09-16 23:20:39 -03:00
Rafael Mendonça França eac9e0325c Merge pull request #7645 from larrylv/configurable-defaults 
Set up config_accessor with a default value by block
 2012-09-16 18:17:44 -07:00
Larry Lv 1efe30ebce set up config_accessor with a default value by block 
* ActiveSupport::Configurable should allow config_accessor to take
  default value by block, just like cattr_accessor.

    class User
      include ActiveSupport::Configurable
      config_accessor :hair_colors do
        [:brown, :black, :blonde, :red]
      end
    end

    User.hair_colors # => [:brown, :black, :blonde, :red]

* remove trailing whitespaces in configurable.rb and its test file.

* Update ActiveSupport CHANGELOG.
 2012-09-17 09:14:21 +08:00
Piotr Sarnacki 82efe8943b Merge pull request #7657 from kennyj/fix_6458-2 
Don't explain except normal CRUD sql.
 2012-09-16 11:55:44 -07:00
kennyj 5bb056d268 Don't explain except normal CRUD sql. 2012-09-17 00:22:34 +09:00
Carlos Antonio da Silva aa81bf7457 Merge pull request #7652 from toshi-kawanishi/find_in_batches 
Fix find_in_batches with customized primary_key
 2012-09-16 05:30:10 -07:00
Toshiyuki Kawanishi 761bc751d3 Fix find_in_batches with customized primary_key 2012-09-16 20:02:23 +09:00
Rafael Mendonça França 56c60cab56 Merge pull request #7648 from kennyj/rename_2_schema 
Query for loading index info should be marked as SCHEMA.
 2012-09-15 09:17:52 -07:00
Xavier Noria 714e34838b Merge pull request #7656 from czarneckid/clarify-documentation 
Clarify the documentation on the Rails::Application#call method
 2012-09-15 08:31:54 -07:00
David Czarnecki 75b9c2c236 Clarify the documentation on the Rails::Application#call method 2012-09-15 11:11:54 -04:00
Rafael Mendonça França b96464e7ee Check if etag exists before to do the gsub 
This fix the build http://travis-ci.org/#!/rails/rails/builds/2459981
 2012-09-15 11:37:50 -03:00
Rafael Mendonça França 3fb492ff87 Merge pull request #7655 from steveklabnik/master 
fix the build
 2012-09-15 07:02:32 -07:00
Steve Klabnik b079f7a334 fix the build 2012-09-15 18:01:23 +04:00
kennyj 3dc402112e Query for sequence info also should be markd as SCHEMA. 2012-09-15 22:43:35 +09:00
kennyj 8933efb9fb Query for loading index info should be marked as SCHEMA. 2012-09-15 22:38:53 +09:00
Rafael Mendonça França 1b7894c95b Merge pull request #7643 from steveklabnik/deprecate_silence 
Deprecate ActiveSupport::Benchmarkable#silence.
 2012-09-15 05:57:08 -07:00
Xavier Noria 3ec6783613 Merge pull request #7654 from steveklabnik/issue_4857 
Improve Process::Status#to_json
 2012-09-15 05:39:40 -07:00
Steve Klabnik afe9654297 Improve Process::Status#to_json 
Because Process::Status has no instance_variables, the
ActiveSupport version of #to_json produces {}, which isn't good.

Therefore, we implement our own #as_json, which makes it useful
again.

Fixes #4857
 2012-09-15 16:35:34 +04:00
Rafael Mendonça França a086ef6f17 Merge pull request #7649 from steveklabnik/issue_2520 
Support for multiple etags in an If-None-Match header
 2012-09-15 05:17:40 -07:00