aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Better orderingDavid Heinemeier Hansson2013-04-181-3/+3
|
* Revert "Merge pull request #10043 from cconstantine/master"Rafael Mendonça França2013-04-182-21/+0
| | | | | | | This reverts commit 521035af530482d6d9ad2dae568eaeb0ab188e1c, reversing changes made to 222011dbee842bbc60d3aaaa3145356b90a30fd1. Reason: This broke the tests
* Use sprockets-rails 2.0.0.rc4Guillermo Iguaran2013-04-181-1/+1
|
* Use sass-rails 4.0.0.rc1Rafael Mendonça França2013-04-181-1/+1
|
* Use the same uglifier version that the generated applicationsRafael Mendonça França2013-04-181-1/+1
|
* Use latest coffee-rails releaseRafael Mendonça França2013-04-182-2/+2
|
* Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet."Rafael Mendonça França2013-04-181-2/+2
| | | | | | | | | This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue
* Bump arel to 4.0.0Rafael Mendonça França2013-04-181-1/+1
|
* Merge pull request #10043 from cconstantine/masterRafael Mendonça França2013-04-182-0/+21
|\ | | | | DB with postgres string array column doesn't load fixtures well
| * Fix loading of string arrays in postgresChris Constantine2013-04-082-0/+21
| |
* | Add CHANGELOG entries - closes #10180, #10185Andrew White2013-04-181-0/+10
| |
* | Refactor ActionDispatch::Http::URL.build_host_urlAndrew White2013-04-182-20/+90
| | | | | | | | | | Add support for extracting the port from the :host option and for removing the subdomain by using nil, false or ''.
* | Add url generation tests for #10185Andrew White2013-04-181-0/+2
| |
* | Duplicate options before mutating themAndrew White2013-04-182-3/+5
| |
* | Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵Derek Watson2013-04-184-1/+32
| | | | | | | | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property
* | Merge pull request #10262 from printercu/patch-3Rafael Mendonça França2013-04-182-0/+7
|\ \ | | | | | | Avoid leak into controller's action_methods
| * | Avoid leak into controller's action_methodsprintercu2013-04-182-0/+7
|/ /
* | Merge pull request #10258 from thenickcox/pending_migrations_pluralRafael Mendonça França2013-04-181-3/+3
|\ \ | | | | | | Fix subject-verb agreement in error msg (and other grammar stuff)
| * | Fix subject-verb agreement in error msg (and other grammar stuff)thenickcox2013-04-171-3/+3
| | |
* | | Merge pull request #10259 from prathamesh-sonpatki/secure-engine-testsCarlos Antonio da Silva2013-04-171-1/+1
|\ \ \ | | | | | | | | Use secure source for rubygems in engine tests
| * | | Use secure source for rubygems in engine testsPrathamesh Sonpatki2013-04-181-1/+1
|/ / /
* | | Merge pull request #10255 from ↵Carlos Antonio da Silva2013-04-171-18/+14
|\ \ \ | | | | | | | | | | | | | | | | wangjohn/increment_or_decrement_refactoring_in_local_cache Refactoring increment and decrement in local cache
| * | | The increment and decrement commands in the local cache are exactly thewangjohn2013-04-171-18/+14
|/ / / | | | | | | | | | same, so their logic is being refactored.
* | | Merge pull request #10254 from wangjohn/refactoring_local_cacheCarlos Antonio da Silva2013-04-171-8/+6
|\ \ \ | | | | | | | | Refactored the storage of a temporary version of the local cache.
| * | | Refactored the storage of a temporary version of the local cache intowangjohn2013-04-171-8/+6
|/ / / | | | | | | | | | its own method.
* | | activerecord-deprecated_finders 1.0.0 has a bug with has_many :throughRafael Mendonça França2013-04-171-1/+1
| | | | | | | | | | | | associations
* | | Merge pull request #10252 from epiclabs/nodoc_registriesRafael Mendonça França2013-04-172-4/+4
|\ \ \ | | | | | | | | add :nodoc: mark to *Registry classes [ci skip]
| * | | add :nodoc: mark to *Registry classes [ci skip]Francesco Rodriguez2013-04-173-5/+5
| | | |
* | | | Add nodoc to LocalCacheRegistryRafael Mendonça França2013-04-171-1/+1
|/ / / | | | | | | [ci skip]
* | | Merge pull request #10250 from wangjohn/local_cache_registryRafael Mendonça França2013-04-171-15/+32
|\ \ \ | | | | | | | | Adding a local thread registry to store local caches.
| * | | Adding a local thread registry to store local caches.wangjohn2013-04-171-15/+32
| | | |
* | | | adding a test for root path in the appAaron Patterson2013-04-171-0/+24
|/ / /
* | | Don't need to add activerecord-deprecated_finders on edge and devRafael Mendonça França2013-04-171-3/+1
| | | | | | | | | | | | | | | | | | | | | applications This gem will not change often to explain it be included in the application Gemfile
* | | Bump activerecord-deprecated_finders to 1.0.0Rafael Mendonça França2013-04-171-1/+1
| | |
* | | Merge pull request #10249 from shime/descriptive_error_messagesPiotr Sarnacki2013-04-172-6/+8
|\ \ \ | | | | | | | | more descriptive error messages for class attributes
| * | | more descriptive NameError's messages for class attributesHrvoje Šimić2013-04-172-6/+8
|/ / /
* | | Merge pull request #10239 from rubys/cache_entry_conversion_problemsJeremy Kemper2013-04-162-52/+51
|\ \ \ | | | | | | | | switch (and lazily convert) ivar names to 3.x
| * | | switch (and lazily convert) ivar names to 3.xSam Ruby2013-04-162-52/+51
| | | |
* | | | Merge pull request #10173 from nashby/element-attributesRafael Mendonça França2013-04-163-1/+13
|\ \ \ \ | | | | | | | | | | options_from_collection_for_select helper takes html attributes
| * | | | options_from_collection_for_select helper takes html attributesVasiliy Ermolovich2013-04-113-1/+13
| | | | | | | | | | | | | | | | | | | | as the last element of the array
* | | | | let EXPLAIN use a thread locals registry [John J. Wang & Xavier Noria]Xavier Noria2013-04-165-46/+70
| |/ / / |/| | | | | | | | | | | Closes #10198.
* | | | fixes gemspecXavier Noria2013-04-161-1/+1
| | | |
* | | | Merge pull request #8206 from kennyj/fix_7619-2Rafael Mendonça França2013-04-163-3/+15
|\ \ \ \ | | | | | | | | | | Fix #7619. 0x prefix must be added when assigning hexadecimal string into bit column in Postgresql, because solving ambiguity.
| * | | | Fix #7619. 0x prefix must be added when assigning hexadecimal string into ↵kennyj2013-04-173-3/+15
|/ / / / | | | | | | | | | | | | bit column in Postgresql, because solving ambiguity.
* | | | Ruby On Rails -> Ruby on Rails [ci skip]Xavier Noria2013-04-161-1/+1
| | | |
* | | | Copy-edits in the ActiveSupport::Subscriber documentation.Rafael Mendonça França2013-04-161-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Thank you @fxn :green_heart::yellow_heart::heart::purple_heart::blue_heart: [ci skip]
* | | | Merge pull request #10218 from dasch/dasch/extract-subscriber-classRafael Mendonça França2013-04-163-43/+89
|\ \ \ \ | | | | | | | | | | Extract a Subscriber base class from LogSubscriber
| * | | | Extract a base class from ActiveSupport::LogSubscriberDaniel Schierbeck2013-04-163-43/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a ActiveSupport::Subscriber base class that LogSubscriber inherits from. By inheriting from Subscriber, other kinds of subscribers can take advantage of the event attachment system.
* | | | | editorial touch, remove these dotsXavier Noria2013-04-161-4/+4
| | | | |
* | | | | converts the project README to MarkdownXavier Noria2013-04-162-77/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We tend to use Markdown for everything but the API, the README is no longer used as the home page of the API after 7a5aa72, so we can now migrate it.