Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #13784 from kuldeepaggarwal/fix-doc-collection-proxy | Rafael Mendonça França | 2014-01-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | add missing information for `id` field when used with `select` [ci skip] | Kuldeep Aggarwal | 2014-01-22 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | `has_one` and `belongs_to` accessors don't add ORDER BY to the queries anymore. | Rafael Mendonça França | 2014-01-21 | 4 | -1/+26 | |
* | | | | | | | | | prepend table name for `Relation#select` columns. | Yves Senn | 2014-01-21 | 3 | -1/+20 | |
* | | | | | | | | | Merge pull request #13696 from senny/engine_bin_rails_load_bundler | Yves Senn | 2014-01-21 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | setup Bundler in engines `bin/rails` stub. | Yves Senn | 2014-01-13 | 1 | -0/+4 | |
* | | | | | | | | | | Active Record changelog wording and formatting. [ci skip] | Yves Senn | 2014-01-21 | 1 | -5/+6 | |
* | | | | | | | | | | Merge pull request #9969 from divineforest/fix-find-in-batches | Yves Senn | 2014-01-21 | 3 | -6/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fail early with "Primary key not included in the custom select clause" in fin... | Alexander Balashov | 2014-01-21 | 3 | -6/+13 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* / | | | | | | | | | Remove missed usage of @first variable | Carlos Antonio da Silva | 2014-01-21 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Forgot to push this change in the parent commit | Rafael Mendonça França | 2014-01-20 | 1 | -1/+1 | |
* | | | | | | | | | When applying changes or reseting changes create the right class | Rafael Mendonça França | 2014-01-20 | 2 | -3/+11 | |
* | | | | | | | | | Remove unneded argument | Rafael Mendonça França | 2014-01-20 | 1 | -2/+2 | |
* | | | | | | | | | Merge pull request #13757 from terracatta/master | Rafael Mendonça França | 2014-01-20 | 10 | -34/+245 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Ensure #second acts like #first AR finder | Jason Meller | 2014-01-20 | 10 | -34/+245 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'anilmaurya-master' | Rafael Mendonça França | 2014-01-20 | 1 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | moving controller_name assignment before model name condition | anilmaurya | 2014-01-20 | 1 | -3/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Tidy up tests and CHANGELOG for #12598 | Andrew White | 2014-01-20 | 4 | -7/+37 | |
* | | | | | | | | | Automatically convert dashes to underscores in shorthand routes | Mikko Johansson | 2014-01-20 | 2 | -0/+11 | |
* | | | | | | | | | Automatically convert dashes to underscores for url helpers | Amr Tamimi | 2014-01-20 | 4 | -2/+20 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | docs should say `email` not `Email`. [ci skip] | Yves Senn | 2014-01-20 | 3 | -4/+4 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | docs, hyperlink the `Mail gem` in Action Mailer guide. [ci skip] | Yves Senn | 2014-01-20 | 1 | -2/+2 | |
* | | | | | | | let's link to the gem README not to the upgrading guide. [ci skip] | Yves Senn | 2014-01-20 | 1 | -2/+1 | |
* | | | | | | | Fix secrets.yml path in exception message | Carlos Antonio da Silva | 2014-01-20 | 1 | -9/+7 | |
* | | | | | | | Merge pull request #13767 from zzak/doc_4_1_release_notes_deprecated_finders | Godfrey Chan | 2014-01-20 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add link to upgrade guide for full list of deprecated finders [ci skip] | Zachary Scott | 2014-01-19 | 1 | -0/+3 | |
* | | | | | | | | Merge pull request #13769 from arelenglish/fix_typo_upgrad_guide | Godfrey Chan | 2014-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix a typo that says you application [ci skip] | Arel English | 2014-01-20 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #13768 from rajeshthummalapally/rails_blog_correct_patch_link | Godfrey Chan | 2014-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Correcting link that is pointing to Rails blog [ci skip] | Rajesh Thummalapally | 2014-01-19 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #13765 from robertomiranda/secrets_token | Guillermo Iguaran | 2014-01-19 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update Error Message when secrets.secret_key_base isn't given | robertomiranda | 2014-01-19 | 1 | -4/+4 | |
* | | | | | | | | | Merge pull request #13745 from nextgearcapital/master | Rafael Mendonça França | 2014-01-19 | 3 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | set encoding to binmode for pipe | Anna Carey | 2014-01-17 | 3 | -0/+6 | |
* | | | | | | | | | | Merge pull request #13762 from robertomiranda/spring-under-rails | Robin Dupret | 2014-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Update Changelog, Spring is under rails/spring [ci skip] | robertomiranda | 2014-01-19 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #13759 from raysrashmi/rails-spring | Robin Dupret | 2014-01-19 | 3 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Spring in now under rails/spring [ci skip] | Rashmi Yadav | 2014-01-19 | 3 | -4/+4 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #13756 from huoxito/rails-spring | Andrew White | 2014-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | spring gem moved to rails/spring | Washington Luiz | 2014-01-18 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #13751 from chancancode/ar_rollback_fix | Godfrey Chan | 2014-01-18 | 4 | -6/+26 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Restore ActiveRecord states after a rollback for models w/o callbacks | Godfrey Chan | 2014-01-18 | 4 | -6/+26 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #13748 from summerblue/master | Richard Schneeman | 2014-01-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Correct the version number to 4 in guides[ci skip] | Charlie Jade | 2014-01-18 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | fix exception translation | Aaron Patterson | 2014-01-17 | 2 | -3/+4 | |
* | | | | | | | | | translate exceptions on prepared statement failure | Aaron Patterson | 2014-01-17 | 2 | -6/+13 | |
* | | | | | | | | | test to ensure bad prepared statements raise a StatementInvalid exception | Aaron Patterson | 2014-01-17 | 1 | -0/+6 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Fix eager load of Serializers on Active Model | Carlos Antonio da Silva | 2014-01-17 | 1 | -2/+2 | |
* | | | | | | | | Consistence in the block style | Rafael Mendonça França | 2014-01-17 | 2 | -5/+5 | |
* | | | | | | | | Remove warnings on Ruby 2.1 | Rafael Mendonça França | 2014-01-17 | 2 | -1/+9 | |
|/ / / / / / / |