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 Mar 20, 2013
@vipulnsward vipulnsward Fix some typos in AR- CHANGELOG, tests, method doc. fixed abd89f9
@gufo gufo Fix broken ActionController#action_missing
A recent change introduced the assumption that all controller actions
are known beforehand, which is not true when using action_missing.
0dfa6cb
@rShetty rShetty Fix a typo b0f7278
@vijaydev vijaydev Merge pull request #9825 from rShetty/patch-1
Fix a typo
eda3908
@vijaydev vijaydev Merge pull request #9821 from vipulnsward/fix_typos_in_AR
Fix some typos in AR- CHANGELOG, tests, method doc. fixed
c81dc8e
@anupamc anupamc Properly named variable inside block
Closes #9824.
9d8ac71
@anupamc anupamc Removed unnecessary block 5f7c351
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9833 from choudhuryanupam/fix_active_schema_test
Removed unnecessary block
acb78c2
@trevorturk trevorturk Tweak exception message to avoid giving potentially misleading sugges…
…tions
1a25ebf
@tenderlove tenderlove Revert "default the reaping frequency to 10 seconds"
mysql can't handle a parallel thread pinging the connection, so we can
get wrong results or segvs

This reverts commit 7cc588b.
7150a9d
@tenderlove tenderlove use `connect_poll` on pg so that reaping does not hurt the connection 34c7e73
@Intrepidd Intrepidd Tidying up some require : removing useless sort and homogenizing with…
… the rest of the code the wat the includes are done
9c025ab
@kjg kjg Don't generate a scaffold.css if no-assets 2e5f49d
@iangreenleaf iangreenleaf Update other counter caches on destroy 66679c8
@guilleiguaran guilleiguaran Merge pull request #9837 from kjg/no_scaffold_css_when_no_assets
Don't generate a scaffold.css when --no-assets is specified
f73c52c
@rafaelfranca rafaelfranca Merge pull request #9802 from newsline/fix-broken-action-missing
Fix missing action_missing

Conflicts:
	actionpack/CHANGELOG.md
066907d
@jeremy jeremy Merge pull request #7706 from iangreenleaf/multiple_counter_caches
Update other counter caches on destroy
70d0537
Commits on Mar 21, 2013
@vipulnsward vipulnsward Fix copy table index test; Change == to ! on false in travis.rb 5b673f3
@charliesome charliesome Add version method to top level modules c07e151
@charliesome charliesome remove references to *::VERSION, replace with *.version f0e6ab5
@rafaelfranca rafaelfranca Merge pull request #9847 from vipulnsward/fix_sqlite_test
Fix copy table index test; Change == to ! on false in travis.rb
b1b9de3
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9836 from Intrepidd/tidy-require
Tidying up some require and removing overhead caused by sorting
34d9aed
@prathamesh-sonpatki prathamesh-sonpatki Added link to Turbolinks Railscast b9b8b24
@prathamesh-sonpatki prathamesh-sonpatki Using American English spellings over British style spellings 573df1c
@wangjohn wangjohn Adding a bang to method name of raise_on_type_mismatch. 53b76c1
@ma2gedev ma2gedev Remove duplicated accepts_nested_attributes description
there are just the same description about accepts_nested_attributes [ci skip]
6f9baae
@rafaelfranca rafaelfranca Merge pull request #9853 from wangjohn/adding_bang_to_raise_method
Adding a bang to method name of raise_on_type_mismatch.
ecfdc84
Alexander Murmann and Can Berk Güder Allows setting fixture_path to a Pathname 018fc5f
@jeremy jeremy Merge pull request #9861 from pivotalcommon/master
Allow fixture_path to be a Pathname
a7391f5
Commits on Mar 22, 2013
@robertomiranda robertomiranda Change Standard error when is required bcrypt-ruby and fails 7e07b7b
@guilleiguaran guilleiguaran Merge pull request #9863 from robertomiranda/require-bcrypt-ruby
Change Standard error when is required bcrypt-ruby and fails
0d3cb00
@cpg cpg fix the initializer block example and clarify
clarify that the contents of the block is expected to return a string. the previous example executed puts and the initializer got nothing.

