aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9007 from dpree/masterRafael Mendonça França2013-01-201-35/+46
|\
| * Removed ActionController::Base dependency from abstract controller translatio...Jens Bissinger2013-01-201-41/+46
| * Test abstract controller's localize method.Jens Bissinger2013-01-201-0/+6
* | Refactor grep call to remove .eachCarlos Antonio da Silva2013-01-201-1/+1
* | Add missing assert callsCarlos Antonio da Silva2013-01-201-2/+2
* | Use 1.9 hash style in docs/comments [ci skip]Carlos Antonio da Silva2013-01-201-3/+3
* | Fix markdown formatting to highlight block in changelog [ci skip]Carlos Antonio da Silva2013-01-201-2/+2
* | Removing warning: shadowing outer local variable Arun Agrawal2013-01-201-3/+3
* | strong parameters filters permitted scalarsXavier Noria2013-01-204-39/+273
|/
* Merge pull request #8978 from chrismcg/remove_i18n_symbol_dependencyAaron Patterson2013-01-192-3/+9
|\
| * Don't change the original i18n dataChris McGrath2013-01-171-1/+1
| * Remove i18n symbol dependencyChris McGrath2013-01-172-3/+9
* | Restore and adapt the implementation reverted atRafael Mendonça França2013-01-194-37/+66
* | Added ability to raise or log on unpermitted params.Thomas Drake-Brockman2013-01-204-6/+117
* | 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
* | | Remove "Application" section title from routesschneems2013-01-181-6/+13
* | | Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"Guillermo Iguaran2013-01-183-4/+4
* | | User Rails 4 find_byrobertomiranda2013-01-183-4/+4
|/ /
* | Remove useless || operationCarlos Antonio da Silva2013-01-172-3/+2
* | 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
* Fix date_select :selected option so you can pass it nilColin Burn-Murdoch2013-01-162-2/+65
* Remove warnings: "(...) interpreted as grouped expression"Carlos Antonio da Silva2013-01-161-2/+2
* adding regression test in master for #8631Aditya Sanghi2013-01-161-0/+21
* Merge pull request #8958 from balexand/strong_parameters_exception_handlingRafael Mendonça França2013-01-154-16/+14
|\
| * strong parameters exception handlingBrian Alexander2013-01-154-16/+14
* | Remove header bloat introduced by BestStandardsSupport middlewareEdward Anderson2013-01-153-2/+10
|/
* Change the behavior of route defaultsAndrew White2013-01-157-11/+99
* Add support for other types of routing constraintsAndrew White2013-01-155-113/+237
* Ensure port is set when passed via the process methodAndrew White2013-01-153-1/+58
* Raise correct exception now Journey is integrated.Andrew White2013-01-153-9/+12
* Revert "log at debug level what line caused the redirect_to"Carlos Antonio da Silva2013-01-151-1/+0
* Merge pull request #8938 from colinbm/date_select_valueSteve Klabnik2013-01-144-4/+57
|\
| * Rename :value option to :selected, in line with other select helpersColin Burn-Murdoch2013-01-144-4/+57
* | Revert benchmark helper regression. Use a #capture within a #benchmarkJeremy Kemper2013-01-143-39/+3
* | Merge pull request #8916 from josemota/collection-with-blockRafael Mendonça França2013-01-132-4/+53
|\ \ | |/ |/|
| * Collection radio buttons and collection check boxes through FormBuilder renderJosé Mota2013-01-122-4/+53
* | Allow value to be set on date_selectColin Burn-Murdoch2013-01-133-1/+26
* | Associaton -> AssociationSteve Klabnik2013-01-131-2/+2
|/
* Fix regression introduced in pull request 8812Sam Ruby2013-01-111-1/+2
* Merge pull request #8882 from goshakkk/clearer-conditionalCarlos Antonio da Silva2013-01-111-3/+3
|\
| * clearer conditional in constraint match checkGosha Arinich2013-01-101-3/+3
* | Merge pull request #8623 from virusman/form_helpers_collectionproxy_fixJon Leighton2013-01-112-1/+24
|\ \
| * | Test nested fields with AssociationProxy mockup & fix AssociationProxy suppor...virusman2012-12-272-1/+24
* | | Fix json params parsing regression for non-object JSON content.Dylan Smith2013-01-113-2/+13
| |/ |/|
* | Merge pull request #8876 from senny/extract_performance_testsGuillermo Iguaran2013-01-105-15/+7
|\ \
| * | extract PerformanceTest into rails-performance_tests gemYves Senn2013-01-105-15/+7
* | | Merge pull request #8821 from jamis/masterRafael Mendonça França2013-01-102-7/+3
|\ \ \ | |/ / |/| |