Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
This comparison is big! We’re only showing the most recent 250 commits
Commits on Oct 12, 2012
Tima Maslyuchenko learn ActiveRecord::QueryMethods#order work with hash arguments 633ea6a
@arturopie arturopie Fix small typo in development_dependencies_install
Fix small typo a link to bundler page in development_dependencies_install.md 
058ae7e
@bjnord bjnord Add .rake to `rake notes` and `rake notes:custom` 06129c0
@jonleighton jonleighton Merge pull request #7765 from insside/clever-order
learn ActiveReccord::Querying#order work with hash arguments
1cb7cb0
@rafaelfranca rafaelfranca Merge pull request #7919 from arunagw/warning_removed_shadowing
warning removed: shadowing outer local variable - value
1957687
@fxn fxn Merge pull request #7913 from mje113/master
MemCacheStore's move to dalli as a backend broke :race_condition_ttl support
168df24
@rafaelfranca rafaelfranca Merge pull request #7871 from bjnord/master
Support another file type .rake in `rake notes`
d08b89f
@rafaelfranca rafaelfranca Move the TestQueue tests to the proper file 08f57bf
@rafaelfranca rafaelfranca ActiveSupport::SynchronousQueue doesn't have the drain method.
Now we are using teh SynchronousQueue in the test environment instead of
the TestQueue
a284b14
@josh josh Split asset url helpers into seperate AssetUrlHelper 9fa1a54
@rafaelfranca rafaelfranca Merge pull request #7923 from josh/seperate-asset-tag-and-url-concerns
Split asset url helpers into seperate AssetUrlHelper
b62f51d
@josh josh Add asset_path and asset_url helpers bd38d9f
@senny senny trailling whitespace cleanup in query_methods.rb 7fc0519
@rafaelfranca rafaelfranca Merge pull request #7926 from senny/whitespace_cleanup
trailling whitespace cleanup in query_methods.rb [ci skip]
3e75369
@rafaelfranca rafaelfranca Merge pull request #7007 from Mik-die/hash_extract
make Hash#extract! more symmetric with Hash#slice
e68b97a
@jaimeiniesta jaimeiniesta Fix typos and clean up Getting Started guide 3e0be3a
@josh josh Refactor AssetUrlHelper to make it friendly for plugins and extensions
Add asset_path/url helper for a consolidated entry point
Expose compute_asset_path as a public API
Expose compute_asset_host as a public API
Move RAILS_ASSET_ID to its own module, AssetIdHelper
Removed AV::AssetPaths
1e2b0ce
@josh josh Ensure AssetUrlHelper can be mixed into AC::Base c3cff4d
@josh josh JAVASCRIPTS_DIR, STYLESHEETS_DIR, ASSETS_DIR don't even exist anymore dee3a19
@josh josh All asset url helpers should pass options aa493f0
@schneems schneems Prompt to run rake when accidentally typed rails
Developers from all levels will accidentally run rake tasks using the `rails` keyword when they meant to use `rake`. Often times beginners struggle with the difference between the tools. The most common example would be `$ rails db:migrate`

Rather than telling the developer simply that they did not use a valid rails command, we can see if it was a valid rake command first. If it is a valid rake command we can auto execute it giving the user a period of time to cancel if that isn't what they intended.

Here is what `rake db:migrate` would look like if you cancel the command:


```sh
$ rails db:migrate
Assuming you meant: $ rake db:migrate 
press any key to cancel in 3 seconds
> 
command terminated ...
```

Here is what it looks like if you don't cancel the command:

```sh
$ rails db:migrate
Assuming you meant: $ rake db:migrate 
press any key to cancel in 3 seconds
> 
Running: $ rake db:migrate 
==  Foo: migrating ============================================================
==  Foo: migrated (0.0000s) ===================================================
```
20385ec
@tenderlove tenderlove Speed up relation merging by reducing calls to Array#-
before:

Calculating -------------------------------------
                  ar        83 i/100ms
-------------------------------------------------
                  ar      832.1 (±4.0%) i/s -       4233 in   5.096611s

after:

Calculating -------------------------------------
                  ar        87 i/100ms
-------------------------------------------------
                  ar      839.0 (±9.3%) i/s -       4176 in   5.032782s

Benchmark:

require 'config/environment'
require 'benchmark/ips'

GC.disable

unless User.find_by_login('tater')
  u = User.new
  u.login = 'tater'
  u.save!
end