also, made it consistent with the single-line example to be more clear as to what's going on
18f9d46
@anupamc anupamc Removed unused loop variable ae41ca8
@vipulnsward vipulnsward Add Error#full_message test; Fix typos
Introduce test on Error#full_message for attribute with underscores; Fix
some typos
24fee97
@jonleighton jonleighton Delete failing test
I don't think this is testing anything useful, and the test code is
exceedingly brittle. It is broken since
34c7e73 because the test code makes
assumptions about the implementation of PostgreSQLAdapter#active? which
are incorrect after the commit.

I could fix this test but it would be even more brittle (by stubbing the
underlying @connection.connect_poll) and it doesn't test any complex
logic. I conclude that it's not worth it.
79c02e8
@jonleighton jonleighton Send SIGTERM, not SIGQUIT.
SIGTERM is the correct signal for a graceful exit.

This will hopefully resolve #9761.
7748d64
@carsonmcdonald carsonmcdonald Fix typo
[ci skip]
6645dc3
@anupamc anupamc Removed unnecessary block c989073
@metaskills metaskills Add minitest-spec-rails to guide's testing options 5be6122
@route route When we pass id to update_attributes it will try to set new id for th…
…at record
89828a4
@jonleighton jonleighton Merge pull request #9707 from route/updates_another_record
When strong_parameters had been included, this case of update became possible
a1d0b8c
@arunagw arunagw StringIO is not required by default in JRuby 28afe45
@senny senny test-case to prevent resetting associations when preloading twice.
Conflicts:

	activerecord/lib/active_record/associations/preloader/through_association.rb
	activerecord/test/cases/associations/eager_test.rb
22a819a
@jonleighton jonleighton Merge pull request #9872 from senny/test_case_to_prevent_unnecessary_…
…reset

test-case to prevent resetting associations when preloading twice.
d8d6dad
@jonleighton jonleighton Don't kill the console
Use the "quit" command instead. This seems to prevents some weirdness on
OS X. See #9761.
c91789c
@guilleiguaran guilleiguaran Merge pull request #9871 from arunagw/stringio-require-jruby
StringIO is not required by default in JRuby
f34c226
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9867 from choudhuryanupam/fix_mysql2_active_schem…
…a_test

Removed unnecessary block
39c26bc
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9866 from choudhuryanupam/fix_connection_test
Removed unused loop variable
d24fb61
@carlosantoniodasilva carlosantoniodasilva Remove exception variable from rescue block
Just raising from the rescue block will re-raise the exception, so the
variable is not necessary.
a03ab8c
@tenderlove tenderlove remove knowledge of SQL from the column definition object 69ef76a
@tenderlove tenderlove stop depending on sql_type in pg 4b4c8bd
@tenderlove tenderlove decouple column definition from the database connection cd07f19
@tenderlove tenderlove remove to_sql from TableDefinition 1c9f7fa
@tenderlove tenderlove mostly decouple TableDefinition from the database connection a80bcc3
@tenderlove tenderlove push SQL generation inside the schema creation object 14d7dc0
@tenderlove tenderlove factory methods should not alter object state a724096
@tenderlove tenderlove keep ivars private, do not manipulate them outside their owner object c5e03e8
@tenderlove tenderlove @columns list is no longer necessary b8a533d
@tenderlove tenderlove push column initialization down to the factory method d43edf6
@tenderlove tenderlove there is no reason to check for an already defined column f84cf41
@tenderlove tenderlove push alter table add column sql in to the schema modification visitor f20b2f4
@tenderlove tenderlove add a pg visitor for dealing with schema modification 6b7fdf3
@tenderlove tenderlove pull add_column_options! off the pg connection class 072dbbf
@tenderlove tenderlove allow multiple add columns 739a720
@tenderlove tenderlove push the mysql add_column up to the abstract adapter 2ac300b
Commits on Mar 23, 2013
@tenderlove tenderlove separate primary key from column type d25e407
@tenderlove tenderlove add uuid primary key support bc8ebef
@tenderlove tenderlove squelch an unused variable warning db3a6e6
@tenderlove tenderlove Merge branch 'schema'
* schema:
  add uuid primary key support
  separate primary key from column type
  push the mysql add_column up to the abstract adapter
  allow multiple add columns
  pull add_column_options! off the pg connection class
  add a pg visitor for dealing with schema modification
  push alter table add column sql in to the schema modification visitor
  there is no reason to check for an already defined column
  push column initialization down to the factory method
  @columns list is no longer necessary
  keep ivars private, do not manipulate them outside their owner object
  factory methods should not alter object state
  push SQL generation inside the schema creation object
  mostly decouple TableDefinition from the database connection
  remove to_sql from TableDefinition
  decouple column definition from the database connection
  stop depending on sql_type in pg
  remove knowledge of SQL from the column definition object
