aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22300 from yui-knk/fix_21893Sean Griffin2015-11-165-5/+23
|\
| * Except keys of `build_record`'s argument from `create_scope` in initialize_at...yui-knk2015-11-165-5/+23
* | Merge pull request #22306 from tylerhunt/patch-1Claudio B2015-11-161-1/+1
|\ \
| * | Use proper syntax for class method reference.Tyler Hunt2015-11-161-1/+1
|/ /
* | Merge pull request #22298 from yuki24/make-static-index-part-of-public-file-s...Kasper Timm Hansen2015-11-165-8/+13
|\ \
| * | Make the `static_index` config part of the `config.public_server` configYuki Nishijima2015-11-165-8/+13
* | | Merge pull request #22302 from kamipo/remove_not_needed_native_database_types...Yves Senn2015-11-162-4/+0
|\ \ \
| * | | Remove not needed `NATIVE_DATABASE_TYPES` entriesRyuta Kamizono2015-11-162-4/+0
| | |/ | |/|
* | | Freeze association foreign keys to reduce allocationsSean Griffin2015-11-151-1/+1
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-11-153-8/+30
|\ \ \ | |/ / |/| |
| * | copy edits [ci skip]Vijay Dev2015-11-151-12/+6
| * | [ci skip] Use full component name in public API documentyui-knk2015-11-151-1/+1
| * | adding missing `.` Gaurav Sharma2015-11-151-5/+5
| * | rollback changes to changelogGaurish Sharma2015-11-141-4/+0
| * | Grammer & Style Tweaks as per feedbackGaurish Sharma2015-11-142-4/+5
| * | Document time testing helpersGaurish Sharma2015-11-092-0/+31
| * | :nailcare: Grammer fixesGaurish Sharma2015-11-091-2/+2
* | | Merge pull request #22299 from claudiob/fix-doc-ttClaudio B2015-11-151-1/+1
|\ \ \ | |_|/ |/| |
| * | [ci skip] Fix <tt> in docclaudiob2015-11-151-1/+1
|/ /
* | Merge pull request #22112 from claudix/masterXavier Noria2015-11-131-0/+21
|\ \
| * | Improved explanationClaudi Martinez2015-11-131-4/+1
| * | Improved explanationClaudi Martinez2015-11-011-10/+16
| * | Fixed typoClaudi Martinez2015-10-291-1/+1
| * | Added warning on coding engine controllersClaudi Martinez2015-10-291-0/+18
* | | Merge pull request #22280 from yui-knk/fix_chagnelog_actionviewRichard Schneeman2015-11-121-1/+1
|\ \ \
| * | | [ci skip] Fix CHANGELOG.md format from list to italic.yui-knk2015-11-131-1/+1
* | | | Merge pull request #22279 from yui-knk/fix_object_partial_falseRichard Schneeman2015-11-124-1/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Respect value of `:object` if `:object` is false when renderingyui-knk2015-11-134-1/+10
|/ / /
* | | Prefer Minitest's location for test failures.Kasper Timm Hansen2015-11-122-3/+9
* | | Don't match specific line numbers in reporter tests.Kasper Timm Hansen2015-11-121-4/+4
* | | Ignore Gemfile.lock in the release taskRafael Mendonça França2015-11-121-1/+1
* | | Merge pull request #22277 from jwworth/pull-request/fix-typo-1447344392Rafael França2015-11-121-1/+1
|\ \ \
| * | | Fix typo [ci skip]Jake Worth2015-11-121-1/+1
* | | | Merge pull request #22259 from daisuko/remove_compiled_root_from_static_rbYves Senn2015-11-121-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | remove unnecessary @compiled_root from static.rbdaisuko2015-11-111-1/+0
* | | | Merge pull request #21601 from yui-knk/fix/ar_tables_without_view2Yves Senn2015-11-1224-98/+208
|\ \ \ \
| * | | | Deprecate `#table_exists?`, `#tables` and passing arguments to `#talbes`yui-knk2015-11-0924-98/+208
* | | | | Merge pull request #22273 from JuanitoFatas/patch/fix-a-warning-in-active-sup...Kasper Timm Hansen2015-11-121-1/+1
|\ \ \ \ \
| * | | | | Fix instance variable not defined warning from Active Support test suiteJuanitoFatas2015-11-121-1/+1
|/ / / / /
* | | | | base (refined) Pathname#ascendant_of? also on Pathname#ascendXavier Noria2015-11-121-7/+2
* | | | | Merge pull request #22269 from dharamgollapudi/patch-1Xavier Noria2015-11-111-1/+1
|\ \ \ \ \
| * | | | | Use the file watcher defined by the app configDharam Gollapudi2015-11-111-1/+1
|/ / / / /
* | | | | let filter_out_descendants do less passesXavier Noria2015-11-111-9/+9
* | | | | Merge pull request #22264 from rails/fix-21230Rafael França2015-11-111-1/+5
|\ \ \ \ \
| * | | | | Show middleware classes on /rails/info/propertiesclaudiob2015-11-111-1/+5
|/ / / / /
* | | | | Merge pull request #22258 from rymai/patch-1Claudio B2015-11-111-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix typo: "in" should be "is"Rémy Coutable2015-11-111-1/+1
* | | | | revises the implementation of Pathname#ascendant_of? (in refinement)Xavier Noria2015-11-112-1/+37
|/ / / /
* | | | normalizes spacing in a CHANGELOG [ci skip]Xavier Noria2015-11-111-6/+6
* | | | Merge branch 'fxn-master'Xavier Noria2015-11-1113-105/+581
|\ \ \ \