aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | tests, remove unneeded requires.Yves Senn2014-11-064-11/+0
* | | | | | tests, use SchemaDumpingHelper to dump a specific table.Yves Senn2014-11-061-12/+12
* | | | | | Merge pull request #17523 from tgxworld/reset_session_after_calling_with_routingRafael Mendonça França2014-11-063-0/+41
|\ \ \ \ \ \
| * | | | | | Remove session to allow `with_routing` to be called twice.Guo Xiang Tan2014-11-053-0/+41
* | | | | | | Merge pull request #17536 from vipulnsward/fix-group-expression-warningRafael Mendonça França2014-11-061-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix grouped expression warning - `warning: (...) interpreted as grouped expr...Vipul A M2014-11-061-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #17526 from rishijain/update_docs_6Vijay Dev2014-11-062-0/+15
|\ \ \ \ \ \ \
| * | | | | | | added example of squish!, remove, test case for multiple occurrence ofRishi Jain2014-11-062-0/+15
* | | | | | | | docs, synchronize 4.2. release notes. [ci skip]Yves Senn2014-11-062-7/+14
* | | | | | | | Merge pull request #17529 from slothbear/patch-1Yves Senn2014-11-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove redundancyPaul Morganthall2014-11-061-1/+1
* | | | | | | | | Merge pull request #17530 from prathamesh-sonpatki/fix-htmlYves Senn2014-11-061-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Replace Html with HTML [ci skip]Prathamesh Sonpatki2014-11-061-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #17528 from revans/respond_with_docGuillermo Iguaran2014-11-062-18/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Removed documentation that still mentioned using respond_with in placeRobert Evans2014-11-052-18/+5
|/ / / / / / /
* | | | | | | Remove unneccesary default parametersSean Griffin2014-11-051-1/+1
* | | | | | | Improve performance of AR object instantiationSean Griffin2014-11-055-11/+61
|/ / / / / /
* | | | | | Merge pull request #15956 from zuhao/refactor_activesupport_dependencies_testYves Senn2014-11-051-101/+124
|\ \ \ \ \ \
| * | | | | | Cleanup loaded features and constants after dependency tests.Zuhao Wan2014-06-281-100/+116
* | | | | | | Merge pull request #17360 from bronzle/includes_and_unscopedYves Senn2014-11-053-0/+15
|\ \ \ \ \ \ \
| * | | | | | | copy reflection_scopes’s unscoped value when building scope for preloading,...Byron Bischoff2014-10-222-0/+12
* | | | | | | | Merge pull request #17521 from arunagw/aa-jobs-test-in-statsGuillermo Iguaran2014-11-052-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add test/jobs files in `rake stats`Arun Agrawal2014-11-052-1/+3
|/ / / / / / / /
* | | | | | | | Update `bin/rake about` [ci skip]Arun Agrawal2014-11-051-6/+1
* | | | | | | | Add skip-turbolinks entry to 4.2 release notes and improve changelogCarlos Antonio da Silva2014-11-052-1/+5
* | | | | | | | Merge pull request #17519 from prathamesh-sonpatki/rm-skip-gemsCarlos Antonio da Silva2014-11-051-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove skip-gems from 4-2 release notesPrathamesh Sonpatki2014-11-051-4/+0
* | | | | | | | | tests, add note about the usage of a specific timezone. Closes #17448.Yves Senn2014-11-051-1/+1
* | | | | | | | | Merge pull request #17510 from pda/ar-create-database-error-messageCarlos Antonio da Silva2014-11-051-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | activerecord: rake db:create shows underlying error message.Paul Annesley2014-11-041-0/+1
* | | | | | | | | | Merge pull request #17473 from vipulnsward/rm-unused-methodYves Senn2014-11-051-8/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | - Remove unused duplicated method `add_column_position` from AbstractMysqlAda...Vipul A M2014-11-011-8/+0
* | | | | | | | | | | Merge pull request #17515 from prathamesh-sonpatki/rm-requireYves Senn2014-11-052-2/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed the unused require of proxy_object and test related to itPrathamesh Sonpatki2014-11-052-2/+0
* | | | | | | | | | | | Merge pull request #17518 from prathamesh-sonpatki/fix-activesupportYves Senn2014-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix broken string_ext_test due to change in timezonePrathamesh Sonpatki2014-11-051-1/+1
* | | | | | | | | | | | Merge pull request #17514 from y-yagi/configuring_guideAbdelkader Boudih2014-11-051-1/+1
|\| | | | | | | | | | | | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] fix `config.assets.digest` default valueyuuji.yaginuma2014-11-051-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #17513 from eileencodes/cleanup-rails-4.2-release-notesZachary Scott2014-11-041-11/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] Fixup spelling and grammar in 4.2 guideseileencodes2014-11-041-11/+11
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '17106'Aaron Patterson2014-11-044-8/+37
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | add lib to $LOAD_PATH on application inhertence. fixes #17106Aaron Patterson2014-11-043-9/+16
| * | | | | | | | | add a test for #17106Aaron Patterson2014-11-042-0/+22
* | | | | | | | | | Merge pull request #17508 from prathamesh-sonpatki/mention-adding-resources-t...Zachary Scott2014-11-041-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Mention that articles resource should be added by user in getting started guidePrathamesh Sonpatki2014-11-051-4/+4
* | | | | | | | | | | Merge pull request #17443 from tomeara/added_jsonb_to_postgres_database_typesYves Senn2014-11-045-18/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Added SchemaDumper support for tables with jsonb columns.Ted O'Meara2014-11-045-18/+17
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #17480 from gsamokovarov/exception-wrapper-tracesRafael Mendonça França2014-11-042-29/+23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move DebugExceptions#traces_from_wrapper to ExceptionWrapperGenadi Samokovarov2014-11-032-29/+23
* | | | | | | | | | | Merge branch 'master' of github.com:rails/railsVijay Dev2014-11-04171-453/+1388
|\ \ \ \ \ \ \ \ \ \ \