7a872e9
@prathamesh-sonpatki prathamesh-sonpatki Fixed typo : contraints -> constraints 12cecdd
@wangjohn wangjohn Refactoring validate_missing_parameters to validate_required_parameters. 3650edf
@prathamesh-sonpatki prathamesh-sonpatki Fixed typos in activerecord CHANGELOG 14ce0c6
@prathamesh-sonpatki prathamesh-sonpatki Spelling 'PostgreSQL' correctly d543394
@rafaelfranca rafaelfranca Merge pull request #9883 from prathamesh-sonpatki/AR-Typos
Fixed typos in activerecord CHANGELOG
dd271ff
@zzak zzak Don't use hash fragment for travis link 3cfbee6
@rafaelfranca rafaelfranca Merge pull request #9888 from zzak/patch-1
Don't use hash fragment for travis link
246dc17
@rafaelfranca rafaelfranca Autoload the AlterTable class 6ff36de
@rafaelfranca rafaelfranca Merge pull request #9880 from wangjohn/refactoring_attribute_assignment
Refactoring validate_missing_parameters to validate_required_parameters.
727e286
@rafaelfranca rafaelfranca Review some CHANGELOG entries [ci skip] 4e363b1
@rafaelfranca rafaelfranca Fix documentation markup [ci skip] 9e8b7d9
Neeraj Singh unscoped works with named scope [ci skip]
Update comment to reflect that unscoped works with named scope
even when named scope is using without block form
a1a2951
@prathamesh-sonpatki prathamesh-sonpatki Changed 'args' to 'arguments' when used in places other than code wit…
…h fixing few more typos
d45145a
Neeraj Singh enhance unscoped tests
Make it obvious that using unscoped with another scope
without the block works
36a4523
@rafaelfranca rafaelfranca Merge pull request #9889 from neerajdotname/unscoped
Unscoped works with other named scope even without block form
bad0b81
@prathamesh-sonpatki prathamesh-sonpatki Reverted code change introduced in d45145a 49760c1
@rafaelfranca rafaelfranca Better styles for the CSS [ci skip] 93c498b
@prathamesh-sonpatki prathamesh-sonpatki Reverted change in activemodel/CHANGELOG.md introduced by d45145a 33d1e37
@prathamesh-sonpatki prathamesh-sonpatki Fixed typo in activemodel/CHANGELOG 5f59317
@prathamesh-sonpatki prathamesh-sonpatki Changed 'args' to 'arguments' in test description ba7c9d7
@rafaelfranca rafaelfranca Merge pull request #9890 from prathamesh-sonpatki/CL-Typos
activemodel/CHANGELOG typo and change in test description
8641467
@doabit doabit Custom index type support with :using. 8094156
@rafaelfranca rafaelfranca Merge pull request #9891 from doabit/additional_index_support
Custom index type support with :using.

