aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9909 from trevorturk/9740Jeremy Kemper2013-03-245-100/+171
|\ | | | | Transparently upgrade signed cookies when setting secret_key_base
| * Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵Trevor Turk2013-03-245-100/+171
| | | | | | | | signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4
* | Merge pull request #9881 from gkop/masterJeremy Kemper2013-03-243-16/+43
|\ \ | | | | | | Support .js.coffee views by default
| * | Put coffee-rails in top-level of generated GemfileGabe Kopley2013-03-243-16/+43
|/ / | | | | | | v3 of pull request based on additional feedback from @jeremy
* | Merge pull request #9912 from rwz/jbuilder-bumpGuillermo Iguaran2013-03-241-1/+1
|\ \ | |/ |/| Relaxed jbuilder dependency and bumped version number
| * Relaxed jbuilder dependency and bumped version numberPavel Pravosud2013-03-251-1/+1
|/ | | | Newer version contains some generator bugfixes
* Merge pull request #9489 from obrie/fix/overridden_defaults_changed_attributesJeremy Kemper2013-03-242-3/+19
|\ | | | | Fix ActiveRecord locking column defaults not getting persisted
| * Fix ActiveRecord locking column defaults not getting persistedAaron Pfeifer2013-03-182-3/+19
| | | | | | | | | | | | | | | | | | | | | | When partial inserts are enabled, overridden db defaults are ignored. This results in locking columns having a nil value for new records if the db default is null. This happens because the list of changed attributes for new records is always assumed to be empty. Solution: When a new record's default attributes are set, also initialize the list of changed attributes by comparing current values against what's stored as the column defaults in the database.
* | Merge pull request #9704 from trevorturk/warn-about-skipped-routesJeremy Kemper2013-03-244-35/+34
|\ \ | | | | | | Raise an ArgumentError when a clashing named route is defined
| * | Tweak exception message to avoid giving potentially misleading suggestionsTrevor Turk2013-03-201-2/+3
| | |
| * | Raise an ArgumentError when a clashing named route is definedTrevor Turk2013-03-194-35/+33
| | |
* | | Merge pull request #9905 from docunext/masterCarlos Antonio da Silva2013-03-241-3/+3
|\ \ \ | | | | | | | | ActiveSupport::MessageVerifier: Updated docs due to removal of serializer accessor
| * | | Updated docs due to removal of serializer accessorAlbert Lash2013-03-241-3/+3
| | | |
* | | | Merge pull request #9904 from rubys/jquery-rails-githubGuillermo Iguaran2013-03-241-1/+3
|\ \ \ \ | |/ / / |/| | | Use jquery-rails from github
| * | | Use jquery-rails from githubSam Ruby2013-03-241-1/+3
|/ / / | | | | | | | | | completes https://github.com/rails/rails/commit/6f3f0f86332004fcee5c2f05d52bbff08c22f980
* | | Merge pull request #9902 from robertomiranda/fix-release-taskGuillermo Iguaran2013-03-241-14/+2
|\ \ \ | | | | | | | | Fix update_version_rb task
| * | | Fix update_version_rb taskrobertomiranda2013-03-241-14/+2
| | | |
* | | | Merge pull request #9901 from vipulnsward/fix_some_typosVijay Dev2013-03-245-5/+5
|\ \ \ \ | |/ / / |/| | | Fix some typos
| * | | Fix some typosVipul A M2013-03-245-5/+5
|/ / /
* | | Fix test: ActiveSupport.version is returning now a Gem::Version instead of a ↵Guillermo Iguaran2013-03-241-1/+1
| | | | | | | | | | | | String
* | | Use jquery-rails from github (fix Gem::Version error)Guillermo Iguaran2013-03-231-1/+1
| | |
* | | Ignore all pkg folders (including also top level one)Guillermo Iguaran2013-03-231-1/+1
| | |
* | | Merge pull request #9897 from robertomiranda/ignore-pkg-foldersRafael Mendonça França2013-03-231-1/+1
|\ \ \ | | | | | | | | Ignore pkg folders
| * | | Ignore pkg foldersrobertomiranda2013-03-231-1/+1
|/ / /
* | | Merge pull request #8501 from charliesome/version-to-sRafael Mendonça França2013-03-2317-57/+63
|\ \ \ | | | | | | | | Add #to_s method to VERSION modules
| * | | add changelog entryCharlie Somerville2013-03-241-0/+4
| | | |
| * | | remove references to *::VERSION, replace with *.versionCharlie Somerville2013-03-219-15/+11
| | | |
| * | | Add version method to top level modulesCharlie Somerville2013-03-217-42/+48
| | | |
* | | | Merge branch 'jlxw-patch-2'Rafael Mendonça França2013-03-232-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | Closes #9184
| * | | | Fix regex to strip quotations from hstore valuesjlxw2013-03-232-2/+6
| | | | | | | | | | | | | | | | | | | | Previously regex did not strip quotation marks where hstore values were multi-line strings.
* | | | | Merge pull request #9891 from doabit/additional_index_supportRafael Mendonça França2013-03-2311-9/+125
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Custom index type support with :using. Closes #9451
| * | | | | Custom index type support with :using.doabit2013-03-2411-9/+125
| | | | | |
* | | | | | Merge pull request #9890 from prathamesh-sonpatki/CL-TyposRafael Mendonça França2013-03-233-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | activemodel/CHANGELOG typo and change in test description
| * | | | | | Changed 'args' to 'arguments' in test descriptionPrathamesh Sonpatki2013-03-242-2/+2
| | | | | | |
| * | | | | | Fixed typo in activemodel/CHANGELOGPrathamesh Sonpatki2013-03-241-1/+1
|/ / / / / /
* | / / / / Better styles for the CSS [ci skip]Rafael Mendonça França2013-03-236-76/+76
| |/ / / / |/| | | |
* | | | | Merge pull request #9889 from neerajdotname/unscopedRafael Mendonça França2013-03-232-8/+4
|\ \ \ \ \ | |/ / / / |/| | | | Unscoped works with other named scope even without block form
| * | | | enhance unscoped testsNeeraj Singh2013-03-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Make it obvious that using unscoped with another scope without the block works
| * | | | unscoped works with named scope [ci skip]Neeraj Singh2013-03-231-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Update comment to reflect that unscoped works with named scope even when named scope is using without block form
* | | | | Fix documentation markup [ci skip]Rafael Mendonça França2013-03-231-0/+2
| | | | |
* | | | | Review some CHANGELOG entries [ci skip]Rafael Mendonça França2013-03-231-7/+8
| | | | |
* | | | | Merge pull request #9880 from wangjohn/refactoring_attribute_assignmentRafael Mendonça França2013-03-231-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Refactoring validate_missing_parameters to validate_required_parameters.
| * | | | | Refactoring validate_missing_parameters to validate_required_parameters.wangjohn2013-03-231-5/+5
| |/ / / /
* | | | | Autoload the AlterTable classRafael Mendonça França2013-03-231-0/+1
| | | | |
* | | | | Merge pull request #9888 from zzak/patch-1Rafael Mendonça França2013-03-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Don't use hash fragment for travis link
| * | | | | Don't use hash fragment for travis linkZachary Scott2013-03-231-1/+1
|/ / / / /
* | | | | Merge pull request #9883 from prathamesh-sonpatki/AR-TyposRafael Mendonça França2013-03-231-9/+9
|\ \ \ \ \ | |/ / / / |/| | | | Fixed typos in activerecord CHANGELOG
| * | | | Spelling 'PostgreSQL' correctlyPrathamesh Sonpatki2013-03-231-7/+7
| | | | |
| * | | | Fixed typos in activerecord CHANGELOGPrathamesh Sonpatki2013-03-231-3/+3
|/ / / /
* | | | Merge branch 'schema'Aaron Patterson2013-03-2210-104/+230
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 02:26:38 +0000