aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use a URL instead of an URL everywhereAbhishek Jain2016-02-153-3/+3
* Remove single_template_render? method.Kasper Timm Hansen2016-02-121-5/+1
* Don't search in locals for cache_options.Kasper Timm Hansen2016-02-121-3/+1
* use assert_not_equal so there will be better error messagesAaron Patterson2016-02-121-1/+1
* use kwargs to avoid hash slicingAaron Patterson2016-02-121-3/+3
* Merge pull request #23611 from abhishekjain16/routes_optionsKasper Timm Hansen2016-02-122-3/+12
|\
| * Fixes routes to match verbs and path with -g optionAbhishek Jain2016-02-112-3/+12
* | Add fixes accidentally removed.Kasper Timm Hansen2016-02-123-3/+4
* | Flesh out request encoding + response parsing changelog entry.Kasper Timm Hansen2016-02-121-2/+11
* | Merge pull request #23642 from tvon/chore/fix-path-omissionVipul A M2016-02-133-3/+3
|\ \
| * | Use correct path in documentation.Tom von Schwerdtner2016-02-123-3/+3
* | | Merge pull request #23641 from abhishekjain16/docs_fixVipul A M2016-02-123-3/+3
|\ \ \ | |/ / |/| |
| * | [ci skip] Fix enqueuing spelling to maintain consistencyAbhishek Jain2016-02-123-3/+3
|/ /
* | Merge pull request #23639 from Gaurav2728/update_change_log_entry_action_packRafael França2016-02-122-3/+3
|\ \
| * | use rails instead of rakeGaurav Sharma2016-02-122-3/+3
|/ /
* | Merge pull request #23633 from maclover7/sec-releasingJon Moss2016-02-121-1/+1
|\ \
| * | Update RELEASING_RAILS.mdJon Moss2016-02-121-1/+1
|/ /
* | Merge pull request #23612 from vipulnsward/23561-fix-routes-argsKasper Timm Hansen2016-02-124-12/+10
|\ \
| * | - Fixed and removed long arguments to rake routesVipul A M2016-02-124-12/+10
* | | Merge pull request #23629 from prathamesh-sonpatki/fix-numbersप्रथमेश Sonpatki2016-02-121-3/+3
|\ \ \
| * | | Fix numbers of steps to upgrade Rails [ci skip]Prathamesh Sonpatki2016-02-121-3/+3
|/ / /
* | | remove detail initialization metaprogrammingAaron Patterson2016-02-111-8/+12
* | | Merge pull request #23618 from hashbangnz/document-upgrade-processJon Moss2016-02-111-0/+15
|\ \ \
| * | | Improve wording in documentation changeLeslie Viljoen2016-02-121-3/+3
| * | | Document the upgrade processLeslie Viljoen2016-02-121-0/+15
* | | | Merge pull request #23546 from maclover7/cable-readme-updateJon Moss2016-02-111-8/+7
|\ \ \ \
| * | | | ActionCable README updatesJon Moss2016-02-081-8/+7
* | | | | Memoize `parsed_body`.Kasper Timm Hansen2016-02-111-1/+1
* | | | | [ci skip] Mention `parsed_body` in docs.Kasper Timm Hansen2016-02-111-2/+1
* | | | | [ci skip] Fix syntax error in CHANGELOG example.Kasper Timm Hansen2016-02-111-1/+1
* | | | | Make `parsed_body` extract parser from the content type.Kasper Timm Hansen2016-02-114-6/+20
* | | | | Don't capture the MissingTemplate exception.Kasper Timm Hansen2016-02-111-1/+1
* | | | | Oops. :cut:Aaron Patterson2016-02-111-6/+0
* | | | | follow indentation rulesAaron Patterson2016-02-111-5/+11
* | | | | make the logger method always return somethingAaron Patterson2016-02-111-4/+9
* | | | | Merge pull request #18109 from k0kubun/unscoped-joinsSean Griffin2016-02-114-6/+29
|\ \ \ \ \
| * | | | | Allow `joins` to be unscopedTakashi Kokubun2016-01-314-6/+31
* | | | | | Merge pull request #23581 from diego-silva/uniqueness-validator-pk-fixSean Griffin2016-02-112-1/+12
|\ \ \ \ \ \
| * | | | | | UniquenessValidator exclude itself when PK changedDiego Silva2016-02-092-1/+12
* | | | | | | Ensure prepared statement caching still occurs with Adequate RecordSean Griffin2016-02-114-7/+7
* | | | | | | Merge pull request #23605 from y-yagi/remove_warnings_in_finder_methodsKasper Timm Hansen2016-02-111-4/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | remove warnings from FinderMethodsyuuji.yaginuma2016-02-111-4/+4
* | | | | | | Merge pull request #23604 from tenderlove/sort-templatesAaron Patterson2016-02-101-4/+4
|\ \ \ \ \ \ \
| * | | | | | | sort templates after looking them up in the from the paths cacheAaron Patterson2016-02-101-4/+4
* | | | | | | | Merge pull request #23606 from supremebeing7/patch-1Jon Moss2016-02-101-0/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Update active_record_querying.mdMark J. Lehman2016-02-101-0/+22
* | | | | | | | | Merge pull request #23596 from afn/issue-23058Aaron Patterson2016-02-102-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Converting backtrace to strings before calling set_backtraceTony Novak2016-02-102-3/+3
* | | | | | | | | Merge pull request #23395 from PareshGupta/remove-unused-constantSantiago Pastorino2016-02-103-54/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove unused class AttributeMethodCachePareshGupta2016-02-022-25/+0