Closes #9451
31388fa
@jlxw jlxw Fix regex to strip quotations from hstore values
Previously regex did not strip quotation marks where hstore values were multi-line strings.
2c93048
@rafaelfranca rafaelfranca Merge branch 'jlxw-patch-2'
Closes #9184
e96fa89
Commits on Mar 24, 2013
@charliesome charliesome add changelog entry 8f05fee
@rafaelfranca rafaelfranca Merge pull request #8501 from charliesome/version-to-s
Add #to_s method to VERSION modules
e600384
@robertomiranda robertomiranda Ignore pkg folders 9c940e5
@rafaelfranca rafaelfranca Merge pull request #9897 from robertomiranda/ignore-pkg-folders
Ignore pkg folders
c3e2f3d
@renchaorevee renchaorevee Typo: Migration class name would use plural a2bb672
@guilleiguaran guilleiguaran Ignore all pkg folders (including also top level one) abcdafe
@guilleiguaran guilleiguaran Use jquery-rails from github (fix Gem::Version error) 6f3f0f8
@guilleiguaran guilleiguaran Fix test: ActiveSupport.version is returning now a Gem::Version inste…
…ad of a String
1f1adb8
@amatsuda amatsuda s/app\/model\//app\/models\//g 9a5d428
@shockone shockone Add a method full_messages_for to the Errors class ec1b715
@prathamesh-sonpatki prathamesh-sonpatki view/views, asset/assets 64dc614
@xiaods xiaods correct test command's typo 11c5883
@xiaods xiaods correct some typo in earlier commit. 5d5ade2
@vipulnsward vipulnsward Fix some typos a8df5bd
@robertomiranda robertomiranda Fix update_version_rb task 7142e92
@vijaydev vijaydev Merge pull request #9901 from vipulnsward/fix_some_typos
Fix some typos
0c7a283
@guilleiguaran guilleiguaran Merge pull request #9902 from robertomiranda/fix-release-task
Fix update_version_rb task
d28247b
@rubys rubys Use jquery-rails from github 7a9a700
Albert Lash Updated docs due to removal of serializer accessor 0788d35
@guilleiguaran guilleiguaran Merge pull request #9904 from rubys/jquery-rails-github
Use jquery-rails from github
b78f77f
@vipulnsward vipulnsward fix some typos 0db928a
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9905 from docunext/master
ActiveSupport::MessageVerifier: Updated docs due to removal of serializer accessor
2cc3648
@jeremy jeremy Merge pull request #9704 from trevorturk/warn-about-skipped-routes
Raise an ArgumentError when a clashing named route is defined
822dd13
@jeremy jeremy Merge pull request #9489 from obrie/fix/overridden_defaults_changed_a…
…ttributes

Fix ActiveRecord locking column defaults not getting persisted
558f320
@trevorturk trevorturk Introduce UpgradeLegacySignedCookieJar to transparently upgrade exist…
…ing signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4
0190cba
Commits on Mar 25, 2013
@rwz rwz Relaxed jbuilder dependency and bumped version number
Newer version contains some generator bugfixes
2b660f1
@guilleiguaran guilleiguaran Merge pull request #9912 from rwz/jbuilder-bump
Relaxed jbuilder dependency and bumped version number
592b4b4
@gkop gkop Put coffee-rails in top-level of generated Gemfile
v3 of pull request based on additional feedback from @jeremy
940da7d
@jeremy jeremy Merge pull request #9881 from gkop/master
Support .js.coffee views by default
825b91b
@jeremy jeremy Merge pull request #9909 from trevorturk/9740
Transparently upgrade signed cookies when setting secret_key_base
15d8e79
@jeremy jeremy Tender love for #9909 :heart: b3e08f2
@jeremy jeremy Update tests for #9704, named route collisions
* Fix named route collision in mount test fixture
* Update controller named route precedence test
32ec8eb
@jeremy jeremy Fix jquery-as-default test to account for switch from gem to github s…
…ource in #9904
3b2a241
@prathamesh-sonpatki prathamesh-sonpatki Controller name pluralized 6a499cd
@fxn fxn Merge pull request #9914 from prathamesh-sonpatki/controller-pluralize
Controller name pluralized
8caafd9
@arunagw arunagw Skipping test for OpenSSL::PKCS5 JRuby d67f761
@amatsuda amatsuda s/Github/GitHub/ 0725007
@amatsuda amatsuda s/Textmate/TextMate/ e21f6c1
@amatsuda amatsuda Fix some typos ea5daeb
Neeraj Singh if cookie is tampered with then nil is returned [ci skip]
if the given key is not found then verifier does raise
`ActiveSupport::MessageVerifier::InvalidSignature` exception
but this exception is resuced and finally nil is returned.
d36cfa2
@rafaelfranca rafaelfranca Merge pull request #9916 from neerajdotname/no-exception-when-cookie-…
…is-tampered-with

