Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Remove unnecessary db call when replacing. | Arthur Neves | 2014-02-28 | 2 | -1/+13 | |
* | | | | | | Merge pull request #14240 from sferik/flat_map | José Valim | 2014-03-01 | 2 | -5/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Replace map.flatten(1) with flat_map | Erik Michaels-Ober | 2014-02-28 | 2 | -5/+5 | |
|/ / / / / / | ||||||
* | | | | | | make sure we wait for the threads to shut down before asserting closure | Aaron Patterson | 2014-02-28 | 1 | -0/+1 | |
* | | | | | | Merge pull request #14195 from robin850/issue-14079 | Guillermo Iguaran | 2014-02-28 | 3 | -2/+23 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Avoid namespacing routes inside engines | Robin Dupret | 2014-02-26 | 3 | -2/+23 | |
* | | | | | | | use built-in exception handling in live controllers | Aaron Patterson | 2014-02-28 | 2 | -17/+22 | |
* | | | | | | | live controllers should have live responses | Aaron Patterson | 2014-02-28 | 3 | -21/+38 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #14233 from kuldeepaggarwal/fix-secrets-doc | Guillermo Iguaran | 2014-02-28 | 2 | -4/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | [ci skip] use secrets.secret_key_base instead of config.secret_key_base | Kuldeep Aggarwal | 2014-03-01 | 2 | -4/+11 | |
* | | | | | | | set the error callback to a nice default in case nobody set an error callback... | Aaron Patterson | 2014-02-28 | 2 | -1/+8 | |
* | | | | | | | Merge pull request #14230 from kuldeepaggarwal/doc-select | Robin Dupret | 2014-02-28 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | [ci skip] correct select examples and doc, ref [522c0fd] | Kuldeep Aggarwal | 2014-03-01 | 1 | -4/+4 | |
* | | | | | | | Improve a bit the 4.1 release notes [ci skip] | Robin Dupret | 2014-02-28 | 1 | -4/+6 | |
* | | | | | | | Merge pull request #14226 from senny/14109_partial_revert | Aaron Patterson | 2014-02-28 | 3 | -1/+26 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | `includes` uses SQL parsing when String joins are involved. | Yves Senn | 2014-02-28 | 3 | -1/+26 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #14231 from brianstorti/bs-docs-secret-token | Guillermo Iguaran | 2014-02-28 | 1 | -3/+18 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | [ci skip] use secrets.yml instead of secret_token.rb in the action controller... | Brian Thomas Storti | 2014-02-27 | 1 | -3/+18 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14203 from Alwahsh/aabouelhamayed | Godfrey Chan | 2014-02-27 | 3 | -0/+42 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix a bug affecting validations of enum attributes | TheMonster | 2014-02-27 | 3 | -0/+42 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_test | Yves Senn | 2014-02-27 | 3 | -5/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | modify model generator warning message. refs [#174c9f0] | Kuldeep Aggarwal | 2014-02-27 | 3 | -5/+5 | |
* | | | | | | | Replace "data store" with database [ci skip] | Robin Dupret | 2014-02-27 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #11481 from sorentwo/fetch-multi-hash | Guillermo Iguaran | 2014-02-27 | 3 | -14/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Return a hash rather than array from fetch_multi | Parker Selbert | 2014-02-26 | 3 | -14/+19 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14216 from garethson/routes-docs-typo | Arthur Nogueira Neves | 2014-02-26 | 1 | -18/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixes docs typo in nested resource path helpers [skip ci] | Gareth du Plooy | 2014-02-26 | 1 | -18/+18 | |
* | | | | | | | | Fix concerning module reference [ci skip] | Carlos Antonio da Silva | 2014-02-26 | 1 | -1/+1 | |
* | | | | | | | | Fix some validators when used on model instance | Eric Hutzelman | 2014-02-26 | 3 | -2/+6 | |
* | | | | | | | | Pass strings to demodulize method | Carlos Antonio da Silva | 2014-02-26 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14105 from twooster/fix-controller-tests | Aaron Patterson | 2014-02-26 | 4 | -1/+29 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix controller test not resetting @_url_options | Tony Wooster | 2014-02-26 | 4 | -1/+29 | |
* | | | | | | | | pass strings to the underscore method | Aaron Patterson | 2014-02-26 | 2 | -3/+3 | |
* | | | | | | | | speed up `underscore` in cases that don't need to do anything | Aaron Patterson | 2014-02-26 | 1 | -0/+1 | |
* | | | | | | | | pass the class name to `tableize` | Aaron Patterson | 2014-02-26 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #14215 from robertomiranda/docs-rake-notes | Guillermo Iguaran | 2014-02-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | [ci skip] Update list of files extensions in rake notes guide | robertomiranda | 2014-02-26 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14211 from loganhasson/master | Xavier Noria | 2014-02-26 | 1 | -12/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Move association class method notes | Logan Hasson | 2014-02-26 | 1 | -12/+12 | |
* | | | | | | | | extract common code in `uuid_test.rb`. | Yves Senn | 2014-02-26 | 1 | -60/+57 | |
* | | | | | | | | move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`. | Yves Senn | 2014-02-26 | 2 | -16/+36 | |
* | | | | | | | | Merge pull request #14208 from lukesteensen/remove-migration-example | Xavier Noria | 2014-02-26 | 1 | -153/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [ci skip] remove guide section on models in migrations | Luke Steensen | 2014-02-26 | 1 | -153/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | test case for custom PostgreSQL enum type. | Yves Senn | 2014-02-26 | 1 | -0/+38 | |
* | | | | | | | | Merge pull request #14149 from tjschuck/bcrypt_gem_rename | Carlos Antonio da Silva | 2014-02-26 | 4 | -7/+11 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Bump version of bcrypt gem | T.J. Schuck | 2014-02-25 | 4 | -7/+11 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Remove inclusion of rubysl gem for rbx on generated Gemfile | Carlos Antonio da Silva | 2014-02-25 | 2 | -16/+0 | |
* | | | | | | | let `insert_record` actuall save the object. | Aaron Patterson | 2014-02-25 | 4 | -4/+32 | |
* | | | | | | | Merge pull request #14200 from spencer1248/fix_typo_in_app_generator_test_name | Carlos Antonio da Silva | 2014-02-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [skip ci] Fix test name typo in app generator tests. | Spencer Rogers | 2014-02-25 | 1 | -1/+1 |