Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | gem 'mysql2', '~> 0.3.18' | Ryuta Kamizono | 2015-05-04 | 1 | -1/+1 |
| | | | | Follow up #18914. | ||||
* | Merge pull request #19991 from mcfiredrill/nodoc-postgresql-change-column | Richard Schneeman | 2015-05-03 | 1 | -2/+1 |
|\ | | | | | `:nodoc:` postgresql's change_column | ||||
| * | `:nodoc:` postgresql's change_column | Tony Miller | 2015-05-03 | 1 | -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_uniquiness | Yves Senn | 2015-05-03 | 1 | -1/+1 |
|\ | | | | | [ci skip] Uniquiness with scope can have one or more arguments | ||||
| * | [ci skip] Uniquiness with scope can have one or more arguments | Angelo Capilleri | 2015-05-03 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19984 from mcfiredrill/nodoc-change-column-null | Yves Senn | 2015-05-03 | 3 | -3/+3 |
|\ \ | | | | | | | :nodoc: change_column_null in the implmenting adapters | ||||
| * | | :nodoc: change_column_null in the implmenting adapters | Tony Miller | 2015-05-03 | 3 | -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_require | Yves Senn | 2015-05-03 | 2 | -2/+0 |
|\ \ \ | |/ / |/| | | Remove unused require | ||||
| * | | Remove unused require | Ryuta Kamizono | 2015-05-03 | 2 | -2/+0 |
|/ / | |||||
* | | Use `def before_setup` instead of `setup do` | eileencodes | 2015-05-02 | 1 | -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?` method | eileencodes | 2015-05-02 | 2 | -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 Scott | 2015-05-02 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19973 from trosborn/master | Zachary Scott | 2015-05-02 | 1 | -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 Osborn | 2015-05-01 | 1 | -46/+39 |
| |/ | |||||
* | | Merge pull request #19974 from yui-knk/fix/form_for_examples_2 | Zachary Scott | 2015-05-02 | 1 | -26/+36 |
|\ \ | | | | | | | [ci skip] Fix example codes of form_for method | ||||
| * | | [ci skip] Fix example codes of form_for method | yui-knk | 2015-05-02 | 1 | -26/+36 |
| |/ | |||||
* | | Merge pull request #19975 from prathamesh-sonpatki/engine-minor-changes | Zachary Scott | 2015-05-01 | 1 | -2/+2 |
|\ \ | |/ |/| | Added missing fullstop in engine API docs [ci skip] | ||||
| * | Added missing fullstop in engine API docs [ci skip] | Prathamesh Sonpatki | 2015-05-02 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #19971 from thiagoaugusto/improve-activerecord-changelog | Yves Senn | 2015-05-01 | 1 | -1/+1 |
|\ \ | | | | | | | Improvement on Activerecord CHANGELOG.md [ci skip] | ||||
| * | | Improvement on Activerecord CHANGELOG | thiagoaugusto | 2015-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #19970 from robertomiranda/patch-3 | Kasper Timm Hansen | 2015-05-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update documentation to contain a 24 char token [ci skip] | ||||
| * | | | Update documentation to contain a 24 char token [ci skip] | Roberto Miranda | 2015-05-01 | 1 | -1/+1 |
|/ / / | |||||
* | | | add test-case for `link_to_if` behavior with a block. | Yves Senn | 2015-05-01 | 1 | -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 Senn | 2015-05-01 | 3 | -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_addition | Yves Senn | 2015-05-01 | 3 | -1/+10 |
|\ \ \ | | | | | | | | | | | | | Update url_helper.rb | ||||
| * | | | Update url_helper.rb | Steven Spiel | 2015-04-21 | 1 | -1/+1 |
| | | | | | | | | | | | | add block to link_to_if when condition is true | ||||
* | | | | Merge pull request #19969 from y-yagi/fix_job_helper_method | Yves Senn | 2015-05-01 | 3 | -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 methods | yuuji.yaginuma | 2015-05-01 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #19962 from prathamesh-sonpatki/nodoc-validate-index-length | Yves Senn | 2015-04-30 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Nodoc validate_index_length! method | ||||
| * | | | | Nodoc validate_index_length! method | Prathamesh Sonpatki | 2015-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | - This method is used only by adapters to validate length of new index names. | ||||
* | | | | | Merge pull request #19961 from prathamesh-sonpatki/pg-docs | Richard Schneeman | 2015-04-30 | 2 | -2/+5 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Added documentation for PostGreSQL database_statements [ci skip] | ||||
| * | | | | Added documentation for PostGreSQL database_statements [ci skip] | Prathamesh Sonpatki | 2015-04-30 | 2 | -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-docs | Zachary Scott | 2015-04-29 | 1 | -11/+11 |
|\ \ \ \ | | | | | | | | | | | Fix style/grammar/typos in Caching guide. | ||||
| * | | | | Fix style/grammar/typos in Caching guide. | Tim Wade | 2015-04-29 | 1 | -11/+11 |
|/ / / / | | | | | | | | | | | | | | | | | * avoid using unnecessary commas * fix some typos | ||||
* | | | | Add doc for original_exception in ActiveJob::DeserializationError [ci skip] | Zachary Scott | 2015-04-29 | 1 | -0/+2 |
| | | | | |||||
* | | | | Add initial doc for Core in AJ [ci skip] | Zachary Scott | 2015-04-29 | 1 | -0/+2 |
| | | | | |||||
* | | | | Add initial doc for Enqueuing module [ci skip] | Zachary Scott | 2015-04-29 | 1 | -0/+1 |
| | | | | |||||
* | | | | Rails should be nodoc'd here [ci skip] | Zachary Scott | 2015-04-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #19957 from rywall/patch-2 | Zachary Scott | 2015-04-29 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | Document :tld_length option for cookies. | ||||
| * | | | | Document :tld_length option for cookies. | Ryan Wallace | 2015-04-29 | 1 | -0/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #19952 from vngrs/activejob_missing_error_messages | Yves Senn | 2015-04-29 | 4 | -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-29 | 4 | -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-fix | Yves Senn | 2015-04-29 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | CHANGELOG punctuation fix | ||||
| * | | | | | CHANGELOG punctuation fix | Thiago Augusto | 2015-04-29 | 1 | -1/+1 |
| | |/ / / | |/| | | | | | | | | Punctuation fix | ||||
* / | | | | Revert "Merge pull request #19817 from tpitale/4_2-release-notes-fix" | Godfrey Chan | 2015-04-28 | 1 | -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_docs | Zachary Scott | 2015-04-28 | 1 | -4/+5 |
|\ \ \ \ | | | | | | | | | | | [ci skip] Correct grammar, add docs to ActiveRecord migration generator | ||||
| * | | | | [ci skip] Correct grammar, add docs to ActiveRecord migration generator | Nick Cox | 2015-04-28 | 1 | -4/+5 |
| | | | | | |||||
* | | | | | Merge pull request #19941 from javan/actionmailer-cache-noop | Rafael Mendonça França | 2015-04-28 | 2 | -2/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Make ActionMailer #cache helper a no-op, not an exception | ||||
| * | | | | | Make ActionMailer #cache helper a no-op, not an exception | Javan Makhmali | 2015-04-28 | 2 | -2/+14 |
|/ / / / / | |||||
* | | | | | Merge pull request #19939 from artofhuman/remove-mocha-from-some-tests | Rafael Mendonça França | 2015-04-28 | 1 | -10/+13 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Remove use of mocha in the named base tests |