nil is retuned if cookie is tampered with [ci skip]
3450eff
@prathamesh-sonpatki prathamesh-sonpatki Fixed typo in railties/test 5546081
@steveklabnik steveklabnik Merge pull request #9918 from prathamesh-sonpatki/railties-typos
Fixed typo in railties/test
1d45419
@prathamesh-sonpatki prathamesh-sonpatki localised => localized f09bf78
@rafaelfranca rafaelfranca Merge pull request #9864 from vipulnsward/fix_test_AR_v2
Introduce test on Error#full_message for attribute with underscores; Fix...
ba012fa
@rafaelfranca rafaelfranca Merge pull request #8527 from shockone/patch-1
Add a method full_messages_for to the Errors class
b8b3df0
@rafaelfranca rafaelfranca Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5
Skipping test for OpenSSL::PKCS5 JRuby
7219c5f
@ranjaykrishna ranjaykrishna Created a layer of abstraction for the valid type checking in schema …
…dumper. Now, connection handles the check for valid types so that each database can handle the changes individually.
c2e2031
@kennyj kennyj Bump TZInfo version to 0.3.37 based on version v2013b of the underlyi…
…ng tz data.
4ed4cfd
@MSch MSch Make Postgres point type correspond to ruby array with two floats inside 336b376
@MSch MSch Move away from column.sql_type in untested code too f8675eb
@rafaelfranca rafaelfranca Merge pull request #7324 from MSch/pg-geometric
Add support for pg geometric datatypes point and box
fc8411a
@senny senny move mailer testing examples into the testing guide.
Closes #9325.

I adjusted the example and the description in the testing guide and
simply linked from the mailer to the testing guide. This way we don't
have to maintain two separate places.
b662cb8
@steveklabnik steveklabnik Merge pull request #9920 from senny/clean_up_testing_examples_for_act…
…ion_mailer

move mailer testing examples into the testing guide.
c28b8ca
@senny senny use relative links inside guides [ci skip] 441fa86
@rafaelfranca rafaelfranca The sql_type method called here is from be71b0e
@steveklabnik steveklabnik Merge pull request #9925 from senny/relative_guide_links
use relative links inside guides [ci skip]
7e91c9a
@rafaelfranca rafaelfranca Fix typo 1a838cc
@danmcclain danmcclain Adds support for concurrent indexing in PostgreSQL adapter
Adds support for algorithm option in MySQL indexes
Moves USING and algorithm options upstream

