Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #9004 from arunagw/warning_removed_shadowing_outer | Guillermo Iguaran | 2013-01-20 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removing warning: shadowing outer local variable | |||||
| * | | | | | | | Removing warning: shadowing outer local variable | Arun Agrawal | 2013-01-20 | 1 | -3/+3 | |
|/ / / / / / / | ||||||
* | | | / / / | strong parameters filters permitted scalars | Xavier Noria | 2013-01-20 | 4 | -39/+273 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Don't use anonymous classes in connection tests | Guillermo Iguaran | 2013-01-19 | 1 | -3/+5 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Anonymous class is not allowed. For reference see #8934 and bc43763247e25 | Guillermo Iguaran | 2013-01-19 | 1 | -4/+6 | |
| | | | | | ||||||
* | | | | | Merge pull request #9002 from dahakawang/master | Aaron Patterson | 2013-01-19 | 2 | -0/+15 | |
|\ \ \ \ \ | |/ / / / |/| | | | | issue #8934 sovled | |||||
| * | | | | fix anonymous class issue | David | 2013-01-20 | 2 | -0/+15 | |
|/ / / / | ||||||
* | | | | Remove warning: shadowing outer local variable | Carlos Antonio da Silva | 2013-01-19 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Fix failing test about date.order translation values | Carlos Antonio da Silva | 2013-01-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Introduced in b718998f3e8e6f3d01ad138e40f08fbcc3736285. | |||||
* | | | | Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependency | Aaron Patterson | 2013-01-19 | 3 | -6/+12 | |
|\ \ \ \ | | | | | | | | | | | Remove i18n symbol dependency | |||||
| * | | | | Don't change the original i18n data | Chris McGrath | 2013-01-17 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Remove i18n symbol dependency | Chris McGrath | 2013-01-17 | 3 | -6/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | date.order is the only key in rails i18n that is required to be a symbol. This patch allows for symbols or strings which means: * No requirement for symbol type in .yml files. A future YAML.safe_load wouldn't need to load symbols * Rails could actually use json rather than yml as the backend | |||||
* | | | | | Merge pull request #8081 from JoeyButler/refactor_cache_store | Rafael Mendonça França | 2013-01-19 | 1 | -25/+41 | |
|\ \ \ \ \ | | | | | | | | | | | | | Refactor cache store | |||||
| * | | | | | Refactor ActiveSupport::Cache::Store#fetch. | Joey Butler | 2013-01-19 | 1 | -25/+41 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #9000 from sherwu/master | Rafael Mendonça França | 2013-01-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Updated Gemfile to use jQuery-rails v 2.2.0 | |||||
| * | | | | | Updated version of jQuery rails in gemfile | Sherwin Wu | 2013-01-19 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Restore and adapt the implementation reverted at | Rafael Mendonça França | 2013-01-19 | 5 | -37/+114 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/cc1c3c5be061e7572018f734e5239750ab449e3f Now instead of raise, we log by default in development and test | |||||
* | | | | | Merge pull request #8999 from thomasfedb/raise_or_log_unpermitted_params | Rafael Mendonça França | 2013-01-19 | 4 | -6/+117 | |
|\ \ \ \ \ | | | | | | | | | | | | | Raise or log unpermitted params. | |||||
| * | | | | | Added ability to raise or log on unpermitted params. | Thomas Drake-Brockman | 2013-01-20 | 4 | -6/+117 | |
|/ / / / / | ||||||
* | | | | | Improve relation docs about to_sql and where_values_hash | Carlos Antonio da Silva | 2013-01-19 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * User class instead of Users. * #where_values_hash does not change the value to downcase as the example was showing. [ci skip] | |||||
* | | | | | Merge pull request #8977 from Soylent/master | Aaron Patterson | 2013-01-18 | 2 | -1/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | Resovled issue rails#7774 | |||||
| * | | | | | Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is empty string | Konstantin Papkovskiy | 2013-01-17 | 2 | -1/+5 | |
| | | | | | | ||||||
* | | | | | | Fix syntax error :grin: | Guillermo Iguaran | 2013-01-18 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #8995 from schneems/schneems/formatting-the-formatters | Guillermo Iguaran | 2013-01-18 | 1 | -6/+13 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove "Application" section title from routes | |||||
| * | | | | | | Remove "Application" section title from routes | schneems | 2013-01-18 | 1 | -6/+13 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR standardizes the output of the HTML and console based routes to not include the title for "Application Routes" those that are defined by the application. Instead only routes defined in engines get any special treatment. Based on this conversation: https://github.com/rails/rails/commit/af5c0fd85fce1adb311083dd1ecf96432ee8caa3#commitcomment-2458823 ATP actionpack /cc @carlosantoniodasilva | |||||
* | | | | | | Merge pull request #8994 from Springest/fix_default_scope_update_all_delete_all | Jon Leighton | 2013-01-18 | 3 | -2/+33 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix .update_all and .delete_all when using a condition on a joined table in a default_scope | |||||
| * | | | | | | Fix .update_all and .delete_all when using a condition on a joined table | Derek Kraan | 2013-01-11 | 3 | -2/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a default_scope. `Model.joins(...).where(condition_on_joined_table).update_all` / `delete_all` worked, but the same operation implemented with a default_scope generated a SQL error because ActiveRecord ignored the join but implemented the where condition anyways. | |||||
* | | | | | | | The test setup is not threadsafe. Wrap in a mutex. | Jon Leighton | 2013-01-18 | 1 | -3/+7 | |
| | | | | | | | ||||||
* | | | | | | | MiniTest already defines a ParallelEach class | Jon Leighton | 2013-01-18 | 1 | -23/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may or may not fix the intermittent railties failures we've been seeing on the CI with Ruby 2.0. We'll see. | |||||
* | | | | | | | Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by" | Guillermo Iguaran | 2013-01-18 | 23 | -70/+70 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1. | |||||
* | | | | | | | Merge pull request #8989 from robertomiranda/use-rails-4-find-by | Guillermo Iguaran | 2013-01-18 | 23 | -70/+70 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Replace deprecated find_by_* with find_by | |||||
| * | | | | | | | User Rails 4 find_by | robertomiranda | 2013-01-18 | 23 | -70/+70 | |
| | | | | | | | | ||||||
* | | | | | | | | Undeprecate the :extend option | Jon Leighton | 2013-01-18 | 6 | -3/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested by @dhh. It doesn't affect the generated SQL, so seems reasonable to continue to allow it as an association option. | |||||
* | | | | | | | | CollectionProxy should be default scoped | Jon Leighton | 2013-01-18 | 2 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8795 | |||||
* | | | | | | | | Merge pull request #8912 from senny/8879_association_empty_method | Jon Leighton | 2013-01-18 | 3 | -1/+19 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | `CollectionAssociation#empty?` respects newly builded records | |||||
| * | | | | | | | | `CollectionAssociation#empty?` respects newly builded records | Yves Senn | 2013-01-13 | 3 | -1/+19 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | s/it's/its/ | Akira Matsuda | 2013-01-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | | script => bin | Akira Matsuda | 2013-01-18 | 2 | -7/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | use tap with block parameter | Akira Matsuda | 2013-01-18 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | iterates the RDoc of update_column(s) | Xavier Noria | 2013-01-18 | 1 | -13/+13 | |
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This revision makes crystal clear that the methods go straight to the database and update the receiver. It also adds and example, and removes the duplication in the singular and plural forms by referring one to the other. | |||||
* | | | | | | | Refactor predicate builder when receiving empty hash | Carlos Antonio da Silva | 2013-01-17 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to create a new arel table or reflect on the column association if the value is empty, these attributes are not used. Also no need to concat a new array, just append the query value. | |||||
* | | | | | | | Merge pull request #8976 from senny/spelling_correction | Xavier Noria | 2013-01-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | spelling correction for Action Mailer interceptors | |||||
| * | | | | | | spelling correction for AM interceptors | Yves Senn | 2013-01-17 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Remove useless || operation | Carlos Antonio da Silva | 2013-01-17 | 2 | -3/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #8975 from arunagw/warning_removed_ambiguous_first_argument | Carlos Antonio da Silva | 2013-01-17 | 1 | -4/+4 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Removing : warning: ambiguous first argument; | |||||
| * | | | | | Removing : warning: ambiguous first argument; | Arun Agrawal | 2013-01-17 | 1 | -4/+4 | |
|/ / / / / | ||||||
* | | | | | Deprecate direct calls to AC::RecordIdentifier.dom_id and dom_class | Carlos Antonio da Silva | 2013-01-16 | 3 | -9/+58 | |
| | | | | | | | | | | | | | | | | | | | | Also add some generic tests to ensure they're properly deprecated. | |||||
* | | | | | Merge pull request #8964 from mattdbridges/specify-log-to-clear | Carlos Antonio da Silva | 2013-01-16 | 3 | -5/+24 | |
|\ \ \ \ \ | | | | | | | | | | | | | Clear specific logs when using `rake log:clear` | |||||
| * | | | | | clear specific logs when using rake log:clear | Matt Bridges | 2013-01-16 | 3 | -5/+24 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #8967 from senny/add_interceptor_to_am_doc | Xavier Noria | 2013-01-16 | 1 | -0/+20 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | document Intercepters in ActionMailer guide |