aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | live controllers should have live responsesAaron Patterson2014-02-283-21/+38
| |/ / |/| |
* | | Merge pull request #14233 from kuldeepaggarwal/fix-secrets-docGuillermo Iguaran2014-02-282-4/+11
|\ \ \
| * | | [ci skip] use secrets.secret_key_base instead of config.secret_key_baseKuldeep Aggarwal2014-03-012-4/+11
* | | | set the error callback to a nice default in case nobody set an error callback...Aaron Patterson2014-02-282-1/+8
* | | | Merge pull request #14230 from kuldeepaggarwal/doc-selectRobin Dupret2014-02-281-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] correct select examples and doc, ref [522c0fd]Kuldeep Aggarwal2014-03-011-4/+4
* | | | Improve a bit the 4.1 release notes [ci skip]Robin Dupret2014-02-281-4/+6
* | | | Merge pull request #14226 from senny/14109_partial_revertAaron Patterson2014-02-283-1/+26
|\ \ \ \
| * | | | `includes` uses SQL parsing when String joins are involved.Yves Senn2014-02-283-1/+26
| |/ / /
* | | | Merge pull request #14231 from brianstorti/bs-docs-secret-tokenGuillermo Iguaran2014-02-281-3/+18
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] use secrets.yml instead of secret_token.rb in the action controller...Brian Thomas Storti2014-02-271-3/+18
|/ / /
* | | Merge pull request #14203 from Alwahsh/aabouelhamayedGodfrey Chan2014-02-273-0/+42
|\ \ \
| * | | Fix a bug affecting validations of enum attributesTheMonster2014-02-273-0/+42
|/ / /
* | | Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_testYves Senn2014-02-273-5/+5
|\ \ \
| * | | modify model generator warning message. refs [#174c9f0]Kuldeep Aggarwal2014-02-273-5/+5
* | | | Replace "data store" with database [ci skip]Robin Dupret2014-02-271-1/+1
* | | | Merge pull request #11481 from sorentwo/fetch-multi-hashGuillermo Iguaran2014-02-273-14/+19
|\ \ \ \
| * | | | Return a hash rather than array from fetch_multiParker Selbert2014-02-263-14/+19
|/ / / /
* | | | Merge pull request #14216 from garethson/routes-docs-typoArthur Nogueira Neves2014-02-261-18/+18
|\ \ \ \
| * | | | Fixes docs typo in nested resource path helpers [skip ci]Gareth du Plooy2014-02-261-18/+18
* | | | | Fix concerning module reference [ci skip]Carlos Antonio da Silva2014-02-261-1/+1
* | | | | Fix some validators when used on model instanceEric Hutzelman2014-02-263-2/+6
* | | | | Pass strings to demodulize methodCarlos Antonio da Silva2014-02-261-1/+1
|/ / / /
* | | | Merge pull request #14105 from twooster/fix-controller-testsAaron Patterson2014-02-264-1/+29
|\ \ \ \
| * | | | Fix controller test not resetting @_url_optionsTony Wooster2014-02-264-1/+29
* | | | | pass strings to the underscore methodAaron Patterson2014-02-262-3/+3
* | | | | speed up `underscore` in cases that don't need to do anythingAaron Patterson2014-02-261-0/+1
* | | | | pass the class name to `tableize`Aaron Patterson2014-02-261-1/+1
* | | | | Merge pull request #14215 from robertomiranda/docs-rake-notesGuillermo Iguaran2014-02-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ci skip] Update list of files extensions in rake notes guiderobertomiranda2014-02-261-1/+1
|/ / / /
* | | | Merge pull request #14211 from loganhasson/masterXavier Noria2014-02-261-12/+12
|\ \ \ \
| * | | | [ci skip] Move association class method notesLogan Hasson2014-02-261-12/+12
* | | | | extract common code in `uuid_test.rb`.Yves Senn2014-02-261-60/+57
* | | | | move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`.Yves Senn2014-02-262-16/+36
* | | | | Merge pull request #14208 from lukesteensen/remove-migration-exampleXavier Noria2014-02-261-153/+0
|\ \ \ \ \
| * | | | | [ci skip] remove guide section on models in migrationsLuke Steensen2014-02-261-153/+0
|/ / / / /
* | | | | test case for custom PostgreSQL enum type.Yves Senn2014-02-261-0/+38
* | | | | Merge pull request #14149 from tjschuck/bcrypt_gem_renameCarlos Antonio da Silva2014-02-264-7/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Bump version of bcrypt gemT.J. Schuck2014-02-254-7/+11
| | |_|/ | |/| |
* | | | Remove inclusion of rubysl gem for rbx on generated GemfileCarlos Antonio da Silva2014-02-252-16/+0
* | | | let `insert_record` actuall save the object.Aaron Patterson2014-02-254-4/+32
* | | | Merge pull request #14200 from spencer1248/fix_typo_in_app_generator_test_nameCarlos Antonio da Silva2014-02-251-1/+1
|\ \ \ \
| * | | | [skip ci] Fix test name typo in app generator tests.Spencer Rogers2014-02-251-1/+1
* | | | | Merge remote-tracking branch 'chancancode/fix_instance_method_already_impleme...Jon Leighton2014-02-255-13/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed STI classes not defining an attribute method if there is aGodfrey Chan2014-02-235-13/+31
* | | | | Merge pull request #14199 from arthurnn/travis_211Guillermo Iguaran2014-02-251-2/+1
|\ \ \ \ \
| * | | | | travis s/2.1.0/2.1.1Arthur Neves2014-02-251-2/+1
|/ / / / /
* | | | | Merge pull request #14152 from schneems/schneems/fix-ar-wtf-why-is-there-no-e...Aaron Patterson2014-02-252-24/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Handle missing environment from non empty configschneems2014-02-212-24/+13
* | | | | Merge pull request #14177 from yahonda/skip_tests_if_duplicate_index_not_allowedYves Senn2014-02-251-10/+13
|\ \ \ \ \