aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed reflects_transaction_state.wangjohn2013-01-201-1/+0
|
* Created state for a transaction and added tests.wangjohn2013-01-203-11/+45
|
* Anonymous class is not allowed. For reference see #8934 and bc43763247e25Guillermo Iguaran2013-01-191-4/+6
|
* Merge pull request #9002 from dahakawang/masterAaron Patterson2013-01-192-0/+15
|\ | | | | issue #8934 sovled
| * fix anonymous class issueDavid2013-01-202-0/+15
|/
* Remove warning: shadowing outer local variableCarlos Antonio da Silva2013-01-191-1/+1
|
* Fix failing test about date.order translation valuesCarlos Antonio da Silva2013-01-191-1/+1
| | | | Introduced in b718998f3e8e6f3d01ad138e40f08fbcc3736285.
* Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependencyAaron Patterson2013-01-193-6/+12
|\ | | | | Remove i18n symbol dependency
| * Don't change the original i18n dataChris McGrath2013-01-171-1/+1
| |
| * Remove i18n symbol dependencyChris McGrath2013-01-173-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_storeRafael Mendonça França2013-01-191-25/+41
|\ \ | | | | | | Refactor cache store
| * | Refactor ActiveSupport::Cache::Store#fetch.Joey Butler2013-01-191-25/+41
| | |
* | | Merge pull request #9000 from sherwu/masterRafael Mendonça França2013-01-191-1/+1
|\ \ \ | |/ / |/| | Updated Gemfile to use jQuery-rails v 2.2.0
| * | Updated version of jQuery rails in gemfileSherwin Wu2013-01-191-1/+1
|/ /
* | Restore and adapt the implementation reverted atRafael Mendonça França2013-01-195-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_paramsRafael Mendonça França2013-01-194-6/+117
|\ \ | | | | | | Raise or log unpermitted params.
| * | Added ability to raise or log on unpermitted params.Thomas Drake-Brockman2013-01-204-6/+117
|/ /
* | Improve relation docs about to_sql and where_values_hashCarlos Antonio da Silva2013-01-191-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/masterAaron Patterson2013-01-182-1/+5
|\ \ | | | | | | Resovled issue rails#7774
| * | Fix ActionDispatch::Request#formats when HTTP_ACCEPT header is empty stringKonstantin Papkovskiy2013-01-172-1/+5
| | |
* | | Fix syntax error :grin:Guillermo Iguaran2013-01-181-1/+1
| | |
* | | Merge pull request #8995 from schneems/schneems/formatting-the-formattersGuillermo Iguaran2013-01-181-6/+13
|\ \ \ | | | | | | | | Remove "Application" section title from routes
| * | | Remove "Application" section title from routesschneems2013-01-181-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_allJon Leighton2013-01-183-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 tableDerek Kraan2013-01-113-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 Leighton2013-01-181-3/+7
| | | |
* | | | MiniTest already defines a ParallelEach classJon Leighton2013-01-181-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 Iguaran2013-01-1823-70/+70
| | | | | | | | | | | | | | | | | | | | This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1.
* | | | Merge pull request #8989 from robertomiranda/use-rails-4-find-byGuillermo Iguaran2013-01-1823-70/+70
|\ \ \ \ | | | | | | | | | | Replace deprecated find_by_* with find_by
| * | | | User Rails 4 find_byrobertomiranda2013-01-1823-70/+70
| | | | |
* | | | | Undeprecate the :extend optionJon Leighton2013-01-186-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 scopedJon Leighton2013-01-182-0/+6
| | | | | | | | | | | | | | | | | | | | Fixes #8795
* | | | | Merge pull request #8912 from senny/8879_association_empty_methodJon Leighton2013-01-183-1/+19
|\ \ \ \ \ | | | | | | | | | | | | `CollectionAssociation#empty?` respects newly builded records
| * | | | | `CollectionAssociation#empty?` respects newly builded recordsYves Senn2013-01-133-1/+19
| | | | | |
* | | | | | s/it's/its/Akira Matsuda2013-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | script => binAkira Matsuda2013-01-182-7/+7
| | | | | |
* | | | | | use tap with block parameterAkira Matsuda2013-01-181-1/+1
| | | | | |
* | | | | | iterates the RDoc of update_column(s)Xavier Noria2013-01-181-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 hashCarlos Antonio da Silva2013-01-171-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_correctionXavier Noria2013-01-171-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | spelling correction for Action Mailer interceptors
| * | | | spelling correction for AM interceptorsYves Senn2013-01-171-1/+1
|/ / / /
* | | | Remove useless || operationCarlos Antonio da Silva2013-01-172-3/+2
| | | |
* | | | Merge pull request #8975 from arunagw/warning_removed_ambiguous_first_argumentCarlos Antonio da Silva2013-01-171-4/+4
|\ \ \ \ | |_|_|/ |/| | | Removing : warning: ambiguous first argument;
| * | | Removing : warning: ambiguous first argument;Arun Agrawal2013-01-171-4/+4
|/ / /
* | | Deprecate direct calls to AC::RecordIdentifier.dom_id and dom_classCarlos Antonio da Silva2013-01-163-9/+58
| | | | | | | | | | | | Also add some generic tests to ensure they're properly deprecated.
* | | Merge pull request #8964 from mattdbridges/specify-log-to-clearCarlos Antonio da Silva2013-01-163-5/+24
|\ \ \ | | | | | | | | Clear specific logs when using `rake log:clear`
| * | | clear specific logs when using rake log:clearMatt Bridges2013-01-163-5/+24
| | | |
* | | | Merge pull request #8967 from senny/add_interceptor_to_am_docXavier Noria2013-01-161-0/+20
|\ \ \ \ | | | | | | | | | | document Intercepters in ActionMailer guide
| * | | | document Intercepters in ActionMailer guideYves Senn2013-01-161-0/+20
| | | | |
* | | | | Merge pull request #8965 from colinbm/date_select_valueCarlos Antonio da Silva2013-01-162-2/+65
|\ \ \ \ \ | |/ / / / |/| | | | Fix date_select :selected option so you can pass it nil
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 02:46:42 +0000