Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'Prefer-IO_NULL'. Closes #18381. | Yves Senn | 2015-01-10 | 4 | -4/+4 | |
|\ \ \ \ | ||||||
| * | | | | Use IO::NULL always | Nobuyoshi Nakada | 2015-01-10 | 4 | -4/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #18433 from koraktor/patch-1 | Yves Senn | 2015-01-10 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix typo in PostresSQLAdapter's documentation | Sebastian Staudt | 2015-01-10 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | formatting pass over CHANGELOGs. [ci skip] | Yves Senn | 2015-01-10 | 4 | -6/+12 | |
* | | | | Remove note about supported plugins from the releasing docs | Carlos Antonio da Silva | 2015-01-09 | 1 | -11/+0 | |
* | | | | Remove support for the protected attributes gem | Carlos Antonio da Silva | 2015-01-09 | 2 | -10/+6 | |
* | | | | Merge pull request #18347 from robertomiranda/has_secure_token_base62 | Guillermo Iguaran | 2015-01-09 | 2 | -32/+8 | |
|\ \ \ \ | ||||||
| * | | | | Switch Secure Token generation to Base58 | robertomiranda | 2015-01-09 | 2 | -32/+8 | |
* | | | | | Merge pull request #10690 from robertomiranda/remove_mass_assignment_security | Guillermo Iguaran | 2015-01-09 | 1 | -7/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove attributes_protected_by_default reference, since MassAssignmentSecurit... | robertomiranda | 2015-01-09 | 1 | -7/+0 | |
* | | | | | | Add missing require | Guillermo Iguaran | 2015-01-09 | 1 | -0/+2 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Add SecureRandom.base58 | Guillermo Iguaran | 2015-01-09 | 3 | -0/+45 | |
|/ / / / | ||||||
* | | | | Merge pull request #18426 from arthurnn/txn_ref | Godfrey Chan | 2015-01-09 | 1 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | Copy records to parent transaction should happen on TransactionManager | Arthur Neves | 2015-01-09 | 1 | -3/+3 | |
* | | | | | Merge pull request #18425 from arthurnn/kargs_transaction | Rafael Mendonça França | 2015-01-09 | 2 | -5/+5 | |
|\| | | | | ||||||
| * | | | | Use keyword args on committed! and rolledback! | Arthur Neves | 2015-01-09 | 2 | -5/+5 | |
|/ / / / | ||||||
* | | | | Properly copy nested bind values from subqueried relations | Sean Griffin | 2015-01-09 | 2 | -12/+22 | |
* | | | | Properly persist `lock_version` as 0 if the DB has no default | Sean Griffin | 2015-01-09 | 2 | -7/+13 | |
* | | | | Merge pull request #18390 from tgxworld/parallel_bundle_install | Rafael Mendonça França | 2015-01-09 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Use parallel bundler install. | Guo Xiang Tan | 2015-01-10 | 1 | -1/+1 | |
* | | | | | Merge pull request #18413 from brainopia/automatic_inverse_of_for_belongs_to | David Heinemeier Hansson | 2015-01-09 | 5 | -31/+70 | |
|\ \ \ \ \ | ||||||
| * | | | | | Drop old test locations from `rake stats` | brainopia | 2015-01-09 | 3 | -6/+8 | |
| * | | | | | Update `rake counts` to count declarative tests in minitest | brainopia | 2015-01-09 | 3 | -25/+62 | |
* | | | | | | Merge pull request #18423 from jone/remove-default-header | Yves Senn | 2015-01-09 | 3 | -0/+35 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Default headers, removed in controller actions, will not be reapplied to the ... | Jonas Baumann | 2015-01-09 | 3 | -0/+35 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #18416 from caike/master | Rafael Mendonça França | 2015-01-09 | 3 | -6/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add _mailer suffix to i18n path | Carlos Souza | 2015-01-08 | 3 | -6/+6 | |
* | | | | | | | Merge pull request #18417 from yoshiokatsuneo/active_record_connection_pool_e... | Sean Griffin | 2015-01-09 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | ||||||
| * | | | | | ActiveRecord: release connection on reconnect failure. | Yoshioka Tsuneo | 2015-01-09 | 1 | -0/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #18410 from seuros/ripfilter | Rafael Mendonça França | 2015-01-08 | 3 | -9/+37 | |
|\ \ \ \ \ | ||||||
| * | | | | | Deprecate all *_filter callbacks in favor of *_action callbacks | Abdelkader Boudih | 2015-01-08 | 3 | -9/+37 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #18404 from claudiob/rebase-14549 | Rafael Mendonça França | 2015-01-08 | 2 | -0/+44 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add test/doc for :if/:except in skip_before_action | claudiob | 2015-01-08 | 2 | -2/+24 | |
| * | | | | | Add test case and documentation for skip_before_filter. | Lauro Caetano | 2015-01-08 | 2 | -0/+22 | |
* | | | | | | Fix the example (for realz) | David Heinemeier Hansson | 2015-01-08 | 1 | -1/+1 | |
* | | | | | | Fix the example | David Heinemeier Hansson | 2015-01-08 | 1 | -1/+1 | |
* | | | | | | Merge pull request #18334 from simi/prepend-false-for-protect-from-forgery | David Heinemeier Hansson | 2015-01-08 | 3 | -1/+91 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add prepend option to protect_from_forgery. | Josef Šimánek | 2015-01-08 | 3 | -1/+91 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #18371 from brainopia/remove_hide_actions | David Heinemeier Hansson | 2015-01-08 | 5 | -93/+7 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Remove ActionController::HideActions (closes #18336) | brainopia | 2015-01-06 | 5 | -93/+7 | |
* | | | | | | Document has_many :extend option | Caleb Thompson | 2015-01-08 | 1 | -0/+4 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #18403 from georgeclaghorn/enqueued-email-assertions | David Heinemeier Hansson | 2015-01-08 | 5 | -2/+144 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add assert_enqueued_emails and assert_no_enqueued_emails | George Claghorn | 2015-01-08 | 3 | -0/+115 | |
| * | | | | | Add :only option to assert_no_enqueued_jobs | George Claghorn | 2015-01-08 | 2 | -2/+29 | |
|/ / / / / | ||||||
* | | | | | Fix Active Job changelog formatting and reword a bit [ci skip] | Carlos Antonio da Silva | 2015-01-08 | 1 | -24/+22 | |
* | | | | | Merge pull request #18397 from georgeclaghorn/enhance-job-assertions | David Heinemeier Hansson | 2015-01-07 | 3 | -7/+76 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add :only option to assert_enqueued_jobs | George Claghorn | 2015-01-07 | 3 | -7/+76 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #16640 from mfazekas/fix_loop_in_changed_for_autosave | Godfrey Chan | 2015-01-07 | 2 | -4/+21 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix potenital stack level too deep with autosave or validation | Miklos Fazkeas | 2015-01-04 | 2 | -4/+21 |