aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix how file_ and password_field_tag edit optionsclaudiob2014-10-152-2/+9
* Merge pull request #17262 from swapdisc/delete-join-operation-structRafael Mendonça França2014-10-151-2/+0
|\
| * delete leftover JoinOperation structswapdisc2014-10-141-2/+0
* | Merge pull request #17271 from claudiob/remove-duplicate-stringify-keysRafael Mendonça França2014-10-151-13/+13
|\ \
| * | Remove duplicate stringify_keys in text_field_tagclaudiob2014-10-151-13/+13
* | | Merge pull request #17257 from Bounga/use_tr_instead_of_gsub_in_journey_scannerSantiago Pastorino2014-10-151-1/+1
|\ \ \
| * | | Use `#tr` instead of `#gsub`Nicolas Cavigneaux2014-10-141-1/+1
* | | | Merge pull request #17264 from claudiob/add-activejob-to-readmeRafael Mendonça França2014-10-151-3/+5
|\ \ \ \
| * | | | Add ActiveJob to "Welcome to Rails" sectionclaudiob2014-10-151-3/+5
| | |/ / | |/| |
* | | | Merge pull request #17265 from claudiob/add-link-to-active-model-readmeRafael Mendonça França2014-10-151-4/+4
|\ \ \ \
| * | | | Link to ActiveModel’s README in "Welcome to Rails"claudiob2014-10-151-4/+4
| |/ / /
* | | | Merge pull request #17266 from claudiob/fix-broken-tore-darell-linkRafael Mendonça França2014-10-151-1/+1
|\ \ \ \
| * | | | Remove broken http://tore.darell.no linkclaudiob2014-10-151-1/+1
| |/ / /
* | | | Merge pull request #17270 from neumanrq/fix/external_links_to_json_projectRafael Mendonça França2014-10-152-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | specify protocol for external linksRobin Neumann2014-10-152-2/+2
|/ / /
* | | Make the config actually copyableGodfrey Chan2014-10-141-1/+1
* | | :scissors: duplicated `require`sGodfrey Chan2014-10-141-1/+0
* | | make sure cache is not used for collection assocations tooAaron Patterson2014-10-143-2/+19
* | | break cache if we're inside a "scoping" call. fixes #17052Aaron Patterson2014-10-142-1/+16
| |/ |/|
* | Merge pull request #17220 from Bounga/fix_journey_rfc_3986_complianceAndrew White2014-10-143-11/+34
|\ \
| * | Improve Journey compliance to RFC 3986Nicolas Cavigneaux2014-10-143-11/+34
|/ /
* | Merge pull request #17253 from gshutler/activemodel-errors-keyRafael Mendonça França2014-10-142-0/+13
|\ \
| * | Add #key? to ActiveModel::ErrorsGarry Shutler2014-10-142-0/+13
* | | Merge pull request #17252 from Bounga/update_all_doc_clarificationSean Griffin2014-10-141-1/+2
|\ \ \ | |/ / |/| |
| * | Clarify `#update_all` doc about value processingNicolas Cavigneaux2014-10-141-1/+2
|/ /
* | Merge pull request #17251 from claudiob/remove-duplicate-exceptionRafael Mendonça França2014-10-131-6/+10
|\ \
| * | Remove duplicate error message "Couldn't find..."claudiob2014-10-131-6/+10
| |/
* | measure record instantiation time in AS::NotificationsAaron Patterson2014-10-133-4/+58
* | Always use latest turbolinksRafael Mendonça França2014-10-131-1/+1
* | Don't need to account turbolinks cookies in get request.Rafael Mendonça França2014-10-131-6/+6
* | add length to ActiveRecord::ResultAaron Patterson2014-10-132-0/+8
* | Merge pull request #17232 from Agis-/issue-17209Rafael Mendonça França2014-10-134-1/+28
|\ \
| * | Autosave callbacks shouldn't be `after_save`Agis-2014-10-134-1/+28
* | | line_statistics is not an executableRafael Mendonça França2014-10-132-2/+2
* | | Make a note about the internal tools/ dir and what each utility doesJeremy Kemper2014-10-131-0/+8
* | | Do not use deprecated `exists?` methodRafael Mendonça França2014-10-131-1/+1
* | | Document the propose of tools/profileRafael Mendonça França2014-10-131-0/+3
* | | Revert "Merge pull request #17247 from igas/fix-deprecations"Rafael Mendonça França2014-10-131-0/+133
* | | Merge pull request #17230 from robertoz-01/masterRafael Mendonça França2014-10-131-1/+1
|\ \ \
| * | | atomic_write rescue also Errno::EACCESRoberto Zanon2014-10-101-1/+1
* | | | Merge pull request #17247 from igas/fix-deprecationsRafael Mendonça França2014-10-131-133/+0
|\ \ \ \
| * | | | remove unused tools/profileIgor Kapkov2014-10-131-133/+0
* | | | | Merge pull request #17240 from masarakki/fix-test_helper-of-mountable-pluginRafael Mendonça França2014-10-132-0/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix test_helper for mountable pluginmasarakki2014-10-132-0/+7
| | |/ / | |/| |
* | | | Merge pull request #17234 from arthurnn/add_regression_for_path_and_cascadeRafael Mendonça França2014-10-131-0/+8
|\ \ \ \
| * | | | Add regression test for router was overwriting PATH_INFOArthur Neves2014-10-101-0/+8
| |/ / /
* | | | Merge pull request #17246 from sferik/railties_firstRafael Mendonça França2014-10-131-7/+7
|\ \ \ \
| * | | | Start running railties builds first, since they take the longest finishErik Michaels-Ober2014-10-131-7/+7
* | | | | Merge pull request #17245 from sferik/sampleXavier Noria2014-10-131-2/+2
|\ \ \ \ \
| * | | | | Replace Array#shuffle.first with Array#sampleErik Michaels-Ober2014-10-131-2/+2
| |/ / / /