aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'error-explanation'Carlos Antonio da Silva2013-06-252-6/+6
|\
| * Fix another "error_explanation" css class in guides [ci skip]Carlos Antonio da Silva2013-06-251-3/+3
| * change id="errorExplanation" to id="error_explanation" to match the generated...Luzi Humm2013-06-251-3/+3
|/
* Merge pull request #11096 from akalyaev/remove-unnecessary-mappingCarlos Antonio da Silva2013-06-251-5/+5
|\
| * removed unnecessary mapping for on optionsAnton Kalyaev2013-06-251-5/+5
* | Merge pull request #11095 from vipulnsward/rails_4_docsXavier Noria2013-06-253-5/+8
|\ \
| * | We are now rails 4 [skip-ci]Vipul A M2013-06-263-5/+8
* | | Merge pull request #11098 from vredniy/masterRafael Mendonça França2013-06-251-1/+1
|\ \ \
| * | | Fixed menu section's location (guides)Dima Zudochkin2013-06-251-1/+1
* | | | Merge pull request #11097 from ryancw/patch-2Rafael Mendonça França2013-06-251-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Comment typoRyan Williams2013-06-251-2/+2
|/ / /
* | | Merge pull request #11093 from nolman/restoring-scaffold-generationRafael Mendonça França2013-06-251-1/+1
|\ \ \ | |/ / |/| |
| * | restore correct scaffold generationNolan Evans2013-06-251-1/+1
|/ /
* | Change reference to all to scoped instead.Steve Klabnik2013-06-251-1/+1
* | Merge pull request #11088 from nolman/nolman/scaffold-fixSteve Klabnik2013-06-251-1/+1
|\ \ | |/ |/|
| * fix deprecation warning in scaffold controllersNolan Evans2013-06-251-1/+1
|/
* Merge pull request #11084 from arkiver/masterYves Senn2013-06-253-3/+3
|\
| * Fixing Issue #11083Akshay Khole2013-06-253-3/+3
|/
* remove trailing whitespace from Active Record CHANGELOGYves Senn2013-06-251-1/+1
* Clarify what arguments are passed to redirect blocks - fixes #11056Andrew White2013-06-251-3/+3
* Fix shorthand routes where controller and action are in the scopeAndrew White2013-06-252-2/+19
* test-case => failingYves Senn2013-06-251-0/+13
* Merge pull request #11069 from ykzts/actiondispatch-ssl-secure-flag-igonore-caseGuillermo Iguaran2013-06-242-1/+15
|\
| * Flag cookies as secure with ignore case in ActionDispatch::SSLYamagishi Kazutoshi2013-06-242-1/+15
* | Merge pull request #11065 from gbuesing/hstsfixGuillermo Iguaran2013-06-242-2/+6
|\ \
| * | ActionDispatch:SSL: don't include STS header in non-https responsesGeoff Buesing2013-06-232-2/+6
* | | Add CHANGELOG entry for #10971Rafael Mendonça França2013-06-241-1/+15
* | | Merge pull request #11075 from vipulnsward/remove_recordYves Senn2013-06-241-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix `another_contract` not being used warningVipul A M2013-06-241-1/+1
|/ /
* | test-case to prevent regressions described in #10901.Jared Armstrong2013-06-241-0/+27
* | Merge pull request #11067 from rajars2576/fix_older_rocketGuillermo Iguaran2013-06-233-20/+20
|\ \ | |/ |/|
| * replace all older rocket sign to new ":" from examples of active record and a...Rajarshi Das2013-06-243-20/+20
|/
* Setup env and seed_loaded for DatabaseTasks outside load_configPiotr Sarnacki2013-06-231-2/+3
* Change a way ActiveRecord's config is prepared for rake tasksPiotr Sarnacki2013-06-231-10/+14
* Revert "Merge pull request #11053 from yangchenyun/mine"José Valim2013-06-221-2/+0
* test-case to prevent regressions on `Association#build` with an Array.Yves Senn2013-06-221-0/+10
* Merge pull request #11053 from yangchenyun/mineYves Senn2013-06-221-0/+2
|\
| * add explicit AS dependencies for ActiveModel::NamingSteven Yang2013-06-221-0/+2
* | Merge pull request #10796 from neerajdotname/10669Jon Leighton2013-06-223-2/+19
|\ \
| * | flatten merged join_values before building the joinsNeeraj Singh2013-06-223-2/+19
|/ /
* | Merge pull request #11050 from robin850/remove-rails-test-mentionCarlos Antonio da Silva2013-06-211-2/+0
|\ \
| * | Remove code related to the rails test commandRobin Dupret2013-06-211-2/+0
* | | Merge pull request #11051 from neerajdotname/10509fJon Leighton2013-06-213-1/+25
|\ \ \ | |/ / |/| |
| * | do not load all child records for inverse caseNeeraj Singh2013-06-213-1/+25
|/ /
* | Merge pull request #11049 from neerajdotname/no-need-of-large-numberJon Leighton2013-06-211-1/+5
|\ \
| * | fix bad test by making number that fits for integerNeeraj Singh2013-06-211-1/+5
* | | Merge pull request #10537 from jetthoughts/10428_bug_with_config_assets_preco...Guillermo Iguaran2013-06-211-0/+23
|\ \ \
| * | | #10428: Added tests for config.assets.precompilePaul Nikitochkin2013-06-211-0/+23
* | | | Merge pull request #11040 from satococoa/fix-create_join_table-documentCarlos Antonio da Silva2013-06-212-4/+4
|\ \ \ \
| * | | | Fix documents for create_join_tableSatoshi Ebisawa2013-06-212-4/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 14:42:48 +0000