aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove not necessary file, move constants to the file they are usedCarlos Antonio da Silva2013-12-113-8/+8
| | | | | | | | File 'empty_bool.rb' was introduced around 4 years ago in c10958fbddb22052e7cbe5fe6b825cda3cb26e48 to remove method redefined warning in AS test suite, however we do not have such need for reuse anymore, so we can safely move the constants back to the file where they are currently used and get rid of the extra file/require.
* Merge pull request #13264 from ↵Rafael Mendonça França2013-12-113-2/+16
|\ | | | | | | | | laurocaetano/fix_dynamic_finder_with_reserved_words Prevent invalid code when using dynamic finders with reserved ruby word.
| * Prevent invalid code when using dynamic finders with Ruby's reserved words.Lauro Caetano2013-12-113-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dynamic finder was creating the method signature with the parameters name, which may have reserved words and this way creating invalid Ruby code. Closes: #13261 Example: # Before Dog.find_by_alias('dog name') # Was creating this method def self.find_by_alias(alias, options = {}) # After Dog.find_by_alias('dog name') # Will create this method def self.find_by_alias(_alias, options = {})
* | Merge branch 'support-deprecated-finders'Rafael Mendonça França2013-12-118-48/+66
|\ \
| * | Move the parameter normalization to the initialize methodRafael Mendonça França2013-12-111-4/+5
| | | | | | | | | | | | | | | activerecord-deprecated_finders expects the parameters denormalized in its initialize method
| * | Revert the whole refactoring in the association builder classes.Rafael Mendonça França2013-12-118-47/+64
| | | | | | | | | | | | This is to get activerecord-deprecated_finders work again
* | | Nodoc missing number helper classes in AS [ci skip]Carlos Antonio da Silva2013-12-113-4/+2
|/ / | | | | | | These classes are not meant to be public.
* | Revert "Merge pull request #13276 from aayushkhandelwal11/change_to_key"Rafael Mendonça França2013-12-111-1/+2
| | | | | | | | | | | | | | This will call primary_key two times This reverts commit d0588a2e897d33c6c12e9fc5f8680328d37a26ca, reversing changes made to 87e1e86640fb8b5a260ff7c0044aaae58fff2bc4.
* | Mark the arguments needed by activerecord-deprecated_finders with a TODORafael Mendonça França2013-12-114-2/+20
| |
* | Revert "Merge pull request #12518 from vipulnsward/remove_count_options"Rafael Mendonça França2013-12-115-17/+20
| | | | | | | | | | | | | | It is needed for activerecord-depecated_finders This reverts commit dcff027a5242b20c0c90eb062dddb22ccf51aed9, reversing changes made to 3a2093984ff49d86db1efeff0c7581e788ecfb9f.
* | Bring back the valid_options class accessorRafael Mendonça França2013-12-116-9/+14
| | | | | | | | It is need in activerecord-deprecated_finders
* | Merge pull request #13276 from aayushkhandelwal11/change_to_keyRafael Mendonça França2013-12-111-2/+1
|\ \ | | | | | | removing multiple check conditions to single check condition
| * | removing multiple check conditions to single check conditionAayush khandelwal2013-12-111-2/+1
| |/
* | Merge pull request #13273 from robertomiranda/test-remove-requireGuillermo Iguaran2013-12-111-1/+0
|\ \ | | | | | | Remove require 'models/administrator', Administrator is not used in secure password test
| * | Remove require 'models/administrator', Administrator is not used in secure ↵robertomiranda2013-12-111-1/+0
| | | | | | | | | | | | password test
* | | Merge pull request #13270 from aayushkhandelwal11/typosDamien Mathieu2013-12-112-2/+2
|\ \ \ | |_|/ |/| | typo rectified
| * | typo rectified [skip ci]Aayush khandelwal2013-12-112-2/+2
|/ /
* | Merge pull request #13260 from arunagw/using-parallelize_meAaron Patterson2013-12-101-6/+3
|\ \ | | | | | | Using parallelize_me! to parallelize isolated test
| * | Using parallelize_me! to parallelize isolated testArun Agrawal2013-12-101-6/+3
| | | | | | | | | | | | | | | As ParallelEach is no more available related commit ec00442c10cb90796909e876fb1cc557ed7518bd
* | | Merge pull request #12699 from drogus/fix-mounting-engine-in-resourcesPiotr Sarnacki2013-12-103-2/+18
|\ \ \ | | | | | | | | Fix mounting engines inside a resources block
| * | | Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-103-2/+18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a route is mounted inside a resources block, it's automatically prefixed, so a following code: resources :users do mount Blog::Engine => '/blog' end will generate a user_blog path helper. In order to access engine helpers, we also use "mounted_helpers", a list of helpers associated with each mounted engine, so a path to blog's post can be generated using user_blog.post_path(user, post). The problem I'm fixing here is that mount used a raw :as option, without taking nestings into account. As a result, blog was added to a route set as a `user_blog`, but helper was generated for just `blog`. This commit applies the proper logic for defining a helper for a mounted engine nested in resources or resource block. (closes #8533)
* | | Revert "Rename not Ruby files to .tt"Santiago Pastorino2013-12-1016-0/+0
| | | | | | | | | | | | | | | | | | This reverts commit bd360ad3c1d59273bf96ea01b17cf04285816dc2. Reverting this for now until we fix the Thor related issue
* | | Merge pull request #13258 from semaperepelitsa/docsDamien Mathieu2013-12-101-1/+1
|\ \ \ | | | | | | | | Fix typo in docs, missing colon in Symbol literal
| * | | Fix typo in docs, missing colon in Symbol literal [ci skip]Semyon Perepelitsa2013-12-111-1/+1
|/ / /
* | | Merge pull request #13257 from eshira/optimize-gsubJosé Valim2013-12-101-1/+2
|\ \ \ | | | | | | | | Replace with gsub! in ActiveSupport::Inflector
| * | | Replace with gsub! in ActiveSupport::Inflector.Elben Shira2013-12-101-1/+2
|/ / /
* | | Rename not Ruby files to .ttSantiago Pastorino2013-12-1016-0/+0
| | |
* | | Merge pull request #13253 from strzalek/variants-inline2David Heinemeier Hansson2013-12-103-4/+65
|\ \ \ | | | | | | | | Variants inline syntax v2
| * | | Inline variants syntaxŁukasz Strzałkowski2013-12-103-3/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, when setting variant specific code, you're not sharing any code within format. Inline syntax can vastly simplify defining variants in those situations: respond_to do |format| format.js { render "trash" } format.html do |variant| variant.phone { redirect_to progress_path } variant.none { render "trash" } end end Becomes: respond_to do |format| format.js { render "trash" } format.html.phone { redirect_to progress_path } format.html.none { render "trash" } end
| * | | Simplify @responses hash initializationŁukasz Strzałkowski2013-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @responses hash needs to be initialized with mime types that we get from Collector#collect_mimes_from_class_level. Mime::Type class as key and nil as value. This need to happen before content negotiation. Before that, it was looping though mime types and executing mime-type-generated method inside collector (see AbstractController::Collector#generate_method_for_mime). That approach resulted in 2 unnecessary method calls for each mime type collected by Collector#collect_mimes_from_class_level. Now hash is initialized in place, without usage of Collector#custom method.
* | | | make `collect_deprecations` available.Yves Senn2013-12-101-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are circumstances where the capabilities of `assert_deprecated` and `assert_not_deprecated` are not enough. For example if a ccertain call-path raises two deprecations but should only raise a single one. This module is still :nodoc and intented for internal use. /cc @rafaelfranca
* | | | Merge pull request #13236 from jetthoughts/13230_type_cast_bug_in_agr_functionsYves Senn2013-12-103-1/+23
|\ \ \ \ | | | | | | | | | | Fix type cast on group sum with custom expression
| * | | | Fix type cast on group sum with custom expressionPaul Nikitochkin2013-12-103-1/+23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | For PG adapters with custom expression and grouped result of aggregate functions have not found correct column type for it. Extract column type from query result. Closes: #13230
* | | | doc: date/conversions.rb should talk about date format not time format.Yves Senn2013-12-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes #13245. [ci skip]
* | | | Fix warnings on mysql2 explain testCarlos Antonio da Silva2013-12-101-3/+3
| | | |
* | | | Merge pull request #13248 from yahonda/support_mysql573_explainJeremy Kemper2013-12-091-3/+3
|\ \ \ \ | | | | | | | | | | Support MySQL 5.7 explain
| * | | | Support MySQL 5.7 explainYasuo Honda2013-12-101-3/+3
| |/ / /
* | | | Merge pull request #13247 from yahonda/support_mysql573_primary_keyJeremy Kemper2013-12-093-7/+7
|\ \ \ \ | |/ / / |/| | | | | | | From http://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-3.html: "Columns in a PRIMARY KEY must be NOT NULL, but if declared explicitly as NULL produced no error. Now an error occurs."
| * | | Remove `DEFAULT NULL` for primary key column to support MySQL 5.7.3Yasuo Honda2013-12-103-7/+7
|/ / / | | | | | | | | | Since MySQL 5.7.3 m13 does now allow primary key column is null.
* | | Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a ↵David Heinemeier Hansson2013-12-082-28/+10
| | | | | | | | | | | | | | | | | | | | | little more work! This reverts commit 186161148a189839a1e0924043f068a8d155ce69, reversing changes made to cad9eb178ea5eec0e27d74e93518f4ed34e2f997.
* | | Merge pull request #13235 from strzalek/variants-inlineDavid Heinemeier Hansson2013-12-082-10/+28
|\ \ \ | |/ / |/| | Inline syntax for variants
| * | Inline variants syntaxŁukasz Strzałkowski2013-12-082-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, when setting variant specific code, you're not sharing any code within format. Inline syntax can vastly simplify defining variants in those sitiations: respond_to do |format| format.js { render "trash" } format.html do |variant| variant.phone { redirect_to progress_path } variant.none { render "trash" } end end ` Becomes: respond_to do |format| format.js { render "trash" } format.html.phone { redirect_to progress_path } format.html.none { render "trash" } end
| * | Simplify @responses hash initializationŁukasz Strzałkowski2013-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @responses hash needs to be initialized with mime types that we get from Collector#collect_mimes_from_class_level. Mime::Type class as key and nil as value. This need to happen before content negotiation. Before that, it was looping though mime types and executing mime-type-generated method inside collector (see AbstractController::Collector#generate_method_for_mime). That approach resulted in 2 unnecessary method calls for each mime type collected by Collector#collect_mimes_from_class_level. Now hash is initialized in place, without usage of Collector#custom method.
* | | Merge pull request #13231 from chancancode/upgrade_minitestGuillermo Iguaran2013-12-081-1/+1
|\ \ \ | | | | | | | | Upgrade minitest version
| * | | Upgrade minitest versionGodfrey Chan2013-12-081-1/+1
| |/ / | | | | | | | | | | | | We made a change in #13213 that depends on a new file that's only in minitest 5.1.0+, so the version should be updated.
* | | Merge pull request #13232 from strzalek/av-missing-requiresRafael Mendonça França2013-12-082-0/+2
|\ \ \ | |/ / |/| | Require action_view explicitly in AC::Base
| * | Require action_view explicitly in AC::BaseŁukasz Strzałkowski2013-12-082-0/+2
|/ /
* | Variants can be declared without a block to signify their presence in the ↵David Heinemeier Hansson2013-12-073-2/+5
| | | | | | | | controller
* | Allow code execution in case no variant has been set with variant.noneDavid Heinemeier Hansson2013-12-072-4/+21
| |
* | Merge pull request #13221 from stereoscott/patch-1Godfrey Chan2013-12-061-1/+1
|\ \ | | | | | | fix tiny typo in comment, "state_state" should be "stale_state" [ci skip]