aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Skip test_migrate_revert_add_index_with_name if databasesYasuo Honda2014-02-251-10/+13
* | | | | Optimize getting started guide images, and use png instead of jpgCarlos Antonio da Silva2014-02-2516-1/+1
* | | | | :scissors: [ci skip]Carlos Antonio da Silva2014-02-251-5/+5
|/ / / /
* | | | Merge pull request #14193 from ys/patch-1Vijay Dev2014-02-251-1/+1
|\ \ \ \
| * | | | Add missing parantheses in index_exists?Yannick Schutz2014-02-251-1/+1
* | | | | Point master changelogs to 4-1-stable branchCarlos Antonio da Silva2014-02-258-3831/+8
|/ / / /
* | | | `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191.Yves Senn2014-02-251-1/+0
* | | | Merge pull request #14006 from Loremaster/strong_params_improvementXavier Noria2014-02-253-6/+28
|\ \ \ \
| * | | | Simple Sungularize ActionController::UnpermittedParameters error in case when...Serj L2014-02-243-6/+28
* | | | | Merge pull request #14186 from ch33hau/standardized-punctuationYves Senn2014-02-251-3/+3
|\ \ \ \ \
| * | | | | [skip ci] Standardized punctuation.ch33hau2014-02-251-3/+3
|/ / / / /
* | | | | Merge pull request #14182 from mecampbellsoup/fix_typo_in_url_helper_docsArthur Nogueira Neves2014-02-241-1/+1
|\ \ \ \ \
| * | | | | [skip ci] Fix typo in link_to :method option descriptionMatt Campbell2014-02-241-1/+1
|/ / / / /
* | | | | refactor, with_locale is not needed because I18n is mocked.Yves Senn2014-02-241-7/+5
* | | | | Merge pull request #14170 from kritik/masterYves Senn2014-02-243-2/+20
|\ \ \ \ \
| * | | | | Fix ActionView label translation for more than 10 nested elementsVladimir Krylov2014-02-243-2/+20
|/ / / / /
* | | | | Go with #presence_in instead of #present_in -- it doesnt sound quite as good,...David Heinemeier Hansson2014-02-243-7/+7
* | | | | refactor, extract `with_locale` helper.Yves Senn2014-02-241-87/+79
* | | | | build fix. follow up to 174c9f0df39cd338a4871f82794256cc64f68a81Yves Senn2014-02-241-1/+1
|/ / / /
* | | | include names in model generator warning message. refs #13515.Yves Senn2014-02-242-5/+7