Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | | document Intercepters in ActionMailer guide | Yves Senn | 2013-01-16 | 1 | -0/+20 |
| | | | | | |||||
* | | | | | Merge pull request #8965 from colinbm/date_select_value | Carlos Antonio da Silva | 2013-01-16 | 2 | -2/+65 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix date_select :selected option so you can pass it nil | ||||
| * | | | | Fix date_select :selected option so you can pass it nil | Colin Burn-Murdoch | 2013-01-16 | 2 | -2/+65 |
|/ / / / | |||||
* | | | | Merge pull request #8959 from vitorbaptista/master | Rafael Mendonça França | 2013-01-16 | 3 | -3/+6 |
|\ \ \ \ | | | | | | | | | | | Don't rely on Hash key's ordering to configure default options | ||||
| * | | | | Don't rely on Hash key's ordering | Vitor Baptista | 2013-01-16 | 3 | -3/+6 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we set encoding latin1 for a PostgreSQL database, it calls PostgreSQLAdapter::create_database with options that have, among other things: { 'encoding' => 'latin1' } Then, we use reverse_merge(:encoding => "utf8") to setup the default encoding. In the end, the hash looks like: { :encoding => 'utf8', 'encoding' => 'latin1' } The call to options.symbolize_keys calls to_sym on each_key of this Hash. It usually means that the encoding passed overwrites the default utf8, but it's not guaranteed. So, we shouldn't rely on it. The same was happening in ActiveRecord::ConnectionHandling. | ||||
* | | | | Remove warnings: "(...) interpreted as grouped expression" | Carlos Antonio da Silva | 2013-01-16 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #8963 from asanghi/regress_8631 | Andrew White | 2013-01-16 | 1 | -0/+21 |
|\ \ \ \ | |/ / / |/| | | | adding regression test in master for #8631 | ||||
| * | | | adding regression test in master for #8631 | Aditya Sanghi | 2013-01-16 | 1 | -0/+21 |
|/ / / | |||||
* | | | Merge pull request #8955 from burns/source_annotation | Rafael Mendonça França | 2013-01-15 | 3 | -16/+76 |
|\ \ \ | | | | | | | | | Allow a `:dirs` option to `SourceAnnotationExtractor.enumerate` | ||||
| * | | | allow :dirs option for .enumerate | Brian D. Burns | 2013-01-15 | 3 | -6/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | Allows custom rake tasks to be defined using: SourceAnnotationExtractor.enumerate 'TODO|FIXME', dirs: %w(app lib), tag: true | ||||
| * | | | use case statement | Brian D. Burns | 2013-01-15 | 1 | -10/+16 |
| | | | | |||||
* | | | | Merge pull request #8958 from balexand/strong_parameters_exception_handling | Rafael Mendonça França | 2013-01-15 | 4 | -16/+14 |
|\ \ \ \ | | | | | | | | | | | Strong parameters exception handling | ||||
| * | | | | strong parameters exception handling | Brian Alexander | 2013-01-15 | 4 | -16/+14 |
| | | | | | |||||
* | | | | | Merge pull request #8914 from nilbus/fix-header-bloat | Rafael Mendonça França | 2013-01-15 | 3 | -2/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | Remove header bloat introduced by BestStandardsSupport middleware | ||||
| * | | | | Remove header bloat introduced by BestStandardsSupport middleware | Edward Anderson | 2013-01-15 | 3 | -2/+10 |
|/ / / / | | | | | | | | | | | | | The same headers were being duplicated on every request. | ||||
* | | | | Merge pull request #8954 from davetoxa/patch-1 | Carlos Antonio da Silva | 2013-01-15 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | Update guides/source/active_record_validations.md |