The syntax is still specific to the Adapter, so the actual executed string happens
in the corresponding adapter
e199dc1
@tenderlove tenderlove default RAILS_ENV to test if we're in a test task 2e68ecc
Commits on Mar 26, 2013
@spastorino spastorino Merge pull request #9930 from kennyj/bump_tzinfo
Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.
078bfbf
@danmcclain danmcclain Checks :algorithm argument for valid values 203e0e0
@rafaelfranca rafaelfranca Merge pull request #9923 from danmcclain/psql-concurrent-indexes
Adds support for concurrent indexing in PostgreSQL adapter
2d33796
@carsonmcdonald carsonmcdonald Fix typo 1595ab6
@zolzaya zolzaya Fixed timezone mapping of Ulaanbaatar. d2a8f7e
@rafaelfranca rafaelfranca Merge pull request #9937 from zolzaya/master
Asia/Ulaanbaatar is incorrect mapping

Fixes #9936
18a0d9f
David Chapman s/and and run/and runs/
Fixing some typos/grammar.
231b109
@rafaelfranca rafaelfranca Merge pull request #9939 from dchapman1988/master
Fixing some typo(s)/grammar.
b6e5971
@vipulnsward vipulnsward respect auto_increment in rename_column for mysql 437961b
@rafaelfranca rafaelfranca Merge pull request #9928 from vipulnsward/fix_rename_auto_increment_m…
…ysql

respect auto_increment in rename_column for mysql
1707763
@MacksMind MacksMind Combine tests and restore columns dropped by hstore testing
Disabling the hstore extension during testing created order dependent
test failures.
524ce56
@rafaelfranca rafaelfranca Merge pull request #9876 from macksmind/restore_cols_dropped_by_hstor…
…e_test

Restore columns dropped by hstore test
c56e620
Commits on Mar 27, 2013
@sthollmann sthollmann ReCAPTCHA plug-in link now points to Github repo. Plug-in is no longe…
…r available at the previous location
164af1f
@SamSaffron SamSaffron Make connection_handler overridable per thread b37399a
@vipulnsward vipulnsward drop variable assignment in validations c082e3f
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9945 from vipulnsward/drop_var_in_validations
Drop variable assignment in validations
81b7ebf
@rafaelfranca rafaelfranca Use thor master since 0.18.0 has a regression
See
erikhuda/thor@08265a3
for the discussion and erikhuda/thor#316 for the
fix
22caf39
@senny senny mention strong parameters in complex forms section of the guides.
Closes #9921.
1a5c3f4
@rafaelfranca rafaelfranca Merge pull request #8368 from SamSaffron/master
Allow connection_handler to be overriden per-thread
4a6059b
@rafaelfranca rafaelfranca Merge pull request #9947 from senny/strong_params_doc_for_complex_forms
mention strong parameters in complex forms section of the guides.
2a05343
@vipulnsward vipulnsward drop errors constant b2f7c46
@prathamesh-sonpatki prathamesh-sonpatki Fixed typos in activerecord b0ac116
@rafaelfranca rafaelfranca Merge pull request #9952 from prathamesh-sonpatki/AR-typos
Fixed typos in activerecord
642ecd5
@rafaelfranca rafaelfranca Merge pull request #9949 from vipulnsward/drop_yaml_error_constant
drop errors constant
30fbbb4
@chrisnicola chrisnicola Provides standard layout lookup behavior for method and proc cases
When setting the layout either by referencing a method or supplying a
Proc there is no way to fall back to the default lookup behavior if
desired. This patch allows fallback to the layout lookup behavior when
returning nil from the proc or method.
ef27bba
Neeraj Singh entirelyby => 'entirely by' 3e3e81b
@rafaelfranca rafaelfranca Merge pull request #9954 from neerajdotname/space_after_entirely
entirelyby => 'entirely by'
1250985
@rafaelfranca rafaelfranca Merge pull request #8458 from lucisferre/improve-layout-override-fall…
…back-behavior

Provides standard layout lookup behavior for method and proc cases

Conflicts:
	actionpack/CHANGELOG.md
