aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make Time#change work with offsets other than UTC or localAndrew White2012-07-013-10/+48
| | | | | Use Time.new to create times where the current offset is not zero or not in the local time zone - closes #4847 and #6651.
* Remove rescue clause from ActiveSupport::TimeZone#to_fAndrew White2012-07-011-2/+1
| | | | | Time#at no longer raises an error for large values so we can remove the rescue clause from ActiveSupport::TimeZone#to_f.
* Remove DateTime#to_time overrideAndrew White2012-07-011-14/+0
| | | | | | | | Currently if the offset is not zero then to_time returns self which can lead to errors where a developer assumes that the value is a Time. To solve this we can use the native implementation of DateTime#to_time in Ruby 1.9.3 as it handles offsets properly and is faster than our override.
* Use strftime to convert DateTime to numericAndrew White2012-07-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native implementation of the seconds since the UNIX epoch in strftime is significantly faster than our method. Benchmark: ---------- require 'benchmark/ips' require 'date' require 'time' date = DateTime.civil(1253,7,6,20,4,0) Benchmark.ips do |x| x.report("strftime.to_i") { date.strftime('%s').to_i } x.report("ssue.to_i") { ((date - DateTime.civil(1970)) * 86400).to_i } x.report("strftime.to_f") { date.strftime('%s').to_f } x.report("ssue.to_f") { ((date - DateTime.civil(1970)) * 86400).to_f } end Output: ------- Calculating ------------------------------------- strftime.to_i 26480 i/100ms ssue.to_i 13818 i/100ms strftime.to_f 26561 i/100ms ssue.to_f 14479 i/100ms ------------------------------------------------- strftime.to_i 616937.3 (±2.4%) i/s - 3098160 in 5.024749s ssue.to_i 200108.8 (±6.9%) i/s - 994896 in 4.999278s strftime.to_f 553581.3 (±2.2%) i/s - 2788905 in 5.040397s ssue.to_f 204260.3 (±4.3%) i/s - 1028009 in 5.043072s
* Update AR and AP changelogs [ci skip]Carlos Antonio da Silva2012-06-302-1/+15
|
* Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-apCarlos Antonio da Silva2012-06-305-24/+33
|\ | | | | Remove Active Model dependency from Action Pack
| * Remove ActiveModel dependency from ActionPackGuillermo Iguaran2012-06-305-24/+33
| | | | | | | | | | | | | | | | ActiveModel is used in ActionPack for ActiveModel::Naming for a few, mostly optional aspects of ActionPack related to automatically converting an ActiveModel compliant object into a key for params and routing. It uses only three methods of ActiveModel (ActiveModel::Naming.route_key, ActiveModel::Naming.singular_route_key and ActiveModel::Naming.param_key).
* | Merge pull request #6913 from lexmag/column_exists_optionsCarlos Antonio da Silva2012-06-302-10/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add :default and :null options to column_exists? method Examples: column_exists?(:testings, :taggable_id, :integer, null: false) column_exists?(:testings, :taggable_type, :string, default: 'Photo')
| * | Add more options to column_exists? methodAleksey Magusev2012-06-302-10/+18
| | | | | | | | | | | | Also fix failures in check options for nil
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-3013-137/+385
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/errors.rb
| * | | Remove mention of `convert_key` now that it's been taken out in ↵Alex Nisnevich2012-06-281-7/+0
| | | | | | | | | | | | | | | | 1eecd9483b0439ab4913beea36f0d0e2aa0518c7
| * | | Rails now uses the ActiveSupport BufferedLogger classChris Adams2012-06-291-1/+1
| | | | | | | | | | | | | | | | Instead of the standard Ruby logger
| * | | update AR::FinderMethods#exists?(false) example [ci skip]Francesco Rodriguez2012-06-281-5/+7
| | | |
| * | | Mention effect of accepts_nested_attributes_for on association autosave ↵Chris Gunther2012-06-271-0/+8
| | | | | | | | | | | | | | | | option [ci skip]
| * | | corrected URLs and controller benchmark method callEric Carty-Fickes2012-06-261-3/+3
| | | |
| * | | update ActiveModel::Name documentation [ci skip]Francesco Rodriguez2012-06-251-1/+133
| | | |
| * | | fix punctuation in activemodel/errors [ci skip]Francesco Rodriguez2012-06-251-1/+1
| | | |
| * | | Fixed example in 1.2 so help will be defined as the text impliesPerry Smith2012-06-241-1/+7
| | | |
| * | | update ActiveModel::Naming documentationFrancesco Rodriguez2012-06-231-7/+8
| | | |
| * | | Merge pull request #104 from udaykadaboina/typofixFrancesco Rodríguez2012-06-231-2/+2
| |\ \ \ | | | | | | | | | | fixed a typo [ci skip]
| | * | | fixed another typo in edge guidesUday Kadaboina2012-06-231-1/+1
| | | | |
| | * | | fixed a typoUday Kadaboina2012-06-231-1/+1
| | | | |
| * | | | update ActiveModel::Model documentation [ci skip]Francesco Rodriguez2012-06-231-16/+37
| | | | |
| * | | | add description ActiveModel::StrictValidationField [ci skip]Francesco Rodriguez2012-06-231-0/+10
| |/ / /
| * | | update ActiveModel::Lint documentation [ci skip]Francesco Rodriguez2012-06-221-22/+23
| | | |
| * | | update ActiveModel::Errors#include? documentation [ci skip]Francesco Rodriguez2012-06-221-1/+1
| | | |
| * | | add documentation and examples to ActiveModel::Errors [ci skip]Francesco Rodriguez2012-06-221-4/+26
| | | |
| * | | update ActiveModel::Errors documentation and minor fixes [ci skip]Francesco Rodriguez2012-06-223-64/+103
| | | |
| * | | update ActiveModel::Conversion documentation [ci skip]Francesco Rodriguez2012-06-221-8/+21
| | | |
* | | | Fix collation database task to use begin..rescue..endCarlos Antonio da Silva2012-06-301-4/+6
| | | |
* | | | Merge pull request #6908 from apotonick/av-prepare2José Valim2012-06-302-20/+13
|\ \ \ \ | | | | | | | | | | Av prepare2
| * | | | removing the AV::Base.helpers class attribute as it is not needed.Nick Sutterer2012-06-291-1/+0
| | | | |
| * | | | remove AV.prepare and move all helper-related logic into the controller. ↵Nick Sutterer2012-06-292-19/+13
| | |_|/ | |/| | | | | | | | | | | | | | | | | | this decouples the view since it no longer knows about routes internals. this is a result of an ongoing discussion at https://github.com/rails/rails/pull/6826.
* | | | Merge pull request #6906 from kennyj/extract_collationRafael Mendonça França2012-06-308-8/+88
|\ \ \ \ | | | | | | | | | | Extract collation tasks to database tasks.
| * | | | Extract collation tasks to database tasks.kennyj2012-07-018-8/+88
| | | | |
* | | | | Merge pull request #6869 from bcardarella/active_relation_inspectJon Leighton2012-06-303-5/+5
|\| | | | | | | | | | | | | | Remove ActiveRelation#inspect
| * | | | Remove ActiveRelation#inspectBrian Cardarella2012-06-293-5/+5
|/ / / /
* | | | make sure the inflection rules are loaded when cherry-picking ↵Xavier Noria2012-06-293-0/+5
| | | | | | | | | | | | | | | | active_support/core_ext/string/inflections.rb [fixes #6884]
* | | | Fix failing test in file update checkerCarlos Antonio da Silva2012-06-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 1abe31670fdad2c357b4356b40a4567a46d16693 The test was failing when running on isolation, because the extensions were not being loaded, thus 1.year.from_now was failing. Just use mktime instead, adding 1 year to Time.now.
* | | | Remove another missing test related to draw external routesCarlos Antonio da Silva2012-06-291-10/+0
| | | | | | | | | | | | | | | | Related with 5e7d6bb
* | | | Remove more tests related to draw external routes filesRafael Mendonça França2012-06-294-53/+1
| | | | | | | | | | | | | | | | Related with 5e7d6bba79393de0279917f93b82f3b7b176f4b5
* | | | Merge pull request #6911 from abonec/masterJosé Valim2012-06-292-1/+17
|\ \ \ \ | | | | | | | | | | Bug with FileUpdateChecker with wrong mtime
| * | | | fix FileUpdateChecker when file has wrong mtime (from future)abonec2012-06-292-1/+17
| | | | |
* | | | | Revert "Allow loading external route files from the router"José Valim2012-06-2910-149/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b. Usage of this feature did not reveal any improvement in existing apps. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb guides/source/routing.textile railties/lib/rails/engine.rb railties/lib/rails/paths.rb railties/test/paths_test.rb
* | | | | Remove unused responsibilities and add a few load definitions to enginesJosé Valim2012-06-295-148/+141
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since plugins were removed, we can clean up a few methods in engines. We also use this opportunity to move `load_console`, `load_tasks` and `load_runner` to Rails::Engine. This means that, if someone wants to improve script/rails for engines to support console or runner commands, part of the work is already done.
* | | | Remove unnecessary Railties structure now that plugins are goneJosé Valim2012-06-295-121/+85
| | | |
* | | | Depend on thor 0.15.4José Valim2012-06-291-1/+1
| | | |
* | | | Rename RouteInspect to RoutesInspector for consistencyJosé Valim2012-06-294-7/+7
| | | |
* | | | Merge pull request #6905 from kennyj/add_changelog_entry_20120629Santiago Pastorino2012-06-291-0/+15
|\ \ \ \ | |/ / / |/| | | Added a changelog entry about fda24312d3.
| * | | Added an entry about fda24312d3 in the CHANGELOG.kennyj2012-06-291-0/+15
|/ / /