def active_record
  user = User.find_by_login('tater')
  starred = user.starred_items.count
end

active_record

Benchmark.ips do |x|
  x.report("ar") { active_record }
end
3a6dfca
@tenderlove tenderlove performance improvements to joins!
Before:

Calculating -------------------------------------
                  ar        87 i/100ms
-------------------------------------------------
                  ar      823.4 (±11.8%) i/s -       4089 in   5.070234s

After:

Calculating -------------------------------------
                  ar        88 i/100ms
-------------------------------------------------
                  ar      894.1 (±3.9%) i/s -       4488 in   5.028161s

Same test as 3a6dfca
db8dbe7
Commits on Oct 13, 2012
@josevalim josevalim Merge pull request #7891 from schneems/schneems/rake_command_warning
Prompt to run rake when accidentally typed rails
32b4d46
@jeremy jeremy Remove the queue container. Premature consolidation. Set up and maint…
…ain queues in the classes that use them instead.
7758298
@jeremy jeremy Tighten up asset precompile tests 1dc2ea8
@jeremy jeremy Backpedal from class-oriented config.queue. Set an actual queue insta…
…nce.
c8fe0d5
@josh josh Add a few more compute_asset_path tests 5dfeb1b
@josh josh Allow asset url config to be undefined 60a4fff
@AvnerCohen AvnerCohen 1.9 hash syntax changes a6ddc39
@jeremy jeremy Test that a Rails.queue consumer is automatically started in production 1fd8926
@leereilly leereilly Replace double quotes with single quotes 7891cbf
@rafaelfranca rafaelfranca Merge pull request #7935 from leereilly/minor-gemfile-twerk
Clean up Gemfile entry (replace double quotes with single quotes) [ci skip]
7cc6ee7
@patriciomacadden patriciomacadden Fix a silly typo 91222f6
@arturopie arturopie Update guides/source/contributing_to_ruby_on_rails.md
In this section we are actually updating 'my_new_branch'
a5d4e1c
@arturopie arturopie #7914 get default value when type uses schema name
PostgreSQL adapter properly parses default values when using multiple
schemas and domains.

When using domains across schemas, PostgresSQL prefixes the type of the
default value with the name of the schema where that type (or domain) is.

For example, this query:
```
SELECT a.attname, d.adsrc
FROM pg_attribute a LEFT JOIN pg_attrdef d
ON a.attrelid = d.adrelid AND a.attnum = d.adnum
WHERE a.attrelid = "defaults"'::regclass
AND a.attnum > 0 AND NOT a.attisdropped
ORDER BY a.attnum;
```

could return something like "'<default_value>'::pg_catalog.text" or
"(''<default_value>'::pg_catalog.text)::text" for the text columns with
defaults.

