aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add back --skip-turbolinks and remove --skip-gemsRafael Mendonça França2014-10-263-16/+12
| | | | | | | For the most part of cases --skip-gems option just remove one line in the Gemfile. This is not worth for the complexity it adds. Closes #17196
* Merge pull request #17330 from DanOlson/rewhereMatthew Draper2014-10-273-1/+12
|\ | | | | Fix Relation#rewhere to work with Range values
| * Fix Relation.rewhere to work with Range valuesDan Olson2014-10-203-1/+12
| |
* | Merge pull request #17397 from ↵Rafael Mendonça França2014-10-261-1/+1
|\ \ | | | | | | | | | | | | prathamesh-sonpatki/fix-type-boolean-error-msg-ci-skip Fix typo in error message when non-boolean value is assigned to boolean column
| * | Fix typo in error message when non-boolean value is assigned to boolean columnPrathamesh Sonpatki2014-10-261-1/+1
| | |
* | | Merge branch 'rishijain-update_docs_1'Zachary Scott2014-10-262-3/+6
|\ \ \ | |/ / |/| |
| * | Making the actionmailer docs more explicit to understand [ci skip]Rishi Jain2014-10-262-3/+6
|/ /
* | Prefix internal method with _Rafael Mendonça França2014-10-258-18/+18
| | | | | | | | This will avoid naming clash with user defined methods
* | Add CHANGELOG entry for #17064Rafael Mendonça França2014-10-251-0/+6
| |
* | Use new hash syntaxRafael Mendonça França2014-10-252-3/+4
| |
* | :scissors:Rafael Mendonça França2014-10-252-3/+2
| |
* | Merge pull request #17064 from frenkel/fix_select_tag_include_blankRafael Mendonça França2014-10-252-2/+14
|\ \ | | | | | | Use include_blank value as option label
| * | Use include_blank value as option labelFrank Groeneveld2014-10-172-2/+14
| | | | | | | | | | | | Update select_tag to reflect documentation and behave the same as form builder select. If the value of include_blank is not boolean true, use that value as the option label.
* | | Merge pull request #17392 from ↵Rafael Mendonça França2014-10-251-2/+2
|\ \ \ | | | | | | | | | | | | | | | | prathamesh-sonpatki/fix-docstring-for-sanitized-helpers-ci-skip Clarify comments about sanitized_allowed_tags
| * | | Clarify comments about sanitized_allowed_tagsPrathamesh Sonpatki2014-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clarify that arguments are expected in array format. - Extension of https://github.com/rails/rails/pull/17390. - https://github.com/rails/rails/pull/17390 was targeted against 4-1-stable branch. This commit updates master. - [ci skip]
* | | | Merge pull request #17391 from prathamesh-sonpatki/fix-oid-description-ci-skipEileen M. Uchitelle2014-10-251-1/+1
|\ \ \ \ | |/ / / |/| | | Fix description of OID in TypeMapInitializer
| * | | Fix description of OID in TypeMapInitializerPrathamesh Sonpatki2014-10-251-1/+1
|/ / / | | | | | | | | | [ci skip]
* | | give a better error message for misspelled helpersXavier Noria2014-10-253-1/+38
| | | | | | | | | | | | | | | | | | See comment in this patch for the rationale. References #16468
* | | fixes circularity check in dependenciesXavier Noria2014-10-254-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for circular loading should depend on a stack of files being loaded at the moment, rather than the collection of loaded files. This showed up indirectly in #16468, where a misspelled helper would incorrectly result in a circularity error message. References #16468
* | | instance_eval is evilAkira Matsuda2014-10-251-1/+1
| | |
* | | Reduce object allocationAkira Matsuda2014-10-251-1/+5
| | |
* | | Reduce object allocationAkira Matsuda2014-10-251-1/+1
| | |
* | | Avoid creating range objects (take II)Akira Matsuda2014-10-251-1/+5
| | |
* | | The code was not up-to-dateAkira Matsuda2014-10-251-9/+7
| | |
* | | Avoid creating unneeded Hash instance and calling slow Hash#fetchAkira Matsuda2014-10-251-1/+1
| | |
* | | Merge pull request #17385 from nakadai/patch-1Zachary Scott2014-10-241-1/+1
|\ \ \ | | | | | | | | Fix typo in "Active Record Basics" guide. [ci skip]
| * | | Fix typo in "Active Record Basics" guide. [ci skip]nakadai2014-10-241-1/+1
|/ / /
* | | Revert a change made to the example in 1ac4525Godfrey Chan2014-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | | @carlosantoniodasilva pointed out that when `@person` is nil then this would blow up when you ended up calling `#first`on `nil`. > "there’s no way to break a try chain when you enter it :D" [ci skip]
* | | Include return value in examples added in #17378 [ci skip]Zachary Scott2014-10-241-2/+2
| | |
* | | Improved try documentation [ci skip]Eugene Gilburg2014-10-241-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - better `if` example - Added chaining example to the try method description - Documented the `respond_to?` check to the try method description - Clearer wording to explain that argument error is raised on argument mismatch to responding method, rather than to non-responding method (which is handled without exception by `try`) - `.any?` is more precise than `! .blank?` - Don't need to use `try` on `children` as (for regular associations) they will always be a collection or array that responds to `first` - Fix typos/grammar
* | | Merge pull request #17381 from jonatack/patch-8Santiago Pastorino2014-10-241-1/+1
|\ \ \ | | | | | | | | AR Migrations Guide#Foreign Keys: fix wrong table
| * | | AR Migrations Guide#Foreign Keys: fix wrong tableJon Atack2014-10-241-1/+1
|/ / / | | | | | | [skip ci]
* | | Merge pull request #17377 from aripollak/dry-try-bangGodfrey Chan2014-10-231-10/+6
|\ \ \ | | | | | | | | DRY up try/try!
| * | | DRY up try/try!Ari Pollak2014-10-231-10/+6
| | | |
* | | | Merge pull request #17369 from rails/secure_compareGuillermo Iguaran2014-10-234-14/+33
|\ \ \ \ | |/ / / |/| | | Secure compare
| * | | Use AS secure_compare for CSRF token comparisonGuillermo Iguaran2014-10-231-2/+2
| | | |
| * | | Use AS secure_compare in AS::MessageVerifierGuillermo Iguaran2014-10-231-12/+2
| | | |
| * | | Add AS::SecurityUtils.secure_compare for constant time string comparisonGuillermo Iguaran2014-10-232-0/+29
| | | |
* | | | Merge branch 'mrgilman-reword-uncountable-documentation'Zachary Scott2014-10-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Reword documentation for `uncountable` [ci skip]Melanie Gilman2014-10-231-1/+1
|/ / /
* | | Merge pull request #17355 from vipulnsward/aj-string-fixesYves Senn2014-10-231-1/+1
|\ \ \ | | | | | | | | Fix error string raised from AJ enqueue_at for ClassQueueAdapter
| * | | - Fix error string raised from `enqueue_at`Vipul A M2014-10-221-1/+1
| | | |
* | | | Merge pull request #17343 from vipulnsward/inline-aj-callbacksYves Senn2014-10-231-16/+13
|\ \ \ \ | | | | | | | | | | Inline AJ around_perform and around_enqueue in CallbackJob used for tests
| * | | | - Inline AJ around_perform and around_enqueue in CallbackJob used for tests.Vipul A M2014-10-211-16/+13
| |/ / /
* | | | Update CHANGELOG and release notes for e98f2a7Godfrey Chan2014-10-222-2/+6
| | | |
* | | | Merge pull request #17361 from aripollak/try-bang-parityGodfrey Chan2014-10-222-5/+9
|\ \ \ \ | | | | | | | | | | Bring try! into parity with try.
| * | | | Bring try! into parity with try.Ari Pollak2014-10-222-5/+9
|/ / / / | | | | | | | | | | | | Based on commit 5e51bdda.
* | | | Merge pull request #17353 from swapdisc/activejob-queue-test-typoRafael Mendonça França2014-10-221-2/+2
|\ \ \ \ | | | | | | | | | | :nail_care: fix typos in activejob queuing test
| * | | | :nail_care: fix typos in activejob queuing testJoe Lewis2014-10-221-2/+2
|/ / / /
* | | | Merge pull request #17346 from accessd/fix-small-typo-in-testRafael Mendonça França2014-10-211-1/+1
|\ \ \ \ | | | | | | | | | | fix small typo in routing test
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-16 22:02:05 +0000