aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Track Gemfile.lock at the repositoryRafael Mendonça França2015-02-183-1/+282
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main reason is to make bisect easier. In some points, we have a lot of git dependencies. Since we don't have the information of which commit we are referring to, bundler get the latest commit of the master branch of the dependency. This sometimes returns a version that is not compatible with Rails anymore, making the tests fail and the harder to identify the commit that introduced a bug. Also this will make sure that a contributor will always get a set of dependencies that are passing with our tests. In our CI server we delete the lock file to make sure we are always testing against the newest release of our dependencies.
* / | | | | | | | | | | | | | | Revert "Merge pull request #18951 from ↵Rafael Mendonça França2015-02-181-1/+0
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jurezove/gemfile-lock-to-plugin-gitignore-template" This reverts commit b824dfd44bf2dd932d6d955ac868af1020f0099a, reversing changes made to 265dcb779dd4bfd9745e0131f585749d7034c3c7. Our general recommendation is to check in the lock file in the repository. This make possible to developers and contributors of a plugin always run their tests against a working set of dependencies. Also, bisect is a lot easier, specially if you have git dependencies in your Gemfile.
* | | | | | | | | | | | | | | Merge pull request #18984 from rousisk/masterCarlos Antonio da Silva2015-02-182-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace deprecated readonly option with scope blocks in docs and guide
| * | | | | | | | | | | | | | | Replace deprecated readonly option with scope blocks in docs and guideKonstantinos Rousis2015-02-182-5/+4
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #18987 from ↵Carlos Antonio da Silva2015-02-1821-25/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/prefer_drop_table_if_exists_true_over_raw_sql Prefer `drop_table if_exists: true` over raw SQL
| * | | | | | | | | | | | | | | | Prefer `drop_table if_exists: true` over raw SQLRyuta Kamizono2015-02-1821-25/+25
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lowercase raw SQL has been replaced by 07b659c already. This commit replaces everything else of raw SQL.
* / / / / / / / / / / / / / / / constants guide: adds a step to a resolution algorithmXavier Noria2015-02-181-1/+3
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure how this one slipped, maybe deleted by accident while editing or something. Anyway, fixed.
* | | | | | | | | | | | | | | prefer `drop_table if_exists: true` over raw SQL.Yves Senn2015-02-1812-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @yahonda This makes it easier for third party adapters to run our tests, even if that database does not support IF EXISTS.
* | | | | | | | | | | | | | | Merge pull request #18980 from nicolasmlv/fix-typo-in-guideZachary Scott2015-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typo in guide - missing word
| * | | | | | | | | | | | | | | fix type in guide - missing wordNicolas Maloeuvre2015-02-181-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #18843 from yuki24/guides-add-guide-for-mail-previewZachary Scott2015-02-171-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add guide for Action Mailer Previews
| * | | | | | | | | | | | | | | Add guide for Action Mailer PreviewsYuki Nishijima2015-02-081-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Add docs for the type registrySean Griffin2015-02-172-5/+24
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Rm `Type#type_cast`Sean Griffin2015-02-1713-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper no longer makes sense as a separate method. Instead I'll just have `deserialize` call `cast` by default. This led to a random infinite loop in the `JSON` pg type, when it called `super` from `deserialize`. Not really a great way to fix that other than not calling super, or continuing to have the separate method, which makes the public API differ from what we say it is.
* | | | | | | | | | | | | | | | `type_cast_from_user` -> `cast`Sean Griffin2015-02-1722-106/+106
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | `type_cast_for_database` -> `serialize`Sean Griffin2015-02-1740-79/+79
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | `Type#type_cast_from_database` -> `Type#deserialize`Sean Griffin2015-02-1736-71/+71
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Add line endings to files which are missing themSean Griffin2015-02-1716-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files get modified whenever someone uses a tool like `sed`. Let's just get this over with in one commit so it'd not adding diff noise to something else.
* | | | | | | | | | | | | | | | Fix test failures on Mysql 5.5Sean Griffin2015-02-171-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Update code which depended on methods added by 1502caefSean Griffin2015-02-171-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Revert "Allow `:precision` option for time type columns"Sean Griffin2015-02-177-90/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1502caefd30b137fd1a0865be34c5bbf85ba64c1. The test suite for the mysql adapter broke when this commit was used with MySQL 5.6. Conflicts: activerecord/CHANGELOG.md
* | | | | | | | | | | | | | | | Merge branch 'y-yagi-fix_deprecate_msg'eileencodes2015-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | correct method name in deprecation messageyuuji.yaginuma2015-02-181-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #18961 from vipulnsward/deprecate-start-valueYves Senn2015-02-174-33/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Deprecated passing of `start` value to `find_in_batches` and `find_each`
| * | | | | | | | | | | | | | | Deprecated passing of `start` value to `find_in_batches` and `find_each` in ↵Vipul A M2015-02-174-33/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | favour of `begin_at` value.
* | | | | | | | | | | | | | | | Revert c732a66:Zachary Scott2015-02-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * "rm docs for dependency_loading and disable_dependency_loading config" It was added back in a71350cae0082193ad8c66d65ab62e8bb0b7853b by @tenderlove See also #13142
* | | | | | | | | | | | | | | | Revert "Don't unhook autoloading in production"Aaron Patterson2015-02-161-0/+7
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a8bf12979e5fa15282b39c8cfa315e663f613539.
* | | | | | | | | | | | | | | Merge pull request #18960 from ctaintor/remove_dependency_docZachary Scott2015-02-161-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removes documentation that is no longer relevant
| * | | | | | | | | | | | | | | removes docs for dependency_loading config option and ↵Case Taintor2015-02-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable_dependency_loading initializer because it was removed by commit a8bf12979e5fa15282b39c8cfa315e663f613539
* | | | | | | | | | | | | | | | Merge pull request #18959 from phillbaker/cleanup/server-log-pathCarlos Antonio da Silva2015-02-161-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | Remove unused Rails::Server#log_path
| * | | | | | | | | | | | | | | Remove unused Rails::Server#log_pathPhill Baker2015-02-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With refactors to Rails::Sever from v3 to v4, this method is no longer used and is untested. Previous usage: https://github.com/rails/rails/blob/3-2-stable/railties/lib/rails/commands/server.rb#L79 Currently set from: https://github.com/rails/rails/blob/7b75551a1a4539876f878f37a2439cd02f89d961/railties/lib/rails/application/configuration.rb#L69
* | | | | | | | | | | | | | | | Merge pull request #18485 from andreynering/robots.txtZachary Scott2015-02-162-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding 'Search Engines Indexing' Section [ci skip]
| * | | | | | | | | | | | | | | | Adding 'Search Engines Indexing' Section [ci skip]Andrey Nering2015-01-142-0/+22
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #18679 from adipra3n/masterZachary Scott2015-02-161-0/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add web console in debugging rails applications guide [ci skip]
| * | | | | | | | | | | | | | | | | document web console in debugging guide [ci skip]Adi Pradhan2015-01-261-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document web console in debugging guide [ci skip] document web console in debugging guide [ci skip]
* | | | | | | | | | | | | | | | | | Merge pull request #18815 from tmingos/patch-1Zachary Scott2015-02-161-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct pluralization error
| * | | | | | | | | | | | | | | | | | Edit text on optional db constraints for uniqueness validations [ci skip]Taylor Mingos2015-02-041-3/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #18958 from andreynering/guides-form-remoteZachary Scott2015-02-161-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improving remote forms guides [ci skip]
| * | | | | | | | | | | | | | | | | | | Improving remote forms guides [ci skip]Andrey Nering2015-02-161-0/+28
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #18949 from craftsmen/image_tag_sizeYves Senn2015-02-163-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to pass a string value to size option in `image_tag` and `video_tag`
| * | | | | | | | | | | | | | | | | | Allow to pass a string value to size option in `image_tag` and `video_tag`Mehdi Lahmam2015-02-163-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the behavior more consistent with `width` or `height` options
* | | | | | | | | | | | | | | | | | | Merge pull request #18662 from estum/foreign-key-existsYves Senn2015-02-164-15/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `foreign_key_exists?` method.
| * | | | | | | | | | | | | | | | | | | Add methods to get foreign key matching argumentsAnton2015-01-292-40/+36
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add `foreign_key_exists?` method.Anton2015-01-243-0/+48
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | fix, `to_table` in `remove_foreign_key` should be plural.Yves Senn2015-02-161-1/+1
| |_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #18951 from ↵Guillermo Iguaran2015-02-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jurezove/gemfile-lock-to-plugin-gitignore-template Add Gemfile.lock to plugin's gitignore template
| * | | | | | | | | | | | | | | | | | | Add Gemfile.lock to plugin's gitignore templateJure Žove2015-02-151-0/+1
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Register adapter specific types with the global type registrySean Griffin2015-02-157-67/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do this in the adapter classes specifically, so the types aren't registered if we don't use that adapter. Constants under the PostgreSQL namespace for example are never loaded if we're using mysql.
* | | | | | | | | | | | | | | | | | | Add a global type registry, used to lookup and register typesSean Griffin2015-02-154-0/+336
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per previous discussions, we want to give users the ability to reference their own types with symbols, instead of having to pass the object manually. This adds the class that will be used to do so. ActiveRecord::Type.register(:money, MyMoneyType)
* | | | | | | | | | | | | | | | | | Tiny documentation edits [ci skip]Robin Dupret2015-02-156-35/+41
| | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 22:40:57 +0000