aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
* Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependencyAaron Patterson2013-01-193-6/+12
|\
| * Don't change the original i18n dataChris McGrath2013-01-171-1/+1
| * Remove i18n symbol dependencyChris McGrath2013-01-173-6/+12
* | Merge pull request #8081 from JoeyButler/refactor_cache_storeRafael Mendonça França2013-01-191-25/+41
|\ \
| * | 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 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
* | Merge pull request #8999 from thomasfedb/raise_or_log_unpermitted_paramsRafael Mendonça França2013-01-194-6/+117
|\ \
| * | 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
* | Merge pull request #8977 from Soylent/masterAaron Patterson2013-01-182-1/+5
|\ \
| * | 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 routesschneems2013-01-181-6/+13
|/ / /
* | | 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 tableDerek Kraan2013-01-113-2/+33
* | | | 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
* | | | Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"Guillermo Iguaran2013-01-1823-70/+70
* | | | Merge pull request #8989 from robertomiranda/use-rails-4-find-byGuillermo Iguaran2013-01-1823-70/+70
|\ \ \ \
| * | | | User Rails 4 find_byrobertomiranda2013-01-1823-70/+70
* | | | | Undeprecate the :extend optionJon Leighton2013-01-186-3/+30
* | | | | CollectionProxy should be default scopedJon Leighton2013-01-182-0/+6
* | | | | Merge pull request #8912 from senny/8879_association_empty_methodJon Leighton2013-01-183-1/+19
|\ \ \ \ \
| * | | | | `CollectionAssociation#empty?` respects newly builded recordsYves Senn2013-01-133-1/+19
* | | | | | s/it's/its/Akira Matsuda2013-01-181-1/+1
* | | | | | 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
| |/ / / / |/| | | |
* | | | | Refactor predicate builder when receiving empty hashCarlos Antonio da Silva2013-01-171-4/+4
* | | | | Merge pull request #8976 from senny/spelling_correctionXavier Noria2013-01-171-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | 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;Arun Agrawal2013-01-171-4/+4
|/ / /
* | | Deprecate direct calls to AC::RecordIdentifier.dom_id and dom_classCarlos Antonio da Silva2013-01-163-9/+58
* | | Merge pull request #8964 from mattdbridges/specify-log-to-clearCarlos Antonio da Silva2013-01-163-5/+24
|\ \ \
| * | | 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 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 nilColin Burn-Murdoch2013-01-162-2/+65
|/ / / /