aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* gem 'mysql2', '~> 0.3.18'Ryuta Kamizono2015-05-041-1/+1
| | | | Follow up #18914.
* Merge pull request #19991 from mcfiredrill/nodoc-postgresql-change-columnRichard Schneeman2015-05-031-2/+1
|\ | | | | `:nodoc:` postgresql's change_column
| * `:nodoc:` postgresql's change_columnTony Miller2015-05-031-2/+1
|/ | | | | Its nodoc'ed for the other implementations, and doc'ed in the base class, just like the other change_column* methods.
* Merge pull request #19982 from acapilleri/scope_uniquinessYves Senn2015-05-031-1/+1
|\ | | | | [ci skip] Uniquiness with scope can have one or more arguments
| * [ci skip] Uniquiness with scope can have one or more argumentsAngelo Capilleri2015-05-031-1/+1
| |
* | Merge pull request #19984 from mcfiredrill/nodoc-change-column-nullYves Senn2015-05-033-3/+3
|\ \ | | | | | | :nodoc: change_column_null in the implmenting adapters
| * | :nodoc: change_column_null in the implmenting adaptersTony Miller2015-05-033-3/+3
| | | | | | | | | | | | | | | | | | `change_column_null` is doc'ed only in ActiveRecord::ConnectionAdapters::SchemaStatements, so it would make sense to :nodoc: it elsewhere.
* | | Merge pull request #19983 from kamipo/remove_unused_requireYves Senn2015-05-032-2/+0
|\ \ \ | |/ / |/| | Remove unused require
| * | Remove unused requireRyuta Kamizono2015-05-032-2/+0
|/ /
* | Use `def before_setup` instead of `setup do`eileencodes2015-05-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `setup do` creates unnecessary allocations of proc objects in test callbacks. This prevents that from happening and results in faster code. Originally I had done this as `def setup` and all Railties tests passed. See 044f9ab. Later it was reported there was an issue with this that caused routes in tests to be nil because devs don't generally call `super` in their test setups. Because of that I reverted the commit until I could find a suitble replacement. `before_setup` esentially does the same thing but without the requirement that applications call `super` in their test setups.
* | Use `args` instead of `*args` in `kwargs_request?` methodeileencodes2015-05-022-6/+6
| | | | | | | | | | | | `*args` is not required here and should be avoided when not necessary because `*args` are slower than `args` and create unnecessary array allocations.
* | Fix method call typo [ci skip]Zachary Scott2015-05-021-1/+1
| |
* | Merge pull request #19973 from trosborn/masterZachary Scott2015-05-021-46/+39
|\ \ | | | | | | Clean up debugging guide and fix minor grammatical errors[ci skip]
| * | Clean up debugging guide and fix minor grammatical errors[ci skip]Thomas Osborn2015-05-011-46/+39
| |/
* | Merge pull request #19974 from yui-knk/fix/form_for_examples_2Zachary Scott2015-05-021-26/+36
|\ \ | | | | | | [ci skip] Fix example codes of form_for method
| * | [ci skip] Fix example codes of form_for methodyui-knk2015-05-021-26/+36
| |/
* | Merge pull request #19975 from prathamesh-sonpatki/engine-minor-changesZachary Scott2015-05-011-2/+2
|\ \ | |/ |/| Added missing fullstop in engine API docs [ci skip]
| * Added missing fullstop in engine API docs [ci skip]Prathamesh Sonpatki2015-05-021-2/+2
| |
* | Merge pull request #19971 from thiagoaugusto/improve-activerecord-changelogYves Senn2015-05-011-1/+1
|\ \ | | | | | | Improvement on Activerecord CHANGELOG.md [ci skip]
| * | Improvement on Activerecord CHANGELOGthiagoaugusto2015-05-011-1/+1
| | |
* | | Merge pull request #19970 from robertomiranda/patch-3Kasper Timm Hansen2015-05-011-1/+1
|\ \ \ | | | | | | | | Update documentation to contain a 24 char token [ci skip]
| * | | Update documentation to contain a 24 char token [ci skip]Roberto Miranda2015-05-011-1/+1
|/ / /
* | | add test-case for `link_to_if` behavior with a block.Yves Senn2015-05-011-0/+10
| | | | | | | | | | | | | | | | | | | | | This illustrates the purpose of the block for `link_to_if` and `link_to_unless` helper methods. It should help to prevent further mistakes like #19844.
* | | Revert "Merge pull request #19844 from ↵Yves Senn2015-05-013-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stevenspiel/link_to_if_block_helper_addition" This reverts commit d459b001b43d25053e7982e96eb8383538a6e358, reversing changes made to 4d4950fae9e2a6970b5f1793aadc56a0b44e28a3. :sweat: The block is not supposed to be passed to `link_to`. It's used for a customized behavior of the `condtion = false` case. The docs illustrate that like so: ``` <%= link_to_if(@current_user.nil?, "Login", { controller: "sessions", action: "new" }) do link_to(@current_user.login, { controller: "accounts", action: "show", id: @current_user }) end %> ```
* | | Merge pull request #19844 from stevenspiel/link_to_if_block_helper_additionYves Senn2015-05-013-1/+10
|\ \ \ | | | | | | | | | | | | Update url_helper.rb
| * | | Update url_helper.rbSteven Spiel2015-04-211-1/+1
| | | | | | | | | | | | add block to link_to_if when condition is true
* | | | Merge pull request #19969 from y-yagi/fix_job_helper_methodYves Senn2015-05-013-2/+30
|\ \ \ \ | | | | | | | | | | | | | | | match a expected value with message of `assert_equal` in AJ helper methods
| * | | | match a expected value with message of `assert_equal` in AJ helper methodsyuuji.yaginuma2015-05-011-2/+2
|/ / / /
* | | | Merge pull request #19962 from prathamesh-sonpatki/nodoc-validate-index-lengthYves Senn2015-04-301-1/+1
|\ \ \ \ | | | | | | | | | | Nodoc validate_index_length! method
| * | | | Nodoc validate_index_length! methodPrathamesh Sonpatki2015-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | - This method is used only by adapters to validate length of new index names.
* | | | | Merge pull request #19961 from prathamesh-sonpatki/pg-docsRichard Schneeman2015-04-302-2/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | Added documentation for PostGreSQL database_statements [ci skip]
| * | | | Added documentation for PostGreSQL database_statements [ci skip]Prathamesh Sonpatki2015-04-302-2/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | - Added documentation for index_name_exists? and rename_index. - Also changed rails to \Rails in documentation of allowed_index_name_length.
* | | | Merge pull request #19959 from imtayadeway/tw/caching-docsZachary Scott2015-04-291-11/+11
|\ \ \ \ | | | | | | | | | | Fix style/grammar/typos in Caching guide.
| * | | | Fix style/grammar/typos in Caching guide.Tim Wade2015-04-291-11/+11
|/ / / / | | | | | | | | | | | | | | | | * avoid using unnecessary commas * fix some typos
* | | | Add doc for original_exception in ActiveJob::DeserializationError [ci skip]Zachary Scott2015-04-291-0/+2
| | | |
* | | | Add initial doc for Core in AJ [ci skip]Zachary Scott2015-04-291-0/+2
| | | |
* | | | Add initial doc for Enqueuing module [ci skip]Zachary Scott2015-04-291-0/+1
| | | |
* | | | Rails should be nodoc'd here [ci skip]Zachary Scott2015-04-291-1/+1
| | | |
* | | | Merge pull request #19957 from rywall/patch-2Zachary Scott2015-04-291-0/+3
|\ \ \ \ | | | | | | | | | | Document :tld_length option for cookies.
| * | | | Document :tld_length option for cookies.Ryan Wallace2015-04-291-0/+3
| | |_|/ | |/| |
* | | | Merge pull request #19952 from vngrs/activejob_missing_error_messagesYves Senn2015-04-294-4/+4
|\ \ \ \ | | | | | | | | | | Add missing error messages for sucker_punch, sneakers and qu
| * | | | Add missing error messages for sucker_punch, sneakers and qu activejob ↵Mehmet Emin İNAÇ2015-04-294-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adapters [ci skip] fix error message change raise to use rails conventions fix misspells
* | | | | Merge pull request #19949 from thiagoaugusto/create-thiago-punctuation-fixYves Senn2015-04-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | CHANGELOG punctuation fix
| * | | | | CHANGELOG punctuation fixThiago Augusto2015-04-291-1/+1
| | |/ / / | |/| | | | | | | | Punctuation fix
* / | | | Revert "Merge pull request #19817 from tpitale/4_2-release-notes-fix"Godfrey Chan2015-04-281-2/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00aa1afae3821dd858dec7111bcdf230b12040d7, reversing changes made to b584cc68fc28492147ed3ed127ad8a7441ca8161. Reason: As far as we can tell, this should not be the case. Both localhost, 127.0.0.1 and ::1 is "supposed to work", so this is probably a bug somewhere. Reopening #19815 instead.
* | | | Merge pull request #19945 from thenickcox/migration_generator_docsZachary Scott2015-04-281-4/+5
|\ \ \ \ | | | | | | | | | | [ci skip] Correct grammar, add docs to ActiveRecord migration generator
| * | | | [ci skip] Correct grammar, add docs to ActiveRecord migration generatorNick Cox2015-04-281-4/+5
| | | | |
* | | | | Merge pull request #19941 from javan/actionmailer-cache-noopRafael Mendonça França2015-04-282-2/+14
|\ \ \ \ \ | | | | | | | | | | | | Make ActionMailer #cache helper a no-op, not an exception
| * | | | | Make ActionMailer #cache helper a no-op, not an exceptionJavan Makhmali2015-04-282-2/+14
|/ / / / /
* | | | | Merge pull request #19939 from artofhuman/remove-mocha-from-some-testsRafael Mendonça França2015-04-281-10/+13
|\ \ \ \ \ | |_|_|/ / |/| | | | Remove use of mocha in the named base tests
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-18 00:38:33 +0000