Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | update CHANGELOG | Tima Maslyuchenko | 2013-10-24 | 1 | -0/+16 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #12629 from Peeja/has_many-pets-typo | Guillermo Iguaran | 2013-10-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix typo: `has_many :pets`, not `pets :has_many`. | Peter Jaros | 2013-10-24 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #12622 from timsly/helpers-from-outside | Guillermo Iguaran | 2013-10-23 | 2 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | pass app config to controller helper proxy | Tima Maslyuchenko | 2013-10-24 | 2 | -1/+11 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #12619 from Veraticus/fix_utils_normalize_path | Rafael Mendonça França | 2013-10-23 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Correct error in Utils.normalize_path that changed paths improperly | Josh Symonds | 2013-10-23 | 2 | -1/+9 | |
* | | | | | | | | | | | | Fix the install task | Rafael Mendonça França | 2013-10-23 | 1 | -9/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #12617 from skv-headless/master | Rafael Mendonça França | 2013-10-23 | 1 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [ci skip] second parameter of asset-url is depricated | Evgeniy | 2013-10-23 | 1 | -4/+3 | |
* | | | | | | | | | | | | Merge pull request #12612 from amatsuda/amo_validates_inclusion_of_time_range... | Rafael Mendonça França | 2013-10-23 | 3 | -6/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Let validates_inclusion_of accept Time and DateTime ranges | Akira Matsuda | 2013-10-23 | 3 | -6/+34 | |
|/ / / / / / / / / / / | ||||||
* | | | / / / / / / / | Try arel master | Rafael Mendonça França | 2013-10-22 | 1 | -0/+1 | |
| |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | this should be private, no other instances of Root should call it | Aaron Patterson | 2013-10-22 | 1 | -1/+1 | |
* | | | | | | | | | | do not search through the keys array twice | Aaron Patterson | 2013-10-22 | 1 | -2/+3 | |
* | | | | | | | | | | use the provided block to filter lists | Aaron Patterson | 2013-10-22 | 1 | -11/+5 | |
* | | | | | | | | | | stop using `send` so that method privacy is respected and we get a small | Aaron Patterson | 2013-10-22 | 1 | -7/+7 | |
* | | | | | | | | | | Fix order dependent tests | Rafael Mendonça França | 2013-10-22 | 1 | -4/+4 | |
* | | | | | | | | | | Merge pull request #12606 from robin850/apps-with-spaces | Yves Senn | 2013-10-22 | 4 | -2/+20 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Make the application name snake cased when it contains spaces | Robin Dupret | 2013-10-22 | 4 | -2/+20 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | minor Active Record CHANGELOG cleanup. [ci skip]. | Yves Senn | 2013-10-22 | 1 | -3/+3 | |
* | | | | | | | | | | move helper class to the top | Aaron Patterson | 2013-10-21 | 1 | -42/+42 | |
* | | | | | | | | | | build the association graph functionally | Aaron Patterson | 2013-10-21 | 3 | -20/+13 | |
* | | | | | | | | | | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-21 | 26 | -244/+418 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #12588 from jetthoughts/12586_subquery_with_unprepared_sql | Rafael Mendonça França | 2013-10-21 | 4 | -6/+56 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Process sub-query relation's binding values | Paul Nikitochkin | 2013-10-20 | 4 | -4/+54 | |
| * | | | | | | | | | | | Escape the parentheses in the default function regexp | Rafael Mendonça França | 2013-10-21 | 2 | -1/+6 | |
| * | | | | | | | | | | | Merge pull request #12567 from GoBoundless/fix_postgres_structure_import | Yves Senn | 2013-10-21 | 3 | -1/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Fix loading a sql structure file on postgres when the file's path has whitesp... | Kevin Mook | 2013-10-21 | 3 | -1/+13 | |
| * | | | | | | | | | | | | Merge pull request #12603 from dv/fix-tilt-template-in-asset-pipeline-docs | Guillermo Iguaran | 2013-10-21 | 1 | -3/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Update docs on Tilt::Template in Asset Pipeline guide | David Verhasselt | 2013-10-21 | 1 | -3/+8 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | remove trailing whitespace added with b057765 [ci skip]. | Yves Senn | 2013-10-21 | 1 | -2/+2 | |
| * | | | | | | | | | | | Merge pull request #12565 from stormsilver/unscope_fixes | Yves Senn | 2013-10-21 | 3 | -7/+23 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Allow unscope to work with `where.not` | Eric Hankins | 2013-10-21 | 3 | -7/+23 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #12549 from makimoto/raise-when-find-without-pk | Yves Senn | 2013-10-21 | 3 | -0/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Raise an exception when model without primary key calls .find_with_ids | Shimpei Makimoto | 2013-10-21 | 3 | -0/+13 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #12591 from vipulnsward/remove_mail_merge | Yves Senn | 2013-10-20 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Remove extra variable creation and merge. | Vipul A M | 2013-10-20 | 1 | -3/+3 | |
| | | |_|_|/ / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #12556 from dasch/dasch/nstrument-am-processing | José Valim | 2013-10-20 | 4 | -7/+29 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Instrument the generation of Action Mailer messages | Daniel Schierbeck | 2013-10-20 | 4 | -7/+29 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge pull request #12533 from szimek/use_exists_in_relation_empty | Santiago Pastorino | 2013-10-19 | 2 | -2/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | In Relation#empty? use #exists? instead of #count. | Szymon Nowak | 2013-10-19 | 2 | -2/+5 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #12560 from sue445/modify_find_lock_sample_code | Yves Senn | 2013-10-18 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | [ci skip] avoid deprecation warning in sample code | sue445 | 2013-10-18 | 1 | -3/+3 | |
| * | | | | | | | | | | Merge pull request #11839 from chocoby/fix/convert_port_number | Yves Senn | 2013-10-18 | 3 | -1/+15 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Convert Fixnum into String the port number in MySQL | Kenta Okamoto | 2013-10-18 | 3 | -1/+15 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge pull request #12569 from arthurnn/autosave_small_cleanip | Rafael Mendonça França | 2013-10-17 | 1 | -196/+196 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Fix some indentation on autosave association | Arthur Neves | 2013-10-17 | 1 | -196/+196 | |
| | * | | | | | | | | | Make define_non_cyclic_method simpler | Arthur Neves | 2013-10-17 | 1 | -7/+7 | |
| * | | | | | | | | | | Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docs | Yves Senn | 2013-10-17 | 1 | -1/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | |