aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10879 from makaroni4/masterAndrew White2013-07-296-0/+50
|\ | | | | Added Time#middle_of_day method
| * Added Time#middle_of_dayAnatoli Makarevich2013-07-286-1/+51
| | | | | | | | Added middle_of_day method to Date and DateTime
* | Merge pull request #11654 from robin850/freebsdXavier Noria2013-07-291-0/+28
|\ \ | | | | | | Add installation instructions for FreeBSD [ci skip]
| * | Add installation instructions for FreeBSD [ci skip]Robin Dupret2013-07-291-0/+28
| | | | | | | | | | | | Add packages required to setup the rails environment on FreeBSD.
* | | Merge pull request #11651 from ↵Carlos Antonio da Silva2013-07-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | neerajdotname/log_should_mimick_original_log_method interceptor should mimick original method
| * | | interceptor should mimick original methodNeeraj Singh2013-07-291-1/+1
| | | | | | | | | | | | | | | | This fix also makes the test order independent.
* | | | Merge pull request #11653 from ankit8898/typoCarlos Antonio da Silva2013-07-291-1/+1
|\ \ \ \ | |_|/ / |/| | | Fixing the broken URL [skip ci]
| * | | Fixing the broken URL [skip ci]Ankit Gupta2013-07-291-1/+1
|/ / /
* | | Fix handling of offsets with Time#to_s(:iso8601)Andrew White2013-07-297-4/+21
| | | | | | | | | | | | | | | | | | Use a lambda to ensure that the generated string respects the offset of the time value. Also add DateTime#to_s(:iso8601) and Date#to_s(:iso8601) for completeness.
* | | Merge pull request #11649 from ↵Carlos Antonio da Silva2013-07-291-30/+20
|\ \ \ | | | | | | | | | | | | | | | | neerajdotname/use_method_with_active_record_default_timezone use method with_active_record_default_timezone
| * | | use method with_active_record_default_timezoneNeeraj Singh2013-07-291-30/+20
| |/ /
* | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2013-07-291-5/+7
| | |
* | | Merge pull request #11648 from prathamesh-sonpatki/doc-fixYves Senn2013-07-291-0/+2
|\ \ \ | | | | | | | | Improved the doc about showing posts in getting started guide [ci skip]
| * | | Improved the doc about showing posts in getting started guide [ci skip]Prathamesh Sonpatki2013-07-291-0/+2
| |/ / | | | | | | | | | - Reference #11644
* | | Merge pull request #11646 from neerajdotname/remove_duplicate_methodYves Senn2013-07-291-7/+0
|\ \ \ | |/ / |/| | remove duplicate method
| * | remove duplicate methodNeeraj Singh2013-07-291-7/+0
|/ / | | | | | | This method is already present in helper.rb
* | Add Time#to_s(:iso8601) for easy conversion of times to the iso8601 format ↵David Heinemeier Hansson2013-07-283-1/+7
| | | | | | | | for easy Javascript date parsing
* | Merge pull request #11608 from arunagw/ruby-from-rubygemsAaron Patterson2013-07-286-12/+6
|\ \ | | | | | | grab executable from rubygems
| * | grab executable from rubygemsArun Agrawal2013-07-266-12/+6
| | | | | | | | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc
* | | Avoid "uninitialized constant ActiveRecord::PendingMigrationError::Rails"Akira Matsuda2013-07-291-1/+1
| | |
* | | Revert "fix order dependent test related to migration"Akira Matsuda2013-07-291-4/+0
| | | | | | | | | | | | | | | | | | This reverts commit 10259c3e906da2191ef0d43cd664a3b5504d9f8c. reason: this causes rake test_mysql and test_mysql2 fail
* | | Properly repair validations when dynamically addedAkira Matsuda2013-07-291-24/+30
| | |
* | | Clear class ivar before testingAkira Matsuda2013-07-291-0/+2
| | |
* | | Unneeded assertionAkira Matsuda2013-07-291-1/+1
| | |
* | | Don't rewrite AR connection#commit_db_transaction method globallyAkira Matsuda2013-07-291-4/+4
| | |
* | | Merge pull request #11640 from pawel2105/manifest_fixDavid Heinemeier Hansson2013-07-283-6/+14
|\ \ \ | | | | | | | | Changed stylesheet load order in the stylesheet manifest generator.
| * | | Changed stylesheet load order in the stylesheet manifest generator.Pawel Janiak2013-07-283-6/+14
| | | |
* | | | Merge pull request #11641 from ankit8898/test_cleanupRafael Mendonça França2013-07-282-2/+2
|\ \ \ \ | | | | | | | | | | Cleanup of class_name
| * | | | Cleanup of class_nameAnkit Gupta2013-07-282-2/+2
| |/ / / | | | | | | | | | | | | Don't think class name is needed as by default belongs_to :select will be linked to Select class.
* | | | Merge pull request #11634 from ↵Rafael Mendonça França2013-07-281-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | neerajdotname/fix_order_dependent_test_for_migration fix order dependent test related to migration
| * | | | fix order dependent test related to migrationNeeraj Singh2013-07-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the order in which tests are executed is changed then test fails. This commit ensures that all migrations are run before ensuring that there are no pending migration.
* | | | | Merge pull request #11635 from ↵Rafael Mendonça França2013-07-281-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | neerajdotname/make_test_order_independent_by_resetting_timezone make test order independent by resetting timezone
| * | | | | make test order independent by resetting timezoneNeeraj Singh2013-07-281-0/+2
| |/ / / /
* | | | | Merge pull request #11637 from neerajdotname/make_test_not_depend_on_orderRafael Mendonça França2013-07-281-0/+4
|\ \ \ \ \ | | | | | | | | | | | | reset default timezone and make test order independent
| * | | | | reset default timezone and make test order independentNeeraj Singh2013-07-281-0/+4
| |/ / / /
* | | | | Merge pull request #11638 from ↵Rafael Mendonça França2013-07-281-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | neerajdotname/make_order_independent_association_test make test not depend on order
| * | | | | make test not depend on orderNeeraj Singh2013-07-281-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `NestedThroughAssociationsTest` adds records to `member_details` table. When test performs `@member_details[0]` then the order of record is not guaranteed. Hence it is best to start with a clean slate by deleting unwanted records.
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-07-285-55/+44
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Typo fixMikhail Dieterle2013-07-281-1/+1
| | | | |
| * | | | Using markdown-style code quotesMikhail Dieterle2013-07-281-2/+2
| | | | |
| * | | | Fix lixml2 to libxml2 [ci skip]Robin Dupret2013-07-281-1/+1
| | | | |
| * | | | Fixes typo in Object#try!Jay Hayes2013-07-261-1/+1
| | | | |
| * | | | Use hyphenated version of assert_url [ci skip]Robin Dupret2013-07-261-1/+1
| | | | |
| * | | | Add a SQL example for `not` [ci skip]Robin Dupret2013-07-261-1/+7
| | | | | | | | | | | | | | | | | | | | To share a certain logic across other examples, let's add a sample SQL code generated by the given Ruby code
| * | | | Refix my misreading of the diffDamien Mathieu2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | sorry @robin850. Thanks @fxn
| * | | | Revert "Fix the SQLite gem name"Damien Mathieu2013-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 700c6c65bcce17d4c61423ceaef031bcbe203337. Bot the `sqlite3` and `sqlite3-ruby` gems exist. https://rubygems.org/gems/sqlite3 https://rubygems.org/gems/sqlite3-ruby In fact, they both point to the same github repository. https://github.com/luislavena/sqlite3-ruby However, the last one hasn't been released since 2011, while the first one keeps getting regular releases.
| * | | | Add packages list for ArchLinux [ci skip]Robin Dupret2013-07-241-0/+20
| | | | | | | | | | | | | | | | | | | | Add the packages required on Arch Linux when setting up the development dependencies
| * | | | Fix the SQLite gem nameRobin Dupret2013-07-241-1/+1
| | | | |
| * | | | Removed doc of removed method diff [ci skip]Rashmi Yadav2013-07-241-38/+0
| | | | |
| * | | | Updated guides with latest method [ci skip]Rashmi Yadav2013-07-241-2/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 07:00:48 +0000