aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Build fix when running in isolationArun Agrawal2014-11-1430-0/+31
* Merge pull request #17618 from sandipransing/testing-guideArun Agrawal2014-11-141-4/+2
|\
| * [ci skip] Remove deprecated testing tasksSandip Ransing2014-11-141-4/+2
|/
* exec_prepared is GVL friendly, so lets use it.Aaron Patterson2014-11-132-5/+3
* Merge pull request #17613 from sandipransing/testing-guideAbdelkader Boudih2014-11-131-3/+5
|\
| * [ci skip] Improve upon testing tasks guideSandip Ransing2014-11-141-3/+5
|/
* Merge pull request #17612 from sandipransing/testing-guideRafael Mendonça França2014-11-131-0/+1
|\
| * [ci skip] Capybara added to other testing approachesSandip Ransing2014-11-141-0/+1
|/
* Merge branch 'sandipransing-master'Zachary Scott2014-11-131-2/+6
|\
| * [ci skip] Add one more example to routing testing, and highlight associationSandip Ransing2014-11-131-2/+6
|/
* Merge pull request #17604 from rymohr/message-verifier-case-sensitivitySantiago Pastorino2014-11-131-2/+10
|\
| * Abstract encoding strategy for ActiveSupport::MessageVerifierRyan Mohr2014-11-121-2/+10
|/
* Improve railties changelog entry and move latest to the top [ci skip]Carlos Antonio da Silva2014-11-121-8/+7
* Merge pull request #17593 from igas/paths-unshift-arityRafael Mendonça França2014-11-122-2/+7
|\
| * Fix Rails::Paths::Path.unshift interfaceIgor Kapkov2014-11-122-2/+7
* | Merge pull request #17596 from aderyabin/follow_convensionRafael Mendonça França2014-11-121-1/+1
|\ \
| * | Follow the coding conventionsAndrey Deryabin2014-11-121-1/+1
|/ /
* | Merge pull request #17348 from DavidGeukers/rake_test_allDavid Heinemeier Hansson2014-11-123-6/+28
|\ \ | |/ |/|
| * Simplify rake test vs rake test:allDavid Geukers2014-11-103-6/+28
* | Merge pull request #17588 from djpowers/patch-1Zachary Scott2014-11-111-2/+2
|\ \
| * | Replace "behaviour" with "behavior"Dave Powers2014-11-111-2/+2
|/ /
* | Merge pull request #17047 from betesh/masterRafael Mendonça França2014-11-111-0/+1
|\ \
| * | Time includes DateAndTime::Zones acts_like(:time)betesh2014-11-091-0/+1
* | | Merge pull request #17580 from ccutrer/change_table_nameYves Senn2014-11-113-17/+29
|\ \ \
| * | | add a Table#name accessor like TableDefinition#nameCody Cutrer2014-11-103-17/+29
* | | | Make FlashHash#key? work with symbol and stringRafael Mendonça França2014-11-112-1/+10
* | | | Remove unnecessary double spaceclaudiob2014-11-102-2/+2
* | | | Merge branch 'rm-fix-secret-token-fallback'Rafael Mendonça França2014-11-109-23/+143
|\ \ \ \
| * | | | :scissors:Rafael Mendonça França2014-11-101-1/+1
| * | | | No need to sync config.secret_token and secrets.secret_tokenRafael Mendonça França2014-11-102-41/+4
| * | | | Merge pull request #16535 from bf4/patch-1Rafael Mendonça França2014-11-109-23/+180
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | `secret_token` is now saved in `Rails.application.secrets.secret_token`Benjamin Fleischer2014-11-029-23/+180
* | | | | dependencies.rb: keep the decorated #load and #require private [closes #17553]Xavier Noria2014-11-103-13/+36
* | | | | Merge pull request #17585 from aderyabin/remove_limited_update_conditionsRafael Mendonça França2014-11-102-8/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove never called method `limited_update_conditions`Andrey Deryabin2014-11-112-8/+0
* | | | | Merge pull request #17579 from aderyabin/cleanup_sqliteRafael Mendonça França2014-11-101-6/+2
|\ \ \ \ \
| * | | | | tiny code improvement in sqlite3 adapter:Andrey Deryabin2014-11-101-6/+2
| |/ / / /
* | | | | Merge pull request #17578 from codeodor/fix-17217-test-bugRafael Mendonça França2014-11-101-1/+1
|\ \ \ \ \
| * | | | | Fixes a bug found when running individual tests against #17217 after mergingSammy Larbi2014-11-101-1/+1
| |/ / / /
* | | | | Merge pull request #11694 from Empact/association-bind-values-not-updated-on-...Rafael Mendonça França2014-11-103-1/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix that a collection proxy could be cached before the save of the owner, res...Ben Woosley2014-10-033-1/+20
* | | | | docs, minor changes in Active Job documentation. [ci skip]Yves Senn2014-11-102-6/+5
* | | | | Remove useless `only_path: true` in path helpersGodfrey Chan2014-11-101-3/+2
* | | | | Pass the route name explicitlyGodfrey Chan2014-11-102-1/+14
* | | | | Revert the behavior of booleans in string columns to that of 4.1Sean Griffin2014-11-093-7/+29
* | | | | Merge pull request #17572 from rishijain/update_docs_10Zachary Scott2014-11-093-1/+5
|\ \ \ \ \
| * | | | | added description for rails generators, and fixed sentence formation for acti...Rishi Jain2014-11-103-1/+5
|/ / / / /
* | | | | Merge pull request #17217 from codeodor/fix-17119Aaron Patterson2014-11-097-3/+25
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Ensure HABTM relationships produce valid class names (Fixes #17119)Sammy Larbi2014-11-097-3/+25
|/ / / /
* | | | Merge pull request #17564 from yui-knk/fix/command_line_guideRobin Dupret2014-11-091-1/+1
|\ \ \ \