aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove unused tools/profileIgor Kapkov2014-10-131-133/+0
* 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
| |/ /
* | | Merge pull request #17244 from sferik/reverse_eachXavier Noria2014-10-135-6/+6
|\ \ \ | |/ / |/| |
| * | Replace Enumerable#reverse.each with Enumerable#reverse_eachErik Michaels-Ober2014-10-135-6/+6
|/ /
* | Merge pull request #17241 from josh/coffee-rails-4-1Guillermo Iguaran2014-10-122-3/+3
|\ \ | |/ |/|
| * Default generated Gemfile to coffee-rails ~> 4.1.0Joshua Peek2014-10-122-3/+3
|/
* Merge pull request #17014 from grosser/grosser/fast-fixturesAaron Patterson2014-10-103-66/+2
|\
| * speed up fixtures by not loading all their classesgrosser2014-10-063-66/+2
* | tests, move `original_` var assignments outside of `begin`.Yves Senn2014-10-102-11/+16
* | Merge pull request #17223 from bgentry/active-job-empty-queue-nameYves Senn2014-10-102-1/+21
|\ \
| * | ActiveJob: allow blank queue namesBlake Gentry2014-10-092-1/+21
|/ /
* | Merge pull request #17221 from StefanH/fix-unknown-http-method-messageRafael Mendonça França2014-10-092-1/+17
|\ \
| * | Request#check_method no longer breaks when :en is not available localeStefan Henzen2014-10-092-1/+17
|/ /
* | Merge pull request #17219 from Gaurav2728/gaurav-missing_i18_linkAbdelkader Boudih2014-10-091-9/+6
|\ \
| * | [ci skip] removing ruby-i18n.org/wiki link that is not available and using â€...Gaurav Sharma2014-10-091-9/+6
|/ /
* | Merge pull request #17215 from aripollak/sidekiq-no-retry-optionRafael Mendonça França2014-10-081-3/+1
|\ \
| * | Don't pass retry option to SidekiqAri Pollak2014-10-081-3/+1
|/ /
* | Point to a specific version of guide to make the redirect workRafael Mendonça França2014-10-081-1/+1
* | Merge pull request #17205 from y-yagi/patch-1Abdelkader Boudih2014-10-081-1/+1
|\ \
| * | update error message when InlineAdapter is usedyuuji.yaginuma2014-10-081-1/+1
* | | Merge pull request #17187 from Bounga/middleware_reloading_explainationAbdelkader Boudih2014-10-081-0/+4
|\ \ \ | |/ / |/| |
| * | Warning about middleware not auto-reloadingNicolas Cavigneaux2014-10-081-0/+4
|/ /
* | Only include the needed assertionsRafael Mendonça França2014-10-072-2/+3
* | Merge pull request #17204 from schneems/schneems/fix-am-tests-masterRafael Mendonça França2014-10-074-7/+9
|\ \
| * | fix tests on action_mailerschneems2014-10-074-7/+9
* | | Merge pull request #17203 from schneems/schneems/av-tag_helperRafael Mendonça França2014-10-073-10/+9
|\| |
| * | remove un-needed sortschneems2014-10-073-10/+9
|/ /
* | Merge pull request #17201 from djpowers/patch-1Abdelkader Boudih2014-10-071-1/+1
|\ \
| * | Fix grammarDave Powers2014-10-071-1/+1
|/ /
* | Merge pull request #17198 from neerajdotname/wordsmitthingRafael Mendonça França2014-10-071-2/+2
|\ \
| * | Rephrasing sentencesNeeraj Singh2014-10-071-2/+2
* | | Merge pull request #17184 from fillman/masterRafael Mendonça França2014-10-071-6/+17
|\ \ \
| * | | fix autoload testsfillman2014-10-051-6/+17
* | | | Merge pull request #17146 from divineforest/active-record-gsub-to-trRafael Mendonça França2014-10-074-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Change `gsub` to `tr` where possibleAlexander Balashov2014-10-064-4/+4
* | | | Merge pull request #17189 from jipiboily/update-queue-classic-detailsZachary Scott2014-10-062-7/+7
|\ \ \ \
| * | | | update queue_classic detailsJean-Philippe Boily2014-10-062-7/+7
|/ / / /
* | / / unify PG spelling in CHANGELOGs. [ci skip]Yves Senn2014-10-061-1/+1
| |/ / |/| |
* | | Merge pull request #17183 from prathamesh-sonpatki/fix-typo-in-am-guideAbdelkader Boudih2014-10-051-2/+2
|\ \ \
| * | | Fix typo in Active Model guidePrathamesh Sonpatki2014-10-051-2/+2
|/ / /
* | | [ci skip] Merge ActiveModel::SecurePassword guide from @aditya-kapoorZachary Scott2014-10-041-0/+46
|\ \ \
| * | | [ci skip] add guide for ActiveModel::SecurePasswordAditya Kapoor2014-08-111-0/+46
* | | | Edits to ActiveModel guide [ci skip]Nick Meehan2014-10-041-36/+38
* | | | Add Active Model to guides [ci skip]Mauro George2014-10-042-14/+302
* | | | Merge pull request #17179 from eileencodes/clarify-delete-strategies-on-colle...Zachary Scott2014-10-041-17/+14
|\ \ \ \