| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge pull request #9334 from NARKOZ/time_tag | Andrew White | 2013-02-21 | 2 | -19/+21 | |
| |\ \ | | | | | | | use ISO 8601 format in time_tag helper | |||||
| | * | | document setting custom datetime attribute for time_tag helper | Nihad Abbasov | 2013-02-22 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | fix time_tag helper and update tests to not rely on dynamically generated values | Nihad Abbasov | 2013-02-22 | 2 | -19/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | Before `time_tag Date.today` will return `<time datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`. This commit fixes time_tag helper to use RFC-3339 full-date format (Y-m-d) in datetime attribute. | |||||
| * | | | Merge pull request #9365 from gaganawhad/core-ext-beginning-of-minute | Andrew White | 2013-02-21 | 6 | -0/+61 | |
| |\ \ \ | | | | | | | | | Added beginning_of_minute support to core_ext calculations for Time and DateTime | |||||
| | * | | | Added beginning_of_minute support to core_ext calculations for Time and DateTime | Gagan Awhad | 2013-02-21 | 6 | -0/+61 | |
| | | | | | ||||||
| * | | | | completes pass over the AP changelog [ci skip] | Xavier Noria | 2013-02-21 | 2 | -15/+6 | |
| | | | | | ||||||
| * | | | | tweaks to the AP changelog [ci skip] | Xavier Noria | 2013-02-21 | 1 | -9/+3 | |
| | | | | | ||||||
| * | | | | Merge pull request #9361 from senny/improved_match_shorthand_syntax | Andrew White | 2013-02-21 | 3 | -14/+53 | |
| |\ \ \ \ | |/ / / |/| | | | determine the match shorthand target early. | |||||
| | * | | | determine the match shorthand target early. | Yves Senn | 2013-02-21 | 3 | -14/+53 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes. | |||||
| * | | | | Revert "Revert "Merge pull request #4803 from lucascaton/master"" | Santiago Pastorino | 2013-02-21 | 3 | -3/+5 | |
| | | | | | | | | | | | | | | | | | This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d. | |||||
| * | | | | This cache is not needed | Santiago Pastorino | 2013-02-21 | 1 | -2/+1 | |
| | | | | | ||||||
| * | | | | Use composition to figure out the forgery protection strategy | Santiago Pastorino | 2013-02-21 | 1 | -9/+27 | |
| | | | | | ||||||
| * | | | | Use #grep to filter priority zones when a regexp is given | Carlos Antonio da Silva | 2013-02-21 | 2 | -3/+5 | |
| | | | | | ||||||
| * | | | | Use Array Difference to calculate the zones array, instead of iterating | Carlos Antonio da Silva | 2013-02-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | It's faster, and doesn't force us to dup the timezones array. | |||||
| * | | | | Fix test name and refactor fake timezones creation in form options test | Carlos Antonio da Silva | 2013-02-21 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Remove not necessary changelog about time zone array mutation | Carlos Antonio da Silva | 2013-02-21 | 1 | -8/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seemed to be introduced in master by 9dd64f2e0c1b3ce85b503b0f81c50c93f89ffbcd, so there's no need to add a changelog entry for fixing it. [ci skip] | |||||
| * | | | | tweaks to the AP changelog [ci skip] | Xavier Noria | 2013-02-21 | 1 | -42/+27 | |
| | | | | | ||||||
| * | | | | Merge pull request #9358 from iwiznia/patch-1 | Xavier Noria | 2013-02-21 | 1 | -3/+3 | |
| |\ \ \ \ | |/ / / |/| | | | Update railties/lib/rails/application/configuration.rb | |||||
| | * | | | Update railties/lib/rails/application/configuration.rb | iwiznia | 2013-02-21 | 1 | -3/+3 | |
| | | | | | | | | | | | | | Better comment for database_configuration method | |||||
| | * | | | Update railties/lib/rails/application/configuration.rb | iwiznia | 2013-02-21 | 1 | -1/+1 | |
| |/ / / | | | | | | | Changed comment that referenced the property #database_configuration_file, now it's paths["config/database"] | |||||
| * | | | Merge pull request #9354 from NARKOZ/remove-warnings | Steve Klabnik | 2013-02-21 | 1 | -2/+2 | |
| |\ \ \ | | | | | | | | | remove assigned but unused variables | |||||
| | * | | | remove assigned but unused variable warning | Nihad Abbasov | 2013-02-21 | 1 | -2/+2 | |
| | | |/ | |/| | ||||||
| * | | | Merge pull request #9357 from fabiokr/rack_test_uploaded_file | Xavier Noria | 2013-02-21 | 2 | -4/+6 | |
| |\ \ \ | |/ / |/| | | Rack::Test::UploadedFile is a permitted scalar | |||||
| | * | | Rack::Test::UploadedFile is a permitted scalar | Fabio Kreusch | 2013-02-21 | 2 | -4/+6 | |
| |/ / | ||||||
| * | | Merge pull request #9348 from schuetzm/doc_no_indices_with_create_join_table | Xavier Noria | 2013-02-21 | 2 | -0/+18 | |
| |\ \ | | | | | | | Add more documentation for create_join_table. | |||||
| | * | | Indent comment block by two spaces. | Marc Schütz | 2013-02-21 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | As requested by @fxn https://github.com/schuetzm/rails/commit/743d15bba182df80d003d205690ead988970299c#commitcomment-2661417 | |||||
| | * | | Add more documentation for create_join_table. | Marc Schütz | 2013-02-20 | 2 | -0/+18 | |
| | | | | | | | | | | | | | | | | Explain that it doesn't create indices by default and that it also has a block form. | |||||
| * | | | Merge pull request #9352 from senny/remove_uncommented_boot_test | Carlos Antonio da Silva | 2013-02-21 | 1 | -20/+0 | |
| |\ \ \ | | | | | | | | | Remove commented railties boot_test.rb | |||||
| | * | | | remove uncommented railties boot_test.rb | Yves Senn | 2013-02-21 | 1 | -20/+0 | |
| | | | | | ||||||
| * | | | | Fix warning | Rafael Mendonça França | 2013-02-21 | 1 | -1/+1 | |
| | |/ / |/| | | ||||||
| * | | | ActiveRecord -> Active Record [ci skip] | Xavier Noria | 2013-02-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #9345 from ↵ | Rafael Mendonça França | 2013-02-20 | 1 | -10/+10 | |
| |\ \ \ | | | | | | | | | | | | | | | | | wangjohn/change_name_of_query_method_argument_checker_for_clarity Renaming the check_empty_arguments method to something more descriptive. | |||||
| | * | | | Renaming the check_empty_arguments method to something more descriptive. | wangjohn | 2013-02-20 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | The function is now called has_arguments? so that it's easier to tell that it's just checking to see if the args are blank or not. | |||||
| * | | | | removes relation bang methods from the AR changelog [ci skip] | Xavier Noria | 2013-02-20 | 1 | -12/+0 | |
| | | | | | ||||||
| * | | | | removes some remaining relation bang methods documentation [ci skip] | Xavier Noria | 2013-02-20 | 1 | -3/+0 | |
| | | | | | ||||||
| * | | | | puts a lambda around a default scope [ci skip] | Xavier Noria | 2013-02-20 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | adds an example in the docs of #not with multiple conditions [ci skip] | Xavier Noria | 2013-02-20 | 1 | -4/+8 | |
| | | | | | ||||||
| * | | | | database.yml -> config/database.yml [ci skip] | Xavier Noria | 2013-02-20 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Revert "Merge pull request #4803 from lucascaton/master" | Santiago Pastorino | 2013-02-20 | 3 | -5/+3 | |
| | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7. This was causing issues in one of our apps we just upgraded. ActionController::RoutingError: No route matches [GET] "/images/favicon.ico" favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned '/favicon.ico' Browsers by default look for favicon.ico in the root directory Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/asset_tag_helper.rb | |||||
| * | | | Skip failing test and add a FIXME note | Rafael Mendonça França | 2013-02-20 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge pull request #9344 from senny/changelog_cleanup | Rafael Mendonça França | 2013-02-20 | 1 | -4/+4 | |
| |\ \ \ | | | | | | | | | unify AR changelog entries [ci skip] | |||||
| | * | | | unify AR changelog entries [ci skip] | Yves Senn | 2013-02-20 | 1 | -4/+4 | |
| |/ / / | ||||||
| * | | | Merge pull request #8645 from senny/rename_index_on_rename_column | Rafael Mendonça França | 2013-02-20 | 7 | -8/+73 | |
| |\ \ \ | | | | | | | | | also rename indexes when a table or column is renamed | |||||
| | * | | | also rename indexes when a table or column is renamed | Yves Senn | 2013-02-20 | 7 | -8/+73 | |
| |/ / / | | | | | | | | | | When a table or a column is renamed related indexes kept their name. This will lead to confusing names. This patch renames related indexes when a column or a table is renamed. Only indexes with names generated by rails will be renamed. Indexes with custom names will not be renamed. | |||||
| * | | | moves the new :nsec date format to the Active Support changelog [ci skip] | Xavier Noria | 2013-02-20 | 2 | -6/+5 | |
| | | | | ||||||
| * | | | revises the documentation of AR::Base.cache_timestamp_format [ci skip] | Xavier Noria | 2013-02-20 | 1 | -2/+4 | |
| |/ / | ||||||
| * | | Merge pull request #8613 from senny/8264_character_limit_for_indices | Rafael Mendonça França | 2013-02-20 | 6 | -14/+69 | |
| |\ \ | | | | | | | deal with long index names and internal sqlite3 operations | |||||
| | * | | reserve less chars for internal sqlite3 operations | Yves Senn | 2013-02-20 | 1 | -7/+7 | |
| | | | | ||||||
| | * | | reserve index name chars for internal rails operations | Yves Senn | 2013-02-20 | 6 | -9/+64 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | Some adapter (SQLite3) need to perform renaming operations to support the rails DDL. These rename prefixes operate with prefixes. When an index name already uses up the full space provieded by `index_name_length` these internal operations will fail. This patch introduces `allowed_index_name_length` which respects the amount of characters used for internal operations. It will always be <= `index_name_length` and every adapter can define how many characters need to be reserved. | |||||
| * | | Merge pull request #9332 from ↵ | Rafael Mendonça França | 2013-02-20 | 3 | -15/+45 | |
| |\ \ | | | | | | | | | | | | | wangjohn/adding_documentation_to_error_raising_in_query_methods Tests to make sure empty arguments in WhereChain raise errors | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |