aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | 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
| | | | | | | |
* | | | | | | | Merge pull request #18946 from davydovanton/format-paragraph-default-paramsZachary Scott2015-02-151-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added default values for #format_paragraph docs [skip ci]
| * | | | | | | | Added default values for #format_paragraph docs [skip ci]Anton Davydov2015-02-151-0/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #18394 from arthurnn/http_cache_foreverArthur Nogueira Neves2015-02-153-0/+75
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Implement http_cache_forever to ActionController
| * | | | | | | | Implement http_cache_forever to ActionControllerArthur Neves2015-02-153-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add http_cache_forever to ActionController, so we can cache results forever. Things like static pages are a good candidate for this type of caching. This cache only controls caching headers, so it is up to the browser to cache those requests.
* | | | | | | | | Merge pull request #18945 from y-yagi/layouts_and_rendering_guideAbdelkader Boudih2015-02-151-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix syntax error in render partial example [ci skip]
| * | | | | | | | | fix syntax error in render partial example [ci skip]yuuji.yaginuma2015-02-151-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #18938 from tchandy/updating_query_tracer_linkArthur Nogueira Neves2015-02-141-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Updating Query Tracer github repository
| * | | | | | | | | Updating Query Tracer github repositoryThiago Pradi2015-02-141-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-02-145-20/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] Add some more code highlights.Juanito Fatas2015-02-101-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Do not use the same name for two `:belongs_to`claudiob2015-02-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A model cannot have two `:belongs_to` with the same exact name, so we are better off avoiding this code in our examples, which might mislead users in thinking it's admissible. [ci skip]
| * | | | | | | | | | AM#Dirty doc fixesVipul A M2015-02-011-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Grammar fixes - Add doc for changes_include? - implemntations => implementations
| * | | | | | | | | | Fix description for AM::CallbacksVipul A M2015-01-311-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Wording fixes for `:skip_after_callbacks_if_terminated` callbacks optionVipul A M2015-01-311-2/+2
| | | | | | | | | | |
| * | | | | | | | | | [ci skip] Add a missing space in t.belongs_to argument.Juanito Fatas2015-01-291-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Mention `where.not` in the exampleGodfrey Chan2015-02-142-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...so it doesn't look like you *have* to use SQL strings for that case (not anymore!). Would like to replace the SQL string example with something that you cannot do with the "normal" query API, but I could not come up with a short, realistic example. Suggestions welcome!
* | | | | | | | | | | Fixed a bug where NULLs are casted into the first enum valueGodfrey Chan2015-02-132-3/+9
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Partially revert ae33aeaGodfrey Chan2015-02-132-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using enum names in SQL strings doesn't actually work, the test was wrong (fixed in 3dfd1ba).
* | | | | | | | | | Break up these testsGodfrey Chan2015-02-131-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we have coverage for both the find/build cases
* | | | | | | | | | oops, 'format' is not a real enumGodfrey Chan2015-02-131-8/+8
| | | | | | | | | |
* | | | | | | | | | Enums mapping is a HWIA [ci skip]Godfrey Chan2015-02-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous edit kind of de-emphasized that, so changing it to be more explict. (It also avoids showing it as if it's a string-keyed hash.)
* | | | | | | | | | Enums should be referred to by symbolsGodfrey Chan2015-02-132-6/+20
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated the documentation about the new ability to query them normally, and added test to make sure they work!
* | | | | | | | | Add missing commaArthur Neves2015-02-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #16381 from kakipo/validate-length-tokenizerRafael Mendonça França2015-02-134-7/+32
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow symbol as values for `tokenizer` of `LengthValidator`
| * | | | | | | | | Allow symbol as values for `tokenize` of `LengthValidator`kakipo2014-08-034-7/+32
| | | | | | | | | |
* | | | | | | | | | Merge pull request #18924 from tgxworld/correct_module_in_depre_msgKasper Timm Hansen2015-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Correct module name in deprecation message.
| * | | | | | | | | | Correct module name in deprecation message.Guo Xiang Tan2015-02-131-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #18923 from tgxworld/fix_deprecation_warning_messageKasper Timm Hansen2015-02-131-4/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Improve deprecation warning message
| * | | | | | | | | | Improve deprecation message.Guo Xiang Tan2015-02-131-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Do not recommend `xhr` since it is going to be deprecated.Guo Xiang Tan2015-02-131-3/+0
| | | | | | | | | | |
* | | | | | | | | | | remove CHANGELOG entry for Rails 5.0 only feature. #18918Yves Senn2015-02-131-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `has_secure_token` hasen't been released yet. No need to track every change in the CHANGELOG.
* | | | | | | | | | | Merge pull request #18918 from ↵Yves Senn2015-02-133-2/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | morgoth/do-not-overwrite-value-of-secret-token-when-present Do not overwrite secret token value when already present.
| * | | | | | | | | | | Do not overwrite secret token value when already present.Wojciech Wnętrzak2015-02-123-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` user = User.create(token: "custom-secure-token") user.token # => "custom-secure-token" ```
* | | | | | | | | | | | Merge pull request #18922 from yui-knk/fix/action_controller_overviewYves Senn2015-02-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | [ci skip] escape under score
| * | | | | | | | | | | [ci skip] escape under scoreyui-knk2015-02-131-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #18919 from nerdrew/missing-rack-utils-requireArthur Nogueira Neves2015-02-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | require rack/utils in exception_wrapper
| * | | | | | | | | | require rack/utils in exception_wrapperAndrew Lazarus2015-02-121-0/+1
|/ / / / / / / / / /
* | | | | | | | | | remove meta programmingAaron Patterson2015-02-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there's really no benefit here. It's the same number of lines without the meta programming and is faster
* | | | | | | | | | there is always an integration session, so remove the checkAaron Patterson2015-02-121-1/+0
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 01:11:47 +0000