e743850
@rafaelfranca rafaelfranca Merge pull request #9274 from KrzysiekJ/spaces_in_scope_names
Use define_method when method name contains weird characters.
7b0402f
@rafaelfranca rafaelfranca Fix syntax error 328c292
@rubys rubys Cosmetic cleanup of generated Gemfile
- Remove obsolete/misleading comment about assets only being used production
- Remove unnecessary group :assets
- Eliminate blank lines if options[:skip_javascript] is not specified
49c4af4
@rubys rubys Remove buggy and unnecessary logic
based on a discussion with @rafaelfranca
4e35dc0
@rafaelfranca rafaelfranca Merge pull request #9955 from rubys/cleanup_app_gemfile
Cosmetic cleanup of generated Gemfile
d684de4
@rafaelfranca rafaelfranca Merge pull request #9523 from stopdropandrew/Instrumenter#instrument-…
…yields-payload

ActiveSupport::Notifications::Instrumenter#instrument should yield

Conflicts:
	activesupport/CHANGELOG.md
57fbcc5
Commits on Mar 28, 2013
@obrie obrie Fix updates not working within after_create hooks 482f8c1
@jroes jroes Extraneous syntax on guides path. d083193
@jroes jroes Remove unnecessary hyphen. 057ae0b
@kenmazaika kenmazaika Dump the 'using' options for a SQL index into the schema. a89e9f7
@jroes jroes Minor proofing edebf26
@rafaelfranca rafaelfranca Merge pull request #9964 from where/using-schema-dump
Dump the 'using' options for a SQL index into the schema.
0739d14
@kenmazaika kenmazaika Add support for FULLTEXT and SPATIAL indexes using the :type flag for…
… MySQL.
9600e0b
@rafaelfranca rafaelfranca Merge pull request #9944 from where/rebased-fulltext-spacial
Add support for FULLTEXT and SPATIAL indexes using the :type flag for MySQL
cf46c31
@rafaelfranca rafaelfranca Add coffee-rails and javascript runtime to gemfile if skip_javascript is
provided
0417bc8
@fxn fxn determine_constant_from_test_name does not swallow NoMethodErrors [Yv…
…es Senn]
341e611
@anupamc anupamc Refactored to remove unused variable d18e8b1
@anupamc anupamc Fixed grammar a895b40
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9968 from choudhuryanupam/fix_typo_n_grammar
Fixed grammar
5533994
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9963 from obrie/fix/after_create_updates
Fix updates not working within after_create hooks
011c8ee
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_cases
Refactored to remove unused loop variable
aca15b4
@carlosantoniodasilva carlosantoniodasilva Use snake case variable names, stick with the convention 60e50d6
@divineforest divineforest Fix typo cfe92c8
@rafaelfranca rafaelfranca Merge pull request #9970 from divineforest/fix-typo
Fix typo
51ba66b
@divineforest divineforest Fix typo: overriden => overriDDen cec0343
@prathamesh-sonpatki prathamesh-sonpatki Fixed typos in ActiveRecord 6943497
@rafaelfranca rafaelfranca Merge pull request #9973 from prathamesh-sonpatki/AR-typos
Fixed typos in ActiveRecord
15d9711
@rafaelfranca rafaelfranca Merge pull request #9972 from divineforest/fix-overriden-typo
Fix typo: overriden => overriDDen
9802cbe
@prathamesh-sonpatki prathamesh-sonpatki Removed unused variable in proc
 * This unused variable is already removed from the code here. d18e8b1

 * So removing it from CHANGELOG to be consistent with code
