aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Fix grouped expression warning - `warning: (...) interpreted as grouped ↵Vipul A M2014-11-061-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | expression`
* | | | | | | Merge pull request #17526 from rishijain/update_docs_6Vijay Dev2014-11-062-0/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update docs 6
| * | | | | | | added example of squish!, remove, test case for multiple occurrence ofRishi Jain2014-11-062-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pattern removal added example for string#remove and test case for remove of multiple occurence of pattern removed extra whitespaces
* | | | | | | | docs, synchronize 4.2. release notes. [ci skip]Yves Senn2014-11-062-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @chancancode
* | | | | | | | Merge pull request #17529 from slothbear/patch-1Yves Senn2014-11-061-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove redundancy [ci skip]
| * | | | | | | | Remove redundancyPaul Morganthall2014-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I love this guide! and "visually see" is redundant. remove "visually", then the sentence reads: > Action Mailer previews provide a way to see how emails look
* | | | | | | | | Merge pull request #17530 from prathamesh-sonpatki/fix-htmlYves Senn2014-11-061-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Replace Html with HTML [ci skip]
| * | | | | | | | Replace Html with HTML [ci skip]Prathamesh Sonpatki2014-11-061-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | - Everywhere else we using HTML Sanitizer except this place.
* | | | | | | | Merge pull request #17528 from revans/respond_with_docGuillermo Iguaran2014-11-062-18/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | [docs] Removed respond_with documentation as it was deprecated and removed from Rails [ci-skip]
| * | | | | | | Removed documentation that still mentioned using respond_with in placeRobert Evans2014-11-052-18/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | of respond_to. respond_with was moved into the responders gem and deprecated inside rails, so there is no need to mention it within rails itself.
* | | | | | | Remove unneccesary default parametersSean Griffin2014-11-051-1/+1
| | | | | | |
* | | | | | | Improve performance of AR object instantiationSean Griffin2014-11-055-11/+61
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We introduced a performance hit by adding an additional iteration through a model's attributes on creation. We don't actually need the values from `Result` to be a hash, we can separate the columns and values and zip them up ourself during the iteration that we have to do.
* | | | | | Merge pull request #15956 from zuhao/refactor_activesupport_dependencies_testYves Senn2014-11-051-101/+124
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Cleanup loaded features and constants after dependency tests.
| * | | | | | 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
| * | | | | | | copy reflection_scopes’s unscoped value when building scope for ↵Byron Bischoff2014-10-222-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preloading, fixes #11036
* | | | | | | | Merge pull request #17521 from arunagw/aa-jobs-test-in-statsGuillermo Iguaran2014-11-052-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add test/jobs files in `rake stats`
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we are no more displaying frameworks
* | | | | | | | Add skip-turbolinks entry to 4.2 release notes and improve changelogCarlos Antonio da Silva2014-11-052-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #17519 from prathamesh-sonpatki/rm-skip-gemsCarlos Antonio da Silva2014-11-051-4/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove skip-gems from 4-2 release notes [ci skip]
| * | | | | | | | Remove skip-gems from 4-2 release notesPrathamesh Sonpatki2014-11-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This option was removed in https://github.com/rails/rails/commit/bf17c8a531bc80. - [ci skip]
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | rake db:create shows underlying error message.
| * | | | | | | | | 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 AbstractMysqlAdapter.
| * | | | | | | | | | - Remove unused duplicated method `add_column_position` from ↵Vipul A M2014-11-011-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AbstractMysqlAdapter
* | | | | | | | | | | Merge pull request #17515 from prathamesh-sonpatki/rm-requireYves Senn2014-11-052-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removed the unused require of proxy_object
| * | | | | | | | | | | Removed the unused require of proxy_object and test related to itPrathamesh Sonpatki2014-11-052-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reference : https://github.com/rails/rails/pull/17493#issuecomment-61739359 - Duration stopped inheriting from ProxyObject in https://github.com/rails/rails/pull/16574
* | | | | | | | | | | | Merge pull request #17518 from prathamesh-sonpatki/fix-activesupportYves Senn2014-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | Fix broken string_ext_test due to change in timezone
| * | | | | | | | | | | Fix broken string_ext_test due to change in timezonePrathamesh Sonpatki2014-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Russian time was changed to UTC+3 from UTC+4 recently. This broke the string_to_ext test.
* | | | | | | | | | | | Merge pull request #17514 from y-yagi/configuring_guideAbdelkader Boudih2014-11-051-1/+1
|\| | | | | | | | | | | | |/ / / / / / / / / / |/| | | | | | | | | | [ci skip] fix `config.assets.digest` default value
| * | | | | | | | | | [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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixup spelling and grammar in 4.2 guides
| * | | | | | | | | | [ci skip] Fixup spelling and grammar in 4.2 guideseileencodes2014-11-041-11/+11
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capitalize CSS, SQL Change spelling of favour to favor - updated for consistency, the rest of the document uses "favor". Grammar / spelling pass
* | | | | | | | | | Merge branch '17106'Aaron Patterson2014-11-044-8/+37
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 17106: add lib to $LOAD_PATH on application inhertence. fixes #17106 add a test for #17106
| * | | | | | | | | 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 ↵Zachary Scott2014-11-041-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prathamesh-sonpatki/mention-adding-resources-to-routes Mention that articles resource should be added by user in getting started guide Fixes #17507 [ci skip]
| * | | | | | | | | | Mention that articles resource should be added by user in getting started guidePrathamesh Sonpatki2014-11-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | 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
| * | | | | | | | | | 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 ExceptionWrapper
| * | | | | | | | | | Move DebugExceptions#traces_from_wrapper to ExceptionWrapperGenadi Samokovarov2014-11-032-29/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::ExceptionWrapper seems to be the more natural place for this method to live in.
* | | | | | | | | | | Merge branch 'master' of github.com:rails/railsVijay Dev2014-11-04171-453/+1388
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix typo [ci skip]Vijay Dev2014-11-041-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #17504 from Gaurav2728/gaurav-update_edgeguideZachary Scott2014-11-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | update rails version for earlier releases in edgeguides [ci skip]
| | * | | | | | | | | | | update rails version for earlier releases in edgeguidesGaurav Sharma2014-11-041-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #17488 from rishijain/update_docs_3Zachary Scott2014-11-031-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | minor docs change [ci skip]
| | * | | | | | | | | | | minor docs change [ci skip]Rishi Jain2014-11-031-2/+2
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 18:31:42 +0000