aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Inline block to fix indent [ci skip]Carlos Antonio da Silva2014-03-041-3/+1
| | | | |
* | | | | Merge pull request #14273 from vipulnsward/fix-warning-13244Yves Senn2014-03-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix enum test unused variable warning.
| * | | | | Fix enum test unused variable warning.Vipul A M2014-03-041-1/+1
|/ / / / / | | | | | | | | | | | | | | | Related - https://github.com/rails/rails/commit/5c55aafd38f45ac019573f98438ffdbdc8c580f9
* | | | | Merge pull request #13244 from kommen/pg_enum_type_mapYves Senn2014-03-044-0/+45
|\ \ \ \ \ | | | | | | | | | | | | Add Enum type to postgresql adapter's oids to prevent unknown OID warnings
| * | | | | Add Enum type to postgresql adapter's oids to prevent unknown OID warnings.Dieter Komendera2014-03-044-0/+45
| |/ / / /
* | | | | Use 1.9 style hash on docs [ci skip]Carlos Antonio da Silva2014-03-041-1/+1
| | | | |
* | | | | Simplify handling of defaults/options in button_tagCarlos Antonio da Silva2014-03-041-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to rely on Active Support's Hash#reverse_merge for simple cases with default values, since we can just merge from the default rather than reverse merge from the options. This also avoids the creation of one extra hash object by moving to a Hash#merge! call.
* | | | | Added missing changlog entry for #14255Godfrey Chan2014-03-041-0/+7
| | | | |
* | | | | Merge pull request #14255 from prikha/masterGodfrey Chan2014-03-042-5/+19
|\ \ \ \ \ | |/ / / / |/| | | | Fixes #14254 ActionView button_tag helper default options values issue.
| * | | | remove private method and rewrite into more precise notationSergey Prikhodko2014-03-041-12/+12
| | | | |
| * | | | rollback to private methodSergey Prikhodko2014-03-031-5/+9
| | | | |
| * | | | cleanup and move extracted method right into the helperSergey Prikhodko2014-03-031-9/+5
| | | | |
| * | | | fix content_or_options to be replaced by options and set to nilSergey Prikhodko2014-03-031-1/+6
| | | | |
| * | | | fix indentationsSergey Prikhodko2014-03-031-4/+3
| | | | |
| * | | | fix form buttonSergey Prikhodko2014-03-031-5/+2
| | | | |
| * | | | fix button tag without optionsSergey Prikhodko2014-03-031-2/+2
| | | | |
| * | | | fix accept nil optionsSergey Prikhodko2014-03-031-3/+5
| | | | |
| * | | | fixes default attributes for button_tagSergey Prikhodko2014-03-032-7/+18
| | | | |
* | | | | Merge pull request #14258 from shuhei/fix_deep_munge_logCarlos Antonio da Silva2014-03-031-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Add spaces to the log message of ActionController:: LogSubscriber#deep_munge
| * | | | | Add spaces to deep_munge log message.Shuhei Kagawa2014-03-031-3/+3
|/ / / / /
* | / / / Add a comment to ensure that a test won't be removed [ci skip]Robin Dupret2014-03-031-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | The 'cow' => 'kine' inflection has gone with c300dca9 but it should not be removed from the tested irregularities since it ensures that inflections work with words that do not begin with the same letters.
* | | | Merge pull request #14239 from zzak/refactor_actionpack_dispatch_request_testsJeremy Kemper2014-03-022-370/+386
|\ \ \ \ | | | | | | | | | | Refactor actionpack ActionDispatch::Request tests
| * | | | Refactor tests from BaseRackTest into BaseRequestTestZachary Scott2014-03-012-370/+386
| | |_|/ | |/| |
* | | | Merge pull request #14248 from vipulnsward/fix-pg-ar-warningsYves Senn2014-03-022-2/+2
|\ \ \ \ | |/ / / |/| | | Fix PG warnings.
| * | | Fix warnings due to:Vipul A M2014-03-032-2/+2
|/ / / | | | | | | | | | | | | - unused variable in PG Adapter. - Ambiguous argument warning from range_test for use - to + Infinity range without brackets.
* | | Merge pull request #14234 from arthurnn/fix_trans_on_replaceSantiago Pastorino2014-03-012-1/+13
|\ \ \ | | | | | | | | Remove unnecessary db call when replacing.
| * | | Remove unnecessary db call when replacing.Arthur Neves2014-02-282-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When replacing a has_many association with the same one, there is no need to do a round-trip to the db to create/and drop a new transaction. [fixes #14220]
* | | | Merge pull request #14240 from sferik/flat_mapJosé Valim2014-03-012-5/+5
|\ \ \ \ | | | | | | | | | | Replace map.flatten(1) with flat_map
| * | | | Replace map.flatten(1) with flat_mapErik Michaels-Ober2014-02-282-5/+5
|/ / / /
* | | | make sure we wait for the threads to shut down before asserting closureAaron Patterson2014-02-281-0/+1
| | | |
* | | | Merge pull request #14195 from robin850/issue-14079Guillermo Iguaran2014-02-283-2/+23
|\ \ \ \ | | | | | | | | | | Avoid namespacing routes inside engines
| * | | | Avoid namespacing routes inside enginesRobin Dupret2014-02-263-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since #11544, invoking the controller generator, any generated route is namespaced according to the class_path method. Since a mountable plugin is namespaced, creating a controller inside would generate a namespaced route based on the engine's name. The controller generator now relies on regular_class_path which does not contain the class hierarchy but the given path. Fixes #14079.
* | | | | use built-in exception handling in live controllersAaron Patterson2014-02-282-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when an exception happens in an action before the response has been committed, then we should re-raise the exception in the main thread. This lets us reuse the existing exception handling.
* | | | | live controllers should have live responsesAaron Patterson2014-02-283-21/+38
| |/ / / |/| | | | | | | | | | | | | | | | | | | detect the type of controller we're testing and return the right type of response based on that controller. This allows us to stop doing the weird sleep thing.
* | | | Merge pull request #14233 from kuldeepaggarwal/fix-secrets-docGuillermo Iguaran2014-02-282-4/+11
|\ \ \ \ | | | | | | | | | | use `secrets.secret_key_base` instead of `config.secret_key_base`
| * | | | [ci skip] use secrets.secret_key_base instead of config.secret_key_baseKuldeep Aggarwal2014-03-012-4/+11
| | | | | | | | | | | | | | | | | | | | use secrets.yml instead of secret_token.rb
* | | | | set the error callback to a nice default in case nobody set an error ↵Aaron Patterson2014-02-282-1/+8
| | | | | | | | | | | | | | | | | | | | callback and an error happens
* | | | | Merge pull request #14230 from kuldeepaggarwal/doc-selectRobin Dupret2014-02-281-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | Correct `select` examples and doc, ref [522c0fd] [ci skip]
| * | | | [ci skip] correct select examples and doc, ref [522c0fd]Kuldeep Aggarwal2014-03-011-4/+4
| | | | |
* | | | | Improve a bit the 4.1 release notes [ci skip]Robin Dupret2014-02-281-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Fix a few typos. #present_in has been changed to #presence_in through commit d61baee5.
* | | | | Merge pull request #14226 from senny/14109_partial_revertAaron Patterson2014-02-283-1/+26
|\ \ \ \ \ | | | | | | | | | | | | `includes` uses SQL parsing when String joins are involved.
| * | | | | `includes` uses SQL parsing when String joins are involved.Yves Senn2014-02-283-1/+26
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a partial revert of 22b3481ba2aa55fad1f9a5db94072312b345fb55. The current implementation of `references_eager_loaded_tables?` needs to know every table involved in the query. With the current API this is not possible without SQL parsing. While a2dab46cae35a06fd5c5500037177492a047c252 deprecated SQL parsing for `includes`. It did not issue deprecation warnings when String joins are involved. This resulted in a breaking change after the deprecated behavior was removed (22b3481ba2aa55fad1f9a5db94072312b345fb55). We will need to rethink the usage of `includes`, `preload` and `eager_load` but for now, this brings back the old *working* behavior.
* | | | | Merge pull request #14231 from brianstorti/bs-docs-secret-tokenGuillermo Iguaran2014-02-281-3/+18
|\ \ \ \ \ | |/ / / / |/| | | | Use secrets.yml instead of secret_token.rb in the docs
| * | | | [ci skip] use secrets.yml instead of secret_token.rb in the action ↵Brian Thomas Storti2014-02-271-3/+18
|/ / / / | | | | | | | | | | | | controller guide
* | | | Merge pull request #14203 from Alwahsh/aabouelhamayedGodfrey Chan2014-02-273-0/+42
|\ \ \ \ | | | | | | | | | | Fix a bug affecting validations of enum attributes
| * | | | Fix a bug affecting validations of enum attributesTheMonster2014-02-273-0/+42
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where any enum attribute of a model would be evaluated always as 0 when calling the database on validations. This fix converts the value of the enum attribute to its integer value rather than the string before building the relation as the bug occured when the string finally gets converted to integer using string.to_i which converts it to 0. [Vilius Luneckas, Ahmed AbouElhamayed]
* | | | Merge pull request #14174 from kuldeepaggarwal/fix-resource_generator_testYves Senn2014-02-273-5/+5
|\ \ \ \ | | | | | | | | | | fix test cases
| * | | | modify model generator warning message. refs [#174c9f0]Kuldeep Aggarwal2014-02-273-5/+5
| | | | |
* | | | | Replace "data store" with database [ci skip]Robin Dupret2014-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | Active Record is specifically for databases. Refs #12101.
* | | | | Merge pull request #11481 from sorentwo/fetch-multi-hashGuillermo Iguaran2014-02-273-14/+19
|\ \ \ \ \ | | | | | | | | | | | | Cache#fetch_multi returns a Hash instead of an Array
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-07 22:18:51 +0000