48a80f3
@steveklabnik steveklabnik Merge pull request #9974 from prathamesh-sonpatki/change_log
Removed unused variable in proc [ci skip]
56edecb
@vipulnsward vipulnsward anual_salary => annual_salary 77a7382
@rafaelfranca rafaelfranca Merge pull request #9977 from vipulnsward/fix_column_test_typo
anual_salary => annual_salary
27d12bd
@fxn fxn contrib guide: documents how to generate a --dev application 3eebc14
@fxn fxn contrib guide: documents guidelines for running the test suite b77b95e
@prathamesh-sonpatki prathamesh-sonpatki Fix typo c6605c5
@carlosantoniodasilva carlosantoniodasilva Merge pull request #9982 from prathamesh-sonpatki/railite-typo
Fix typo
0639d95
@ranjaykrishna ranjaykrishna added comments to test_invalid_type in sqlite3 adapter test and added…
… valid_type? method to abstract_adapter.rb and removed unnecessary method from sqlite3 adapter
7c5e003
@rafaelfranca rafaelfranca Merge pull request #9984 from ranjaykrishna/col-prob
valid_type? added to super class abstract_adapter
69c6513
@guilleiguaran guilleiguaran Add better comments to assets gems 59d20af
@guilleiguaran guilleiguaran Update the call to Bundler.require in application.rb since assets gro…
…up doesn't exist anymore in Gemfile
e2df5d0
@robertomiranda robertomiranda Update Bundler require in getting started application bbaa8ab
@rafaelfranca rafaelfranca Merge pull request #9987 from robertomiranda/group-assets
Update Bundler require in getting started application
33f6a4b
@robertomiranda robertomiranda Update Gemfile since group assets doesn't exist anymore in Gemfile dbb00f2
@guilleiguaran guilleiguaran Merge pull request #9989 from robertomiranda/group-assets
Update Gemfile since group assets doesn't exist anymore in Gemfile
178a685
Commits on Mar 29, 2013
@vquaiato vquaiato info that Gemfile *group :assets* was removed
Adding info that Gemfile *group :assets* was removed on upgrading_ruby_on_rails.md
9c6ccb3
@vquaiato vquaiato Merge pull request #130 from crafters/master
Adding info that Gemfile group :assets doesn't exists anymore
0462276
@fxn fxn removes activerecord/examples/associations.png
This seems to be a legacy file, I cannot find any place where it is used.
8db99d3
@fxn fxn removes bindir from the rails gemspec
Nowadays the rails gem itself has no executables.
1003f5b
Neeraj Singh fix broken sentence [ci skip] 6807114
Neeraj Singh Do not use deprecate method [ci skip] f3cabb3
@steveklabnik steveklabnik Merge pull request #9998 from neerajdotname/association-doc
fixes for association doc
b22ec86
Neeraj Singh explain method invertible_for [ci skip] d4dad04
@jroes jroes Proofreading tweaks
- Consistent hash structure
- Rewording / typo fixes
8fcc1be
@jroes jroes More typo / wording fixes 6bd1bbe
@fxn fxn changes the RDoc title of the API
Nowadays the documentation of Ruby on Rails is more than the API.
ab6cdf7
@fxn fxn encapsulates API generation in Rails::API::Task 7a5aa72
@fxn fxn moves RDOC_MAIN.rdoc to railties
The goal of these refactors is to have the same code generating
edge and doc:rails APIs, and the rails gem is not available in
LOAD_PATHS because it has no lib directory.
3235537
@fxn fxn unifies API generation 84c0ac3
@fxn fxn rdoc is no longer a gem dependency, sdoc becomes a runtime dependency 2595611
@fxn fxn registers the new doc:rails behaviour in the changelog 2cc934a
@fxn fxn typo 4ecf1f8
Commits on Mar 30, 2013
@fxn fxn adds the API home page to the gemspec, needed for doc:rails 022ed6c
@vijaydev vijaydev Revert "Using American English spellings over British style spellings"
This reverts commit 573df1c.

Reason: changelog edits aren't allowed in docrails.

[ci skip]
06e22c0
@vijaydev vijaydev Merge branch 'master' of github.com:lifo/docrails
Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/adapter_test.rb
	guides/source/testing.md

[ci skip]
6d8c070
@vijaydev vijaydev Merge branch 'master' of github.com:rails/rails e63086c
Neeraj Singh minor copy editing 805c4c1
Commits on Mar 31, 2013
@carsonmcdonald carsonmcdonald Fix typo 75afe19
@jroes jroes Remove unnecessary / confusing code in example da9031a