I modified the regexp used to parse this value so that it ignores
anything between ':: and \b(?:character varying|bpchar|text), and it
allows to have optional parens like in the above second example.
2da85ed
Commits on Oct 14, 2012
@arturopie arturopie #7914 Add change of previous commit to CHANGELOG.md 54b3f41
@arturopie arturopie #7914 Using a better way to get the defaults from db.
According to postgreSQL documentation:
(http://www.postgresql.org/docs/8.2/static/catalog-pg-attrdef.html)
we should not be using 'adsrc' field because this field is unaware of
outside changes that could affect the way that default values are
represented. Thus, I changed the queries to use
"pg_get_expr(adbin, adrelid)" instead of the historical "adsrc" field.
40475cf
@arturopie arturopie #7914 Remove code for unsupported postgreSQL version.
Remove parsing of character type default values for 8.1 formatting since
Rails doesn't support postgreSQL 8.1 anymore.

Remove misleading comment unrelated to code.
8fb841b
@rafaelfranca rafaelfranca Merge pull request #7937 from arturopie/7914-defaults-on-domains-and-…
…multiple-schemas

Fixes #7914 - PostgreSQL adapter doesn't fetch column defaults when using multiple schemas and domains
ca618d4
@vijaydev vijaydev Merge pull request #118 from patriciomacadden/master
Fix a typo in caching with rails guide
e320c0a
@NARKOZ NARKOZ remove 'then' from conditional statement ecee641
@jaimeiniesta jaimeiniesta Fix formatting on migrations guide 319fd4e
@jeremy jeremy Merge pull request #7943 from NARKOZ/patch-4
remove 'then' from conditional statement
1974911
@robin850 robin850 Use Ruby 1.9 Hash syntax in railties 5ad7f8a
@jeremy jeremy Merge pull request #7941 from robin850/master
Use 1.9 Hash syntax in railties
6338e1e
@jeremy jeremy The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now. 7b290ad
@jeremy jeremy Fix typo in #7941 4e8cf43
@IPGlider IPGlider Fix typo in inet and cidr saving 6f400da
@rafaelfranca rafaelfranca Merge pull request #7942 from IPGlider/master
Fix typo in inet and cidr saving
ae61c03
@acapilleri acapilleri refactoring of uniqueness validate_each
get scope_value only one time dependig on reflection
08927cf
@rafaelfranca rafaelfranca Merge pull request #7947 from acapilleri/uniqueness_validate
refactoring of uniqueness validate_each
a550a68
@AvnerCohen AvnerCohen Hash syntax to 1.9 style c615161
Commits on Oct 15, 2012
@steveklabnik steveklabnik Working With JavaScript guide.
Originally, this guide was called "AJAX on Rails," but really, it's
not just about AJAX. This was never finished, but it got accidentally
generated and Google found out about it.

In the meantime, all the guides were converted to markdown, as well.

So here's a new guide. It covers all of the built-in helpers that
use ajax requests, it covers CoffeeScript, and it covers UJS.
4d0c43e
@ccarruitero ccarruitero fix link bug in contributing page fe5f5d1
@ayrton ayrton Minor cleanup, helper method was only used once a0f97e4
@kryzhovnik kryzhovnik Removed useless "extend SanitizeHelper::ClassMethods"
Since SanitizeHelper includes ActiveSupport::Concern,
extending of it ClassMethods is no needed.
0b238e4
@spastorino spastorino Merge pull request #7952 from ayrton/minor_cleanup
Minor cleanup, helper method was only used once
2b4c3c8
@spastorino spastorino Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanup
Removed useless "extend SanitizeHelper::ClassMethods"
5225a93
@jeremy jeremy ruby-prof isn't compatible with ruby trunk after 36925 46dc6e7
@josh josh Just check request instead of controller.request e6451a5
@josh josh merge! default asset tag options 511382b
@josh josh :fire: Rails asset id support 3db6990
@josh josh Remove old asset_path from rails config 7dba159
@jaimeiniesta jaimeiniesta Fix formatting errors on the Active Record Validations and Callbacks …
…guide
b8dafa3
@josh josh Merge branch 'master' into asset-path-helper
Conflicts:
	railties/test/application/configuration_test.rb
c800e27
@josh josh Use sprockets-rails branch for now 8d7fc73
@josh josh Sprockets-rails branch 9d41238
@josh josh Extract compute_asset_extname and allow extname to be disabled 6601917
@josh josh Use sprockets-rails master eafc2b0
@rafaelfranca rafaelfranca Merge pull request #7927 from josh/asset-path-helper
Refactor AssetUrlHelper
046ab84
@tenderlove tenderlove Move two hotspots to use Hash[] rather than Hash#dup 02174a3
@tenderlove tenderlove buckets hash isn't public, so use symbol keys to avoid string
allocations
dc126cf
@josh josh Ignore asset url query string or anchor when appending extensions and…
… computing public path
c4276dd
@rafaelfranca rafaelfranca Merge pull request #7956 from josh/ignore-asset-url-query-or-anchor
Ignore asset url query string or anchor when generating path
4f44173
@tenderlove tenderlove use `setup` for setting up the test 081f0ad
@refractalize refractalize ActiveRecord: sum expression returns string '0' for no records, fixed 51d6e21
@tenderlove tenderlove Merge pull request #7439 from featurist/master
ActiveRecord: sum expression returns string '0' for no records, fixed
0a78417
@carlosantoniodasilva carlosantoniodasilva Move changelog entry from #7439 to the top [ci skip] d207a33
@josh josh Switch to new sprockets-rails plugin b8c7e31
Commits on Oct 16, 2012
@AvnerCohen AvnerCohen Moving code base to 1.9 hash syntax d761eab
@mdespuits mdespuits Adding reference a few Time and Date aliases
I originally contributed these aliases 10 months ago and just never got
it added to the Rails 4.0 release notes. Here they are.
13cdfac
@spastorino spastorino Merge pull request #7958 from mattdbridges/rails-guides-active-suppor…
…t-addition

Adding reference a few Time and Date aliases in Rails 4.0 release notes
d1fb675
@fxn fxn Revert "remove unnecessary object/conversions file"
This file is used at least by Active Merchant, its existence
is maybe not necessary but no big deal either.

This reverts commit ae9b3d7.
74bf8af
@arunagw arunagw redcarpet gem will not work with JRuby! ea14e76
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7963 from arunagw/redcarpet_not_for_jruby
Add :platform to redcarpet gem, pointing to :ruby only.
12a0383
@csmuc csmuc Call super to nullify the reference to the original errors object in …
…the dup'ed object (call ActiveModel::Validations#initialize_dup). Closes #7291
fb66521
@spastorino spastorino Merge pull request #7371 from csmuc/fix_dup_validation_errors
Dup'ed ActiveRecord objects may not share the errors object
c432c74
@josh josh Only compile non-js/css under app/assets by default 117d5e3
Commits on Oct 17, 2012
@scottwillson scottwillson Fix bug with presence validation of associations.
Would incorrectly add duplicated errors when the association was blank. Bug introduced in 1fab518.
25262bc
@rrmartins rrmartins Change with start of translation in internationalization, this time w…
…ith pt_br.
09682e9
@rrmartins rrmartins divided into folder with the language f5b9ed4
@josevalim josevalim Merge pull request #7972 from scottwillson/fix-double-presence-of-err…
…ors-2

Fix bug with presence validation of associations.
bf876af
@jaimeiniesta jaimeiniesta Fix typos in Association Basics guide 701bd83
Rafael Mendonça França Revert "divided into folder with the language"
This reverts commit f5b9ed4.

REASON: Translation work can not be done in the docrails repository
9eeb009
Rafael Mendonça França Revert "Change with start of translation in internationalization, thi…
…s time with pt_br."

This reverts commit 09682e9.

Conflicts:
	guides/source/en/association_basics.md

REASON: Translation work can not be done in the docrails repository
759e797
@tenderlove tenderlove use the tmp filesystem rather than our own thing. d410ac5
@tenderlove tenderlove fix Digestor to be thread safe.
Add a lock on the cache so that we don't have concurrency issues when
calculating the cache.
01149dd
@tenderlove tenderlove use columns hash to look up the column for the count field e06c06d
@tenderlove tenderlove remove unused variables. Oops! 506e266
Commits on Oct 18, 2012
@rafaelfranca rafaelfranca Add CHANGELOG entry for #7927
Removed the asset_path configuration from the guides and added an entry
in the upgrading_ruby_on_rails guide

[ci skip]
e627834
@rafaelfranca rafaelfranca Add more CHANGELOG entries from #7927
Also remove references for RAILS_ASSET_ID from the guides

[ci skip]
d7f8b2a
@rafaelfranca rafaelfranca Merge pull request #7964 from josh/josh-sprockets-rails
Switch to new sprockets-rails plugin
f4c6ecc
@rafaelfranca rafaelfranca Merge pull request #7968 from josh/only-precompile-app-assets-by-default
Only compile non-js/css under app/assets by default
0dfebbc
@josh josh Add changelog entry for precompile config a3913ca
@josh josh Change back to official sprockets-rails d88b65f
@rafaelfranca rafaelfranca Typecast to string and array are not supported in multiparameter
attributes
ae7f109
@rafaelfranca rafaelfranca Permit string and float values in the multiparameter attributes 0c3ca0f
@rafaelfranca rafaelfranca Now the Sprockets railtie lives in sprockets/railtie fc32ff4
@senny senny cleanup, replace non-breaking spaces with spaces f00b33e
@senny senny active_model/validations requires necessary files to run a06012c
Francesco Rodriguez remove non-breaking spaces [ci skip] f12244b
Francesco Rodriguez remove some non-breaking spaces [ci skip] f069ec1
@Grandrath Grandrath Don't use test environment by default when running rake db:structure:…
…load; #7951

`ENV['RAILS_ENV']` is not defined unless explicitly specified on the
command line when running `rake db:structure:load`.
5042eda
@rafaelfranca rafaelfranca Merge pull request #7969 from senny/active_model_validations_requires…
…_necessary_files

active_model/validations requires necessary files to run
c1e080d
@mrbrdo mrbrdo add credit to committer of pull request #6569 a774354
@rafaelfranca rafaelfranca Merge pull request #7990 from mrbrdo/master
Credit for previous commit [ci skip]
55d153e
@butcher butcher Extend date_select helper functionality. a48ef9b
@rafaelfranca rafaelfranca Fix the app_generator and plugin_new tests 12fb937
@rafaelfranca rafaelfranca Don't use action_controller.perform_caching to enable rack-rack.
Setting the action_dispatch.rack_cache options to true or a hash should
be the way to enable it.
90733e7
@rafaelfranca rafaelfranca Remove warning setting eager_load ff79df0
@rafaelfranca rafaelfranca Merge pull request #7975 from butcher/extend_date_select_helper_funct…
…ionality

Extend date_select helper functionality.

Conflicts:
	actionpack/CHANGELOG.md
11acaa1
Francesco Rodriguez add a nested attributes example into Strong Parameters documentation …
…[ci skip]
2834454
@tenderlove tenderlove some ruby interpreters don't have ruby-prof so just skip the tests
rather than exiting the process.
4f106bb
@thedarkone thedarkone Make DescendantsTracker thread safe and optimize the #descendants met…
…hod.
9f84e60
@tenderlove tenderlove fix assertions a3ad0a7
@acoffman acoffman Change 'branches' to 'branch' [ci skip] d774f4c
@tenderlove tenderlove prefer composition over inheritence 6ea781c
@tenderlove tenderlove add test for fetch with a block b2debfb
@tenderlove tenderlove move cache inside the instance so we do not need locking 13655a4
@tenderlove tenderlove eagerly populate the http method loookup cache so we don't need locks 872d8c3
@thedarkone thedarkone There is already a Set of non-hidden action_names lying around. 7cc5bf5
@tenderlove tenderlove initialize required instance variables for this mixin 210c841
@tenderlove tenderlove if no filters are supplied, default to an empty list 57d3817
@tenderlove tenderlove simplify filter enabled checking c6c6ffb
Commits on Oct 19, 2012
@tenderlove tenderlove prevent people from accidentally modifying the filter word 6c3166a
@tenderlove tenderlove nil isn't a valid filter be9fc77
@tenderlove tenderlove move compiled filters to their own class so that recursive calls don't
need to check for the length of @filters
79e91cc
@tenderlove tenderlove keep a singleton filter around that we can use when no filter is set 481f30e
@tenderlove tenderlove oops, forgot the default parameter 73de222
@tenderlove tenderlove add another singleton for environment filtering 8654f8c
@tenderlove tenderlove synchronize on param filter cache.
Do we actually need this cache?
0d7b0f0
Francesco Rodriguez remove assert_valid method from testing guide [ci skip] feb9c5f
@dogweather dogweather Corrected the logic in production.rb comment. b83e0c3
@jonleighton jonleighton Add Relation#find_or_create_by and friends
This is similar to #first_or_create, but slightly different and a nicer
API. See the CHANGELOG/docs in the commit.

Fixes #7853
eb72e62
@jonleighton jonleighton The default value of a text/blob in mysql strict mode should be nil
In non-strict mode it is '', but if someone is in strict mode then we
should honour the strict semantics.

Also, this removes the need for a completely horrible hack in dirty.rb.

Closes #7780
af8c8b4
@jonleighton jonleighton fix test :/ 45d585e
@jonleighton jonleighton nodoc the first_or_create methods and document alternatives 0096f53
@shime shime better examples in ActiveModel readme 2d2c823
@shime shime include serializers in ActiveModel::Serialization example aee07fe
@jonleighton jonleighton Rename the partial_updates config to partial_writes
This reflects the fact that it now impact inserts as well as updates.
7efb1fe
@carlosantoniodasilva carlosantoniodasilva Update rails gemspec to use sprockets-rails 2.0.0.rc1
So that we can bundle and travis can run our tests.
18e979e
Francesco Rodriguez truncate debug.log on each test run 98043c6
@jonleighton jonleighton Get rid of the ActiveRecord::Model::DeprecationProxy thing.
I think it's going to be too much pain to try to transition the
:active_record load hook from executing against Base to executing
against Model.

For example, after Model is included in Base, and modules included in
Model will no longer get added to the ancestors of Base.

So plugins which wish to be compatible with both Model and Base should
use the :active_record_model load hook which executes *before* Base gets
loaded.

In general, ActiveRecord::Model is an advanced feature at the moment and
probably most people will continue to inherit from ActiveRecord::Base
for the time being.
8384683
@rafaelfranca rafaelfranca Merge pull request #7994 from frodsan/truncate_debug_log
truncate debug.log on each test run
2268859
@elpic elpic ActiveRecord Callbacks ordering examples d4db095
@yahonda yahonda Revert "truncate debug.log on each test run"
This reverts commit 98043c6.

Because if every time `debug.log` is truncated,
developers have no way to see the previous ActiveRecord unit test results.
`debug.log` file can be easily reduced
by executing `$ touch /dev/null > debug.log` periodically.
048866a
@rafaelfranca rafaelfranca Merge pull request #7996 from yahonda/revert_7994
Revert "truncate debug.log on each test run"

I'm reverting this since we may want to see SQL results of subsequent tests run, to, per example, copare them.

I didn't realized this first time but @yahonda pointed me out.
86df55e
@steveklabnik steveklabnik Add i18n scope to disance_of_time_in_words.
This fixes #733.
e22e785
@rafaelfranca rafaelfranca Merge pull request #7997 from steveklabnik/issue_733
Add i18n scope to disance_of_time_in_words.
c50de96
Commits on Oct 20, 2012
@adimichele adimichele Changed scope for "taken" error message translation to decrease prece…
…dence

Moved activerecord.errors.messages.taken to errors.messages.taken so that translations for, e.g., errors.attributes.email.taken don't get overridden.

Test that the translation for 'taken' can be overridden
f48b7cc
@rafaelfranca rafaelfranca Merge pull request #7995 from adimichele/master
Small change to active_record/locale/en.yml
5341b84
@rafaelfranca rafaelfranca We don't need this anymore since we had a sprockets-rails release bfc6c17
@carlosantoniodasilva carlosantoniodasilva Merge pull request #7951 from Grandrath/patch-1
Use `Rails.env` instead of `ENV['RAILS_ENV']`.
Fix behavior of `rake db:structure:load`.
c869ce0
@AvnerCohen AvnerCohen Hash Syntax changes to 1.9 format 71c67d1
@jeremy jeremy Revert "Get rid of the ActiveRecord::Model::DeprecationProxy thing."
This reverts commit 8384683.
4ed1563
@nashby nashby check_box value can be not only an object of Array class
there is a chance that `value` is a Set or an object that reponses to `include?` method so let's handle this case
3ee6bcf
@rafaelfranca rafaelfranca Merge pull request #8002 from nashby/checkbox-include
check_box value can be not only an object of Array class
3be9e8a
@rafaelfranca rafaelfranca Rotate the debug.log on each 100MB 64391cd
Commits on Oct 21, 2012
Francesco Rodriguez nodoc AR::Generators [ci skip] 19a2673
Francesco Rodriguez update AR::AttributeMethods documentation [ci skip] aceb4a5
Francesco Rodriguez minor edits in AM documentation [ci skip] c9a88a2
@fxn fxn Merge pull request #7493 from steveklabnik/ajax_guide
Re-writing the AJAX Guide
cec66e5
@vijaydev vijaydev copy edits [ci skip] e842813
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	activesupport/lib/active_support/core_ext/hash/slice.rb
	guides/source/active_support_core_extensions.md
f938019
@vijaydev vijaydev fix a couple of typos in the js guide [ci skip] 676ee78
@GRoguelon GRoguelon Remove extra line in Gemfile under turbolinks. 1f74315
@rafaelfranca rafaelfranca Merge pull request #8006 from GRoguelon/master
Remove extra line in Gemfile generated
8059b82
Commits on Oct 22, 2012
@rafaelfranca rafaelfranca Add tests to make sure that the I18n taken message can be overrided i…
…n the

activerecord scope.

Related with 5341b84
78adc45
@tenderlove tenderlove frozen state should be restored after txn is aborted 4049643
Commits on Oct 23, 2012
@noahhendrix noahhendrix pass the key to the block in cache.fetch on misses 81b7112
Tima Maslyuchenko changed test case name ff29dd8
@rafaelfranca rafaelfranca Merge pull request #8014 from insside/task-test-typos
changed test case name
a5744f0
@fxn fxn adds Rails to the title of the JS guide [ci skip] c145f35
@fxn fxn renames the JS guide file name to match the new title [ci skip] 69e9715
@fxn fxn JS guide: AJAX -> Ajax
We discussed this on Twitter, seems to be the best option.
8c38172
@fxn fxn registers the JS guide in the CHANGELOG [ci skip] c3d4fc4
@fxn fxn JS guide: applies guides casing guidelines for titles [ci skip] 9d66c40
Commits on Oct 24, 2012
@noahhendrix noahhendrix make the cache test more @tenderlove(ing) and not depend on internal …
…implentation
96f5cea
@ugisozols ugisozols Fix incorrect markdown by removing extra space. 1a6b082
@rafaelfranca rafaelfranca Merge pull request #8021 from ugisozols/master
Fix incorrect markdown by removing extra space. [ci skip]
1582100
Commits on Oct 25, 2012
@tenderlove tenderlove Merge pull request #8013 from noahhendrix/master
Pass key to block in cache.fetch on miss
f5ae64d
@tenderlove tenderlove fix uninitialized ivar warnings 6033e8a
@tenderlove tenderlove do not lose backtrace information from the raised exception facd3e8
@tenderlove tenderlove give access to the original exception raised in case of a parse error cde326b
@tenderlove tenderlove remain backwards compatible, exception can be constructed with no arg…
…uments
59a53f4
@calebthompson calebthompson Fix gratuitous use of ternary operator 3d3fd39
@rafaelfranca rafaelfranca Merge pull request #8030 from calebthompson/fix-ternary
Fix gratuitous use of ternary operator
ca3b429
Commits on Oct 26, 2012
Vinny Diehl Update redcarpet dependency
"~> 2.2.2" from "~> 2.1.1". Also converted all hash rockets in the
Gemfile to the 1.9 syntax.
cadff7b
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8031 from gbchaosmaster/redcarpet-2.2.2
Update redcarpet dependency
91c5af4
@jeremy jeremy Add missing require for minitest assertions. Breaks calling 'app' in …
…console otherwise. See 94248ff.
a27b517
@jonleighton jonleighton Remove ActiveRecord::Model
In the end I think the pain of implementing this seamlessly was not
worth the gain provided.

The intention was that it would allow plain ruby objects that might not
live in your main application to be subclassed and have persistence
mixed in. But I've decided that the benefit of doing that is not worth
the amount of complexity that the implementation introduced.
9e4c41c
@jeremy jeremy Remove REE GC stats since master is 1.9.3 00791bf
@carlosantoniodasilva carlosantoniodasilva Remove ActiveRecord::Model consant from AS::TestCase
Fixing the build.
7c7a225
@carlosantoniodasilva carlosantoniodasilva Remove ActiveRecord::Model entry from 4.0 Release Notes [ci skip] d200cb9
@jonleighton jonleighton remove unused config option 6ac33f9
@dgraham dgraham Implement replace method so key? works correctly. f38e752
@rafaelfranca rafaelfranca Merge pull request #7971 from dgraham/hash-replace
Implement HashWithIndifferentAccess#replace so key? works correctly.
f078f91
@veader veader Decode attributes pulled from URI.parse
The RFC indicates that username and passwords may be encoded.
http://tools.ietf.org/html/rfc2396#section-3.2.2

Found this trying to use the mysql://username:password@host:port/db and having special characters in the password which needed to be URI encoded.
f96b410
@rafaelfranca rafaelfranca Merge pull request #7593 from veader/patch-1
Decode attributes pulled from URI.parse
35f2a09
Vinny Diehl Organize README
* Organized code status badges into a "Code Status" section.
* Moved the OSI MIT License link inline (bullets are for unordered
  lists).
* Removed all EOL whitespace.

[ci skip]
c195aed
@jeremy jeremy Job worker thread logs to stderr if no logger is provided 411378e
@jeremy jeremy Job worker thread logs failed jobs too 26f52b2
@jeremy jeremy Job consumer logs to Rails.logger by default bf2009f
Commits on Oct 27, 2012
@jeremy jeremy Fix queueing tests that should be consuming the queue rather than dra…
…ining it
b794440
Francesco Rodriguez AM::Serializers::Xml depends on AM::Naming 0703295
Francesco Rodriguez fix AM::Serializers titles [ci skip] 10d9cb2
@jeremy jeremy Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency
Fix AM::Serializers::Xml dependency
94f6b3d
Francesco Rodriguez fix failing isolated tests df2b60c
@jeremy jeremy Merge pull request #8040 from frodsan/fix_build_isolated
fix failing isolated tests in activemodel
67166c4
@senny senny cleanup, remove trailing whitespace within actionpack 4d7f533
@rafaelfranca rafaelfranca Merge pull request #8043 from senny/remove_trailing_whitespace_in_act…
…ionpack

remove trailing whitespace within actionpack [ci skip]
f3807a8
@rafaelfranca rafaelfranca Add the Working with JavaScript Guides in the guides home as WIP e3dad96
@fxn fxn Merge pull request #8034 from gbchaosmaster/readme-format
Organize README
028f29d
@rafaelfranca rafaelfranca Improve the deprecation message of link_to_function and
button_to_function

Point the the Unobtrusive JavaScript secion in the JavaScript guide
a4c3d5a
@pwnall pwnall Use the MySQL varbinary type when appropriate in migrations. 5d30e44
@rafaelfranca rafaelfranca Merge pull request #7960 from pwnall/mysql_varbinary
Use the MySQL varbinary type when appropriate in migrations
51adec3
@rafaelfranca rafaelfranca USe the released version of sprockets-rails in a new Rails 4 application 2e44dda
@pmahoney pmahoney Replace flow-control exception with explicit test.
It was noticed while profiling 'assets:precompile' in JRuby that
exception creation was consuming a large portion of time, and
some of that was due to File.atomic_write.

Testing first with File.exists? eliminates the need for an exception
which should be a perfomrance improvement on both JRuby and MRI.
In this case, the stat() isn't even extra overhead, since it is always
called.
8d0efcc
Commits on Oct 28, 2012
@bashmish bashmish fix typo in button_to helper example 3b76725
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8050 from bashmish/master
fix typo in button_to helper example [ci skip]
66033a9
@carlosantoniodasilva carlosantoniodasilva Add backticks around link_to example in javascript guide [ci skip] f47026e
@carlosantoniodasilva carlosantoniodasilva Add syntax highlight to code blocks in javascript guide [ci skip] 94aadf7
@schneems schneems Don't log on pending migration check
Conversation from: #6665 cc/ @rafaelfranca
0fbdddd
@rafaelfranca rafaelfranca Merge pull request #8052 from schneems/schneems/silence-ar-query-in-m…
…iddleware

Don't log on pending migration check
e46a8d8
Francesco Rodriguez AR::AttributeMethods#[] raises AM::AttributeMissingError for missing …
…attributes.

This fixes the following behaviour:

    class Person < ActiveRecord::Base
      belongs_to :company
    end

    # Before:
    person = Person.select('id').first
    person[:name]       # => nil
    person.name         # => ActiveModel::MissingAttributeError: missing_attribute: name
    person[:company_id] # => nil
    person.company      # => nil

    # After:
    person = Person.select('id').first
    person[:name]       # => ActiveModel::MissingAttributeError: missing_attribute: name
    person.name         # => ActiveModel::MissingAttributeError: missing_attribute: name
    person[:company_id] # => ActiveModel::MissingAttributeError: missing_attribute: company_id
    person.company      # => ActiveModel::MissingAttributeError: missing_attribute: company_id

Fixes #5433.
10f6f90
@rafaelfranca rafaelfranca Merge pull request #8056 from frodsan/fix_issue_missing_attribute
AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes
c82f0d7
@senny senny refactor `SQLite3Adapter#copy_table` to prevent primary key redefinit…
…ions. #6378
b104157
@senny senny raise `ArgumentError` when redefining the primary key column. Closes #… e4790a2
@senny senny Do not render views when mail() isn't called. (NullMail refactoring) b786f06
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8054 from senny/6378_create_table_raises_when_def…
…ining_pk_column

create_table raises an ArgumentError when the primary key is redefined.
ed80dd7
@carlosantoniodasilva carlosantoniodasilva Fix some assert_raise calls containing messages in Active Support d46f9e3
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8047 from arunagw/json_only_in_18
Removing JSON for other ruby
a698175
@rafaelfranca rafaelfranca Merge pull request #8048 from senny/7761_dont_render_view_without_mai…
…l_call

Do not render views when mail() isn't called. (NullMail refactoring)
a273b6b
@rafaelfranca rafaelfranca Merge pull request #8046 from pmahoney/exceptions_as_flow_control
Replace flow-control exception with explicit test.
5bbe245
@henrik henrik Enable update_column(s) for the primary key attribute.
Didn't work before because it updated the model-in-memory first, so the DB query couldn't find the record.
1849665
@carlosantoniodasilva carlosantoniodasilva Merge pull request #8053 from henrik/update_columns_with_primary_key
Unbreak update_column/update_columns for the primary key attribute.
c6f47c1
@xuanxu loaded relations cannot be mutated by extending! 35ca953
@xuanxu ActiveRecord::Relation#none! method. 300d080
@rafaelfranca rafaelfranca Merge pull request #7750 from xuanxu/none_modificating_relation_in_place
Added ActiveRecord::Relation#none! method
852e376